rc 1.0

shchen-Lab · Oct 16, 2023 · 0d95773 · 0d95773
1 parent 6b2d52c
commit 0d95773
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/examples/lighting-app/bouffalolab/README.md b/examples/lighting-app/bouffalolab/README.md
@@ -383,5 +383,6 @@ ota-provider-app build and usage.
     ```
 -  TestCommand
     ```shell
-    ./chip-tool any command-by-id 0x130D0B05 0x0000 '{ "0x0": { "0": null, "1": false }}' 123 1
+    ./chip-tool any command-by-id 0x130DFCCE 0x0000 '{ "0x0": { "0": null, "1": false }}' 1 1
+    ./chip-tool any read-by-id 0x130DFCCE  0x011c 1 1
     ```
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -1715,7 +1715,7 @@ server cluster ColorControl = 768 {
 }
 
 /** Zigbee Diagnostic cluser */
-server cluster ZigbeeDiagnostic = 319621893 {
+server cluster ZigbeeDiagnostic = 319683790 {
   attribute int8u lastMessageLQI = 284;
   attribute int8s lastMessageRSSI = 285;
   readonly attribute command_id generatedCommandList[] = 65528;

diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap
@@ -4444,7 +4444,7 @@
         },
         {
           "name": "ZigbeeDiagnostic",
-          "code": 319621893,
+          "code": 319683790,
           "mfgCode": null,
           "define": "ZIGBEE_DIAGNOSTIC",
           "side": "server",
@@ -4474,7 +4474,7 @@
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
-              "reportableChange": 1
+              "reportableChange": 0
             },
             {
               "name": "LastMessageRSSI",
@@ -4490,7 +4490,7 @@
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
-              "reportableChange": 1
+              "reportableChange": 0
             },
             {
               "name": "GeneratedCommandList",

diff --git a/src/app/clusters/zigbee-diagnostic-server/zigbee-diagnostic-server.cpp b/src/app/clusters/zigbee-diagnostic-server/zigbee-diagnostic-server.cpp
@@ -47,7 +47,7 @@ class ZigbeeDiagnosticServer : public AttributeAccessInterface
 public:
     static ZigbeeDiagnosticServer & Instance();
     // Register for the Basic cluster on all endpoints.
-    ZigbeeDiagnosticServer() : AttributeAccessInterface(Optional<EndpointId>::Missing(), BasicInformation::Id) {}
+    ZigbeeDiagnosticServer() : AttributeAccessInterface(Optional<EndpointId>::Missing(), ZigbeeDiagnostic::Id) {}
     bool TestDeviceCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath);
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
     CHIP_ERROR Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder) override;
@@ -69,6 +69,7 @@ ZigbeeDiagnosticServer & ZigbeeDiagnosticServer::Instance()
 }
 CHIP_ERROR ZigbeeDiagnosticServer::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
+    printf("1111111111\r\n");
     if (aPath.mClusterId != Clusters::ZigbeeDiagnostic::Id)
     {
         // We shouldn't have been called at all.

diff --git a/src/app/zap-templates/zcl/data-model/chip/zigbee-diagnostic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/zigbee-diagnostic-cluster.xml
@@ -21,7 +21,7 @@ limitations under the License.
         <name>ZigbeeDiagnostic</name>
         <domain>CHIP</domain>
         <description>Zigbee Diagnostic cluser</description>
-        <code>0x130D0B05</code>
+        <code>0x130DFCCE</code>
         <define>ZIGBEE_DIAGNOSTIC</define>
         <client tick="false" init="false">true</client>
         <server tick="false" init="false">true</server>

diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h