From 8f01fa592775a87ef46c12a440db32fcc89d004f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 14 十二月 2020 17:30:39 +0800
Subject: [PATCH] V2.15 255时间片不生效
---
Src/main.c | 67 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 1a151a8..e394a64 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -113,7 +113,7 @@
if(huart1.Instance->ISR&USART_ISR_FE)
{
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
//if(!HAL_GPIO_ReadPin(PWR_ON_GPIO_Port,PWR_ON_Pin))
//{
@@ -210,17 +210,20 @@
u16 current_slotnum;
extern int32_t offsettimeus;
-#define FIXSLOT
-#define FIXSLOTPOS 5
+//#define FIXSLOT
+#define FIXSLOTPOS 1
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)
{
#ifdef FIXSLOT
+ fix_slotpos = g_com_map[ALARM_DISTANCE1];
slotpos = fix_slotpos;
+ tagslotpos = fix_slotpos;
#endif
if(current_slotnum>=tag_frequency)
@@ -230,9 +233,10 @@
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;
+ lptime=target_time-offsettimeus-10000;
lpcount = lptime/LPTIMER_LSB;
if(lpcount>LPTIMER_1S_COUNT)
lpcount-=LPTIMER_1S_COUNT;
@@ -243,6 +247,7 @@
__HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
}
}
+u8 active_flag=0;
void Program_Init(void)
{ float temp;
uint16_t temp2;
@@ -250,22 +255,32 @@
Usart1ParseDataCallback = UsartParseDataHandler;
parameter_init();
//deca_sleep(1000);
- g_com_map[VERSION] = 0x0207;
+ g_com_map[VERSION] = 0x020f;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
-// g_com_map[DEV_ID]=0x123;
+ // g_com_map[DEV_ID]=0x11;
// g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
g_com_map[IMU_ENABLE]=0;
- g_com_map[COM_INTERVAL]=50;
+ //g_com_map[COM_INTERVAL]=50;
#endif
//g_com_map[NOMOVESLEEP_TIME]=10;
- // g_com_map[COM_INTERVAL]=100;
+// g_com_map[IMU_ENABLE]=0;
+// g_com_map[COM_INTERVAL]=50;
+ active_flag = g_com_map[ACTIVE_INDEX];
+ if(active_flag==0)
+ { g_com_map[COM_INTERVAL]=1000;
+ g_com_map[IMU_ENABLE]=1;
+ 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)
@@ -393,7 +408,7 @@
// {
// MODBUS_Poll();
// }
- 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;
@@ -824,6 +839,40 @@
current_slotnum++;
SetNextPollTime(tagslotpos);
nomove_count+=(float)g_com_map[COM_INTERVAL]/1000;
+ if(active_flag==0)
+ {
+ if(!GET_USERKEY)
+ {
+ LED_LG_ON;
+ key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
+ if(key_keeptime>3)
+ {
+ u8 i=250,keystate=1;
+ while(i--)
+ {
+ if(i%10==0)
+ {
+ LED_LG_BLINK;
+ }
+ if(GET_USERKEY)
+ {keystate = 0;}
+ if(keystate==0&&!GET_USERKEY)
+ {
+ parameter_init();
+ g_com_map[ACTIVE_INDEX] = 1;
+ save_com_map_to_flash();
+ delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+ delay_ms(10);
+ }
+ }
+ }else{
+ LED_LG_OFF;
+ key_keeptime=0;
+ }
+
+ }
if(motor_ontime>0)
{
motor_ontime-=(float)1/tag_frequency;
--
Gitblit v1.9.3