Merge branch 'master' into telink_docker_update

project-chip · May 23, 2023 · d5970d7 · d5970d7
2 parents 489a670 + 1efbaf6
commit d5970d7
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 27 deletions.
diff --git a/examples/chip-tool/templates/tests/commands.zapt b/examples/chip-tool/templates/tests/commands.zapt
@@ -18,7 +18,7 @@ public:
     TestList() : Command("list") {};
     CHIP_ERROR Run() override
     {
-        {{#chip_tests "../../../../src/app/tests/suites/ciTests.json"}}printf("{{filename}}\n");{{/chip_tests}}
+        {{#chip_tests "../../../../src/app/tests/suites/ciTests.json" includeAllClusters=true}}printf("{{filename}}\n");{{/chip_tests}}
 
         return CHIP_NO_ERROR;
     }
@@ -30,7 +30,7 @@ public:
     ManualTestList() : Command("list-manual") {};
     CHIP_ERROR Run() override
     {
-        {{#chip_tests "../../../../src/app/tests/suites/manualTests.json"}}printf("{{filename}}\n");{{/chip_tests}}
+        {{#chip_tests "../../../../src/app/tests/suites/manualTests.json" includeAllClusters=true}}printf("{{filename}}\n");{{/chip_tests}}
 
         return CHIP_NO_ERROR;
     }
@@ -49,10 +49,10 @@ void registerCommandsTests(Commands & commands, CredentialIssuerCommands * creds
 #if CONFIG_ENABLE_YAML_TESTS
         make_unique<TestList>(),
         make_unique<ManualTestList>(),
-      {{#chip_tests "../../../../src/app/tests/suites/ciTests.json"}}
+      {{#chip_tests "../../../../src/app/tests/suites/ciTests.json" includeAllClusters=true}}
         make_unique<{{filename}}Suite>(credsIssuerConfig),
       {{/chip_tests}}
-      {{#chip_tests "../../../../src/app/tests/suites/manualTests.json"}}
+      {{#chip_tests "../../../../src/app/tests/suites/manualTests.json" includeAllClusters=true}}
         make_unique<{{filename}}Suite>(credsIssuerConfig),
       {{/chip_tests}}
 #endif // CONFIG_ENABLE_YAML_TESTS

diff --git a/examples/chip-tool/templates/tests/partials/test_cluster.zapt b/examples/chip-tool/templates/tests/partials/test_cluster.zapt
@@ -1,4 +1,4 @@
-{{#chip_tests tests}}
+{{#chip_tests tests includeAllClusters=true}}
 class {{filename}}Suite: public TestCommand
 {
 public:

diff --git a/examples/darwin-framework-tool/templates/tests/commands.zapt b/examples/darwin-framework-tool/templates/tests/commands.zapt
@@ -19,7 +19,7 @@ public:
     TestList() : Command("list") {};
     CHIP_ERROR Run() override
     {
-        {{#chip_tests "ciTests.json"}}printf("{{filename}}\n");{{/chip_tests}}
+        {{#chip_tests "ciTests.json" includeAllClusters=true}}printf("{{filename}}\n");{{/chip_tests}}
 
         return CHIP_NO_ERROR;
     }
@@ -31,7 +31,7 @@ public:
     ManualTestList() : Command("list-manual") {};
     CHIP_ERROR Run() override
     {
-        {{#chip_tests "manualTests.json"}}printf("{{filename}}\n");{{/chip_tests}}
+        {{#chip_tests "manualTests.json" includeAllClusters=true}}printf("{{filename}}\n");{{/chip_tests}}
 
         return CHIP_NO_ERROR;
     }
@@ -50,10 +50,10 @@ void registerCommandsTests(Commands & commands)
 #if CONFIG_ENABLE_YAML_TESTS
         make_unique<TestList>(),
         make_unique<ManualTestList>(),
-      {{#chip_tests "ciTests.json"}}
+      {{#chip_tests "ciTests.json" includeAllClusters=true}}
         make_unique<{{filename}}>(),
       {{/chip_tests}}
-      {{#chip_tests "manualTests.json"}}
+      {{#chip_tests "manualTests.json" includeAllClusters=true}}
         make_unique<{{filename}}>(),
       {{/chip_tests}}
 #endif // CONFIG_ENABLE_YAML_TESTS

diff --git a/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt b/examples/darwin-framework-tool/templates/tests/partials/test_cluster.zapt
@@ -1,4 +1,4 @@
-{{#chip_tests tests useSynthesizeWaitForReport=true}}
+{{#chip_tests tests useSynthesizeWaitForReport=true includeAllClusters=true}}
 class {{filename}}: public TestCommandBridge
 {
   public:

diff --git a/examples/placeholder/templates/tests-commands.zapt b/examples/placeholder/templates/tests-commands.zapt
@@ -10,7 +10,7 @@
 
 std::unique_ptr<TestCommand>GetTestCommand(std::string testName)
 {
-  {{#chip_tests "../linux/apps/app1/ciTests.json"}}
+  {{#chip_tests "../linux/apps/app1/ciTests.json" includeAllClusters=true}}
   if (testName == "{{filename}}")
   {
       return std::unique_ptr<{{filename}}Suite>(new {{filename}}Suite());
@@ -22,7 +22,7 @@ std::unique_ptr<TestCommand>GetTestCommand(std::string testName)
 
 void PrintTestCommands()
 {
-  {{#chip_tests "../linux/apps/app1/ciTests.json"}}
+  {{#chip_tests "../linux/apps/app1/ciTests.json" includeAllClusters=true}}
   {{#first}}
   ChipLogError(chipTool, "Supported commands:");
   {{/first}}

diff --git a/integrations/docker/images/chip-build-ti/Dockerfile b/integrations/docker/images/chip-build-ti/Dockerfile
@@ -11,9 +11,9 @@ RUN set -x \
 
 # Install Sysconfig
 RUN set -x \
-    && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.13.0.2553/sysconfig-1.13.0_2553-setup.run \
-    && chmod +x sysconfig-1.13.0_2553-setup.run \
-    && ./sysconfig-1.13.0_2553-setup.run --mode unattended \
+    && wget https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-nsUM6f7Vvb/1.15.0.2826/sysconfig-1.15.0_2826-setup.run \
+    && chmod +x sysconfig-1.15.0_2826-setup.run \
+    && ./sysconfig-1.15.0_2826-setup.run --mode unattended \
     && : # last line
 
-ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.13.0
+ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.15.0
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -48,7 +48,7 @@ COPY --from=k32w /opt/sdk /opt/k32w_sdk
 
 COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland
 
-COPY --from=ti /opt/ti/sysconfig_1.13.0 /opt/ti/sysconfig_1.13.0
+COPY --from=ti /opt/ti/sysconfig_1.15.0 /opt/ti/sysconfig_1.15.0
 
 COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/
 

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.7.13 Version bump reason: [Telink] Update Docker image (drivers update)
+0.7.14 Version bump reason: [Telink] Update Docker image (drivers update)
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.05.16-nightly
+ARG ZAP_VERSION=v2023.05.22-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -9,7 +9,7 @@
                 "mac-arm64",
                 "windows-amd64"
             ],
-            "tags": ["version:2@v2023.05.16-nightly.1"]
+            "tags": ["version:2@v2023.05.22-nightly.1"]
         }
     ]
 }
diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version
@@ -1 +1 @@
-v2023.05.16-nightly
+v2023.05.22-nightly
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2023.5.16'
+MIN_ZAP_VERSION = '2023.5.22'
 
 
 class ZapTool:

diff --git a/src/app/tests/suites/examples/TestGenExample.zapt b/src/app/tests/suites/examples/TestGenExample.zapt
@@ -1,4 +1,4 @@
-{{#chip_tests "ciTests.json"}}
+{{#chip_tests "ciTests.json" includeAllClusters=true}}
 {{#chip_tests_config}}
 "Argument Name {{name}}"
 "Argument Type {{type}}"

diff --git a/src/app/tests/suites/templates/simulated-cluster-objects.zapt b/src/app/tests/suites/templates/simulated-cluster-objects.zapt
@@ -7,7 +7,7 @@
 
 namespace chip {
 
-{{#chip_tests_only_clusters}}
+{{#chip_tests_only_clusters includeAllClusters=true}}
 {{#chip_tests_only_cluster_commands}}
 
 struct {{name}}Command

diff --git a/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/time-synchronization-cluster.xml
@@ -104,7 +104,8 @@ limitations under the License.
     <client init="false" tick="false">true</client>
     <server init="false" tick="false">true</server>
     <description>Accurate time is required for a number of reasons, including scheduling, display and validating security materials.</description>
-    <!-- Base data types -->
+    <globalAttribute side="either" code="0xFFFD" value="2"/>
+
     <attribute side="server" code="0x0000" define="UTC_TIME" type="epoch_us" isNullable="true" optional="false">UTCTime</attribute>
     <attribute side="server" code="0x0001" define="GRANULARITY" type="GranularityEnum" default="0x00" optional="false">Granularity</attribute>
     <attribute side="server" code="0x0002" define="TIME_SOURCE" type="TimeSourceEnum" default="0x00" optional="true">TimeSource</attribute>

diff --git a/src/crypto/CHIPCryptoPALPSA.cpp b/src/crypto/CHIPCryptoPALPSA.cpp
@@ -1773,7 +1773,7 @@ CHIP_ERROR ExtractRawDNFromX509Cert(bool extractSubject, const ByteSpan & certif
     dn.reduce_size(len);
 
 exit:
-    _log_mbedTLS_error(result);
+    logMbedTLSError(result);
     mbedtls_x509_crt_free(&mbedCertificate);
 
 #else

diff --git a/src/platform/Ameba/BLEManagerImpl.cpp b/src/platform/Ameba/BLEManagerImpl.cpp
@@ -292,7 +292,12 @@ CHIP_ERROR BLEManagerImpl::HandleGAPDisconnect(uint16_t conn_id, uint16_t disc_c
         disconReason = BLE_ERROR_CHIPOBLE_PROTOCOL_ABORT;
         break;
     }
-    HandleConnectionError(conn_id, disconReason);
+
+    ChipDeviceEvent event;
+    event.Type                           = DeviceEventType::kCHIPoBLEConnectionError;
+    event.CHIPoBLEConnectionError.ConId  = conn_id;
+    event.CHIPoBLEConnectionError.Reason = disconReason;
+    PlatformMgr().PostEventOrDie(&event);
 
     // Force a reconfiguration of advertising in case we switched to non-connectable mode when
     // the BLE connection was established.

diff --git a/src/setup_payload/AdditionalDataPayload.h b/src/setup_payload/AdditionalDataPayload.h
@@ -34,6 +34,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace chip {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.7.13 Version bump reason: [Telink] Update Docker image (drivers update)
		0.7.14 Version bump reason: [Telink] Update Docker image (drivers update)