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.

Sign up for GitHub

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

Jump to bottom

Add Concentration Measurement Cluster Definition #26525

Merged
merged 31 commits into from
May 26, 2023
Merged

Add Concentration Measurement Cluster Definition #26525

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
73ce064
Add Cluster Definition
p0fi May 11, 2023
3586159
Add New Cluster Definition to Required Files
p0fi May 11, 2023
87d3e79
Add New Clusters to ZAP Cluster List
p0fi May 11, 2023
f924aa6
Enable New Clusters in Controller
p0fi May 11, 2023
70514bc
Update Feature Map Name
p0fi May 11, 2023
67132a5
Add Generated Code
p0fi May 11, 2023
a8ba6ea
Merge branch 'project-chip:master' into 26225-add-concentration-measu…
May 11, 2023
28a1c10
Update Generated Code
p0fi May 11, 2023
7a300f6
Add Expected Build Files
p0fi May 11, 2023
18b2091
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
p0fi May 12, 2023
237b97c
Remove Min Max Values for Floating Point Numbers
p0fi May 12, 2023
591b78e
Fix Type Names
p0fi May 12, 2023
e240567
Update Cluster Names
p0fi May 12, 2023
0d4cd33
Merge branch 'master' of github.com:project-chip/connectedhomeip into…
p0fi May 12, 2023
545c078
Update Generated Code
p0fi May 12, 2023
2072c08
Update Expected Files
p0fi May 12, 2023
c7ee90f
Update src/app/zap-templates/zcl/data-model/chip/concentration-measur…
May 12, 2023
602c2ec
Update Generated Code
p0fi May 16, 2023
f55af61
Merge branch 'project-chip:master' into 26225-add-concentration-measu…
May 16, 2023
c13f062
Add Missing Expected Generated Files
p0fi May 16, 2023
72279af
Merge branch 'master' into 26225-add-concentration-measurement-cluste…
p0fi May 22, 2023
00dbd8a
Update Generated Code
p0fi May 22, 2023
dc14bba
Update Data Type
p0fi May 22, 2023
ccb1514
Fix Java Build
p0fi May 22, 2023
ef93df3
Fix Merge Chaos
p0fi May 22, 2023
f897c68
Merge branch 'master' into 26225-add-concentration-measurement-cluste…
p0fi May 22, 2023
41c386d
Merge branch 'master' into 26225-add-concentration-measurement-cluste…
p0fi May 22, 2023
58d2d1d
Merge branch 'master' into 26225-add-concentration-measurement-cluste…
p0fi May 26, 2023
0f165a1
Update Generated Code
p0fi May 26, 2023
d6bc709
Merge branch 'master' into 26225-add-concentration-measurement-cluste…
p0fi May 26, 2023
1ad07c0
Change Cluster Definition
p0fi May 26, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml \
src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
Expand Down
1 change: 1 addition & 0 deletions scripts/rules.matterlint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
load "../src/app/zap-templates/zcl/data-model/chip/chip-types.xml";
load "../src/app/zap-templates/zcl/data-model/chip/clusters-extensions.xml";
load "../src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml";
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/data-model/all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<xi:include href="chip/client-monitoring-cluster.xml" />
<xi:include href="chip/clusters-extensions.xml" />
<xi:include href="chip/color-control-cluster.xml" />
<xi:include href="chip/concentration-measurement-cluster.xml" />
<xi:include href="chip/content-launch-cluster.xml" />
<xi:include href="chip/descriptor-cluster.xml" />
<xi:include href="chip/diagnostic-logs-cluster.xml" />
Expand Down
1,028 changes: 1,028 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"client-monitoring-cluster.xml",
"clusters-extensions.xml",
"color-control-cluster.xml",
"concentration-measurement-cluster.xml",
"content-launch-cluster.xml",
"descriptor-cluster.xml",
"diagnostic-logs-cluster.xml",
Expand Down
1 change: 1 addition & 0 deletions src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"client-monitoring-cluster.xml",
"clusters-extensions.xml",
"color-control-cluster.xml",
"concentration-measurement-cluster.xml",
"content-launch-cluster.xml",
"descriptor-cluster.xml",
"diagnostic-logs-cluster.xml",
Expand Down
36 changes: 36 additions & 0 deletions src/app/zap_cluster_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,71 @@
"BINDING_CLUSTER": [],
"BOOLEAN_STATE_CLUSTER": [],
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
"BROMATE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"BROMODICHLOROMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"BROMOFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CHANNEL_CLUSTER": [],
"CHLORAMINES_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CHLORINE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CHLORODIBROMOMETHANE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CHLOROFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"CLIENT_MONITORING_CLUSTER": [],
"COLOR_CONTROL_CLUSTER": [],
"COMMISSIONING_CLUSTER": [],
"CONTENT_LAUNCHER_CLUSTER": [],
"COPPER_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"DESCRIPTOR_CLUSTER": [],
"DEVICE_TEMP_CLUSTER": [],
"DIAGNOSTIC_LOGS_CLUSTER": [],
"DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"DOOR_LOCK_CLUSTER": [],
"ELECTRICAL_MEASUREMENT_CLUSTER": [],
"ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
"ETHYLENE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"ETHYLENE_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"FAN_CONTROL_CLUSTER": [],
"FAULT_INJECTION_CLUSTER": [],
"FECAL_COLIFORM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"FIXED_LABEL_CLUSTER": [],
"FLOW_MEASUREMENT_CLUSTER": [],
"FLUORIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"GENERAL_COMMISSIONING_CLUSTER": [],
"GENERAL_DIAGNOSTICS_CLUSTER": [],
"GROUP_KEY_MANAGEMENT_CLUSTER": [],
"GROUPS_CLUSTER": [],
"HALOACETIC_ACIDS_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"HYDROGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"HYDROGEN_SULFIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"IAS_ZONE_CLUSTER": [],
"IDENTIFY_CLUSTER": [],
"ILLUMINANCE_MEASUREMENT_CLUSTER": [],
"KEYPAD_INPUT_CLUSTER": [],
"LEAD_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"LEVEL_CONTROL_CLUSTER": [],
"LOCALIZATION_CONFIGURATION_CLUSTER": [],
"LOW_POWER_CLUSTER": [],
"MANGANESE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"MEDIA_INPUT_CLUSTER": [],
"MEDIA_PLAYBACK_CLUSTER": [],
"MODE_SELECT_CLUSTER": [],
"NETWORK_COMMISSIONING_CLUSTER": [],
"NITRIC_OXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
"ON_OFF_CLUSTER": [],
"ON_OFF_SWITCH_CONFIGURATION_CLUSTER": [],
"OPERATIONAL_CREDENTIALS_CLUSTER": [],
"OTA_BOOTLOAD_CLUSTER": [],
"OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
"OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
"OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"PM10_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"PM1_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"PM2_5_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"POLL_CONTROL_CLUSTER": [],
"POWER_CONFIG_CLUSTER": [],
"POWER_PROFILE_CLUSTER": [],
Expand All @@ -65,9 +93,13 @@
"pump-configuration-and-control-client"
],
"PWM_CLUSTER": [],
"RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
"SCENES_CLUSTER": [],
"SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"SOFTWARE_DIAGNOSTICS_CLUSTER": [],
"SULFATE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"SULFUR_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"SWITCH_CLUSTER": [],
"TARGET_NAVIGATOR_CLUSTER": [],
"TEMPERATURE_MEASUREMENT_CLUSTER": [],
Expand All @@ -77,10 +109,14 @@
"TIME_CLUSTER": [],
"TIME_FORMAT_LOCALIZATION_CLUSTER": [],
"TIME_SYNCHRONIZATION_CLUSTER": [],
"TOTAL_COLIFORM_BACTERIA_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"TOTAL_TRIHALOMETHANES_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
"TURBIDITY_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"UNIT_LOCALIZATION_CLUSTER": [],
"UNIT_TESTING_CLUSTER": [],
"USER_LABEL_CLUSTER": [],
"VOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"WAKE_ON_LAN_CLUSTER": [],
"WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
"WINDOW_COVERING_CLUSTER": [],
Expand Down
66 changes: 66 additions & 0 deletions src/controller/data_model/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,72 @@ if (current_os == "android" || build_java_matter_controller) {
"jni/ElectricalMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/UnitTestingClient-ReadImpl.cpp",
"jni/UnitTestingClient-InvokeSubscribeImpl.cpp",
"jni/BromateConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/BromateConcentrationMeasurementClient-ReadImpl.cpp",
"jni/BromodichloromethaneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/BromodichloromethaneConcentrationMeasurementClient-ReadImpl.cpp",
"jni/BromoformConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/BromoformConcentrationMeasurementClient-ReadImpl.cpp",
"jni/CarbonDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/CarbonDioxideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/CarbonMonoxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/CarbonMonoxideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/ChloraminesConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/ChloraminesConcentrationMeasurementClient-ReadImpl.cpp",
"jni/ChlorineConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/ChlorineConcentrationMeasurementClient-ReadImpl.cpp",
"jni/ChlorodibromomethaneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/ChlorodibromomethaneConcentrationMeasurementClient-ReadImpl.cpp",
"jni/ChloroformConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/ChloroformConcentrationMeasurementClient-ReadImpl.cpp",
"jni/CopperConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/CopperConcentrationMeasurementClient-ReadImpl.cpp",
"jni/DissolvedOxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/DissolvedOxygenConcentrationMeasurementClient-ReadImpl.cpp",
"jni/EthyleneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/EthyleneConcentrationMeasurementClient-ReadImpl.cpp",
"jni/EthyleneOxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/EthyleneOxideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/FecalColiformEColiConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/FecalColiformEColiConcentrationMeasurementClient-ReadImpl.cpp",
"jni/FluorideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/FluorideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/FormaldehydeConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/FormaldehydeConcentrationMeasurementClient-ReadImpl.cpp",
"jni/HaloaceticAcidsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/HaloaceticAcidsConcentrationMeasurementClient-ReadImpl.cpp",
"jni/HydrogenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/HydrogenConcentrationMeasurementClient-ReadImpl.cpp",
"jni/HydrogenSulfideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/HydrogenSulfideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/LeadConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/LeadConcentrationMeasurementClient-ReadImpl.cpp",
"jni/ManganeseConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/ManganeseConcentrationMeasurementClient-ReadImpl.cpp",
"jni/NitricOxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/NitricOxideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/NitrogenDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/NitrogenDioxideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/OxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/OxygenConcentrationMeasurementClient-ReadImpl.cpp",
"jni/OzoneConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/OzoneConcentrationMeasurementClient-ReadImpl.cpp",
"jni/RadonConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/RadonConcentrationMeasurementClient-ReadImpl.cpp",
"jni/SodiumConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/SodiumConcentrationMeasurementClient-ReadImpl.cpp",
"jni/SulfateConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/SulfateConcentrationMeasurementClient-ReadImpl.cpp",
"jni/SulfurDioxideConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/SulfurDioxideConcentrationMeasurementClient-ReadImpl.cpp",
"jni/TotalColiformBacteriaConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/TotalColiformBacteriaConcentrationMeasurementClient-ReadImpl.cpp",
"jni/TotalTrihalomethanesConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/TotalTrihalomethanesConcentrationMeasurementClient-ReadImpl.cpp",
"jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/TotalVolatileOrganicCompoundsConcentrationMeasurementClient-ReadImpl.cpp",
"jni/TurbidityConcentrationMeasurementClient-InvokeSubscribeImpl.cpp",
"jni/TurbidityConcentrationMeasurementClient-ReadImpl.cpp",

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