Handle typedef in zapt templates & matter_idl #36124

gmarcosb · 2024-10-17T15:32:26Z

Dependent on zap updates at project-chip/zap#1458

Update zap templaets to processtypedef in zap, supporting things like defining a VideoStreamID as a uint16, see the camera spec: https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/10004

This should also eliminate the need for many of the things in chip-types.xml, which can now be simply defined in the XML files as a simple typedef

See also discussion with @bzbarsky-apple: #35773 (comment)

semanticdiff-com · 2024-10-17T15:32:30Z

Review changes with

gmarcosb · 2024-10-17T16:20:52Z

src/controller/java/templates/templates.json

@@ -24,10 +24,6 @@
            "name": "cluster_header",
            "path": "../../../app/zap-templates/partials/cluster_header.zapt"
        },
-        {


This is somewhat unrelated & really more just cleanup: this file no longer exists

github-actions · 2024-10-17T16:34:57Z

PR #36124: Size comparison from dead378 to 61d1605

Full report (1 build for stm32)

platform	target	config	section	`dead378`	`61d1605`	change	% change
stm32	light	STM32WB5MM-DK	FLASH	481896	481896	0	0.0
			RAM	144844	144844	0	0.0

* [Fabric-Admin] Implement FabricSyncGetter APIs * Update examples/fabric-admin/device_manager/FabricSyncGetter.h Co-authored-by: Terence Hampson <[email protected]> --------- Co-authored-by: Terence Hampson <[email protected]>

project-chip#36088)

* Adding accessory for publicKeyData * Update src/darwin/Framework/CHIP/MTRCertificateInfo.mm * Restyled by whitespace * Restyled by clang-format * braces for multi-line conditional statement --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Kiel Oleson <[email protected]>

* Fix up group iterator releasing * Add missing bracket * Renames and comments * Restyled by clang-format * Update src/app/WriteHandler.cpp Co-authored-by: Arkadiusz Bokowy <[email protected]> --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Arkadiusz Bokowy <[email protected]>

bzbarsky-apple · 2024-10-17T22:30:28Z

src/darwin/Framework/CHIP/templates/templates.json

@@ -56,6 +56,10 @@
            "name": "enum_decl",
            "path": "partials/enum_decl.zapt"
        },
