From 8a64dd03a6565f25a4920171fb18d41f49aa8d11 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 05 七月 2020 23:46:50 +0800
Subject: [PATCH] 防撞9对5测试完成，发给华星
---
源码/核心板/Src/main.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 b48ded5..38e4bc9 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"
@@ -47,6 +47,7 @@
u16 tyncpoll_time;
u16 slottime,max_slotpos;
extern u8 module_power;
+extern u16 total_slotnum;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -66,12 +67,13 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0112;
+ g_com_map[VERSION] = 0x0113;
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]*0.4)+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];
if(module_power>67)
{
module_power=67;
@@ -119,6 +121,7 @@
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)
{
@@ -143,11 +146,13 @@
tagpos_rec[i] = 0;
}
}
+ if(target_time>1000)
+ {target_time-=1000;}
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
{u16 checksum;
usart_send_flag=0;
- usart_send_anc[2] = 5;//正常模式
+ usart_send_anc[2] = 4;//正常模式
usart_send_anc[3] = anc_report_num*6+2;//正常模式
checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);
@@ -186,6 +191,10 @@
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)
--
Gitblit v1.9.3