From 942d685e55e3a58b6bcd7d0158765e9648b9373a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 28 十月 2021 22:16:01 +0800
Subject: [PATCH] 中断模式，配合时间片测试完成
---
源码/核心板/Src/main.c | 41 +++++++++++------------------------------
1 files changed, 11 insertions(+), 30 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 a28753b..175b9b4 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;
@@ -146,8 +147,8 @@
int32_t intheight;
void HeatBeat(void)
{ u16 checksum;
- GetPressAndHeight();
- intheight = Height*100;//+g_com_map[MAX_REPORT_ANC_NUM];
+ // GetPressAndHeight();
+ // intheight = Height*100;//+g_com_map[MAX_REPORT_ANC_NUM];
if(synclost_count>5)
{
hbsend[6] = 0;
@@ -162,7 +163,7 @@
UART_PushFrame(hbsend,16);
}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
-u16 heartbeat_timer=58000,poll_timer;
+u16 heartbeat_timer=58,poll_timer;
int16_t sync_timer;
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
@@ -172,7 +173,7 @@
{
UART_CheckReceive();
- UART_CheckSend();
+// UART_CheckSend();
UART2_CheckReceive();
// if( memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
@@ -181,7 +182,7 @@
// delay_ms(100);
// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
// }
- if(heartbeat_timer>60000)
+ if(heartbeat_timer>60)
{
heartbeat_timer=0;
if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
@@ -200,26 +201,13 @@
// 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
}
}
+extern u8 needanchorrx;
int main(void)
{
@@ -235,19 +223,12 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
+ dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间
+ dwt_rxenable(0);//打开接收
//SendComMap(50, 0);
while(1)
{
- g_start_sync_flag=0;
- if(g_start_send_flag)
- {
- g_start_send_flag = 0;
- Tag_App();
- }
- IdleTask();
-if(g_com_map[DEV_ROLE]!=1)
- Anchor_App();
-
+ IdleTask();
}
}
--
Gitblit v1.9.3