Merge branch 'master' into telink_leds_buttons_improvements

project-chip · Jun 3, 2023 · 6027824 · 6027824
2 parents 2684b39 + 83ecf9c
commit 6027824
Show file tree

Hide file tree

Showing 105 changed files with 4,034 additions and 3,609 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -242,7 +242,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
             - name: Clang-tidy validation
-              timeout-minutes: 45
+              timeout-minutes: 60
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \
@@ -462,7 +462,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
             - name: Clang-tidy validation
-              timeout-minutes: 45
+              timeout-minutes: 60
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/run-clang-tidy-on-compile-commands.py \

diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
@@ -113,6 +113,8 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py --target android-arm64-tv-server build"
+            - name: Clean out build output
+              run: rm -rf ./out                    
             - name: Build Android arm64-chip-tool
               run: |
                   ./scripts/run_in_build_env.sh \

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -197,7 +197,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml \
                       src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
-                      src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml \
                     "
             - name: Build Apps
               timeout-minutes: 60
@@ -509,6 +509,8 @@ jobs:
                   scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_ACE_1_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --int-arg PIXIT.ACE.APPENDPOINT:1 PIXIT.ACE.APPDEVTYPEID:0x0100 --string-arg PIXIT.ACE.APPCLUSTER:OnOff PIXIT.ACE.APPATTRIBUTE:OnOff"'
                   scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_ACE_1_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
                   scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_CGEN_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021"'
+                  scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_DA_1_2.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values"'
+                  scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app  --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_decode 1" --script "src/python_testing/TC_DA_1_5.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS src/app/tests/suites/certification/ci-pics-values"'
                   scripts/run_in_build_env.sh './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py"'
             - name: Uploading core files
               uses: actions/upload-artifact@v3

diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp
@@ -73,7 +73,7 @@ Status StaticSupportedModesManager::getModeOptionByMode(unsigned short endpointI
             return Status::Success;
         }
     }
-    emberAfPrintln(EMBER_AF_PRINT_DEBUG, "Cannot find the mode %u", mode);
+    ChipLogProgress(Zcl, "Cannot find the mode %u", mode);
     return Status::InvalidCommand;
 }
 

diff --git a/examples/bridge-app/esp32/README.md b/examples/bridge-app/esp32/README.md
@@ -1,7 +1,7 @@
-# CHIP ESP32 Bridge App Example
+# Matter ESP32 Bridge App Example
 
 Please
-[setup ESP-IDF and CHIP Environment](../../../docs/guides/esp32/setup_idf_chip.md)
+[setup ESP-IDF and Matter Environment](../../../docs/guides/esp32/setup_idf_chip.md)
 and refer
 [building and commissioning](../../../docs/guides/esp32/build_app_and_commission.md)
 guides to get started.

diff --git a/examples/bridge-app/linux/README.md b/examples/bridge-app/linux/README.md
@@ -1,14 +1,14 @@
-# CHIP Linux Bridge Example
+# Matter Linux Bridge Example
 
 An example demonstrating a simple lighting bridge and the use of dynamic
 endpoints. The document will describe the theory of operation and how to build
-and run CHIP Linux Bridge Example on Raspberry Pi. This doc is tested on
+and run Matter Linux Bridge Example on Raspberry Pi. This doc is tested on
 **Ubuntu for Raspberry Pi Server 20.04 LTS (aarch64)** and **Ubuntu for
 Raspberry Pi Desktop 20.10 (aarch64)**
 
 <hr>
 
