Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build] Fix Build #121

Merged
merged 2 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
#define CONFIG_EXAMPLE_MATTER_CHIPTEST 1
#define CONFIG_EXAMPLE_MATTER_LIGHT 0
#define CONFIG_EXAMPLE_MATTER_THERMOSTAT 0
#define CONFIG_EXAMPLE_MATTER_BRIDGE 0
#define CONFIG_EXAMPLE_MATTER_AIRCON 0
#define CONFIG_EXAMPLE_MATTER_DISHWASHER 0
#define CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER 0
#define CONFIG_EXAMPLE_MATTER_REFRIGERATOR 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ You may add clusters and attributes handling in `matter_driver_uplink_update_han
## How to build

### Configurations
Enable `CONFIG_EXAMPLE_MATTER` and `CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER` in `platform_opts_matter.h`.
Enable `CONFIG_EXAMPLE_MATTER` and `CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER` in `platform_opts_matter.h`.
Ensure that `CONFIG_EXAMPLE_MATTER_CHIPTEST` is disabled.

### Setup the Build Environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "matter_drivers.h"
#include "matter_interaction.h"

#if defined(CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER) && CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER
#if defined(CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER) && CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER

static void example_matter_laundrywasher_task(void *pvParameters)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.o
rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.i
rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.s
rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.d
rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/air_purifier_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/air_purifier_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.o
rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.i
rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.s
rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.d
rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/aircon_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/aircon_port/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.o
rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.i
rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.s
rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.d
rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/all_clusters_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/all_clusters_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.o
rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.i
rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.s
rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.d
rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/bridge_dm_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_dm_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.o
rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.i
rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.s
rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.d
rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/bridge_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/bridge_port/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.o
rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.i
rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.s
rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.d
rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/dishwasher_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/dishwasher_port/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.o
rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.i
rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.s
rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.d
rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/laundrywasher_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/laundrywasher_port/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.o
rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.i
rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.s
rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.d
rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/light-switch_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/light_switch_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.o
rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.i
rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.s
rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.d
rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/lighting_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.o
rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.i
rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.s
rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.d
rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/lighting_dm_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_dm_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.o
rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.i
rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.s
rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.d
rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/lighting_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/lighting_port/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.o
rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.i
rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.s
rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.d
rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.ii
rm -f $(ROOTDIR)/make/chip_main/ota_requestor_app/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/ota_requestor_app/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.o
rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.i
rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.s
rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.d
rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/refrigerator_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/refrigerator_port/*.su

-include $(DEPS)
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ $(STATIC_LIB):$(OBJS)
# CLEAN GENERATED FILES #
#*****************************************************************************#
clean:
rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.o
rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.i
rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.s
rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.d
rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.ii
rm -f $(ROOTDIR)/make/chip_main/thermostat_port/*.su
rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.o
rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.i
rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.s
rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.d
rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.ii
rm -f $(MATTER_BUILDDIR)/make/chip_main/thermostat_port/*.su

-include $(DEPS)
2 changes: 1 addition & 1 deletion component/common/example/example_entry.c
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ example_hilink();
example_matter_aircon();
#elif defined(CONFIG_EXAMPLE_MATTER_DISHWASHER) && (CONFIG_EXAMPLE_MATTER_DISHWASHER == 1)
example_matter_dishwasher();
#elif defined(CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER) && (CONFIG_EXAMPLE_MATTER_LAUNDRYWASHER == 1)
#elif defined(CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER) && (CONFIG_EXAMPLE_MATTER_LAUNDRY_WASHER == 1)
example_matter_laundrywasher();
#endif
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ bridge_dm: build_target_folder copy_ld_img2 check_toolchain build_info.h
make -C $(MATTER_BUILDDIR) bridge_dm

dishwasher_port: build_target_folder copy_ld_img2 check_toolchain build_info.h
make -C $(MATTER_BUILDDIR) laundrywasher_port
make -C $(MATTER_BUILDDIR) dishwasher_port

laundrywasher_port: build_target_folder copy_ld_img2 check_toolchain build_info.h
make -C $(MATTER_BUILDDIR) laundrywasher_port
Expand Down
Loading