From d0c8138b8c7154b1f4816561645add3b70bb5e0f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 06 十一月 2020 17:14:15 +0800
Subject: [PATCH] V1.33 增加基站修改全部标签参数模式
---
源码/核心板/Src/main.c | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 f7c4e53..014e391 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"
@@ -67,9 +67,13 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0112;
+ if(g_com_map[COM_INTERVAL]==0)
+ {
+ g_com_map[COM_INTERVAL]=100;
+ }
+ g_com_map[VERSION] = 0x0121;
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];
@@ -115,17 +119,30 @@
{
UART_PushFrame(hbsend,16);
}
+uint16_t temp;
+float dw_vbat;
+void StartUpTest(void)
+{
+ temp=dwt_readtempvbat(1);
+ dw_vbat=(float)((temp&0xff)-173)/173+3.3;
+ if(dw_vbat<2.8)
+ {
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer;
int16_t sync_timer;
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)
{
UART_CheckReceive();
UART_CheckSend();
+
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
@@ -134,6 +151,16 @@
}
if(flag_newsecond)
{
+ uint32_t temp23;
+ temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+ if(temp23!=0x4A480022)
+ {
+ temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ;
+ if(temp23!=0x4A480022)
+ {
+ NVIC_SystemReset();
+ }
+ }
flag_newsecond=0;
tagpos_binary=0;
memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -145,17 +172,20 @@
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;
- usart_send_anc[2] = 4;//正常模式
+ usart_send_anc[2] = 5;//正常模式
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);
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;
@@ -188,12 +218,17 @@
delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
+ {
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
}
int main(void)
{
Device_Init();
+ //StartUpTest();
Program_Init();
Dw1000_Init();
delay_ms(10);
--
Gitblit v1.9.3