From 7d0041d90c6223fa57cfeb6fd23e64c1f30e8ea8 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 10 Aug 2024 15:53:39 +0800
Subject: [PATCH] update

---
 .settings/stm32cubeide.project.prefs          | 4 ++--
 Core/Inc/FreeRTOSConfig.h                     | 2 +-
 Core/Src/sysmem.c                             | 2 +-
 STM32F407VETX_FLASH.ld                        | 2 +-
 STM32F407VETX_RAM.ld                          | 2 +-
 usrc/app/dmapp.cpp                            | 1 +
 usrc/board_base/app_share/tmc_motor_group.cpp | 2 ++
 zsdk                                          | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.settings/stm32cubeide.project.prefs b/.settings/stm32cubeide.project.prefs
index 184ab7f..20bfd27 100644
--- a/.settings/stm32cubeide.project.prefs
+++ b/.settings/stm32cubeide.project.prefs
@@ -1,6 +1,6 @@
-2F62501ED4689FB349E356AB974DBE57=1A37C75E31949FC1CF47D46CC4BFA318
+2F62501ED4689FB349E356AB974DBE57=E1D44A1E495B58081025CCE424330771
 635E684B79701B039C64EA45C3F84D30=C8B026EBE17C208F17FB66CE4235156C
 66BE74F758C12D739921AEA421D593D3=1
-8DF89ED150041C4CBC7CB9A9CAA90856=1A37C75E31949FC1CF47D46CC4BFA318
+8DF89ED150041C4CBC7CB9A9CAA90856=E1D44A1E495B58081025CCE424330771
 DC22A860405A8BF2F2C095E5B6529F12=EC6C4D369FD4F7EABFE17B3222B5F3A0
 eclipse.preferences.version=1
diff --git a/Core/Inc/FreeRTOSConfig.h b/Core/Inc/FreeRTOSConfig.h
index 4e6a824..6fc7f70 100644
--- a/Core/Inc/FreeRTOSConfig.h
+++ b/Core/Inc/FreeRTOSConfig.h
@@ -68,7 +68,7 @@
 #define configTICK_RATE_HZ                       ((TickType_t)1000)
 #define configMAX_PRIORITIES                     ( 7 )
 #define configMINIMAL_STACK_SIZE                 ((uint16_t)512)
-#define configTOTAL_HEAP_SIZE                    ((size_t)50000)
+#define configTOTAL_HEAP_SIZE                    ((size_t)60000)
 #define configMAX_TASK_NAME_LEN                  ( 16 )
 #define configGENERATE_RUN_TIME_STATS            1
 #define configUSE_TRACE_FACILITY                 1
diff --git a/Core/Src/sysmem.c b/Core/Src/sysmem.c
index 921ecef..d29b250 100644
--- a/Core/Src/sysmem.c
+++ b/Core/Src/sysmem.c
@@ -27,7 +27,7 @@
 /**
  * Pointer to the current high watermark of the heap usage
  */
-static uint8_t *__sbrk_heap_end = NULL;
+uint8_t *__sbrk_heap_end = NULL;
 
 /**
  * @brief _sbrk() allocates memory to the newlib heap and is used by malloc
diff --git a/STM32F407VETX_FLASH.ld b/STM32F407VETX_FLASH.ld
index 16a870a..94e5a8c 100644
--- a/STM32F407VETX_FLASH.ld
+++ b/STM32F407VETX_FLASH.ld
@@ -39,7 +39,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x0; /* required amount of heap */
+_Min_Heap_Size = 0x1000; /* required amount of heap */
 _Min_Stack_Size = 0x2000; /* required amount of stack */
 
 /* Memories definition */
diff --git a/STM32F407VETX_RAM.ld b/STM32F407VETX_RAM.ld
index f458113..1ba9282 100644
--- a/STM32F407VETX_RAM.ld
+++ b/STM32F407VETX_RAM.ld
@@ -39,7 +39,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM); /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x0000; /* required amount of heap */
+_Min_Heap_Size = 0x1000; /* required amount of heap */
 _Min_Stack_Size = 0x3000; /* required amount of stack */
 
 /* Memories definition */
diff --git a/usrc/app/dmapp.cpp b/usrc/app/dmapp.cpp
index e10d0e8..f7ef64d 100644
--- a/usrc/app/dmapp.cpp
+++ b/usrc/app/dmapp.cpp
@@ -134,6 +134,7 @@ void DisinfectionApp::initialize() {
   }
   // 比例阀初始化
   if (isBoardType(kPipeDMLiquidCtrlBoard)) {
+    ZLOGI(TAG, "ProportionalValveCtrl init");
     LargeSpaceDMLiquidCtrlBoardHal::HUART2_INIT(9600);
     proportionalValveCtrl.initialize(&huart2);
     bindProportionalValveCtrl();
diff --git a/usrc/board_base/app_share/tmc_motor_group.cpp b/usrc/board_base/app_share/tmc_motor_group.cpp
index 55d06f0..362ae89 100644
--- a/usrc/board_base/app_share/tmc_motor_group.cpp
+++ b/usrc/board_base/app_share/tmc_motor_group.cpp
@@ -26,10 +26,12 @@ static void motorErrorFlag_set(int subindex, bool val) {
 }
 
 static void onMotorMonitorTimer(void const* argument) {
+  return;
   // 电机异常检查
   TmcMotorGroup*           DEVICE = (TmcMotorGroup*)argument;
   report_exeception_data_t data;
   for (size_t i = 0; i < DEVICE->motorNum(); i++) {
+    ZLOGI(TAG, "check motor %d", i);
     bool estate = motorErrorFlag_get(i);
 
     if (!DEVICE->motor(i)->ping()) {
diff --git a/zsdk b/zsdk
index 8070043..b005cfe 160000
--- a/zsdk
+++ b/zsdk
@@ -1 +1 @@
-Subproject commit 8070043a4c639e4a7bfd98578927ddec60c8988a
+Subproject commit b005cfe73378067a490bea27eb7b4d4503da7af8