Energy gateway app (Part 2) - Add CommodityPrice Delegate and Test Event Trigger support#38255
Merged
mergify[bot] merged 179 commits intoproject-chip:masterfrom Apr 25, 2025
Merged
Conversation
…e due to device type problems bringing in expected clusters.
…g error 'Unable to find cluster extension by component'
…l and global-enums.xml (NOTE: ApparentPowerThresholds SHOULD be power_mva! but Zap does not recognise this yet.
…s. Removed legacy measurement-and-sensing.xml in favour of new global-structs/global-enums.xml
…s in attributes- regen_all
…tub basic-type Currency. Disabled Ember in config-data.yaml. Linux now builds but aborts at start-up.
…pe' into energy-gateway-app
…pe' into energy-gateway-app
|
PR #38255: Size comparison from bc7f2a4 to 96a3110 Full report (14 builds for cc13x4_26x4, cc32xx, nrfconnect, qpg, stm32, tizen)
|
This was referenced Apr 24, 2025
|
PR #38255: Size comparison from bc7f2a4 to 49a3e80 Full report (75 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
bzbarsky-apple
approved these changes
Apr 25, 2025
Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
|
PR #38255: Size comparison from 40ee1e9 to 42306bb Full report (3 builds for cc32xx, stm32)
|
hasty
approved these changes
Apr 25, 2025
|
PR #38255: Size comparison from 40ee1e9 to 8c2ff6c Full report (46 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, nrfconnect, psoc6, qpg, stm32, telink, tizen)
|
|
PR #38255: Size comparison from 40ee1e9 to 6b8c310 Full report (75 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
jamesharrow
commented
Apr 25, 2025
Contributor
Author
jamesharrow
left a comment
jamesharrow
left a comment
There was a problem hiding this comment.
Updated after reviews
sayondeep
pushed a commit
to sayondeep/connectedhomeip
that referenced
this pull request
Apr 26, 2025
…ent Trigger support (project-chip#38255) * Basic energy-gateway-app framework for Linux and ESP32 - linking issue due to device type problems bringing in expected clusters. * Initial attempt to add new clusters based of PR 10815 - ZAP is raising error 'Unable to find cluster extension by component' * Added missing xml files to zcl.json. Added regen of global-structs.xml and global-enums.xml (NOTE: ApparentPowerThresholds SHOULD be power_mva! but Zap does not recognise this yet. * Temporary change of "money" to int64s whilst waiting for a ZAP change. * Added Meter Identification cluster XML * Updated tests.yaml and rules.matterlint to include new clusters * .matter file updates caused by new enums * Updated files after zap_regen_all * New files after zap_regen_all * Add support for money and new electrical data types * Added new attributes for structs to attributeAccessInterfaceAttributes. Removed legacy measurement-and-sensing.xml in favour of new global-structs/global-enums.xml * Updated .matter files after subsequent regen_all * code autogen after moving to global structs/enums and updating structs in attributes- regen_all * Backed out change to support SetVidVerificationStatement etc * Enabled Commodity Price in data_model/contoller-clusters.zap. Added stub basic-type Currency. Disabled Ember in config-data.yaml. Linux now builds but aborts at start-up. * Update chip-types.xml with new energy types and money * Changed to use correct global struct CurrencyStruct * Revert changes to generated attribute-type.h file * regen_all after merging in Hasty's new types PR: project-chip#37980 * Further zap_regen_all updates after picking up fix from Hasty#s project-chip#37980 * Revert reversion of generated attribute-type.h * Fix build issue due to moving MeasurementAccuracyStruct to global-structs. * Restyled by whitespace * Restyled by clang-format * Restyled by gn * Update attribute-type.h * Fix EEM/EPM clusters which use new global MeasurementAccuracyRangeStruct and MeasurementTypeEnum * Restyled by clang-format * Generated XML files from Alchemy for new clusters and refreshed older EM clusters with latest Alchemy. * Added missing zap_cluster_list.json * Added missing CurrencyStruct * zap_regen_all * Fix-up EEM/EPM and apps that use them because the Structs and Enums have moved to Globals:: namespace * Fix CI issue - Re-did bootstrap to pick up new ZAP, and regen_all. Updated ChipStructs.java which was different in CI * Reverted back to using existing measurement-and-sensing-.xml to avoid API backwards compatibility change. * Regen_all to revert all .matter files back to remove global MeasurementType enum * Another regen_all * Manually added missing description to the clusters to hopefully fix the IDL parsing errors. * Regen_all to include description tag from XML. * Updated ChipStructs.java after previous regen_all * Revert bad merge * Reverted removal of measurement and sensing xml * regen_all * Moved MatterCommodityPricePluginServerInitCallback() to util.cpp to resolve linker error * Reverted ElectricalPowermeasurementDelegate use of global struct * Added basic test steps for TC_SEPR_2.1/2/3.py * Bump zap to 2025.3.25 * Partial regen-all to update .matter files (zap-regen-all still crashes!) * Support non-nightly versions * Another update for logic * Fix bad update * Update one more extra extension * Reverted some of the xml files that were updated by alchemy and not really needed in this pr * Reverted EEM/EPM xml files * Zap regen all finally fixed with increased timeout * Merge of .github/workflows/tests.yaml had screwed up * Fixed Linux crash on startup by adding an empty cmd handler function for now and calling ChipLinuxAppInit() * Revert "Merge remote-tracking branch 'andrei/zap_update' into energy-gateway-app" This reverts commit 0cc1dea, reversing changes made to 2fd6786. * Syncd back to Master after reverting Andrei's zap changes * Initial stab at CommodityPriceDelegate.cpp/.h * moved files * Basic delegate added with ability and setting of Descriptor tags for this endpoint * Added CommodityPriceTestEventTriggerHandler.h * Added hooks to enable/disable chip_enable_commodity_price_trigger to Linux build * Used TestEvent Trigger to set a Price into CurrentPrice. Needs more work but is basically working. * Per review comment - changed copyright to only 2025 * Updated more copyright to 2025 * Update copyright commodity-price-server.cpp * Merged Hasty's PR 38226 into TC_SEPR_2_1.py * Currently returns a valid empty list for PriceForecast. * Updated test case to not complain if list is empty and to check that the description and components must not be included. * New proposed ElectricalGridConditions (EGC) * Fixed issue in spec which caused 2nd event not to generate correctly * Manually added new cluster to tests.yaml, rules.matterlint, zcl.json since Alchemy didn't work for some reason * Ran zap_regen_all * Updated XML based on Rene's PR review comments. * Initial attempt to add a Forecast with list and sub-list and memory management * Updated CommodityPrice XML based on Spec PR to add PriceLevel and make Events have nullable fields to match attributes. * ZAP Regen all * Restyled by whitespace * Restyled by clang-format * Restyled by gn * Restyled by isort * Fix build issue caused by new spec update to make price optional * Updated test script to allow for optional price or price level in both CommodityPrice and CommodityPriceComponent structs * Updated test steps after spec update and test plan update. * Moved common code into TC_SEPRTestBase. Some additional checks added to 2.2 test * Update test scripts so that they use TestBase * ruff fixes in python tests * Restyled by autopep8 * Restyled by isort * regen_all update * Refactor - made cluster server handle 'set' operations so that it sends out a Matter Reporting callback for each attribute if it is changed. Started making commands work but needs more work * Refactoring to allow cluster server to retrieve a copy of the Forecast based on bitmap * Slightly buggy version but sort of works if there is enough memory * An update to get per entry component values. Currently had to reduce the forecast to 4 entries to get it to fit * Clean up and fix some issues in the data and SetCurrentPrice. Removed unnecessary files now that delegate isn't really holding the data. * More clean-up * More clean up * Updated zcl.json with AttributeInterface handling. * Zap regen all once zcl.json was updated * Had accidentally turned off FeatureMap in CommodityPrice. Now back on. * Update commodity-price-cluster.xml based on spec PR 11569 * zap regen all * Marked TC_SEPRTestBase as shared code (not a script) * Update EntryToText.cpp - restore newline at EOF * Update EntryToText.h - restore newline at EOF * Update EntryToText.cpp - restore newline at EOF * Update EntryToText.h - restore newline at EOF * Align structures to corrected Price as Money type. * Fixed IncorrectState when running commands caused by AddStatus after AddResponse * Made the ReadAttribute and GetDetailedForecastCommand dynamically size the response to avoid packet overflow. * Deleted unused java files so CI passes * Completed and fixed test case TC_SEPR_2_2. * Fixed bug introduced in last commit. TC_SEPR_2_1 now passes again * Updated SDK to send PriceForecast events. Note that events have an overhead so not as many entries can be sent. * Implemented TC_SEPR_2_3 and fixed other issues with test scripts. * Restyled by isort * Fix Lint error * Made local copy of EnergyTimeUtils.h * Updated linux to use local copy of EnergyTimeUtils.cpp * Removed Python Tests so that they don't trigger build check failure. * Revert test_metadata.yaml since we're backing out Python scripts from this PR. * Restyled by clang-format * Changed GetDetailedForecastRequest to take a ScopedMemoryBuffer * Improved Memory management for GetDetailedPriceRequest() * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Remove Forecast Changed Event * Addressing most of code review comments * More review comment changes * removing chip:: and moving to CharSpan::fromCharString() * Refactored SetCurrentPrice to save a local copy into the cluster server. * Fixed issue with wrong variable in SetCurrentPrice - removed unused variable now - seen when sending multiple triggers. * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Further review comments fixed in SetCurrentPrice() * Further refinement on SetCurrentPrice deep copy * Fixed issues with wrong buffer and a bug in the .component.Value() called without checking .HasValue() first * Removed byte counting nonsense now we have Large Message support * Renamed function * Avoid error when it is ok not to have allocated sub-elements * Missing .matter file after regen_all after merge causing CI issues. * Update src/app/clusters/commodity-price-server/commodity-price-server.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Merge from Master * Revert "Merge from Master" This reverts commit bf42fda. * Tidy up AppMain.cpp after merge * Fixed another merge error * Removed VerifyOrDie when checking that memory should already be free'd. Free it if allocated. * Fixed GetEpochTS (again) - merge issue? --------- Co-authored-by: Hasty Granbery <hasty@granbery.org> Co-authored-by: Hasty Granbery <granbery@google.com> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andrei Litvin <andreilitvin@google.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
dsavitsky-dsr
pushed a commit
to popovdg/connectedhomeip
that referenced
this pull request
Apr 29, 2025
…ent Trigger support (project-chip#38255) * Basic energy-gateway-app framework for Linux and ESP32 - linking issue due to device type problems bringing in expected clusters. * Initial attempt to add new clusters based of PR 10815 - ZAP is raising error 'Unable to find cluster extension by component' * Added missing xml files to zcl.json. Added regen of global-structs.xml and global-enums.xml (NOTE: ApparentPowerThresholds SHOULD be power_mva! but Zap does not recognise this yet. * Temporary change of "money" to int64s whilst waiting for a ZAP change. * Added Meter Identification cluster XML * Updated tests.yaml and rules.matterlint to include new clusters * .matter file updates caused by new enums * Updated files after zap_regen_all * New files after zap_regen_all * Add support for money and new electrical data types * Added new attributes for structs to attributeAccessInterfaceAttributes. Removed legacy measurement-and-sensing.xml in favour of new global-structs/global-enums.xml * Updated .matter files after subsequent regen_all * code autogen after moving to global structs/enums and updating structs in attributes- regen_all * Backed out change to support SetVidVerificationStatement etc * Enabled Commodity Price in data_model/contoller-clusters.zap. Added stub basic-type Currency. Disabled Ember in config-data.yaml. Linux now builds but aborts at start-up. * Update chip-types.xml with new energy types and money * Changed to use correct global struct CurrencyStruct * Revert changes to generated attribute-type.h file * regen_all after merging in Hasty's new types PR: project-chip#37980 * Further zap_regen_all updates after picking up fix from Hasty#s project-chip#37980 * Revert reversion of generated attribute-type.h * Fix build issue due to moving MeasurementAccuracyStruct to global-structs. * Restyled by whitespace * Restyled by clang-format * Restyled by gn * Update attribute-type.h * Fix EEM/EPM clusters which use new global MeasurementAccuracyRangeStruct and MeasurementTypeEnum * Restyled by clang-format * Generated XML files from Alchemy for new clusters and refreshed older EM clusters with latest Alchemy. * Added missing zap_cluster_list.json * Added missing CurrencyStruct * zap_regen_all * Fix-up EEM/EPM and apps that use them because the Structs and Enums have moved to Globals:: namespace * Fix CI issue - Re-did bootstrap to pick up new ZAP, and regen_all. Updated ChipStructs.java which was different in CI * Reverted back to using existing measurement-and-sensing-.xml to avoid API backwards compatibility change. * Regen_all to revert all .matter files back to remove global MeasurementType enum * Another regen_all * Manually added missing description to the clusters to hopefully fix the IDL parsing errors. * Regen_all to include description tag from XML. * Updated ChipStructs.java after previous regen_all * Revert bad merge * Reverted removal of measurement and sensing xml * regen_all * Moved MatterCommodityPricePluginServerInitCallback() to util.cpp to resolve linker error * Reverted ElectricalPowermeasurementDelegate use of global struct * Added basic test steps for TC_SEPR_2.1/2/3.py * Bump zap to 2025.3.25 * Partial regen-all to update .matter files (zap-regen-all still crashes!) * Support non-nightly versions * Another update for logic * Fix bad update * Update one more extra extension * Reverted some of the xml files that were updated by alchemy and not really needed in this pr * Reverted EEM/EPM xml files * Zap regen all finally fixed with increased timeout * Merge of .github/workflows/tests.yaml had screwed up * Fixed Linux crash on startup by adding an empty cmd handler function for now and calling ChipLinuxAppInit() * Revert "Merge remote-tracking branch 'andrei/zap_update' into energy-gateway-app" This reverts commit 0cc1dea, reversing changes made to 2fd6786. * Syncd back to Master after reverting Andrei's zap changes * Initial stab at CommodityPriceDelegate.cpp/.h * moved files * Basic delegate added with ability and setting of Descriptor tags for this endpoint * Added CommodityPriceTestEventTriggerHandler.h * Added hooks to enable/disable chip_enable_commodity_price_trigger to Linux build * Used TestEvent Trigger to set a Price into CurrentPrice. Needs more work but is basically working. * Per review comment - changed copyright to only 2025 * Updated more copyright to 2025 * Update copyright commodity-price-server.cpp * Merged Hasty's PR 38226 into TC_SEPR_2_1.py * Currently returns a valid empty list for PriceForecast. * Updated test case to not complain if list is empty and to check that the description and components must not be included. * New proposed ElectricalGridConditions (EGC) * Fixed issue in spec which caused 2nd event not to generate correctly * Manually added new cluster to tests.yaml, rules.matterlint, zcl.json since Alchemy didn't work for some reason * Ran zap_regen_all * Updated XML based on Rene's PR review comments. * Initial attempt to add a Forecast with list and sub-list and memory management * Updated CommodityPrice XML based on Spec PR to add PriceLevel and make Events have nullable fields to match attributes. * ZAP Regen all * Restyled by whitespace * Restyled by clang-format * Restyled by gn * Restyled by isort * Fix build issue caused by new spec update to make price optional * Updated test script to allow for optional price or price level in both CommodityPrice and CommodityPriceComponent structs * Updated test steps after spec update and test plan update. * Moved common code into TC_SEPRTestBase. Some additional checks added to 2.2 test * Update test scripts so that they use TestBase * ruff fixes in python tests * Restyled by autopep8 * Restyled by isort * regen_all update * Refactor - made cluster server handle 'set' operations so that it sends out a Matter Reporting callback for each attribute if it is changed. Started making commands work but needs more work * Refactoring to allow cluster server to retrieve a copy of the Forecast based on bitmap * Slightly buggy version but sort of works if there is enough memory * An update to get per entry component values. Currently had to reduce the forecast to 4 entries to get it to fit * Clean up and fix some issues in the data and SetCurrentPrice. Removed unnecessary files now that delegate isn't really holding the data. * More clean-up * More clean up * Updated zcl.json with AttributeInterface handling. * Zap regen all once zcl.json was updated * Had accidentally turned off FeatureMap in CommodityPrice. Now back on. * Update commodity-price-cluster.xml based on spec PR 11569 * zap regen all * Marked TC_SEPRTestBase as shared code (not a script) * Update EntryToText.cpp - restore newline at EOF * Update EntryToText.h - restore newline at EOF * Update EntryToText.cpp - restore newline at EOF * Update EntryToText.h - restore newline at EOF * Align structures to corrected Price as Money type. * Fixed IncorrectState when running commands caused by AddStatus after AddResponse * Made the ReadAttribute and GetDetailedForecastCommand dynamically size the response to avoid packet overflow. * Deleted unused java files so CI passes * Completed and fixed test case TC_SEPR_2_2. * Fixed bug introduced in last commit. TC_SEPR_2_1 now passes again * Updated SDK to send PriceForecast events. Note that events have an overhead so not as many entries can be sent. * Implemented TC_SEPR_2_3 and fixed other issues with test scripts. * Restyled by isort * Fix Lint error * Made local copy of EnergyTimeUtils.h * Updated linux to use local copy of EnergyTimeUtils.cpp * Removed Python Tests so that they don't trigger build check failure. * Revert test_metadata.yaml since we're backing out Python scripts from this PR. * Restyled by clang-format * Changed GetDetailedForecastRequest to take a ScopedMemoryBuffer * Improved Memory management for GetDetailedPriceRequest() * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Remove Forecast Changed Event * Addressing most of code review comments * More review comment changes * removing chip:: and moving to CharSpan::fromCharString() * Refactored SetCurrentPrice to save a local copy into the cluster server. * Fixed issue with wrong variable in SetCurrentPrice - removed unused variable now - seen when sending multiple triggers. * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Further review comments fixed in SetCurrentPrice() * Further refinement on SetCurrentPrice deep copy * Fixed issues with wrong buffer and a bug in the .component.Value() called without checking .HasValue() first * Removed byte counting nonsense now we have Large Message support * Renamed function * Avoid error when it is ok not to have allocated sub-elements * Missing .matter file after regen_all after merge causing CI issues. * Update src/app/clusters/commodity-price-server/commodity-price-server.h Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Merge from Master * Revert "Merge from Master" This reverts commit bf42fda. * Tidy up AppMain.cpp after merge * Fixed another merge error * Removed VerifyOrDie when checking that memory should already be free'd. Free it if allocated. * Fixed GetEpochTS (again) - merge issue? --------- Co-authored-by: Hasty Granbery <hasty@granbery.org> Co-authored-by: Hasty Granbery <granbery@google.com> Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andrei Litvin <andreilitvin@google.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR aims to complete the commodity-price-server and add delegate and Test event trigger support
In order to keep this PR smallish there will be several follow up PRs which close out this work:
Currently the number of list elements in Forecast is limited due to udp packet size and it attempts to dynamically size the number of entries based on content to avoid running out of memory.
Testing
All test cases are passing