From 17ac111b289ffb9f0a804388e52f994d727abf52 Mon Sep 17 00:00:00 2001 From: xshuqun <77948861+xshuqun@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:16:04 +0800 Subject: [PATCH] [sdk] fix build issue with operational state (#182) * all-clusters-app/ameba operation state has been moved to all-clusters-app/all-clusters-common/src, therefore adding files to fix missing definition. * add app/cluster-init-callback.cpp for cluster initialization --- .../matter/example/aircon/lib_chip_aircon_main.mk | 1 + .../matter/example/bridge_dm/lib_chip_bridge_main.mk | 1 + .../matter/example/dishwasher/lib_chip_dishwasher_main.mk | 1 + .../application/matter/example/fan/lib_chip_fan_main.mk | 1 + .../example/laundrywasher/lib_chip_laundrywasher_main.mk | 1 + .../application/matter/example/light/lib_chip_light_main.mk | 1 + .../matter/example/light_dm/lib_chip_light_main.mk | 1 + .../example/refrigerator/lib_chip_refrigerator_main.mk | 1 + .../matter/example/thermostat/lib_chip_thermostat_main.mk | 1 + .../GCC-RELEASE/lib_chip_air_purifier_main.mk | 1 + .../GCC-RELEASE/lib_chip_chef_main.mk | 1 + .../GCC-RELEASE/lib_chip_light_main.mk | 1 + .../realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_main.mk | 5 +++-- .../GCC-RELEASE/lib_chip_otar_main.mk | 1 + .../GCC-RELEASE/lib_chip_switch_main.mk | 1 + tools/matter/codegen_helpers/expected.outputs | 1 + 16 files changed, 18 insertions(+), 2 deletions(-) diff --git a/component/common/application/matter/example/aircon/lib_chip_aircon_main.mk b/component/common/application/matter/example/aircon/lib_chip_aircon_main.mk index 4e589da6..ba7766ad 100644 --- a/component/common/application/matter/example/aircon/lib_chip_aircon_main.mk +++ b/component/common/application/matter/example/aircon/lib_chip_aircon_main.mk @@ -217,6 +217,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/bridge_dm/lib_chip_bridge_main.mk b/component/common/application/matter/example/bridge_dm/lib_chip_bridge_main.mk index 52183f45..fa000965 100644 --- a/component/common/application/matter/example/bridge_dm/lib_chip_bridge_main.mk +++ b/component/common/application/matter/example/bridge_dm/lib_chip_bridge_main.mk @@ -213,6 +213,7 @@ SRC_CPP += $(CHIPDIR)/src/lib/dnssd/minimal_mdns/responders/IP.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/dishwasher/lib_chip_dishwasher_main.mk b/component/common/application/matter/example/dishwasher/lib_chip_dishwasher_main.mk index c1f97fb0..7c7f4f72 100644 --- a/component/common/application/matter/example/dishwasher/lib_chip_dishwasher_main.mk +++ b/component/common/application/matter/example/dishwasher/lib_chip_dishwasher_main.mk @@ -208,6 +208,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/fan/lib_chip_fan_main.mk b/component/common/application/matter/example/fan/lib_chip_fan_main.mk index 56123414..dafcacad 100644 --- a/component/common/application/matter/example/fan/lib_chip_fan_main.mk +++ b/component/common/application/matter/example/fan/lib_chip_fan_main.mk @@ -217,6 +217,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/laundrywasher/lib_chip_laundrywasher_main.mk b/component/common/application/matter/example/laundrywasher/lib_chip_laundrywasher_main.mk index 8fc190da..91fd9a3c 100644 --- a/component/common/application/matter/example/laundrywasher/lib_chip_laundrywasher_main.mk +++ b/component/common/application/matter/example/laundrywasher/lib_chip_laundrywasher_main.mk @@ -212,6 +212,7 @@ SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/laundry- SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/light/lib_chip_light_main.mk b/component/common/application/matter/example/light/lib_chip_light_main.mk index 11cb3482..a66ff071 100644 --- a/component/common/application/matter/example/light/lib_chip_light_main.mk +++ b/component/common/application/matter/example/light/lib_chip_light_main.mk @@ -216,6 +216,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/light_dm/lib_chip_light_main.mk b/component/common/application/matter/example/light_dm/lib_chip_light_main.mk index a9167e77..802780bd 100644 --- a/component/common/application/matter/example/light_dm/lib_chip_light_main.mk +++ b/component/common/application/matter/example/light_dm/lib_chip_light_main.mk @@ -215,6 +215,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/refrigerator/lib_chip_refrigerator_main.mk b/component/common/application/matter/example/refrigerator/lib_chip_refrigerator_main.mk index 400f20e2..db680669 100644 --- a/component/common/application/matter/example/refrigerator/lib_chip_refrigerator_main.mk +++ b/component/common/application/matter/example/refrigerator/lib_chip_refrigerator_main.mk @@ -210,6 +210,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/component/common/application/matter/example/thermostat/lib_chip_thermostat_main.mk b/component/common/application/matter/example/thermostat/lib_chip_thermostat_main.mk index 4b01ef63..18a9aef4 100644 --- a/component/common/application/matter/example/thermostat/lib_chip_thermostat_main.mk +++ b/component/common/application/matter/example/thermostat/lib_chip_thermostat_main.mk @@ -216,6 +216,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_air_purifier_main.mk b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_air_purifier_main.mk index fe256b1c..18375ec7 100644 --- a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_air_purifier_main.mk +++ b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_air_purifier_main.mk @@ -213,6 +213,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_chef_main.mk b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_chef_main.mk index 1ab75250..c3671a06 100644 --- a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_chef_main.mk +++ b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_chef_main.mk @@ -209,6 +209,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_light_main.mk b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_light_main.mk index 629382a0..925e6813 100644 --- a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_light_main.mk +++ b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_light_main.mk @@ -211,6 +211,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_main.mk b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_main.mk index 23ce5dca..39a4b77c 100644 --- a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_main.mk +++ b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_main.mk @@ -213,6 +213,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -224,7 +225,8 @@ SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/laundry- SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/dishwasher-alarm-stub.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/dishwasher-mode.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/fan-stub.cpp -# SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/operational-state-delegate-impl.cpp +SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/operational-state-delegate-impl.cpp +SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/resource-monitoring-delegates.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/rvc-modes.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp @@ -234,7 +236,6 @@ SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/all-clusters-common/src/static-s SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/chipinterface.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/BindingHandler.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/ManualOperationCommand.cpp -SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/OperationalStateManager.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/SmokeCOAlarmManager.cpp SRC_CPP += $(CHIPDIR)/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp diff --git a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_otar_main.mk b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_otar_main.mk index 910f3427..5f13dbf6 100644 --- a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_otar_main.mk +++ b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_otar_main.mk @@ -213,6 +213,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_switch_main.mk b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_switch_main.mk index e4424d00..47cf9740 100644 --- a/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_switch_main.mk +++ b/project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_switch_main.mk @@ -213,6 +213,7 @@ SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp SRC_CPP += $(shell cat $(CODEGENDIR)/cluster-file.txt) SRC_CPP += $(CODEGENDIR)/app/callback-stub.cpp +SRC_CPP += $(CODEGENDIR)/app/cluster-init-callback.cpp SRC_CPP += $(CODEGENDIR)/zap-generated/IMClusterCommandHandler.cpp SRC_CPP += $(CHIPDIR)/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp diff --git a/tools/matter/codegen_helpers/expected.outputs b/tools/matter/codegen_helpers/expected.outputs index 98f8188f..24eba6b2 100644 --- a/tools/matter/codegen_helpers/expected.outputs +++ b/tools/matter/codegen_helpers/expected.outputs @@ -1,2 +1,3 @@ app/PluginApplicationCallbacks.h app/callback-stub.cpp +app/cluster-init-callback.cpp