Skip to content

Commit f0d4f2d

Browse files
author
Thomas Hartwig
authored
Add Replaceable Monitoring Cluster Definition (#26431)
* Add Replacable Monitoring Cluster Definition * Add Cluster Definition to Relevant Lists * Enable New Clusters in Darvin and Android Clients * Add Clusters to Cluster List * Add Generated Code * Fix Code Formatting for Java Files When generating the code on macOS the java files cannot be formated due to the missing formatter. This commit regenerated the code inside a linux devcontainer which has the required tools and therefore formats the java files correctly. * Add Cluster Definition to CI Tests * Add Missing Cluster in Cluster List * Fix Java Code Gen * Revert Parameter Re-Ordering In order to keep the delta minimal the arguments to that script should not be re-ordered alphabetically. * Add Cluster Definition to CI Tests * Revert Re-Ordering * Add New Cluster * Revert Re-Ordering * Add New Cluster * Re-Add Changes The changes got lost during pre-re-ordering reconstruction. This commit re-introduces those chanes. * Revert Re-Sorting * Revert Re-Ordering * Re-Add Changes The changes got lost during pre-re-ordering reconstruction. This commit re-introduces those chanes. * Add Expected Generated Files * Update Generated Code * Update Feature Map Name * Move Line to Nearly Correct Position 😅 * Fix Attribute Definitions - Defines need to be the attribute name not the cluster name - Optionality was missing * Update Cluster Defines Defines should match other defines in the SDK. The pattern was missing the _CLUSTER suffix * Fix ZAP File ZAP does not really well handle things if cluster defines get renamed 😱
1 parent c96daf5 commit f0d4f2d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+71649
-11762
lines changed

‎.github/workflows/tests.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ jobs:
192192
src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \
193193
src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml \
194194
src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
195+
src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml \
195196
"
196197
- name: Build Apps
197198
timeout-minutes: 60

‎scripts/rules.matterlint

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ load "../src/app/zap-templates/zcl/data-model/draft/barrier-control-cluster.xml"
7575
load "../src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml";
7676
load "../src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml";
7777
load "../src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml";
78+
load "../src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml";
7879

7980
all endpoints {
8081
// These attributes follow a different code path and do not have to be

‎src/app/zap-templates/zcl/data-model/all.xml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<xi:include href="chip/pump-configuration-and-control-cluster.xml" />
5454
<xi:include href="chip/pwm-cluster.xml" />
5555
<xi:include href="chip/relative-humidity-measurement-cluster.xml" />
56+
<xi:include href="chip/replacable-monitoring-cluster.xml.xml" />
5657
<xi:include href="chip/scene.xml" />
5758
<xi:include href="chip/software-diagnostics-cluster.xml" />
5859
<xi:include href="chip/switch-cluster.xml" />

‎src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml

+324
Large diffs are not rendered by default.

‎src/app/zap-templates/zcl/zcl-with-test-extensions.json

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"pump-configuration-and-control-cluster.xml",
7272
"pwm-cluster.xml",
7373
"relative-humidity-measurement-cluster.xml",
74+
"replacable-monitoring-cluster.xml",
7475
"scene.xml",
7576
"software-diagnostics-cluster.xml",
7677
"switch-cluster.xml",

‎src/app/zap-templates/zcl/zcl.json

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"pump-configuration-and-control-cluster.xml",
7070
"pwm-cluster.xml",
7171
"relative-humidity-measurement-cluster.xml",
72+
"replacable-monitoring-cluster.xml",
7273
"scene.xml",
7374
"software-diagnostics-cluster.xml",
7475
"switch-cluster.xml",

‎src/app/zap_cluster_list.json

+12
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"ACCESS_CONTROL_CLUSTER": [],
44
"ACCOUNT_LOGIN_CLUSTER": [],
55
"ACTIONS_CLUSTER": [],
6+
"ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [],
67
"ADMINISTRATOR_COMMISSIONING_CLUSTER": [],
78
"ALARM_CLUSTER": [],
89
"APPLICATION_BASIC_CLUSTER": [],
@@ -15,6 +16,7 @@
1516
"BINDING_CLUSTER": [],
1617
"BOOLEAN_STATE_CLUSTER": [],
1718
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
19+
"CERAMIC_FILTER_MONITORING_CLUSTER": [],
1820
"CHANNEL_CLUSTER": [],
1921
"CLIENT_MONITORING_CLUSTER": [],
2022
"COLOR_CONTROL_CLUSTER": [],
@@ -25,18 +27,23 @@
2527
"DIAGNOSTIC_LOGS_CLUSTER": [],
2628
"DOOR_LOCK_CLUSTER": [],
2729
"ELECTRICAL_MEASUREMENT_CLUSTER": [],
30+
"ELECTROSTATIC_FILTER_MONITORING_CLUSTER": [],
2831
"ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
2932
"FAN_CONTROL_CLUSTER": [],
3033
"FAULT_INJECTION_CLUSTER": [],
3134
"FIXED_LABEL_CLUSTER": [],
3235
"FLOW_MEASUREMENT_CLUSTER": [],
36+
"FUEL_TANK_MONITORING_CLUSTER": [],
3337
"GENERAL_COMMISSIONING_CLUSTER": [],
3438
"GENERAL_DIAGNOSTICS_CLUSTER": [],
3539
"GROUP_KEY_MANAGEMENT_CLUSTER": [],
3640
"GROUPS_CLUSTER": [],
41+
"HEPA_FILTER_MONITORING_CLUSTER": [],
3742
"IAS_ZONE_CLUSTER": [],
3843
"IDENTIFY_CLUSTER": [],
3944
"ILLUMINANCE_MEASUREMENT_CLUSTER": [],
45+
"INK_CARTRIDGE_MONITORING_CLUSTER": [],
46+
"IONIZING_FILTER_MONITORING_CLUSTER": [],
4047
"KEYPAD_INPUT_CLUSTER": [],
4148
"LEVEL_CONTROL_CLUSTER": [],
4249
"LOCALIZATION_CONFIGURATION_CLUSTER": [],
@@ -52,6 +59,7 @@
5259
"OTA_BOOTLOAD_CLUSTER": [],
5360
"OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
5461
"OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
62+
"OZONE_FILTER_MONITORING_CLUSTER": [],
5563
"POLL_CONTROL_CLUSTER": [],
5664
"POWER_CONFIG_CLUSTER": [],
5765
"POWER_PROFILE_CLUSTER": [],
@@ -77,13 +85,17 @@
7785
"TIME_CLUSTER": [],
7886
"TIME_FORMAT_LOCALIZATION_CLUSTER": [],
7987
"TIME_SYNCHRONIZATION_CLUSTER": [],
88+
"TONER_CARTRIDGE_MONITORING_CLUSTER": [],
8089
"TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
8190
"UNIT_LOCALIZATION_CLUSTER": [],
8291
"UNIT_TESTING_CLUSTER": [],
8392
"USER_LABEL_CLUSTER": [],
93+
"UV_FILTER_MONITORING_CLUSTER": [],
8494
"WAKE_ON_LAN_CLUSTER": [],
95+
"WATER_TANK_MONITORING_CLUSTER": [],
8596
"WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
8697
"WINDOW_COVERING_CLUSTER": [],
98+
"ZEOLITE_FILTER_MONITORING_CLUSTER": [],
8799
"ZLL_COMMISSIONING_CLUSTER": []
88100
},
89101
"ServerDirectories": {

‎src/controller/data_model/BUILD.gn

+24
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,30 @@ if (current_os == "android" || build_java_matter_controller) {
174174
"jni/ElectricalMeasurementClient-InvokeSubscribeImpl.cpp",
175175
"jni/UnitTestingClient-ReadImpl.cpp",
176176
"jni/UnitTestingClient-InvokeSubscribeImpl.cpp",
177+
"jni/IonizingFilterMonitoringClient-ReadImpl.cpp",
178+
"jni/IonizingFilterMonitoringClient-InvokeSubscribeImpl.cpp",
179+
"jni/ZeoliteFilterMonitoringClient-ReadImpl.cpp",
180+
"jni/ZeoliteFilterMonitoringClient-InvokeSubscribeImpl.cpp",
181+
"jni/HepaFilterMonitoringClient-ReadImpl.cpp",
182+
"jni/HepaFilterMonitoringClient-InvokeSubscribeImpl.cpp",
183+
"jni/ElectrostaticFilterMonitoringClient-ReadImpl.cpp",
184+
"jni/ElectrostaticFilterMonitoringClient-InvokeSubscribeImpl.cpp",
185+
"jni/WaterTankMonitoringClient-ReadImpl.cpp",
186+
"jni/WaterTankMonitoringClient-InvokeSubscribeImpl.cpp",
187+
"jni/OzoneFilterMonitoringClient-ReadImpl.cpp",
188+
"jni/OzoneFilterMonitoringClient-InvokeSubscribeImpl.cpp",
189+
"jni/InkCartridgeMonitoringClient-ReadImpl.cpp",
190+
"jni/InkCartridgeMonitoringClient-InvokeSubscribeImpl.cpp",
191+
"jni/CeramicFilterMonitoringClient-ReadImpl.cpp",
192+
"jni/CeramicFilterMonitoringClient-InvokeSubscribeImpl.cpp",
193+
"jni/ActivatedCarbonFilterMonitoringClient-ReadImpl.cpp",
194+
"jni/ActivatedCarbonFilterMonitoringClient-InvokeSubscribeImpl.cpp",
195+
"jni/FuelTankMonitoringClient-ReadImpl.cpp",
196+
"jni/FuelTankMonitoringClient-InvokeSubscribeImpl.cpp",
197+
"jni/UvFilterMonitoringClient-ReadImpl.cpp",
198+
"jni/UvFilterMonitoringClient-InvokeSubscribeImpl.cpp",
199+
"jni/TonerCartridgeMonitoringClient-ReadImpl.cpp",
200+
"jni/TonerCartridgeMonitoringClient-InvokeSubscribeImpl.cpp",
177201

178202
# Disable CM cluster table tests until update is done
179203
# https://github.com/project-chip/connectedhomeip/issues/24425

0 commit comments

Comments
 (0)