From 701755a24d798dabe9f604d71303a398356678b2 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 08 九月 2021 20:06:42 +0800
Subject: [PATCH] 1
---
源码/核心板/Src/main.c | 121 +++++++++++++++++++++++-----------------
1 files changed, 69 insertions(+), 52 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 f9ef281..16a2b8c 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"
@@ -18,7 +18,7 @@
RCC_Configuration();
//SystemInit();
NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000);
- Nvic_Init();
+
// Systick_Init();
TIM3_Int_Init();
@@ -29,6 +29,7 @@
Spi_Init();
ADC_Configuration();
Led_Init();
+ Nvic_Init();
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -124,7 +125,7 @@
for(i=0;i<255;i++)
{
g_Tagdist[i]=0x1ffff;
- IdleTask();
+
}
}
@@ -173,51 +174,65 @@
UART_CheckSend();
UART2_CheckReceive();
- if( memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
- {
- SendAnchorState(SM_MAPERROR);
- delay_ms(100);
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
- if(heartbeat_timer>1000)
- {
- heartbeat_timer=0;
- if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
- HeatBeat();
- }
-// if(flag_newsecond)
-// {
-// flag_newsecond=0;
-// tagpos_binary=0;
-// memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
-// ancidlist_num=0;
-// for(u8 i=0;i<max_slotpos;i++)
-// {
-// if(tagpos_rec[i])
-// tagpos_binary|=1<<i;
-// 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] = 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[MAP_SIGN_INDEX]!=0x55AA)
- {
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
+// #ifdef USART_INTEGRATE_OUTPUT
+// if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
+// {u16 checksum;
+// usart_send_flag=0;
+// 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
+
}
+u32 secondtimer;
+void OneSecondTask(void)
+{
+ if(time32_incr-secondtimer>1000)
+ {
+ uint8_t i;
+ secondtimer = time32_incr;
+ for(i=0;i<MAX_REGTAGNUM;i++)
+ {
+ if(regtag_map.remain_time[i]>0)
+ {
+ regtag_map.remain_time[i]--;
+ }
+ }
+ if(pwtag.remain_time>0)
+ {pwtag.remain_time--;}
+ flag_newsecond=1;
+ // GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET);
+ synclost_count++;
+ TagListUpdate();
+
+
+ if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0&&(heartbeat_timer++>60))
+ {
+ heartbeat_timer = 0;
+ HeatBeat();
+ }
+ if( memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
+ {
+ SendAnchorState(SM_MAPERROR);
+ 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
+ }
+
+ }
+}
+extern u8 needanchorrx;
int main(void)
{
@@ -236,16 +251,18 @@
//SendComMap(50, 0);
while(1)
{
- g_start_sync_flag=0;
- if(g_start_send_flag)
- {
- g_start_send_flag = 0;
- Tag_App();
- }
+// g_start_sync_flag=0;
+// if(g_start_send_flag)
+// {
+// g_start_send_flag = 0;
+// Tag_App();
+// }
+// OneSecondTask();
IdleTask();
-if(g_com_map[DEV_ROLE]!=1)
- Anchor_App();
-
+if(g_com_map[DEV_ROLE]==0&&needanchorrx==1)
+ {needanchorrx = 0;
+ Anchor_Start();
+ }
}
}
--
Gitblit v1.9.3