From c5193cf1c2e36894cbb2d7e9cd171b64f81ae8ea Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 25 十月 2021 11:53:26 +0800
Subject: [PATCH] 1
---
Src/main.c | 55 ++++++-------------------------------------------------
1 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 57b3d76..5ec3740 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -193,7 +193,7 @@
state5v=1;
UsartInit();
}
- if(bat_percent>99)
+ if(HAL_GPIO_ReadPin(PWR_ON_GPIO_Port,PWR_ON_Pin))
{
LED_LR_OFF;
LED_LG_ON;
@@ -254,52 +254,7 @@
u16 slotpos_intoatl;
uint16_t bigslot_num;
uint8_t fix_slotpos =FIXSLOTPOS;
-int32_t lpcount,lptime,target_time;
-extern u16 tagslotpos;
-void SetNextPollTime(u16 slotpos) //时间片逻辑：上来默认计算一个时间，时间同步之后，就近选择时间片。SetNextPollTime会调整下次发送
-{
-#ifdef FIXSLOT
- fix_slotpos =FIXSLOTPOS;
- fix_slotpos = g_com_map[ALARM_DISTANCE2];
- slotpos = fix_slotpos;
- tagslotpos = fix_slotpos;
-#endif
-
- while(current_slotnum>=tag_frequency)
- { current_slotnum-=tag_frequency;}
- slotpos_intoatl = current_slotnum*bigslot_num+slotpos;
-
- if(current_slotnum==19)
- {slotpos_intoatl = current_slotnum*bigslot_num+slotpos;}
- target_time=(slotpos_intoatl*SLOTTIME_MS+100)*100;
-
- //if(target_time<90000)
- {
- lptime=target_time-offsettimeus+1200;
- lpcount = lptime/LPTIMER_LSB;
- if(lpcount>LPTIMER_1S_COUNT)
- lpcount-=LPTIMER_1S_COUNT;
- if(lpcount<0)
- {
- lpcount+=LPTIMER_1S_COUNT;
- }
- __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;
@@ -311,7 +266,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] = 0x021e;
+ g_com_map[VERSION] = 0x0221;
+
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
@@ -328,7 +284,8 @@
// g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
if(active_flag==0)
- { g_com_map[COM_INTERVAL]=1000;
+ {
+ g_com_map[COM_INTERVAL]=1000;
g_com_map[IMU_ENABLE]=1;
g_com_map[NOMOVESLEEP_TIME]=10;
g_com_map[MOTOR_ENABLE]=0;
@@ -960,7 +917,7 @@
g_start_send_flag=1;
current_slotnum++;
- SetNextPollTime(tagslotpos);
+ //SetNextPollTime(tagslotpos);
nomove_count+=1/(float)tag_frequency;
if(motor_keeptime>0)
{
--
Gitblit v1.9.3