From 8e3c571a48a30e8c1bd07dca4786a53d7c9994f5 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 19 十月 2020 10:49:54 +0800
Subject: [PATCH] 修改基站临近接收BUG
---
源码/核心板/Src/main.c | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index a145aa0..18ba671 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -46,6 +46,31 @@
}
u16 tyncpoll_time;
u16 slottime,max_slotpos;
+extern u8 module_power;
+extern u16 total_slotnum;
+void ComMapCheck(void)
+{
+ if(g_com_map[COM_INTERVAL]<10)
+ {
+ g_com_map[COM_INTERVAL]=500;
+ }
+ if(g_com_map[COM_INTERVAL]>1000)
+ {
+ g_com_map[COM_INTERVAL]=1000;
+ }
+ if(module_power>67)
+ {module_power=67;}
+ if(module_power<0)
+ {module_power=0;}
+ if(g_com_map[MAX_REPORT_ANC_NUM]>10)
+ {g_com_map[MAX_REPORT_ANC_NUM]=10;}
+ if(g_com_map[MAX_REPORT_ANC_NUM]<1)
+ {g_com_map[MAX_REPORT_ANC_NUM]=1;}
+ if(g_com_map[IMU_THRES]>10)
+ {g_com_map[IMU_THRES]=10;}
+ if(g_com_map[IMU_THRES]<1)
+ {g_com_map[IMU_THRES]=1;}
+}
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -65,25 +90,27 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0112;
+ ComMapCheck();
+ g_com_map[VERSION] = 0x0201;
dev_id = g_com_map[DEV_ID];
- slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
+ 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;
+ module_power = g_com_map[POWER];
+ total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ anchor_type = dev_id%3;
+
+ if(g_com_map[DEV_ROLE])
+ {
+ printf("标签ID: %d .\r\n",dev_id);
+ printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
+ printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+ }else{
-
-// if(g_com_map[DEV_ROLE])
-// {
-// printf("标签ID: %d .\r\n",dev_id);
-// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
-// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
-// }else{
-//
-// anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
-// printf("基站ID: %x .\r\n",dev_id);
-// printf("基站类型: %c .\r\n",anchor_type+0x41);
-// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
-// }
+ printf("基站ID: %x .\r\n",dev_id);
+ printf("基站类型: %c .\r\n",anchor_type+0x41);
+ printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+ }
OUT485_DISABLE;
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -114,9 +141,10 @@
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
extern u16 ancidlist_rec[20],ancidlist_send[20];
+extern u16 target_time;
void IdleTask(void)
{
- main_logic();
+
UART_CheckReceive();
UART_CheckSend();
if(heartbeat_timer>1000)
@@ -138,7 +166,9 @@
tagpos_rec[i] = 0;
}
}
-
+ if(target_time>1000)
+ {target_time-=1000;}
+ #ifdef USART_INTEGRATE_OUTPUT
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
{u16 checksum;
usart_send_flag=0;
@@ -149,6 +179,7 @@
UART_PushFrame(usart_send_anc,6+anc_report_num*6);
anc_report_num=0;
}
+ #endif
if(g_com_map[CNT_UPDATE]==1)
{
uint32_t result = 0;
@@ -166,6 +197,25 @@
// Delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+ if(g_com_map[CNT_REBOOT]==1)
+ {
+ g_com_map[CNT_REBOOT]=0;
+ g_com_map[MAP_SIGN_INDEX]=0;
+ save_com_map_to_flash();
+ delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+ if(g_com_map[CNT_RESTART]==1)
+ {
+ g_com_map[CNT_RESTART]=0;
+ save_com_map_to_flash();
+ delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
+ {
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
}
int main(void)
@@ -182,7 +232,7 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
-
+ //SendComMap(50, 0);
while(1)
{
g_start_sync_flag=0;
--
Gitblit v1.9.3