From 029e40a76681f702e1f83c97b15bee3151562602 Mon Sep 17 00:00:00 2001 From: Rohit Jadhav Date: Fri, 30 Jun 2023 15:10:06 +0530 Subject: [PATCH] Fix CI --- .../all-clusters-app.matter | 17 +- .../all-clusters-common/all-clusters-app.zap | 302 +----------------- .../static-supported-temperature-levels.h | 7 - examples/all-clusters-app/linux/BUILD.gn | 1 - examples/all-clusters-app/nxp/mw320/BUILD.gn | 2 - examples/all-clusters-app/tizen/BUILD.gn | 1 - .../ameba/chip_main.cmake | 1 - .../all-clusters-minimal-app/asr/BUILD.gn | 1 - .../infineon/psoc6/BUILD.gn | 1 - .../all-clusters-minimal-app/linux/BUILD.gn | 1 - .../mbed/CMakeLists.txt | 1 - .../nrfconnect/CMakeLists.txt | 1 - .../telink/CMakeLists.txt | 1 - .../all-clusters-minimal-app/tizen/BUILD.gn | 1 - examples/placeholder/linux/apps/app1/BUILD.gn | 1 - examples/placeholder/linux/apps/app2/BUILD.gn | 1 - examples/shell/cc13x2x7_26x2x7/BUILD.gn | 1 - examples/shell/cc13x4_26x4/BUILD.gn | 1 - .../supported-temperature-levels-manager.cpp | 40 --- .../supported-temperature-levels-manager.h | 4 - 20 files changed, 4 insertions(+), 382 deletions(-) delete mode 100644 src/app/clusters/temperature-control-server/supported-temperature-levels-manager.cpp diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 4504f2f38d6e18..19647963092547 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2490,6 +2490,7 @@ server cluster ModeSelect = 80 { command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; } +<<<<<<< HEAD /** Attributes and commands for configuring the temperature control, and reporting temperature. */ server cluster TemperatureControl = 86 { bitmap Feature : BITMAP32 { @@ -2528,11 +2529,6 @@ server cluster RefrigeratorAlarm = 87 { AlarmMap mask = 3; } -<<<<<<< HEAD -======= - readonly attribute AlarmMap mask = 0; - readonly attribute AlarmMap state = 2; - readonly attribute AlarmMap supported = 3; /** Attributes and commands for configuring the temperature control, and reporting temperature. */ server cluster TemperatureControl = 86 { bitmap Feature : BITMAP32 { @@ -2544,7 +2540,6 @@ server cluster TemperatureControl = 86 { readonly attribute temperature temperatureSetpoint = 0; readonly attribute temperature minTemperature = 1; readonly attribute temperature maxTemperature = 2; ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -6706,23 +6701,13 @@ endpoint 1 { } server cluster TemperatureControl { -<<<<<<< HEAD ram attribute selectedTemperatureLevel default = 0; callback attribute supportedTemperatureLevels; -======= - ram attribute temperatureSetpoint default = 1; - ram attribute minTemperature default = 0; - ram attribute maxTemperature default = 100; ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) callback attribute generatedCommandList; callback attribute acceptedCommandList; callback attribute eventList; callback attribute attributeList; -<<<<<<< HEAD ram attribute featureMap default = 2; -======= - ram attribute featureMap default = 1; ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) ram attribute clusterRevision default = 1; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index f38678d960faf1..dd8d6c688afa57 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -7034,211 +7034,6 @@ ] }, { -<<<<<<< HEAD -======= - "name": "Temperature Control", - "code": 86, - "mfgCode": null, - "define": "TEMPERATURE_CONTROL_CLUSTER", - "side": "server", - "enabled": 0, - "attributes": [ - { - "name": "TemperatureSetpoint", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "temperature", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MinTemperature", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "temperature", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "MaxTemperature", - "code": 2, - "mfgCode": null, - "side": "server", - "type": "temperature", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "Step", - "code": 3, - "mfgCode": null, - "side": "server", - "type": "temperature", - "included": 0, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SelectedTemperatureLevel", - "code": 4, - "mfgCode": null, - "side": "server", - "type": "int8u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "SupportedTemperatureLevels", - "code": 5, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "2", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) "name": "Door Lock", "code": 257, "mfgCode": null, @@ -13844,11 +13639,7 @@ "mfgCode": null, "side": "server", "type": "temperature", -<<<<<<< HEAD "included": 0, -======= - "included": 1, ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -13864,11 +13655,7 @@ "mfgCode": null, "side": "server", "type": "temperature", -<<<<<<< HEAD "included": 0, -======= - "included": 1, ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -13881,7 +13668,6 @@ { "name": "MaxTemperature", "code": 2, -<<<<<<< HEAD "mfgCode": null, "side": "server", "type": "temperature", @@ -13917,11 +13703,6 @@ "mfgCode": null, "side": "server", "type": "int8u", -======= - "mfgCode": null, - "side": "server", - "type": "temperature", ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) "included": 1, "storageOption": "RAM", "singleton": 0, @@ -13954,11 +13735,11 @@ "mfgCode": null, "side": "server", "type": "int8u", - "included": 0, + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -13970,7 +13751,7 @@ "mfgCode": null, "side": "server", "type": "array", - "included": 0, + "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, @@ -14177,82 +13958,6 @@ "reportableChange": 0 }, { - "name": "GeneratedCommandList", - "code": 65528, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AcceptedCommandList", - "code": 65529, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "EventList", - "code": 65530, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "AttributeList", - "code": 65531, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, -<<<<<<< HEAD -======= - "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -14432,7 +14137,6 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) "defaultValue": "1", "reportable": 1, "minInterval": 1, diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h index f104e1a8c90b3a..9936a1ac086b54 100644 --- a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h +++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h @@ -21,7 +21,6 @@ #include #include #include ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) namespace chip { namespace app { @@ -33,12 +32,6 @@ namespace TemperatureControl { */ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsIteratorDelegate -======= -class StaticSupportedTemperatureLevels : public SupportedTemperatureLevelsIterator ->>>>>>> 07d46e3ba1 (Restructure server implementation to match spec) -======= -class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsIteratorDelegate ->>>>>>> 569182fe4e (Addressed review comments) { struct EndpointPair { diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn index b97b6b8064aaa8..3e2f9c40f807a7 100644 --- a/examples/all-clusters-app/linux/BUILD.gn +++ b/examples/all-clusters-app/linux/BUILD.gn @@ -29,7 +29,6 @@ source_set("chip-all-clusters-common") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", - "${chip_root}/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.cpp", "AllClustersCommandDelegate.cpp", "AppOptions.cpp", "WindowCoveringManager.cpp", diff --git a/examples/all-clusters-app/nxp/mw320/BUILD.gn b/examples/all-clusters-app/nxp/mw320/BUILD.gn index 6fbb361d05e75e..bd40e0ff3a4317 100644 --- a/examples/all-clusters-app/nxp/mw320/BUILD.gn +++ b/examples/all-clusters-app/nxp/mw320/BUILD.gn @@ -30,11 +30,9 @@ mw320_sdk("sdk") { "${examples_plat_dir}/app/project_include", "${chip_root}/src/app/util", "${chip_root}/examples/all-clusters-app/nxp/mw320/include", - "${chip_root}/examples/all-clusters-app/all-clusters-common/include", ] sources = [ - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", "include/CHIPProjectConfig.h", "include/FreeRTOSConfig.h", ] diff --git a/examples/all-clusters-app/tizen/BUILD.gn b/examples/all-clusters-app/tizen/BUILD.gn index 438f1ee5266eef..94e841dd81dbed 100644 --- a/examples/all-clusters-app/tizen/BUILD.gn +++ b/examples/all-clusters-app/tizen/BUILD.gn @@ -28,7 +28,6 @@ source_set("chip-all-clusters-common") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", - "${chip_root}/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.cpp", ] deps = [ diff --git a/examples/all-clusters-minimal-app/ameba/chip_main.cmake b/examples/all-clusters-minimal-app/ameba/chip_main.cmake index 3b1ff990d02fff..95b062a636f0a6 100755 --- a/examples/all-clusters-minimal-app/ameba/chip_main.cmake +++ b/examples/all-clusters-minimal-app/ameba/chip_main.cmake @@ -131,7 +131,6 @@ list( ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/bridged-actions-stub.cpp ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/smco-stub.cpp ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/static-supported-modes-manager.cpp - ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/static-supported-temperature-levels.cpp ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp diff --git a/examples/all-clusters-minimal-app/asr/BUILD.gn b/examples/all-clusters-minimal-app/asr/BUILD.gn index d6bc66fe2f7c99..f918700d18e314 100755 --- a/examples/all-clusters-minimal-app/asr/BUILD.gn +++ b/examples/all-clusters-minimal-app/asr/BUILD.gn @@ -74,7 +74,6 @@ asr_executable("clusters_minimal_app") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", "${examples_plat_dir}/CHIPDeviceManager.cpp", "${examples_plat_dir}/LEDWidget.cpp", "${examples_plat_dir}/init_Matter.cpp", diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn b/examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn index 70dbacaf509430..721b1492d4c1f5 100644 --- a/examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn +++ b/examples/all-clusters-minimal-app/infineon/psoc6/BUILD.gn @@ -111,7 +111,6 @@ psoc6_executable("clusters_minimal_app") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", "${examples_plat_dir}/LEDWidget.cpp", "${examples_plat_dir}/init_psoc6Platform.cpp", "src/AppTask.cpp", diff --git a/examples/all-clusters-minimal-app/linux/BUILD.gn b/examples/all-clusters-minimal-app/linux/BUILD.gn index e417969c151c65..ea25284906df07 100644 --- a/examples/all-clusters-minimal-app/linux/BUILD.gn +++ b/examples/all-clusters-minimal-app/linux/BUILD.gn @@ -25,7 +25,6 @@ source_set("chip-all-clusters-common") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", "AppOptions.cpp", "include/tv-callbacks.cpp", "include/tv-callbacks.h", diff --git a/examples/all-clusters-minimal-app/mbed/CMakeLists.txt b/examples/all-clusters-minimal-app/mbed/CMakeLists.txt index 7e4af8f0b51270..e50fcef67663f8 100644 --- a/examples/all-clusters-minimal-app/mbed/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/mbed/CMakeLists.txt @@ -62,7 +62,6 @@ target_sources(${APP_TARGET} PRIVATE ${ALL_CLUSTERS_COMMON}/src/bridged-actions-stub.cpp ${ALL_CLUSTERS_COMMON}/src/smco-stub.cpp ${ALL_CLUSTERS_COMMON}/src/static-supported-modes-manager.cpp - ${ALL_CLUSTERS_COMMON}/src/static-supported-temperature-levels.cpp ) chip_configure_data_model(${APP_TARGET} diff --git a/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt b/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt index 19d03c00beb378..2e5c3fbbf1102f 100644 --- a/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/nrfconnect/CMakeLists.txt @@ -57,7 +57,6 @@ target_sources(app PRIVATE main/main.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/smco-stub.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp - ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-temperature-levels.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp ${NRFCONNECT_COMMON}/util/LEDWidget.cpp) diff --git a/examples/all-clusters-minimal-app/telink/CMakeLists.txt b/examples/all-clusters-minimal-app/telink/CMakeLists.txt index d21468a9a34b33..410f305c3b317a 100644 --- a/examples/all-clusters-minimal-app/telink/CMakeLists.txt +++ b/examples/all-clusters-minimal-app/telink/CMakeLists.txt @@ -72,7 +72,6 @@ target_sources(app PRIVATE src/AppTask.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/smco-stub.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp - ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-temperature-levels.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp ${TELINK_COMMON}/common/src/mainCommon.cpp diff --git a/examples/all-clusters-minimal-app/tizen/BUILD.gn b/examples/all-clusters-minimal-app/tizen/BUILD.gn index 34b3c0b27806d5..5485fdd469d223 100644 --- a/examples/all-clusters-minimal-app/tizen/BUILD.gn +++ b/examples/all-clusters-minimal-app/tizen/BUILD.gn @@ -27,7 +27,6 @@ source_set("chip-all-clusters-common") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", ] deps = [ diff --git a/examples/placeholder/linux/apps/app1/BUILD.gn b/examples/placeholder/linux/apps/app1/BUILD.gn index cf6920b1d6b107..595a0b7563132c 100644 --- a/examples/placeholder/linux/apps/app1/BUILD.gn +++ b/examples/placeholder/linux/apps/app1/BUILD.gn @@ -32,7 +32,6 @@ source_set("app1") { sources = [ "../../src/bridged-actions-stub.cpp", "../../static-supported-modes-manager.cpp", - "../../static-supported-temperature-levels.cpp", ] public_deps = [ ":configuration" ] diff --git a/examples/placeholder/linux/apps/app2/BUILD.gn b/examples/placeholder/linux/apps/app2/BUILD.gn index 87868f4601a5d9..7d8f30a8ea83ec 100644 --- a/examples/placeholder/linux/apps/app2/BUILD.gn +++ b/examples/placeholder/linux/apps/app2/BUILD.gn @@ -32,7 +32,6 @@ source_set("app2") { sources = [ "../../src/bridged-actions-stub.cpp", "../../static-supported-modes-manager.cpp", - "../../static-supported-temperature-levels.cpp", ] public_deps = [ ":configuration" ] diff --git a/examples/shell/cc13x2x7_26x2x7/BUILD.gn b/examples/shell/cc13x2x7_26x2x7/BUILD.gn index f63e480e7e1cab..45351e854e6150 100644 --- a/examples/shell/cc13x2x7_26x2x7/BUILD.gn +++ b/examples/shell/cc13x2x7_26x2x7/BUILD.gn @@ -78,7 +78,6 @@ ti_simplelink_executable("shell_app") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/smco-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", "main/AppTask.cpp", "main/main.cpp", ] diff --git a/examples/shell/cc13x4_26x4/BUILD.gn b/examples/shell/cc13x4_26x4/BUILD.gn index b0bd0073a07419..1b950f20f1d9bc 100644 --- a/examples/shell/cc13x4_26x4/BUILD.gn +++ b/examples/shell/cc13x4_26x4/BUILD.gn @@ -77,7 +77,6 @@ ti_simplelink_executable("shell_app") { "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp", "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp", - "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp", "main/AppTask.cpp", "main/main.cpp", ] diff --git a/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.cpp b/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.cpp deleted file mode 100644 index e0b60278d96f3b..00000000000000 --- a/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * - * Copyright (c) 2023 Project CHIP Authors - * All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "supported-temperature-levels-manager.h" - -namespace chip { -namespace app { -namespace Clusters { -namespace TemperatureControl { -static SupportedTemperatureLevelsIteratorDelegate * sInstance = nullptr; - -SupportedTemperatureLevelsIteratorDelegate * SupportedTemperatureLevelsIteratorDelegate::GetInstance() -{ - return sInstance; -} - -void SupportedTemperatureLevelsIteratorDelegate::SetInstance(SupportedTemperatureLevelsIteratorDelegate * instance) -{ - sInstance = instance; -} - -} // namespace TemperatureControl -} // namespace Clusters -} // namespace app -} // namespace chip diff --git a/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.h b/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.h index b5092eba36e9cc..be8c1123dd2f1a 100644 --- a/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.h +++ b/src/app/clusters/temperature-control-server/supported-temperature-levels-manager.h @@ -47,10 +47,6 @@ class SupportedTemperatureLevelsIteratorDelegate virtual CHIP_ERROR Next(chip::MutableCharSpan & item) = 0; - static SupportedTemperatureLevelsIteratorDelegate * GetInstance(); - - static void SetInstance(SupportedTemperatureLevelsIteratorDelegate * instance); - protected: EndpointId mEndpoint; uint8_t mIndex;