From b9b403d51a680cdcd4fd6ae19411450dd58f8009 Mon Sep 17 00:00:00 2001 From: "tennessee.carmelveilleux@gmail.com" Date: Thu, 14 Dec 2023 14:28:48 -0500 Subject: [PATCH 1/2] Fix General Diagnostics XML to match spec See https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/8673 --- .../zcl/data-model/chip/general-diagnostics-cluster.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml index a8347a57ce3f46..7d6fe3eb1b88ed 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml @@ -117,8 +117,8 @@ limitations under the License. Response for the TimeSnapshot command. - - + + From d2139ba267656fb00a9c78abe0541335437d7edd Mon Sep 17 00:00:00 2001 From: "tennessee.carmelveilleux@gmail.com" Date: Thu, 14 Dec 2023 14:30:43 -0500 Subject: [PATCH 2/2] Regen zap --- .../air-purifier-app.matter | 4 +-- .../air-quality-sensor-app.matter | 4 +-- .../all-clusters-app.matter | 4 +-- .../all-clusters-minimal-app.matter | 4 +-- .../bridge-common/bridge-app.matter | 4 +-- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +-- ...umiditysensor_thermostat_56de3d5f45.matter | 4 +-- ...ootnode_airqualitysensor_e63187f6c9.matter | 4 +-- ...ootnode_basicvideoplayer_0ff86e943b.matter | 4 +-- ...de_colortemperaturelight_hbUnzYVeyn.matter | 4 +-- .../rootnode_contactsensor_lFAGG1bfRO.matter | 4 +-- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +-- .../rootnode_dishwasher_cc105034fe.matter | 4 +-- .../rootnode_doorlock_aNKYAreMXE.matter | 4 +-- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 4 +-- .../devices/rootnode_fan_7N2TobIlOX.matter | 4 +-- .../rootnode_flowsensor_1zVxHedlaV.matter | 4 +-- .../rootnode_genericswitch_9866e35d0b.matter | 4 +-- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 4 +-- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 4 +-- .../rootnode_laundrywasher_fb10d238c8.matter | 4 +-- .../rootnode_lightsensor_lZQycTFcJK.matter | 4 +-- ...rootnode_occupancysensor_iHyVgifZuo.matter | 4 +-- .../rootnode_onofflight_bbs1b7IaOV.matter | 4 +-- .../rootnode_onofflight_samplemei.matter | 4 +-- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 4 +-- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 +-- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 4 +-- .../devices/rootnode_pump_5f904818cc.matter | 4 +-- .../devices/rootnode_pump_a811bb33a0.matter | 4 +-- ...eraturecontrolledcabinet_ffdb696680.matter | 4 +-- ...ode_roboticvacuumcleaner_1807ff0c49.matter | 4 +-- ...tnode_roomairconditioner_9cf3607804.matter | 4 +-- .../rootnode_smokecoalarm_686fe0dcb8.matter | 4 +-- .../rootnode_speaker_RpzeXdimqA.matter | 4 +-- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 4 +-- .../rootnode_thermostat_bm3fb8dhYi.matter | 4 +-- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 4 +-- .../contact-sensor-app.matter | 4 +-- .../dishwasher-common/dishwasher-app.matter | 4 +-- .../light-switch-app.matter | 4 +-- .../data_model/lighting-app-ethernet.matter | 4 +-- .../data_model/lighting-app-thread.matter | 4 +-- .../data_model/lighting-app-wifi.matter | 4 +-- .../lighting-common/lighting-app.matter | 4 +-- .../nxp/zap/lighting-on-off.matter | 4 +-- examples/lighting-app/qpg/zap/light.matter | 4 +-- .../data_model/lighting-thread-app.matter | 4 +-- .../data_model/lighting-wifi-app.matter | 4 +-- .../lit-icd-common/lit-icd-server-app.matter | 4 +-- examples/lock-app/lock-common/lock-app.matter | 4 +-- examples/lock-app/nxp/zap/lock-app.matter | 4 +-- examples/lock-app/qpg/zap/lock.matter | 4 +-- .../network-manager-app.matter | 4 +-- .../ota-provider-app.matter | 4 +-- .../ota-requestor-app.matter | 4 +-- .../placeholder/linux/apps/app1/config.matter | 4 +-- .../placeholder/linux/apps/app2/config.matter | 4 +-- examples/pump-app/pump-common/pump-app.matter | 4 +-- .../silabs/data_model/pump-thread-app.matter | 4 +-- .../silabs/data_model/pump-wifi-app.matter | 4 +-- .../pump-controller-app.matter | 4 +-- .../refrigerator-app.matter | 4 +-- examples/rvc-app/rvc-common/rvc-app.matter | 4 +-- .../smoke-co-alarm-app.matter | 4 +-- .../temperature-measurement.matter | 4 +-- .../nxp/zap/thermostat_matter_thread.matter | 4 +-- .../nxp/zap/thermostat_matter_wifi.matter | 4 +-- .../thermostat-common/thermostat.matter | 4 +-- examples/tv-app/tv-common/tv-app.matter | 4 +-- .../tv-casting-common/tv-casting-app.matter | 4 +-- .../virtual-device-app.matter | 4 +-- examples/window-app/common/window-app.matter | 4 +-- .../data_model/controller-clusters.matter | 4 +-- .../chip/devicecontroller/ChipClusters.java | 20 ++++++------- .../devicecontroller/ClusterInfoMapping.java | 10 +++---- .../clusters/GeneralDiagnosticsCluster.kt | 24 +++++++-------- .../zap-generated/CHIPInvokeCallbacks.cpp | 30 +++++++++---------- .../python/chip/clusters/Objects.py | 8 ++--- .../zap-generated/MTRCommandPayloadsObjc.h | 4 +-- .../zap-generated/MTRCommandPayloadsObjc.mm | 18 +++++------ .../zap-generated/cluster-objects.cpp | 12 ++++---- .../zap-generated/cluster-objects.h | 12 ++++---- .../cluster/logging/DataModelLogger.cpp | 4 +-- 84 files changed, 219 insertions(+), 219 deletions(-) diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter index f525e4053bc2c7..d6f5e88f0f3407 100644 --- a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter +++ b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter @@ -811,8 +811,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter index 4c04b0d2e25945..e1c3018f693dfa 100644 --- a/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter +++ b/examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter @@ -764,8 +764,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index d6345f8867dddd..cb54b4fd7a48d9 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -1942,8 +1942,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 3cc36229c8b746..4c33fb8a3d701c 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1822,8 +1822,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 97835a68cb1efd..7e73c15a77843a 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1214,8 +1214,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 9a8957be4b3670..63ead45d7bb823 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -987,8 +987,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter index e7e8616c9d9bd1..6066dc34eedb2e 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter @@ -734,8 +734,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter index 87d3a47668ce5f..90005fa99cd6f0 100644 --- a/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter +++ b/examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter @@ -872,8 +872,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index 81e68dad0a1e58..54d007ef366a95 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -894,8 +894,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index fdab8c257d64b9..af5819a6623250 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -1085,8 +1085,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 004879bd53966b..cfb648787c6b84 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 4c2f346d5dbddc..541f0e2afafd61 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1167,8 +1167,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index e170f74b0ef1be..db46b2db43a458 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -697,8 +697,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index e3ba613c365a8c..8aaa1ee81997f2 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 60530d635550ac..906cd474afa5d2 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1167,8 +1167,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index db2240bd6e89ff..fc2c4c62b0d179 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -949,8 +949,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 5be1a384367de2..1a35e053e79660 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter index f35a8a6cdddd35..748ff8600d947e 100644 --- a/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter +++ b/examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter @@ -657,8 +657,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 8de16d77b55736..741d7b25fef7db 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1167,8 +1167,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 02f89ad33648f1..13d17eb37417ea 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter index 2b4eb985e1554a..d5eb1ef1827039 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter @@ -697,8 +697,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index bbf46a02affd29..e02f49d22e9596 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 39b2401d020e77..e0c1190683fd55 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 27fa6bf8c16855..3e0677c042fcba 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1167,8 +1167,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index 9910342d11e89d..a5ab25e98ee287 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -1167,8 +1167,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 31a458ed0dd416..fbcda1f0781584 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1114,8 +1114,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 8776586620c6b4..11e2818981123a 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1042,8 +1042,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index e53da0bf3b722b..29ecb770963c79 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index 7c82d569fbd94a..eff24b568e8e1f 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -769,8 +769,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 2df56e9b77056d..3cb93176336f27 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -769,8 +769,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter index f5fcbfcea5b280..4ed7903266400a 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter @@ -697,8 +697,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter index 427a490da9d9ef..014daaffa2213f 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter @@ -734,8 +734,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index 6ff79435719b1f..af70a8875073c9 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -806,8 +806,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter index 113d1060bb9d1c..6328708dc1f816 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter @@ -993,8 +993,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index ce60f0890559a5..d5e42a22c43f66 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1090,8 +1090,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 7a56d226aba1c0..c45114f20de705 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index c2f9fd89f0446c..26bd437442d209 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 853a7cf73626d8..3cb70eea484491 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -970,8 +970,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 1eff36e286d8cb..6065ce3b36efc0 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -949,8 +949,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter index 1d81957ca8e3c7..70888c4c53d335 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.matter @@ -795,8 +795,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 16944fb7b66def..1f8c3b2bb4a5b5 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1285,8 +1285,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 28a9cab82191e4..8a539d61c51aba 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -1146,8 +1146,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 4476951b9adaa1..b84d9b2b2774f3 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -1146,8 +1146,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index a5bb2dea68150b..e5dc83b4a1a781 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -1146,8 +1146,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index de9d08ce214ff1..8a50b9eb7721af 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1339,8 +1339,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 6dd34ba0c3f896..7886980bc9f6c1 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -1038,8 +1038,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 672fd44a070d8e..40bde659477d8a 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -1085,8 +1085,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index c3cbc87075c515..882aed6c1ddc3a 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -1598,8 +1598,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 46fe5c76ea62ff..6914dd4e3e37f2 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -1598,8 +1598,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter index ce33f98ec7a354..1d09cf81bfbcd2 100644 --- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter +++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter @@ -790,8 +790,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 10263f5c0caabe..8ddf0f1b644245 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1113,8 +1113,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index 840efb325a6090..6813051a938d09 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -610,8 +610,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index ad2dc792d753b0..fe403eac28cf46 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -888,8 +888,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/network-manager-app/network-manager-common/network-manager-app.matter b/examples/network-manager-app/network-manager-common/network-manager-app.matter index 1a20c7523f90e9..1e754d83f02d35 100644 --- a/examples/network-manager-app/network-manager-common/network-manager-app.matter +++ b/examples/network-manager-app/network-manager-common/network-manager-app.matter @@ -610,8 +610,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index e4ec469a4e94d1..2bb839cefd3d0c 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -772,8 +772,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index bd8d7db682d25a..6b0a43538b4b8e 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -974,8 +974,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index dd7a80c0e82c2c..8fe26ea7120d38 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1959,8 +1959,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 08fdcf436ee5c4..c2524228f2e15d 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1916,8 +1916,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 4a9c3e81af6cb0..acd97c8d5bb068 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -982,8 +982,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index a9a2c74ef80ddc..78f0e88073df49 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -982,8 +982,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index a9a2c74ef80ddc..78f0e88073df49 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -982,8 +982,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 45af3d224111a3..efaad303eb0d5b 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -857,8 +857,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter index 4d43b58978f0d2..e5fc026d45b4fd 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.matter @@ -647,8 +647,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/rvc-app/rvc-common/rvc-app.matter b/examples/rvc-app/rvc-common/rvc-app.matter index 55377548f672fd..f791bee8e85180 100644 --- a/examples/rvc-app/rvc-common/rvc-app.matter +++ b/examples/rvc-app/rvc-common/rvc-app.matter @@ -657,8 +657,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index e92c57ffe44531..b33469527db40a 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -1208,8 +1208,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index 7fa16486e7743f..774e1ed2e8e5bd 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -848,8 +848,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter index fc8fad99aaecf5..01267c685050b1 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_thread.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_thread.matter @@ -1451,8 +1451,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter index 4791f4bdef41a3..8c75a3585d8f4c 100644 --- a/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter +++ b/examples/thermostat/nxp/zap/thermostat_matter_wifi.matter @@ -1451,8 +1451,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 92a13b7f8e0f35..a3141741f72acd 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1046,8 +1046,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 6a2e39c61d94aa..9ca7ff571c37f4 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1258,8 +1258,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 6e305470fa07af..cf420c215d9ac2 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1046,8 +1046,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index d658c052a20f2d..ec813150847955 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -1442,8 +1442,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index c5258a2c9c781b..a3d14300047ad7 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1187,8 +1187,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 5ee0a9704a4462..9f1d106833f32e 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1882,8 +1882,8 @@ cluster GeneralDiagnostics = 51 { } response struct TimeSnapshotResponse = 2 { - systime_us systemTimeUs = 0; - nullable epoch_us UTCTimeUs = 1; + systime_ms systemTimeMs = 0; + nullable posix_ms posixTimeMs = 1; } /** Provide a means for certification tests to trigger some test-plan-specific events */ diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index b571ac051e3f2b..224dab357f761a 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -11061,29 +11061,29 @@ public void timeSnapshot(TimeSnapshotResponseCallback callback, int timedInvokeT invoke(new InvokeCallbackImpl(callback) { @Override public void onResponse(StructType invokeStructValue) { - final long systemTimeUsFieldID = 0L; - Long systemTimeUs = null; - final long UTCTimeUsFieldID = 1L; - @Nullable Long UTCTimeUs = null; + final long systemTimeMsFieldID = 0L; + Long systemTimeMs = null; + final long posixTimeMsFieldID = 1L; + @Nullable Long posixTimeMs = null; for (StructElement element: invokeStructValue.value()) { - if (element.contextTagNum() == systemTimeUsFieldID) { + if (element.contextTagNum() == systemTimeMsFieldID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - systemTimeUs = castingValue.value(Long.class); + systemTimeMs = castingValue.value(Long.class); } - } else if (element.contextTagNum() == UTCTimeUsFieldID) { + } else if (element.contextTagNum() == posixTimeMsFieldID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { UIntType castingValue = element.value(UIntType.class); - UTCTimeUs = castingValue.value(Long.class); + posixTimeMs = castingValue.value(Long.class); } } } - callback.onSuccess(systemTimeUs, UTCTimeUs); + callback.onSuccess(systemTimeMs, posixTimeMs); }}, commandId, value, timedInvokeTimeoutMs); } public interface TimeSnapshotResponseCallback extends BaseClusterCallback { - void onSuccess(Long systemTimeUs, @Nullable Long UTCTimeUs); + void onSuccess(Long systemTimeMs, @Nullable Long posixTimeMs); } public interface NetworkInterfacesAttributeCallback extends BaseAttributeCallback { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index 27b051c993d5f5..b92600bc9890a4 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -3696,13 +3696,13 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Long systemTimeUs, @Nullable Long UTCTimeUs) { + public void onSuccess(Long systemTimeMs, @Nullable Long posixTimeMs) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo systemTimeUsResponseValue = new CommandResponseInfo("systemTimeUs", "Long"); - responseValues.put(systemTimeUsResponseValue, systemTimeUs); - CommandResponseInfo UTCTimeUsResponseValue = new CommandResponseInfo("UTCTimeUs", "Long"); - responseValues.put(UTCTimeUsResponseValue, UTCTimeUs); + CommandResponseInfo systemTimeMsResponseValue = new CommandResponseInfo("systemTimeMs", "Long"); + responseValues.put(systemTimeMsResponseValue, systemTimeMs); + CommandResponseInfo posixTimeMsResponseValue = new CommandResponseInfo("posixTimeMs", "Long"); + responseValues.put(posixTimeMsResponseValue, posixTimeMs); callback.onSuccess(responseValues); } diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt index 3873ba445170e3..bb27b9469a666f 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt @@ -37,7 +37,7 @@ class GeneralDiagnosticsCluster( private val controller: MatterController, private val endpointId: UShort ) { - class TimeSnapshotResponse(val systemTimeUs: ULong, val UTCTimeUs: ULong?) + class TimeSnapshotResponse(val systemTimeMs: ULong, val posixTimeMs: ULong?) class NetworkInterfacesAttribute(val value: List) @@ -102,21 +102,21 @@ class GeneralDiagnosticsCluster( val tlvReader = TlvReader(response.payload) tlvReader.enterStructure(AnonymousTag) - val TAG_SYSTEM_TIME_US: Int = 0 - var systemTimeUs_decoded: ULong? = null + val TAG_SYSTEM_TIME_MS: Int = 0 + var systemTimeMs_decoded: ULong? = null - val TAG_U_T_C_TIME_US: Int = 1 - var UTCTimeUs_decoded: ULong? = null + val TAG_POSIX_TIME_MS: Int = 1 + var posixTimeMs_decoded: ULong? = null while (!tlvReader.isEndOfContainer()) { val tag = tlvReader.peekElement().tag - if (tag == ContextSpecificTag(TAG_SYSTEM_TIME_US)) { - systemTimeUs_decoded = tlvReader.getULong(tag) + if (tag == ContextSpecificTag(TAG_SYSTEM_TIME_MS)) { + systemTimeMs_decoded = tlvReader.getULong(tag) } - if (tag == ContextSpecificTag(TAG_U_T_C_TIME_US)) { - UTCTimeUs_decoded = + if (tag == ContextSpecificTag(TAG_POSIX_TIME_MS)) { + posixTimeMs_decoded = if (tlvReader.isNull()) { tlvReader.getNull(tag) null @@ -133,13 +133,13 @@ class GeneralDiagnosticsCluster( } } - if (systemTimeUs_decoded == null) { - throw IllegalStateException("systemTimeUs not found in TLV") + if (systemTimeMs_decoded == null) { + throw IllegalStateException("systemTimeMs not found in TLV") } tlvReader.exitContainer() - return TimeSnapshotResponse(systemTimeUs_decoded, UTCTimeUs_decoded) + return TimeSnapshotResponse(systemTimeMs_decoded, posixTimeMs_decoded) } suspend fun readNetworkInterfacesAttribute(): NetworkInterfacesAttribute { diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 1c361f0c6f7546..3b65b69a3a456a 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -2365,27 +2365,27 @@ void CHIPGeneralDiagnosticsClusterTimeSnapshotResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject SystemTimeUs; - std::string SystemTimeUsClassName = "java/lang/Long"; - std::string SystemTimeUsCtorSignature = "(J)V"; - jlong jniSystemTimeUs = static_cast(dataResponse.systemTimeUs); - chip::JniReferences::GetInstance().CreateBoxedObject(SystemTimeUsClassName.c_str(), SystemTimeUsCtorSignature.c_str(), - jniSystemTimeUs, SystemTimeUs); - jobject UTCTimeUs; - if (dataResponse.UTCTimeUs.IsNull()) + jobject SystemTimeMs; + std::string SystemTimeMsClassName = "java/lang/Long"; + std::string SystemTimeMsCtorSignature = "(J)V"; + jlong jniSystemTimeMs = static_cast(dataResponse.systemTimeMs); + chip::JniReferences::GetInstance().CreateBoxedObject(SystemTimeMsClassName.c_str(), SystemTimeMsCtorSignature.c_str(), + jniSystemTimeMs, SystemTimeMs); + jobject PosixTimeMs; + if (dataResponse.posixTimeMs.IsNull()) { - UTCTimeUs = nullptr; + PosixTimeMs = nullptr; } else { - std::string UTCTimeUsClassName = "java/lang/Long"; - std::string UTCTimeUsCtorSignature = "(J)V"; - jlong jniUTCTimeUs = static_cast(dataResponse.UTCTimeUs.Value()); - chip::JniReferences::GetInstance().CreateBoxedObject(UTCTimeUsClassName.c_str(), UTCTimeUsCtorSignature.c_str(), - jniUTCTimeUs, UTCTimeUs); + std::string PosixTimeMsClassName = "java/lang/Long"; + std::string PosixTimeMsCtorSignature = "(J)V"; + jlong jniPosixTimeMs = static_cast(dataResponse.posixTimeMs.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject(PosixTimeMsClassName.c_str(), PosixTimeMsCtorSignature.c_str(), + jniPosixTimeMs, PosixTimeMs); } - env->CallVoidMethod(javaCallbackRef, javaMethod, SystemTimeUs, UTCTimeUs); + env->CallVoidMethod(javaCallbackRef, javaMethod, SystemTimeMs, PosixTimeMs); } CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback::CHIPTimeSynchronizationClusterSetTimeZoneResponseCallback( jobject javaCallback) : Callback::Callback(CallbackFn, this) diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index a76a5978a0a820..735228c9725f71 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -8483,12 +8483,12 @@ class TimeSnapshotResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="systemTimeUs", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="UTCTimeUs", Tag=1, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="systemTimeMs", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="posixTimeMs", Tag=1, Type=typing.Union[Nullable, uint]), ]) - systemTimeUs: 'uint' = 0 - UTCTimeUs: 'typing.Union[Nullable, uint]' = NullValue + systemTimeMs: 'uint' = 0 + posixTimeMs: 'typing.Union[Nullable, uint]' = NullValue class Attributes: @dataclass diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 5778c777f0e0b3..0218c676a642ff 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -3344,9 +3344,9 @@ MTR_PROVISIONALLY_AVAILABLE MTR_PROVISIONALLY_AVAILABLE @interface MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull systemTimeUs MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull systemTimeMs MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nullable utcTimeUs MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable posixTimeMs MTR_PROVISIONALLY_AVAILABLE; /** * Initialize an MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams with a response-value dictionary diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 319c22ab6ecc41..f9cfc8e297a801 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -8831,9 +8831,9 @@ - (instancetype)init { if (self = [super init]) { - _systemTimeUs = @(0); + _systemTimeMs = @(0); - _utcTimeUs = nil; + _posixTimeMs = nil; } return self; } @@ -8842,15 +8842,15 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams alloc] init]; - other.systemTimeUs = self.systemTimeUs; - other.utcTimeUs = self.utcTimeUs; + other.systemTimeMs = self.systemTimeMs; + other.posixTimeMs = self.posixTimeMs; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: systemTimeUs:%@; utcTimeUs:%@; >", NSStringFromClass([self class]), _systemTimeUs, _utcTimeUs]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: systemTimeMs:%@; posixTimeMs:%@; >", NSStringFromClass([self class]), _systemTimeMs, _posixTimeMs]; return descriptionString; } @@ -8901,13 +8901,13 @@ @implementation MTRGeneralDiagnosticsClusterTimeSnapshotResponseParams (Internal - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType &)decodableStruct { { - self.systemTimeUs = [NSNumber numberWithUnsignedLongLong:decodableStruct.systemTimeUs]; + self.systemTimeMs = [NSNumber numberWithUnsignedLongLong:decodableStruct.systemTimeMs]; } { - if (decodableStruct.UTCTimeUs.IsNull()) { - self.utcTimeUs = nil; + if (decodableStruct.posixTimeMs.IsNull()) { + self.posixTimeMs = nil; } else { - self.utcTimeUs = [NSNumber numberWithUnsignedLongLong:decodableStruct.UTCTimeUs.Value()]; + self.posixTimeMs = [NSNumber numberWithUnsignedLongLong:decodableStruct.posixTimeMs.Value()]; } } return CHIP_NO_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index df15ba3324775f..4869634c35461f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -6685,8 +6685,8 @@ namespace TimeSnapshotResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; - encoder.Encode(to_underlying(Fields::kSystemTimeUs), systemTimeUs); - encoder.Encode(to_underlying(Fields::kUTCTimeUs), UTCTimeUs); + encoder.Encode(to_underlying(Fields::kSystemTimeMs), systemTimeMs); + encoder.Encode(to_underlying(Fields::kPosixTimeMs), posixTimeMs); return encoder.Finalize(); } @@ -6704,13 +6704,13 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; const uint8_t __context_tag = std::get(__element); - if (__context_tag == to_underlying(Fields::kSystemTimeUs)) + if (__context_tag == to_underlying(Fields::kSystemTimeMs)) { - err = DataModel::Decode(reader, systemTimeUs); + err = DataModel::Decode(reader, systemTimeMs); } - else if (__context_tag == to_underlying(Fields::kUTCTimeUs)) + else if (__context_tag == to_underlying(Fields::kPosixTimeMs)) { - err = DataModel::Decode(reader, UTCTimeUs); + err = DataModel::Decode(reader, posixTimeMs); } else { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 753e52108eb6a5..9438ed24a7cd5f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -8420,8 +8420,8 @@ struct DecodableType namespace TimeSnapshotResponse { enum class Fields : uint8_t { - kSystemTimeUs = 0, - kUTCTimeUs = 1, + kSystemTimeMs = 0, + kPosixTimeMs = 1, }; struct Type @@ -8431,8 +8431,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::TimeSnapshotResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } - uint64_t systemTimeUs = static_cast(0); - DataModel::Nullable UTCTimeUs; + uint64_t systemTimeMs = static_cast(0); + DataModel::Nullable posixTimeMs; CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -8447,8 +8447,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::TimeSnapshotResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; } - uint64_t systemTimeUs = static_cast(0); - DataModel::Nullable UTCTimeUs; + uint64_t systemTimeMs = static_cast(0); + DataModel::Nullable posixTimeMs; CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace TimeSnapshotResponse diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 4ae5691c8c8c33..913a28be7583fc 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6751,8 +6751,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const GeneralDiagnostics::Commands::TimeSnapshotResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); - ReturnErrorOnFailure(DataModelLogger::LogValue("systemTimeUs", indent + 1, value.systemTimeUs)); - ReturnErrorOnFailure(DataModelLogger::LogValue("UTCTimeUs", indent + 1, value.UTCTimeUs)); + ReturnErrorOnFailure(DataModelLogger::LogValue("systemTimeMs", indent + 1, value.systemTimeMs)); + ReturnErrorOnFailure(DataModelLogger::LogValue("posixTimeMs", indent + 1, value.posixTimeMs)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; }