+        {
+            "name": "typedef_decl",


But where is this partial used?

bzbarsky-apple

This needs some test coverage to exercise these bits: please add something with typedefs to the UnitTesting cluster.

bzbarsky-apple · 2024-10-17T22:32:22Z

src/app/zap-templates/templates/app/cluster-typedefs-check.zapt

+namespace Clusters {
+{{#zcl_typedefs}}
+{{#if has_more_than_one_cluster}}
+{{> cluster_typedefs_ensure_known_value ns="detail"}}


Where is cluster_typedefs_ensure_known_value defined? What is it supposed to do?

bzbarsky-apple · 2024-10-17T22:32:55Z

src/app/zap-templates/templates/app/cluster-typedefs.zapt

+
+{{#if has_more_than_one_cluster}}
+
+{{> cluster_typedefs_enum ns=""}}


Where is cluster_typedefs_enum defined?

…ip#36057) * Implement CommissionerControl command APIs * Address review comment * Add missing change * Init mCommissionerControl in SetRemoteBridgeNodeId * Remove redundant optimization * Fix merge conflict * Call OnDone on failure * Fix build error after merge

…moveAllEntries (project-chip#36053) * [ICD] Add log for storeEntry/removeEntry/removeAllEntires * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>

… self (project-chip#36131) * [Darwin] Some MTRDevice mtr_strongify sites need to guard against nil self * Took ksperling-apple's suggestion to use VerifyOrReturn instead for cleaner code

…on (project-chip#36115)

* Remove various un-necessary code from MTRDevice. The _deviceInternalStateChanged declaration was duplicated in MTRDevice_Concrete and only needed there. MTRDeviceClusterData implementation can move into its own file. setPersistedClusterData: is only used on MTRDevice_Concrete instances, so its declaration can move to MTRDevice_Concrete and the unused implementation in MTRDevice can be removed. setPersistedDeviceData: is only used on MTRDevice_Concrete instances, so its declaration can move to MTRDevice_Concrete and the unused implementation in MTRDevice can be removed. Now _setLastInitialSubscribeLatency and _updateAttributeDependentDescriptionData on MTRDevice are unused and can be removed. At this point, _informationalVendorID, _informationalProductID, _networkFeatures, _vid, _pid, _allNetworkFeatures, and _descriptionLock are all unused on MTRDevice and can be removed. Now _informationalNumberAtAttributePath is unused on MTRDevice and can be removed. _endpointList is also unused on MTRDevice and can be removed. deviceCachePrimed is implemented by both MTRDevice_XPC and MTRDevice_Concrete, so the implementation on MTRDevice can be removed. unitTestGetClusterDataForPath, unitTestGetPersistedClusters, unitTestClusterHasBeenPersisted, unitTestResetSubscription, unitTestAttributesReportedSinceLastCheck, unitTestClearClusterData, unitTestInjectEventReport, unitTestInjectAttributeReport, and unitTestAttributeCount are only used on MTRDevice_Concrete, so the duplicate implementations on MTRDevice can be removed. At this point, _cachedAttributeValueForPath is unused on MTRDevice and can be removed. Now _getCachedDataVersions is unused on MTRDevice and can be removed. deviceUsesThread is only used by MTRDeviceController_Concrete on MTRDevice_Concrete instances and so can move to MTRDevice_Concrete entirely. Then _deviceUsesThread becomes unused on MTRDevice and can be removed. Then _clusterDataForPath is unused on MTRDevice and can be removed. Now _reconcilePersistedClustersWithStorage is unused on MTRDevice and can be removed. Also, _knownClusters is unused on MTRDevice and can be removed. setStorageBehaviorConfiguration is only used from MTRDeviceController_Concrete (which has an MTRDevice_Concrete) and from unit tests (which have an MTRDevice_Concrete, though they don't know it), so it can be removed from MTRDevice. Then _resetStorageBehaviorState also becomes unused and can be removed. At this point, _scheduleClusterDataPersistence is not used on MTRDevice and can be removed. This makes _persistClusterDataAsNeeded and _deviceCachePrimed unused, and they can also be removed. At this point, _persistClusterData, _deviceIsReportingExcessively, _reportToPersistenceDelayTimeAfterMutiplier, _reportToPersistenceDelayTimeMaxAfterMutiplier, _mostRecentReportTimes, and _clusterDataPersistenceFirstScheduledTime are not used on MTRDevice and can be removed. Now _dataStoreExists, _clusterDataToPersistSnapshot, _storageBehaviorConfiguration, _reportToPersistenceDelayCurrentMultiplier, _deviceReportingExcessivelyStartTime, and _persistedClusters are unused on MTRDevice and can be removed. At this point _clusterDataToPersist and _persistedClusterData are unused on MTRDevice and can be removed. _systemTimeChangeObserverToken was never actually used on MTRDevice (it's only used on MTRDevice_Concrete) and can be removed. The MTRDeviceAttributeReportHandler typedef is unused on MTRDevice and can be removed. kSecondsToWaitBeforeMarkingUnreachableAfterSettingUpSubscription and ENABLE_CONNECTIVITY_MONITORING are unused on MTRDevice and can be removed. assertChipStackLockedByCurrentThread is not used in MTRDevice, so the LockTracker.h include can be removed. MTRAsyncWorkQueue, MTRAttributeIsSpecified, MTRCommandNeedsTimedInvoke, MTRDeviceConnectivityMonitor, MTRDeviceControllerOverXPC, MTRDecodeEventPayload, are all unused in MTRDevice, so the imports of the corresponding headers can be removed. arrayOfNumbersFromAttributeValue is now unused on MTRDevice and can be removed. The fabricIndex property is write-only on both MTRDevice and MTRDevice_Concrete and can be removed on both. _dataValueWithoutDataVersion is unused on MTRDevice and can be removed. * Move MTRDeviceClusterData into a separate header/implementation file.

…6135)

andy31415 · 2024-11-13T16:42:42Z

.github/issue-labeler.yml

+# or integration with wifi/ethernet/bluetootn/etc.)
+#
+# linux:
+#   - "/(linux)/i"


This change is part of a different PR already merged into master.

Something is wrong with the merges in this PR. Could you merge with master so that deltas are smaller and directly relate to the PR description?

gmarcosb requested review from a team as code owners October 17, 2024 15:32

pullapprove bot added the review - pending label Oct 17, 2024

github-actions bot added documentation Improvements or additions to documentation examples scripts darwin controller app github workflows labels Oct 17, 2024

mergify bot added the conflict label Oct 17, 2024

gmarcosb force-pushed the camera-webrtc-provider branch from efaff8c to 61d1605 Compare October 17, 2024 16:19

mergify bot removed the conflict label Oct 17, 2024

gmarcosb commented Oct 17, 2024

View reviewed changes

yufengwangca and others added 5 commits October 17, 2024 19:34

Cleanup AutoSync command (project-chip#36128)

ed7ef1b

[Fabric Sync] Have ECOINFO mark attribute dirty when new entry added … (

5fe4409

project-chip#36088)

bzbarsky-apple reviewed Oct 17, 2024

View reviewed changes

yufengwangca and others added 6 commits October 17, 2024 22:34

[ICD] Add logs to improve debuggability for storeEntry/removeEntry/re…

3a6c545

…moveAllEntries (project-chip#36053) * [ICD] Add log for storeEntry/removeEntry/removeAllEntires * Restyled by clang-format --------- Co-authored-by: Restyled.io <[email protected]>

[Darwin] Some MTRDevice mtr_strongify sites need to guard against nil…

915fb2c

… self (project-chip#36131) * [Darwin] Some MTRDevice mtr_strongify sites need to guard against nil self * Took ksperling-apple's suggestion to use VerifyOrReturn instead for cleaner code

[Logging] Log the duration for successfully establishing a subscripti…

76e9e14

…on (project-chip#36115)

Add missing availability annotation on publicKeyData. (project-chip#3…

edf3b8b

…6135)

andy31415 reviewed Nov 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle typedef in zapt templates & matter_idl #36124

Handle typedef in zapt templates & matter_idl #36124

gmarcosb commented Oct 17, 2024 •

edited

Loading

semanticdiff-com bot commented Oct 17, 2024 •

edited

Loading

gmarcosb Oct 17, 2024

github-actions bot commented Oct 17, 2024

bzbarsky-apple Oct 17, 2024

bzbarsky-apple left a comment

bzbarsky-apple Oct 17, 2024

bzbarsky-apple Oct 17, 2024

andy31415 Nov 13, 2024


		{{#if has_more_than_one_cluster}}

		{{> cluster_typedefs_enum ns=""}}

Handle typedef in zapt templates & matter_idl #36124

Are you sure you want to change the base?

Handle typedef in zapt templates & matter_idl #36124

Conversation

gmarcosb commented Oct 17, 2024 • edited Loading

semanticdiff-com bot commented Oct 17, 2024 • edited Loading

gmarcosb Oct 17, 2024

Choose a reason for hiding this comment

github-actions bot commented Oct 17, 2024

bzbarsky-apple Oct 17, 2024

Choose a reason for hiding this comment

bzbarsky-apple left a comment

Choose a reason for hiding this comment

bzbarsky-apple Oct 17, 2024

Choose a reason for hiding this comment

bzbarsky-apple Oct 17, 2024

Choose a reason for hiding this comment

andy31415 Nov 13, 2024

Choose a reason for hiding this comment

gmarcosb commented Oct 17, 2024 •

edited

Loading

semanticdiff-com bot commented Oct 17, 2024 •

edited

Loading