Skip to content

Commit 0d2ffbb

Browse files
authoredFeb 1, 2024
Feature/electrical energy & power measurement clusters (project-chip#31518)
* Hoist shared enums and bitmaps into detail namespace * Regenerate * Add electrical measurement clusters * Add NumberOfMeasurements attribute * Bump to latest spec * Bump ZAP version * Remove Electrical Measurement cluster * Add initial Electrical Power Measurement cluster implementation * Revert "Remove Electrical Measurement cluster" This reverts commit 47f5298. * Fix incorrect min/max values on energy attributes * Formatting electrical-power-measurement-server * Regen after restoring deprecated electrical measurement cluster * Re-add inexplicably important blank line to zap_execution.py * De-alphabetize list of files to avoid breaking GH action * Semi-realphabetize? * Restore strangely dropped events * Better BitMask handling * Change min/max on electrical measurements to be decimal instead of hex * Rename meas-and-sense to measurement-and-sensing.xml * Remove seemingly superfluous attribute requirements on Descriptor cluster on Electrical Measurement * Updates to electrical-power-measurement-server based on comments * Remove defaults from MeasurementAccuracyRangeStruct to match spec update * Restore side="server" to events * Move common enums and bitmaps to detail:: instead of detail::Enums and detail::Bitmaps; remove superfluous using statement * Assign ID to Electrical Sensor device type * Removed EPM and EEM from Root Node Device * Restyled formatting is different than clang-format * Re-add FeatureMap to attributeAccessInterfaceAttributes for EEM and EPM * Regen after merge * Lock client on Electrical Sensor device type * Remove unneeded using statement now that Enums are in detail:: * Check for null iterators and error * Switch to ResourceExhausted from CHIP_ERROR_INTERNAL * Add stub for EPM cluster * Fixes for Python tests * Correct name for Ember init callback * Formatting * Sync optional attributes list with .zap file for EPM * Add missing features to EPM stub * Revert FeatureMap in attributeAccessInterfaceAttributes * Allow FeatureMap in EEM constructor; add all-clusters-app EEM stub * Forgot zcl-with-test-extensions * Unregister EEM attribute access in destructor * Remove redundant returns to keep clang-tidy happy * Add CumulativeEnergyResetStruct and CumulativeEnergyReset attribute to EEM * Add optional CumulativeEnergyReset attribute to EEM
1 parent a77e01c commit 0d2ffbb

File tree

93 files changed

+18092
-1659
lines changed

Some content is hidden

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

93 files changed

+18092
-1659
lines changed
 

‎.github/workflows/tests.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
119119
src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
120120
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
121+
src/app/zap-templates/zcl/data-model/chip/measurement-and-sensing.xml \
121122
src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml \
122123
src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml \
123124
src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
@@ -194,6 +195,8 @@ jobs:
194195
src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
195196
src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml \
196197
src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml \
198+
src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml \
199+
src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml \
197200
"
198201
- name: Build Apps
199202
run: |

‎docs/clusters.md

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Generally regenerate using one of:
7777
| 114 | 0x72 | ActivatedCarbonFilterMonitoring |
7878
| 128 | 0x80 | BooleanStateConfiguration |
7979
| 129 | 0x81 | ValveConfigurationAndControl |
80+
| 144 | 0x90 | ElectricalPowerMeasurement |
8081
| 145 | 0x91 | ElectricalEnergyMeasurement |
8182
| 150 | 0x96 | DemandResponseLoadControl |
8283
| 151 | 0x97 | Messages |

0 commit comments

Comments
 (0)