diff --git a/component/common/application/matter/common/include/platform_opts_matter.h b/component/common/application/matter/common/include/platform_opts_matter.h index 4c7c9469..68e308f3 100644 --- a/component/common/application/matter/common/include/platform_opts_matter.h +++ b/component/common/application/matter/common/include/platform_opts_matter.h @@ -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 diff --git a/component/common/application/matter/example/laundrywasher/README.md b/component/common/application/matter/example/laundrywasher/README.md index 49c3fafd..6ba38ae6 100644 --- a/component/common/application/matter/example/laundrywasher/README.md +++ b/component/common/application/matter/example/laundrywasher/README.md @@ -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 diff --git a/component/common/application/matter/example/laundrywasher/example_matter_laundrywasher.cpp b/component/common/application/matter/example/laundrywasher/example_matter_laundrywasher.cpp index dc319ccd..c43a5184 100644 --- a/component/common/application/matter/example/laundrywasher/example_matter_laundrywasher.cpp +++ b/component/common/application/matter/example/laundrywasher/example_matter_laundrywasher.cpp @@ -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) { diff --git a/component/common/application/matter/project/amebad/make/chip_main/air_purifier_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/air_purifier_app/Makefile index 1fe5b810..e7eb6e76 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/air_purifier_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/air_purifier_app/Makefile @@ -168,11 +168,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/aircon_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/aircon_port/Makefile index 4d9f8639..ecc0365d 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/aircon_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/aircon_port/Makefile @@ -173,11 +173,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/all_clusters_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/all_clusters_app/Makefile index 07803b23..9694a1e3 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/all_clusters_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/all_clusters_app/Makefile @@ -198,11 +198,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/bridge_dm_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/bridge_dm_app/Makefile index 8e22455e..88ec88d9 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/bridge_dm_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/bridge_dm_app/Makefile @@ -173,11 +173,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/bridge_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/bridge_port/Makefile index 61016494..0b5f6a82 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/bridge_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/bridge_port/Makefile @@ -172,11 +172,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/dishwasher_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/dishwasher_port/Makefile index 084c38d0..20035a6d 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/dishwasher_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/dishwasher_port/Makefile @@ -179,11 +179,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/laundrywasher_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/laundrywasher_port/Makefile index 33c73547..d254d99a 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/laundrywasher_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/laundrywasher_port/Makefile @@ -178,11 +178,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/light_switch_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/light_switch_app/Makefile index 79ec4baa..367d7ad0 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/light_switch_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/light_switch_app/Makefile @@ -173,11 +173,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/lighting_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/lighting_app/Makefile index f5d4759d..9a48ea25 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/lighting_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/lighting_app/Makefile @@ -170,11 +170,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/lighting_dm_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/lighting_dm_app/Makefile index d579186a..1cce4b59 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/lighting_dm_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/lighting_dm_app/Makefile @@ -182,11 +182,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/lighting_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/lighting_port/Makefile index 1f80d15b..d00ade23 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/lighting_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/lighting_port/Makefile @@ -179,11 +179,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/ota_requestor_app/Makefile b/component/common/application/matter/project/amebad/make/chip_main/ota_requestor_app/Makefile index d0e3df54..4cefbe42 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/ota_requestor_app/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/ota_requestor_app/Makefile @@ -184,11 +184,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/refrigerator_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/refrigerator_port/Makefile index 04724033..1fbd42ac 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/refrigerator_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/refrigerator_port/Makefile @@ -180,11 +180,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) diff --git a/component/common/application/matter/project/amebad/make/chip_main/thermostat_port/Makefile b/component/common/application/matter/project/amebad/make/chip_main/thermostat_port/Makefile index d1e04cc7..4b646be5 100644 --- a/component/common/application/matter/project/amebad/make/chip_main/thermostat_port/Makefile +++ b/component/common/application/matter/project/amebad/make/chip_main/thermostat_port/Makefile @@ -180,11 +180,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) diff --git a/component/common/example/example_entry.c b/component/common/example/example_entry.c index 7814a5a2..283c7d82 100755 --- a/component/common/example/example_entry.c +++ b/component/common/example/example_entry.c @@ -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 diff --git a/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/Makefile b/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/Makefile index 96f9beae..7012d4c9 100755 --- a/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/Makefile +++ b/project/realtek_amebaD_va0_example/GCC-RELEASE/project_hp/asdk/Makefile @@ -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