Merge branch 'master' into dnssd_tracing

project-chip · Jun 12, 2023 · ae1663f · ae1663f
2 parents b52115a + 452d3b4
commit ae1663f
Show file tree

Hide file tree

Showing 70 changed files with 616 additions and 4,339 deletions.
diff --git a/examples/lighting-app/bouffalolab/README.md b/examples/lighting-app/bouffalolab/README.md
@@ -305,7 +305,7 @@ ota-provider-app build and usage.
 -   BLE commission BL602/BL702 lighting if not commissioned.
 -   Start OTA software upgrade process
     ```shell
-    ./chip-tool otasoftwareupdaterequestor announce-ota-provider 1 0 0 0 <node_id_to_lighting_app> 0
+    ./chip-tool otasoftwareupdaterequestor announce-otaprovider 1 0 0 0 <node_id_to_lighting_app> 0
     ```
     where `<node_id_to_lighting_app>` is node id of BL602/BL702 lighting app.
 -   After OTA software upgrade gets done, BL602/BL702 will get reboot

diff --git a/examples/lighting-app/bouffalolab/bl702/args.gni b/examples/lighting-app/bouffalolab/bl702/args.gni
@@ -30,3 +30,8 @@ lwip_platform = "bl702"
 
 chip_enable_ota_requestor = true
 chip_detail_logging = false
+
+pw_build_LINK_DEPS = [
+  "$dir_pw_assert:impl",
+  "$dir_pw_log:impl",
+]
diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp
@@ -40,9 +40,9 @@
 #endif
 
 #if CHIP_ENABLE_OPENTHREAD
-#include <ThreadStackManagerImpl.h>
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
+#include <platform/bouffalolab/common/ThreadStackManagerImpl.h>
 #include <utils_list.h>
 #endif
 

diff --git a/examples/platform/bouffalolab/common/plat/OTAConfig.cpp b/examples/platform/bouffalolab/common/plat/OTAConfig.cpp
@@ -19,6 +19,7 @@
 #include "OTAConfig.h"
 #include <app/server/Server.h>
 
+#include <platform/bouffalolab/common/OTAImageProcessorImpl.h>
 // Global OTA objects
 chip::DefaultOTARequestor gRequestorCore;
 chip::DefaultOTARequestorStorage gRequestorStorage;

diff --git a/examples/platform/bouffalolab/common/plat/OTAConfig.h b/examples/platform/bouffalolab/common/plat/OTAConfig.h
@@ -22,7 +22,6 @@
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
-#include <platform/bouffalolab/BL702/OTAImageProcessorImpl.h>
 
 class OTAConfig
 {

diff --git a/examples/platform/bouffalolab/common/plat/platform.cpp b/examples/platform/bouffalolab/common/plat/platform.cpp
@@ -30,17 +30,17 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <route_hook/bl_route_hook.h>
 #endif
-#include <PlatformManagerImpl.h>
+#include <platform/bouffalolab/common/PlatformManagerImpl.h>
 
 #if HEAP_MONITORING
 #include <MemMonitoring.h>
 #include <lib/support/CHIPMem.h>
 #endif
 
 #if CHIP_ENABLE_OPENTHREAD
-#include <ThreadStackManagerImpl.h>
 #include <platform/OpenThread/OpenThreadUtils.h>
 #include <platform/ThreadStackManager.h>
+#include <platform/bouffalolab/common/ThreadStackManagerImpl.h>
 #include <utils_list.h>
 #endif
 

diff --git a/examples/platform/silabs/syscalls_stubs.cpp b/examples/platform/silabs/syscalls_stubs.cpp
@@ -174,7 +174,7 @@ int __attribute__((weak)) _read(int file, char * ptr, int len)
 {
     (void) file;
 #if SILABS_LOG_OUT_UART
-    return = uartConsoleRead(ptr, len);
+    return uartConsoleRead(ptr, len);
 #else
     (void) ptr;
     (void) len;

diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
@@ -7,7 +7,7 @@ steps:
               git config --global --add safe.directory "*"
               git submodule update --init --recursive
       id: Submodules
-    - name: "connectedhomeip/chip-build-vscode:0.7.3"
+    - name: "connectedhomeip/chip-build-vscode:0.7.16"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:

diff --git a/scripts/tools/memory/platform/qpg.cfg b/scripts/tools/memory/platform/qpg.cfg
@@ -35,10 +35,21 @@
         'sections': {
             'FLASH': [
                 '.text',
-                '.rom',
+                '.flashjumptable',
+                '.datajumptable',
+                '.m_flashjumptable',
+                '.loaded_user_license',
                 '.native_user_license',
+                '.extended_user_license',
                 '.isr_vector',
                 '.ARM.exidx',
+                # Bootloader
+                '.bootloader',
+                '.bl_user_license',
+                '.upgrade_image_user_license',
+                # NVM / Factory areas
+                '.gpNVM',
+                '.factory_data',
             ],
             'RAM': [
                 '.data',
@@ -49,17 +60,17 @@
                 '.ret_hw',
                 '.ret_sw',
                 '.unused_area',
-                '.pkey',
-                '.pufr',
                 '.lower_ram_retain',
                 '.lower_ram_retain_gpmicro_accessible',
                 '.higher_ram_noretain',
-                '.gpNVM',
+                '.rom_m_bss',
+                '.rom_m_data',
+                '.lower_ram_retain_gpmicro_accessible_mrom',
+            ],
+            'OTA': [
+                'OTA',
+                'JTOTA',
             ]
         }
     },
-    'collect': {
-        # Strip these prefixes from compilation unit paths.
-        'prefix': ['/mnt/c/Projects', '/mnt/c']
-    },
 }
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -6915,7 +6915,7 @@ PICS:
       id: DGTHREAD.S.A0033
 
     - label:
