Browse Source

update

master
zhaohe 12 months ago
parent
commit
7d0041d90c
  1. 4
      .settings/stm32cubeide.project.prefs
  2. 2
      Core/Inc/FreeRTOSConfig.h
  3. 2
      Core/Src/sysmem.c
  4. 2
      STM32F407VETX_FLASH.ld
  5. 2
      STM32F407VETX_RAM.ld
  6. 1
      usrc/app/dmapp.cpp
  7. 2
      usrc/board_base/app_share/tmc_motor_group.cpp
  8. 2
      zsdk

4
.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

2
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

2
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

2
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 */

2
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 */

1
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();

2
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()) {

2
zsdk

@ -1 +1 @@
Subproject commit 8070043a4c639e4a7bfd98578927ddec60c8988a
Subproject commit b005cfe73378067a490bea27eb7b4d4503da7af8
Loading…
Cancel
Save