Merge pull request #6 from RafaelMicro/fix-issues

fix multiple issues
RafaelMicro · Jan 3, 2024 · ab5bd58 · ab5bd58
2 parents 422fb6e + edc4c21
commit ab5bd58
Show file tree

Hide file tree

Showing 29 changed files with 153 additions and 203 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -115,7 +115,8 @@
         "condition_variable": "cpp",
         "numeric": "cpp",
         "random": "cpp",
-        "thread": "cpp"
+        "thread": "cpp",
+        "util_log.h": "c"
     },
     // Configure paths or glob patterns to exclude from file watching.
     "files.watcherExclude": {
@@ -125,7 +126,7 @@
         "**/third_party/**": true
     },
     "files.eol": "\n",
-    "editor.formatOnSave": true,
+    "editor.formatOnSave": false,
     "better-comments.tags": [
         {
             "tag": "!",

diff --git a/examples/light-switch-app/rt58x/BUILD.gn b/examples/light-switch-app/rt58x/BUILD.gn
@@ -70,7 +70,6 @@ assert(!(chip_enable_wifi && chip_enable_openthread))
 
 rt58x_sdk("sdk") {
   sources = [
-    "${examples_plat_dir}/config/FreeRTOSConfig.h",
     "${rt58x_project_dir}/include/CHIPProjectConfig.h",
   ]
 
@@ -90,9 +89,6 @@ rt58x_sdk("sdk") {
   if (chip_build_platform_attestation_credentials_provider) {
     defines += [ "RAFAEL_CERTS_ENABLED=1" ]
   }
-  if (chip_build_libshell) {
-    defines += [ "CONFIG_ENABLE_CHIP_SHELL=1" ]
-  }
   if (chip_enable_pw_rpc) {
     defines += [
       "HAL_VCOM_ENABLE=1",

diff --git a/examples/light-switch-app/rt58x/args.gni b/examples/light-switch-app/rt58x/args.gni
@@ -19,7 +19,7 @@ import("${chip_root}/src/platform/RT58x/args.gni")
 rt58x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_enable_ota_requestor = false
-chip_build_libshell = true
+chip_build_libshell = false
 chip_build_platform_attestation_credentials_provider = false
 
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"

diff --git a/examples/light-switch-app/rt58x/src/AppTask.cpp b/examples/light-switch-app/rt58x/src/AppTask.cpp
@@ -20,6 +20,7 @@
 #include "AppTask.h"
 #include "AppConfig.h"
 #include "AppEvent.h"
+#include <OTAConfig.h>
 
 #include <app/clusters/identify-server/identify-server.h>
 #include <app/util/attribute-storage.h>
@@ -55,6 +56,7 @@
 #include "bsp.h"
 #include "bsp_button.h"
 #include "matter_config.h"
+#include "fota_define.h"
 
 using namespace chip;
 using namespace ::chip::app;
@@ -166,6 +168,27 @@ void UnlockOpenThreadTask(void)
 {
     chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
 }
+void MatterFotaInit(void)
+{
+    fota_information_t  *p_fota_info = (fota_information_t *)(FOTA_UPDATE_BANK_INFO_ADDRESS);
+
+    if (p_fota_info->fotabank_ready == FOTA_IMAGE_READY)
+    { 
+        if (p_fota_info->fota_result == FOTA_RESULT_SUCCESS)
+        {
+            // err("sw ver: %d\r\n", p_fota_info->reserved[0]);
+            chip::DeviceLayer::ConfigurationMgr().StoreSoftwareVersion(p_fota_info->reserved[0]);
+        } 
+        else
+        {
+            err("fota result: %d\r\n", p_fota_info->fota_result);
+        }  
+        while (flash_check_busy());
+        taskENTER_CRITICAL();
+        flash_erase(FLASH_ERASE_SECTOR, FOTA_UPDATE_BANK_INFO_ADDRESS);
+        taskEXIT_CRITICAL();
+    }
+}
 void AppTask::OpenCommissioning(intptr_t arg)
 {
     // Enable BLE advertisements
@@ -284,10 +307,14 @@ void AppTask::InitServer(intptr_t arg)
     {
         ChipLogError(NotSpecified, "LightSwitchMgr Init failed!");
     }
+#if RT58x_OTA_ENABLED
+    OTAConfig::Init();
+#endif
 }
 
 CHIP_ERROR AppTask::Init()
 {
+    MatterFotaInit();
     CHIP_ERROR err;
     // ChipLogProgress(NotSpecified, "Current Software Version: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
 

diff --git a/examples/light-switch-app/rt58x/src/main.cpp b/examples/light-switch-app/rt58x/src/main.cpp
@@ -30,7 +30,7 @@
 
 #include <lib/core/CHIPError.h>
 
-#if CONFIG_ENABLE_CHIP_SHELL
+#if ENABLE_CHIP_SHELL
 #include "matter_shell.h"
 #endif
 

diff --git a/examples/lighting-app/rt58x/BUILD.gn b/examples/lighting-app/rt58x/BUILD.gn
@@ -43,7 +43,6 @@ declare_args() {
 
 rt58x_sdk("sdk") {
   sources = [
-    "${examples_plat_dir}/config/FreeRTOSConfig.h",
     "${rt58x_project_dir}/include/CHIPProjectConfig.h",
   ]
 
@@ -63,10 +62,6 @@ rt58x_sdk("sdk") {
   if (chip_build_platform_attestation_credentials_provider) {
     defines += [ "RAFAEL_CERTS_ENABLED=1" ]
   }
-
-  if (chip_build_libshell) {
-    defines += [ "CONFIG_ENABLE_CHIP_SHELL=1" ]
-  }
 }
 
 rt58x_executable("lighting_app") {

diff --git a/examples/lighting-app/rt58x/args.gni b/examples/lighting-app/rt58x/args.gni
@@ -19,7 +19,7 @@ import("${chip_root}/src/platform/RT58x/args.gni")
 rt58x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_enable_ota_requestor = false
-chip_build_libshell = true
+chip_build_libshell = false
 chip_build_platform_attestation_credentials_provider = false
 
 # rafael_board = "RT58x"

diff --git a/examples/lighting-app/rt58x/src/main.cpp b/examples/lighting-app/rt58x/src/main.cpp
@@ -35,7 +35,7 @@
 #include <mbedtls/aes.h>
 #include <mbedtls/platform.h>
 
-#if CONFIG_ENABLE_CHIP_SHELL
+#if ENABLE_CHIP_SHELL
 #include "matter_shell.h"
 #endif
 

diff --git a/examples/lock-app/rt58x/BUILD.gn b/examples/lock-app/rt58x/BUILD.gn
@@ -70,7 +70,6 @@ assert(!(chip_enable_wifi && chip_enable_openthread))
 
 rt58x_sdk("sdk") {
   sources = [
-    "${examples_plat_dir}/config/FreeRTOSConfig.h",
     "${rt58x_project_dir}/include/CHIPProjectConfig.h",
   ]
 
@@ -90,9 +89,6 @@ rt58x_sdk("sdk") {
   if (chip_build_platform_attestation_credentials_provider) {
     defines += [ "RAFAEL_CERTS_ENABLED=1" ]
   }
-  if (chip_build_libshell) {
-    defines += [ "CONFIG_ENABLE_CHIP_SHELL=1" ]
-  }
   if (chip_enable_pw_rpc) {
     defines += [
       "HAL_VCOM_ENABLE=1",

diff --git a/examples/lock-app/rt58x/args.gni b/examples/lock-app/rt58x/args.gni
@@ -19,7 +19,7 @@ import("${chip_root}/src/platform/RT58x/args.gni")
 rt58x_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
 chip_enable_ota_requestor = false
-chip_build_libshell = true
+chip_build_libshell = false
 chip_build_platform_attestation_credentials_provider = false
 
 pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip"

diff --git a/examples/lock-app/rt58x/src/AppTask.cpp b/examples/lock-app/rt58x/src/AppTask.cpp
@@ -20,6 +20,7 @@
 #include "AppTask.h"
 #include "AppConfig.h"
 #include "AppEvent.h"
+#include <OTAConfig.h>
 
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
@@ -56,6 +57,7 @@
 #include "bsp_button.h"
 #include "bsp_led.h"
 #include "matter_config.h"
+#include "fota_define.h"
 
 
 using namespace chip;
@@ -167,6 +169,27 @@ void UnlockOpenThreadTask(void)
 {
     chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
 }
+void MatterFotaInit(void)
+{
+    fota_information_t  *p_fota_info = (fota_information_t *)(FOTA_UPDATE_BANK_INFO_ADDRESS);
+
+    if (p_fota_info->fotabank_ready == FOTA_IMAGE_READY)
+    { 
+        if (p_fota_info->fota_result == FOTA_RESULT_SUCCESS)
+        {
+            // err("sw ver: %d\r\n", p_fota_info->reserved[0]);
+            chip::DeviceLayer::ConfigurationMgr().StoreSoftwareVersion(p_fota_info->reserved[0]);
+        } 
+        else
+        {
+            err("fota result: %d\r\n", p_fota_info->fota_result);
+        }  
+        while (flash_check_busy());
+        taskENTER_CRITICAL();
+        flash_erase(FLASH_ERASE_SECTOR, FOTA_UPDATE_BANK_INFO_ADDRESS);
+        taskEXIT_CRITICAL();
+    }
+}
 void AppTask::OpenCommissioning(intptr_t arg)
 {
     // Enable BLE advertisements
@@ -299,6 +322,9 @@ void AppTask::InitServer(intptr_t arg)
     BoltLockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     PlatformMgr().ScheduleWork(UpdateClusterState, 0);
+#if RT58x_OTA_ENABLED
+    OTAConfig::Init();
+#endif
 }
 
 void AppTask::UpdateStatusLED()
@@ -358,6 +384,7 @@ void AppTask::ChipEventHandler(const ChipDeviceEvent * aEvent, intptr_t /* arg *
 
 CHIP_ERROR AppTask::Init()
 {
+    MatterFotaInit();
     CHIP_ERROR err;
     ChipLogProgress(NotSpecified, "Current Software Version: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
 

diff --git a/examples/lock-app/rt58x/src/main.cpp b/examples/lock-app/rt58x/src/main.cpp
@@ -30,7 +30,7 @@
 
 #include <lib/core/CHIPError.h>
 
-#if CONFIG_ENABLE_CHIP_SHELL
+#if ENABLE_CHIP_SHELL
 #include "matter_shell.h"
 #endif
 

diff --git a/examples/platform/rt58x/FreeRTOSConfig.h b/examples/platform/rt58x/FreeRTOSConfig.h
@@ -50,7 +50,11 @@ extern uint32_t SystemCoreClock;
 #define configUSE_PREEMPTION (1)
 #define configUSE_TIME_SLICING (0)
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION (0)
+#if(CHIP_CONFIG_ENABLE_ICD_SERVER)
 #define configUSE_TICKLESS_IDLE (1)
+#else
+#define configUSE_TICKLESS_IDLE (0)
+#endif
 
 #define configMAX_PRIORITIES (56)
 #define configMINIMAL_STACK_SIZE (128) /* Number of words to use for Idle and Timer stacks */