From dbdff32c9e492abf93f618efe526d0961428bd88 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期三, 17 三月 2021 09:51:18 +0800 Subject: [PATCH] 修改固定IDbug --- Src/main.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Src/main.c b/Src/main.c index d982ef7..25d1382 100644 --- a/Src/main.c +++ b/Src/main.c @@ -286,8 +286,20 @@ __HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount); } } +void ErrorConfig_Handler(void) +{ + if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000) + { + g_com_map[COM_INTERVAL]=100; + } + if(g_com_map[IMU_THRES]>10) + {g_com_map[IMU_THRES]=2;} + if(g_com_map[POWER]>MAX_RFPOWER) + {g_com_map[POWER]=MAX_RFPOWER;} + if(g_com_map[POWER]<0) + {g_com_map[POWER]=0;} +} u8 active_flag=0; - void Program_Init(void) { float temp; uint16_t temp2; @@ -298,8 +310,8 @@ hardware_pici= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2); hardware_type= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4); //deca_sleep(1000); - g_com_map[VERSION] = 0x0216; -// g_com_map[DEV_ID]=0x11; + g_com_map[VERSION] = 0x0217; +// g_com_map[DEV_ID]=0x7; #ifdef DEBUG_MODE // g_com_map[DEV_ROLE]=1; g_com_map[DEV_ID]=0x4008; @@ -320,16 +332,7 @@ g_com_map[NOMOVESLEEP_TIME]=10; g_com_map[MOTOR_ENABLE]=0; } - if(g_com_map[COM_INTERVAL]==0) - { - g_com_map[COM_INTERVAL]=100; - } - if(g_com_map[IMU_THRES]>10) - {g_com_map[IMU_THRES]=2;} - if(g_com_map[POWER]>MAX_RFPOWER) - {g_com_map[POWER]=MAX_RFPOWER;} - if(g_com_map[POWER]<0) - {g_com_map[POWER]=0;} + module_power = g_com_map[POWER]; imu_enable=g_com_map[IMU_ENABLE]; motor_enable=g_com_map[MOTOR_ENABLE]; -- Gitblit v1.9.3