--   [CHIP Linux Bridge Example](#chip-linux-bridge-example)
+-   [Matter Linux Bridge Example](#matter-linux-bridge-example)
     -   [Theory of Operation](#theory-of-operation)
     -   [Building](#building)
     -   [Running the Complete Example on Raspberry Pi 4](#running-the-complete-example-on-raspberry-pi-4)

diff --git a/examples/dynamic-bridge-app/linux/BUILD.gn b/examples/dynamic-bridge-app/linux/BUILD.gn
@@ -40,7 +40,6 @@ chip_codegen("chip-bridge-codegen") {
     "bridge/Switch.h",
     "bridge/TemperatureMeasurement.h",
     "bridge/BridgeClustersImpl.h",
-    "bridge/BridgeGlobalStructs.h",
   ]
 }
 

diff --git a/examples/dynamic-bridge-app/linux/README.md b/examples/dynamic-bridge-app/linux/README.md
@@ -1,14 +1,14 @@
-# CHIP Linux Bridge Example
+# Matter Linux Dynamic Endpoints Bridge Example
 
 An example demonstrating a simple lighting bridge and the use of dynamic
 endpoints. The document will describe the theory of operation and how to build
-and run CHIP Linux Bridge Example on Raspberry Pi. This doc is tested on
+and run Matter Linux Bridge Example on Raspberry Pi. This doc is tested on
 **Ubuntu for Raspberry Pi Server 20.04 LTS (aarch64)** and **Ubuntu for
 Raspberry Pi Desktop 20.10 (aarch64)**
 
 <hr>
 
--   [CHIP Linux Bridge Example](#chip-linux-bridge-example)
+-   [Matter Linux Dynamic Endpoints Bridge Example](#matter-linux-dynamic-endpoints-bridge-example)
     -   [Theory of Operation](#theory-of-operation)
     -   [Building](#building)
     -   [Running the Complete Example on Raspberry Pi 4](#running-the-complete-example-on-raspberry-pi-4)

diff --git a/examples/lock-app/linux/main.cpp b/examples/lock-app/linux/main.cpp
@@ -87,6 +87,6 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
     // TODO: Watch for LockState, DoorState, Mode, etc changes and trigger appropriate action
     if (attributePath.mClusterId == Clusters::DoorLock::Id)
     {
-        emberAfDoorLockClusterPrintln("Door Lock attribute changed");
+        ChipLogProgress(Zcl, "Door Lock attribute changed");
     }
 }
diff --git a/examples/placeholder/linux/static-supported-modes-manager.cpp b/examples/placeholder/linux/static-supported-modes-manager.cpp
@@ -73,7 +73,7 @@ Status StaticSupportedModesManager::getModeOptionByMode(unsigned short endpointI
             return Status::Success;
         }
     }
-    emberAfPrintln(EMBER_AF_PRINT_DEBUG, "Cannot find the mode %u", mode);
+    ChipLogProgress(Zcl, "Cannot find the mode %u", mode);
     return Status::InvalidCommand;
 }
 

diff --git a/examples/platform/esp32/mode-support/static-supported-modes-manager.cpp b/examples/platform/esp32/mode-support/static-supported-modes-manager.cpp
@@ -17,8 +17,6 @@
  */
 
 #include "static-supported-modes-manager.h"
-#include <app/util/debug-printing.h>
-#include <app/util/ember-print.h>
 #include <platform/ESP32/ESP32Config.h>
 
 using namespace chip;
@@ -176,7 +174,7 @@ Status StaticSupportedModesManager::getModeOptionByMode(unsigned short endpointI
             return Status::Success;
         }
     }
-    emberAfPrintln(EMBER_AF_PRINT_DEBUG, "Cannot find the mode %u", mode);
+    ChipLogProgress(Zcl, "Cannot find the mode %u", mode);
     return Status::InvalidCommand;
 }
 

diff --git a/examples/window-app/common/src/WindowApp.cpp b/examples/window-app/common/src/WindowApp.cpp
@@ -295,7 +295,7 @@ void WindowApp::DispatchEventAttributeChange(chip::EndpointId endpoint, chip::At
 
     if (nullptr == cover)
     {
-        emberAfWindowCoveringClusterPrint("Ep[%u] not supported AttributeId=%u\n", endpoint, (unsigned int) attribute);
+        ChipLogProgress(Zcl, "Ep[%u] not supported AttributeId=%u\n", endpoint, (unsigned int) attribute);
         return;
     }
 
@@ -675,7 +675,7 @@ void WindowApp::Cover::OnTiltTimeout(WindowApp::Timer & timer)
 void WindowApp::Cover::SchedulePositionSet(chip::Percent100ths position, bool isTilt)
 {
     CoverWorkData * data = chip::Platform::New<CoverWorkData>();
-    VerifyOrReturn(data != nullptr, emberAfWindowCoveringClusterPrint("Cover::SchedulePositionSet - Out of Memory for WorkData"));
+    VerifyOrReturn(data != nullptr, ChipLogProgress(Zcl, "Cover::SchedulePositionSet - Out of Memory for WorkData"));
 
     data->mEndpointId   = mEndpoint;
     data->percent100ths = position;
@@ -701,7 +701,7 @@ void WindowApp::Cover::CallbackPositionSet(intptr_t arg)
 void WindowApp::Cover::ScheduleOperationalStateSet(OperationalState opState, bool isTilt)
 {
     CoverWorkData * data = chip::Platform::New<CoverWorkData>();
-    VerifyOrReturn(data != nullptr, emberAfWindowCoveringClusterPrint("Cover::OperationalStatusSet - Out of Memory for WorkData"));
+    VerifyOrReturn(data != nullptr, ChipLogProgress(Zcl, "Cover::OperationalStatusSet - Out of Memory for WorkData"));
 
     data->mEndpointId = mEndpoint;
     data->opState     = opState;

diff --git a/scripts/py_matter_idl/BUILD.gn b/scripts/py_matter_idl/BUILD.gn
@@ -39,19 +39,16 @@ pw_python_package("matter_idl") {
     "matter_idl/tests/inputs/several_clusters.matter",
     "matter_idl/tests/inputs/simple_attribute.matter",
     "matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeClustersImpl.h",
-    "matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h",
     "matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h",
     "matter_idl/tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "matter_idl/tests/outputs/cluster_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeClustersImpl.h",
-    "matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h",
     "matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h",
     "matter_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-ReadImpl.cpp",
     "matter_idl/tests/outputs/global_struct_attribute/jni/DemoClusterClient-InvokeSubscribeImpl.cpp",
     "matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-ReadImpl.cpp",
     "matter_idl/tests/outputs/optional_argument/jni/MyClusterClient-InvokeSubscribeImpl.cpp",
     "matter_idl/tests/outputs/several_clusters/bridge/BridgeClustersImpl.h",
-    "matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h",
     "matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h",
     "matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h",
     "matter_idl/tests/outputs/several_clusters/bridge/Third.h",
@@ -65,7 +62,6 @@ pw_python_package("matter_idl") {
     "matter_idl/tests/outputs/several_clusters/jni/SecondClient-InvokeSubscribeImpl.cpp",
     "matter_idl/tests/outputs/several_clusters/jni/ThirdClient-InvokeSubscribeImpl.cpp",
     "matter_idl/tests/outputs/simple_attribute/bridge/BridgeClustersImpl.h",
-    "matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h",
     "matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h",
     "matter_idl/tests/outputs/simple_attribute/jni/MyClusterClient-ReadImpl.cpp",
     "matter_idl/tests/outputs/simple_attribute/jni/MyClusterClient-InvokeSubscribeImpl.cpp",

diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersHeader.jinja
@@ -1,7 +1,5 @@
 #include <new>
 
-#include "bridge/BridgeGlobalStructs.h"
-
 namespace clusters {
 
 {%- for cluster in clusters %}

diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/__init__.py b/scripts/py_matter_idl/matter_idl/generators/bridge/__init__.py
@@ -179,12 +179,3 @@ def internal_render_all(self):
                 'idl': self.idl,
             }
         )
-
-        self.internal_render_one_output(
-            template_path="BridgeClustersGlobalStructs.jinja",
-            output_file_name="bridge/BridgeGlobalStructs.h",
-            vars={
-                'idl': self.idl,
-                'structs': self.idl.structs,
-            }
-        )
diff --git a/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml b/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
@@ -54,30 +54,25 @@ java-class:
 bridge:
     inputs/simple_attribute.matter:
         bridge/BridgeClustersImpl.h: outputs/simple_attribute/bridge/BridgeClustersImpl.h
-        bridge/BridgeGlobalStructs.h: outputs/simple_attribute/bridge/BridgeGlobalStructs.h
         bridge/MyClusterServer.h: outputs/simple_attribute/bridge/MyClusterServer.h
 
     inputs/global_struct_attribute.matter:
         bridge/BridgeClustersImpl.h: outputs/global_struct_attribute/bridge/BridgeClustersImpl.h
-        bridge/BridgeGlobalStructs.h: outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h
         bridge/DemoClusterServer.h: outputs/global_struct_attribute/bridge/DemoClusterServer.h
 
     inputs/cluster_struct_attribute.matter:
         bridge/BridgeClustersImpl.h: outputs/cluster_struct_attribute/bridge/BridgeClustersImpl.h
-        bridge/BridgeGlobalStructs.h: outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h
         bridge/DemoClusterServer.h: outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
 
     inputs/several_clusters.matter:
         bridge/BridgeClustersImpl.h: outputs/several_clusters/bridge/BridgeClustersImpl.h
-        bridge/BridgeGlobalStructs.h: outputs/several_clusters/bridge/BridgeGlobalStructs.h
         bridge/FirstServer.h: outputs/several_clusters/bridge/FirstServer.h
         bridge/SecondServer.h: outputs/several_clusters/bridge/SecondServer.h
         bridge/ThirdServer.h: outputs/several_clusters/bridge/ThirdServer.h
         bridge/Third.h: outputs/several_clusters/bridge/Third.h
 
     inputs/cluster_with_commands.matter:
         bridge/BridgeClustersImpl.h: outputs/cluster_with_commands/bridge/BridgeClustersImpl.h
-        bridge/BridgeGlobalStructs.h: outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
         bridge/OnOff.h: outputs/cluster_with_commands/bridge/OnOff.h
 
 cpp-app:

diff --git a/...matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h b/...matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/BridgeGlobalStructs.h
diff --git a/...y_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h b/...y_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/...py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h b/...py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/..._matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h b/..._matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/BridgeGlobalStructs.h
diff --git a/...py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h b/...py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/BridgeGlobalStructs.h
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "BridgeGlobalStructs.h"
 #include "GeneratedClusters.h"
 
 namespace clusters {

diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/BridgeGlobalStructs.h