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.

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

Feature/electrical energy & power measurement clusters #31518

Merged
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
6b02d7b
Hoist shared enums and bitmaps into detail namespace
hasty Dec 14, 2023
f6e2e30
Regenerate
hasty Dec 14, 2023
82716f2
Add electrical measurement clusters
hasty Nov 21, 2023
b4164bd
Add NumberOfMeasurements attribute
hasty Nov 22, 2023
9c2842c
Bump to latest spec
hasty Jan 17, 2024
18b453b
Bump ZAP version
hasty Jan 17, 2024
f9123c4
Remove Electrical Measurement cluster
hasty Jan 18, 2024
80960e1
Add initial Electrical Power Measurement cluster implementation
hasty Jan 18, 2024
e8a1f9c
Revert "Remove Electrical Measurement cluster"
hasty Jan 18, 2024
76a7465
Fix incorrect min/max values on energy attributes
hasty Jan 19, 2024
58d6cf2
Formatting electrical-power-measurement-server
hasty Jan 19, 2024
f755203
Regen after restoring deprecated electrical measurement cluster
hasty Jan 19, 2024
d55d637
Re-add inexplicably important blank line to zap_execution.py
hasty Jan 19, 2024
3aead8a
De-alphabetize list of files to avoid breaking GH action
hasty Jan 19, 2024
dbea267
Semi-realphabetize?
hasty Jan 19, 2024
1335b8a
Restore strangely dropped events
hasty Jan 19, 2024
58bfa09
Better BitMask handling
hasty Jan 19, 2024
519b0ac
Change min/max on electrical measurements to be decimal instead of hex
hasty Jan 22, 2024
9d79bba
Rename meas-and-sense to measurement-and-sensing.xml
hasty Jan 22, 2024
792b0e5
Remove seemingly superfluous attribute requirements on Descriptor clu…
hasty Jan 22, 2024
c7161de
Updates to electrical-power-measurement-server based on comments
hasty Jan 22, 2024
1ff7640
Remove defaults from MeasurementAccuracyRangeStruct to match spec update
hasty Jan 24, 2024
ab2ba44
Restore side="server" to events
hasty Jan 25, 2024
9117f30
Move common enums and bitmaps to detail:: instead of detail::Enums an…
hasty Jan 25, 2024
6b0b45c
Assign ID to Electrical Sensor device type
hasty Jan 25, 2024
adf13f6
Merge branch 'master' into granbery/electrical_measurement
hasty Jan 25, 2024
6dcf82c
Removed EPM and EEM from Root Node Device
hasty Jan 25, 2024
d788995
Restyled formatting is different than clang-format
hasty Jan 25, 2024
a9f0afd
Re-add FeatureMap to attributeAccessInterfaceAttributes for EEM and EPM
hasty Jan 25, 2024
ab17650
Regen after merge
hasty Jan 25, 2024
f854e11
Lock client on Electrical Sensor device type
hasty Jan 26, 2024
2d8fa4b
Remove unneeded using statement now that Enums are in detail::
hasty Jan 26, 2024
54b126f
Check for null iterators and error
hasty Jan 26, 2024
0fd361e
Switch to ResourceExhausted from CHIP_ERROR_INTERNAL
hasty Jan 26, 2024
29d6f41
Add stub for EPM cluster
hasty Jan 26, 2024
78c7658
Fixes for Python tests
hasty Jan 27, 2024
5677719
Merge branch 'master' into granbery/electrical_measurement
hasty Jan 27, 2024
887253a
Correct name for Ember init callback
hasty Jan 27, 2024
2e1d2c9
Formatting
hasty Jan 27, 2024
febcb9c
Merge branch 'master' into granbery/electrical_measurement
hasty Jan 27, 2024
8f1edea
Sync optional attributes list with .zap file for EPM
hasty Jan 27, 2024
3b4ad35
Add missing features to EPM stub
hasty Jan 27, 2024
1203545
Revert FeatureMap in attributeAccessInterfaceAttributes
hasty Jan 27, 2024
37e8fed
Allow FeatureMap in EEM constructor; add all-clusters-app EEM stub
hasty Jan 27, 2024
272ca37
Forgot zcl-with-test-extensions
hasty Jan 27, 2024
3fae3b4
Unregister EEM attribute access in destructor
hasty Jan 27, 2024
a951bf1
Remove redundant returns to keep clang-tidy happy
hasty Jan 28, 2024
d87f897
Merge branch 'master' into granbery/electrical_measurement
hasty Jan 30, 2024
0ed559c
Add CumulativeEnergyResetStruct and CumulativeEnergyReset attribute t…
hasty Jan 31, 2024
a730bf4
Merge branch 'granbery/electrical_measurement' of github.com:hasty/co…
hasty Jan 31, 2024
5ac33e5
Add optional CumulativeEnergyReset attribute to EEM
hasty Jan 31, 2024
94d96e4
Merge branch 'master' into granbery/electrical_measurement
hasty Jan 31, 2024
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
Prev Previous commit
Next Next commit
Forgot zcl-with-test-extensions
hasty committed Jan 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 272ca37de8dcf064b736e46d021fc9bf8ef6cff1
3 changes: 2 additions & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
Original file line number Diff line number Diff line change
@@ -610,7 +610,8 @@
"CumulativeEnergyImported",
"CumulativeEnergyExported",
"PeriodicEnergyImported",
"PeriodicEnergyExported"
"PeriodicEnergyExported",
"FeatureMap"
],
"Electrical Power Measurement": [
"PowerMode",