From 61445f53207dce2dce3ae11450297aa33908b1e6 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 21 十月 2021 11:51:03 +0800
Subject: [PATCH] 1
---
Src/main.c | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 806fe84..9041d80 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -254,38 +254,38 @@
u16 slotpos_intoatl;
uint16_t bigslot_num;
uint8_t fix_slotpos =FIXSLOTPOS;
-int32_t lpcount,lptime,target_time;
-extern u16 tagslotpos;
+//u16 lpcount,lptime,;
+//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
+//#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;
+// 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);
-}
+// 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)
{
@@ -478,6 +478,7 @@
// {
// MODBUS_Poll();
// }
+ active_flag = 1;
if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
SystemClock_Config();
--
Gitblit v1.9.3