From 4f32034d82f2d9a62f065ae407fd82bb2919c689 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 06 十一月 2020 15:52:32 +0800
Subject: [PATCH] 修改独立输出模式
---
源码/核心板/Src/main.c | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 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 33cffde..68bb4a7 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,7 +67,11 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x011b;
+ if(g_com_map[COM_INTERVAL]==0)
+ {
+ g_com_map[COM_INTERVAL]=100;
+ }
+ g_com_map[VERSION] = 0x0120;
dev_id = g_com_map[DEV_ID];
slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
@@ -115,6 +119,17 @@
{
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;
@@ -127,6 +142,7 @@
UART_CheckReceive();
UART_CheckSend();
+
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
@@ -135,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);
@@ -146,7 +172,7 @@
tagpos_rec[i] = 0;
}
}
- if(target_time>1000)
+ if(target_time>=1000)
{target_time-=1000;}
#ifdef USART_INTEGRATE_OUTPUT
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
@@ -192,7 +218,7 @@
delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
+ if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
@@ -202,6 +228,7 @@
{
Device_Init();
+ //StartUpTest();
Program_Init();
Dw1000_Init();
delay_ms(10);
--
Gitblit v1.9.3