-          "Does the DUT(server) support the RxErrInvalidScrAddrCount attribute?"
+          "Does the DUT(server) support the RxErrInvalidSrcAddrCount attribute?"
       id: DGTHREAD.S.A0034
 
     - label: "Does the DUT(server) support the RxErrSecCount attribute?"
@@ -7255,7 +7255,7 @@ PICS:
 
     - label:
           "Does the DUT(client) have access privileges for the
-          RxErrInvalidScrAddrCount attribute implemented on the server?"
+          RxErrInvalidSrcAddrCount attribute implemented on the server?"
       id: DGTHREAD.C.A0034
 
     - label:

diff --git a/src/app/tests/suites/include/ConstraintsChecker.h b/src/app/tests/suites/include/ConstraintsChecker.h
@@ -299,6 +299,17 @@ class ConstraintsChecker
         return CheckConstraintMinValue(itemName, current.Value(), static_cast<T>(expected));
     }
 
+    template <typename T, typename U>
+    bool CheckConstraintMinValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current,
+                                 const chip::app::DataModel::Nullable<U> & expected)
+    {
+        if (expected.IsNull())
+        {
+            return true;
+        }
+        return CheckConstraintMinValue(itemName, current, expected.Value());
+    }
+
     template <typename T, typename U>
     bool CheckConstraintMinValue(const char * itemName, const T & current, const chip::Optional<U> & expected)
     {
@@ -375,6 +386,17 @@ class ConstraintsChecker
         return CheckConstraintMaxValue(itemName, current.Value(), static_cast<T>(expected));
     }
 
+    template <typename T, typename U>
+    bool CheckConstraintMaxValue(const char * itemName, const chip::app::DataModel::Nullable<T> & current,
+                                 const chip::app::DataModel::Nullable<U> & expected)
+    {
+        if (expected.IsNull())
+        {
+            return true;
+        }
+        return CheckConstraintMaxValue(itemName, current, expected.Value());
+    }
+
     template <typename T, typename U>
     bool CheckConstraintMaxValue(const char * itemName, const T & current, const chip::Optional<U> & expected)
     {

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -229,13 +229,13 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
     } else if (chip_device_platform == "bl602") {
       defines += [
         "CHIP_DEVICE_LAYER_TARGET_BL602=1",
-        "CHIP_DEVICE_LAYER_TARGET=bouffalolab/BL602",
+        "CHIP_DEVICE_LAYER_TARGET=bouffalolab/common",
         "CHIP_DEVICE_CONFIG_ENABLE_WIFI=${chip_enable_wifi}",
       ]
     } else if (chip_device_platform == "bl702") {
       defines += [
         "CHIP_DEVICE_LAYER_TARGET_BL702=1",
-        "CHIP_DEVICE_LAYER_TARGET=bouffalolab/BL702",
+        "CHIP_DEVICE_LAYER_TARGET=bouffalolab/common",
         "CHIP_DEVICE_CONFIG_ENABLE_WIFI=${chip_enable_wifi}",
       ]
     } else if (chip_device_platform == "fake") {