From 29b382988c5ff4d6f8d2df877beecbc9a7c4c0f7 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 17 四月 2022 16:50:49 +0800
Subject: [PATCH] V1.30
---
Src/main.c | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 3c2efac..539c0a8 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -94,7 +94,8 @@
uint16_t lastpoll_count,interval_count,slot_startcount,tag_frequency,lastpoll_time,current_time;
extern uint8_t module_power;
extern float nomove_count;
-uint8_t imu_enable,motor_enable;
+uint8_t imu_enable,motor_enable;
+float cltimeleft;
u16 GetLPTime(void)
{
u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
@@ -168,12 +169,21 @@
}
break;
case 2:
+ if(cltimeleft<=0)
+ {
+ cltimeleft = g_com_map[COOLINGTIME_INDEX];
+ }
+ if(cltimeleft>g_com_map[COOLINGTIME_INDEX]-20)
+ {
if(hardware_type==NSH1)
{MOTOR_ON;
}else if(hardware_type==GP)
{
HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
}
+ }else{
+ MOTOR_OFF;
+ }
break;
case 3:
if(hardware_type==NSH1)
@@ -295,6 +305,7 @@
break;
}
}
+u8 active_flag,nomovesleeptime;
void Program_Init(void)
{ float temp;
uint16_t temp2;
@@ -305,7 +316,27 @@
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] = 0x0118;
+ g_com_map[VERSION] = (1<<8)|30;
+ active_flag = g_com_map[ACTIVE_INDEX];
+ module_power = g_com_map[POWER];
+ imu_enable=g_com_map[IMU_ENABLE];
+ motor_enable=g_com_map[MOTOR_ENABLE];
+
+ group_id=g_com_map[GROUP_ID];
+ dev_id = g_com_map[DEV_ID];
+ slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
+ max_slotpos=g_com_map[COM_INTERVAL]/slottime;
+ tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
+ slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
+ lastpoll_time=tyncpoll_time;
+ tag_frequency = 1000/g_com_map[COM_INTERVAL];
+ total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ nomovesleeptime = g_com_map[NOMOVESLEEP_TIME];
+ if(active_flag==0)
+ {
+ imu_enable=1;
+ nomovesleeptime =10;
+ }
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
@@ -321,19 +352,7 @@
{module_power=67;}
if(module_power<0)
{module_power=0;}
- module_power = g_com_map[POWER];
- imu_enable=g_com_map[IMU_ENABLE];
- motor_enable=g_com_map[MOTOR_ENABLE];
-
- group_id=g_com_map[GROUP_ID];
- dev_id = g_com_map[DEV_ID];
- slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
- max_slotpos=g_com_map[COM_INTERVAL]/slottime;
- tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
- slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
- lastpoll_time=tyncpoll_time;
- tag_frequency = 1000/g_com_map[COM_INTERVAL];
- total_slotnum = 1000/g_com_map[COM_INTERVAL];
+
current_slotnum=1;
current_time=GetLPTime();
if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, slot_startcount) != HAL_OK) //system time is 1010ms 1 puls=30.518us
@@ -405,10 +424,11 @@
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_LPTIM1_Init();
+ MX_DMA_Init();
MX_USART1_UART_Init();
MX_SPI1_Init();
MX_ADC_Init();
- MX_DMA_Init();
+
// MX_TIM2_Init();
/* USER CODE BEGIN 2 */
LED_LG_ON;
@@ -439,7 +459,7 @@
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
- if(g_start_send_flag)
+ if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
SystemClock_Config();
g_start_send_flag = 0;
@@ -450,7 +470,7 @@
// }else{
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
-// LED_TR_BLINK;
+// LED_TR_BLINK;s
bat_percent=Get_Battary();
if(bat_percent>15)
@@ -923,6 +943,10 @@
current_slotnum++;
SetNextPollTime(tyncpoll_time);
nomove_count+=(float)g_com_map[COM_INTERVAL]/1000;
+ if(cltimeleft>0)
+ {
+ cltimeleft-=(float)g_com_map[COM_INTERVAL]/1000;
+ }
if(motor_keeptime>0)
{
motor_keeptime-=(float)g_com_map[COM_INTERVAL]/1000;
@@ -932,6 +956,10 @@
key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
if(key_keeptime>=KEY_KEEPRESET_TIME)
{
+ g_com_map[ACTIVE_INDEX]=!active_flag;
+ save_com_map_to_flash();
+ MOTOR_ON;
+ HAL_Delay(2000);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
}else{
@@ -943,11 +971,11 @@
}else{
stationary_flag = 0;
}
-if(nomove_count>=g_com_map[NOMOVESLEEP_TIME]-1&&imu_enable)
+if(nomove_count>=nomovesleeptime-1&&imu_enable)
{
tx_near_msg[TAGSTATE] = tx_near_msg[TAGSTATE]|GOINGSLEEPBIT;
}
- if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
+ if(nomove_count>nomovesleeptime&&imu_enable)
{
mcu_sleep();
}
--
Gitblit v1.9.3