[ICD] Initial Client Monitoring Cluster xml update (#26302)

* update cm cluster xml * change hex to decimal representation * Apply suggestions from code review Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * disable CM cluster generation and tests * generated files * disable cm cluster table * Disable java cm table * disable cm cluster in descriptor test * generated files * disable cm cluster for esp32 * restyler * comment out cm table sources * ifdef out cm table code for esp32 * restyle * disable cm cluster yaml for repl * removed acess modifier --------- Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
project-chip · Sep 13, 2023 · 1385934 · 1385934
1 parent 6133f65
commit 1385934
Show file tree

Hide file tree

Showing 44 changed files with 383 additions and 2,571 deletions.
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
@@ -4225,39 +4225,6 @@ server cluster ElectricalMeasurement = 2820 {
  readonly attribute int16u clusterRevision = 65533;
 }
 
-/** Client Monitoring allows for ensuring that listed clients meet the required monitoring conditions on the server. */
-server cluster ClientMonitoring = 4166 {
- fabric_scoped struct MonitoringRegistration {
- node_id clientNodeId = 1;
- int64u ICid = 2;
- fabric_idx fabricIndex = 254;
- }
-
- readonly attribute int32u idleModeInterval = 0;
- readonly attribute int32u activeModeInterval = 1;
- readonly attribute int16u activeModeThreshold = 2;
- readonly attribute MonitoringRegistration expectedClients[] = 3;
- readonly attribute command_id generatedCommandList[] = 65528;
- readonly attribute command_id acceptedCommandList[] = 65529;
- readonly attribute event_id eventList[] = 65530;
- readonly attribute attrib_id attributeList[] = 65531;
- readonly attribute bitmap32 featureMap = 65532;
- readonly attribute int16u clusterRevision = 65533;
-
- request struct RegisterClientMonitoringRequest {
- node_id clientNodeId = 0;
- INT64U ICid = 1;
- }
-
- request struct UnregisterClientMonitoringRequest {
- node_id clientNodeId = 0;
- INT64U ICid = 1;
- }
-
- command access(invoke: manage) RegisterClientMonitoring(RegisterClientMonitoringRequest): DefaultSuccess = 0;
- command access(invoke: manage) UnregisterClientMonitoring(UnregisterClientMonitoringRequest): DefaultSuccess = 1;
-}
-
 /** The Test Cluster is meant to validate the generated code */
 server cluster UnitTesting = 4294048773 {
  enum SimpleEnum : ENUM8 {
@@ -4951,18 +4918,6 @@ endpoint 0 {
  ram attribute clusterRevision default = 3;
  }
 
- server cluster ClientMonitoring {
- ram attribute idleModeInterval default = 0x12C;
- ram attribute activeModeInterval default = 0x12C;
- ram attribute activeModeThreshold default = 0xFA0;
- callback attribute expectedClients;
- callback attribute generatedCommandList;
- callback attribute acceptedCommandList;
- callback attribute attributeList;
- ram attribute featureMap default = 0;
- ram attribute clusterRevision default = 1;
- }
-
  server cluster FaultInjection {
  callback attribute generatedCommandList;
  callback attribute acceptedCommandList;

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -1,5 +1,5 @@
 {
- "featureLevel": 92,
+ "featureLevel": 96,
  "creator": "zap",
  "keyValuePairs": [
  {
@@ -16,19 +16,19 @@
  }
  ],
  "package": [
+ {
+ "pathRelativity": "relativeToZap",
+ "path": "../../../src/app/zap-templates/app-templates.json",
+ "type": "gen-templates-json",
+ "version": "chip-v1"
+ },
  {
  "pathRelativity": "relativeToZap",
  "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
  "type": "zcl-properties",
  "category": "matter",
  "version": 1,
  "description": "Matter SDK ZCL data with some extensions"
- },
- {
- "pathRelativity": "relativeToZap",
- "path": "../../../src/app/zap-templates/app-templates.json",
- "type": "gen-templates-json",
- "version": "chip-v1"
  }
  ],
  "endpointTypes": [
@@ -8194,220 +8194,6 @@
  }
  ]
  },
- {
- "name": "Client Monitoring",
- "code": 4166,
- "mfgCode": null,
- "define": "CLIENT_MONITORING_CLUSTER",
- "side": "client",
- "enabled": 0,
- "commands": [
- {
- "name": "RegisterClientMonitoring",
- "code": 0,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- },
- {
- "name": "UnregisterClientMonitoring",
- "code": 1,
- "mfgCode": null,
- "source": "client",
- "incoming": 1,
- "outgoing": 1
- }
- ],
- "attributes": [
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "client",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "client",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
- {
- "name": "Client Monitoring",
- "code": 4166,
- "mfgCode": null,
- "define": "CLIENT_MONITORING_CLUSTER",
- "side": "server",
- "enabled": 1,
- "attributes": [
- {
- "name": "IdleModeInterval",
- "code": 0,
- "mfgCode": null,
- "side": "server",
- "type": "int32u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x12C",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ActiveModeInterval",
- "code": 1,
- "mfgCode": null,
- "side": "server",
- "type": "int32u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0x12C",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ActiveModeThreshold",
- "code": 2,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0xFA0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ExpectedClients",
- "code": 3,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "GeneratedCommandList",
- "code": 65528,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "AcceptedCommandList",
- "code": 65529,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "AttributeList",
- "code": 65531,
- "mfgCode": null,
- "side": "server",
- "type": "array",
- "included": 1,
- "storageOption": "External",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "FeatureMap",
- "code": 65532,
- "mfgCode": null,
- "side": "server",
- "type": "bitmap32",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "0",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- },
- {
- "name": "ClusterRevision",
- "code": 65533,
- "mfgCode": null,
- "side": "server",
- "type": "int16u",
- "included": 1,
- "storageOption": "RAM",
- "singleton": 0,
- "bounded": 0,
- "defaultValue": "1",
- "reportable": 1,
- "minInterval": 1,
- "maxInterval": 65534,
- "reportableChange": 0
- }
- ]
- },
  {
  "name": "Unit Testing",
  "code": 4294048773,

diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -77,7 +77,9 @@ set(SRC_DIRS_LIST
  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server"
  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic-information"
  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings"
- "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/client-monitoring-server"
+ # Disable Client Monitoring cluster until update is done
+ # https://github.com/project-chip/connectedhomeip/issues/24425
+ # "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/client-monitoring-server"
  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server"
  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server"
  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server"