From d43f5c57427173eba8a2d1ed11bb8da408ec5dfc Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 31 八月 2021 20:06:16 +0800
Subject: [PATCH] 2K 板子测试完成 增加功率测试
---
源码/核心板/Src/main.c | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 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 bf4e8de..2ce6499 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"
@@ -145,22 +145,22 @@
g_start_sync_flag=0;
UART_CheckReceive();
UART_CheckSend();
- 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
- }
- if(heartbeat_timer>1000)
- {
- heartbeat_timer=0;
- if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==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
+// }
+// if(heartbeat_timer>1000)
+// {
+// heartbeat_timer=0;
+// if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
+// HeatBeat();
+// }
}
uint16_t temp;
@@ -169,6 +169,7 @@
{
Device_Init();
Program_Init();
+ module_power = 67;
Dw1000_Init();
delay_ms(10);
Dw1000_App_Init();
@@ -177,6 +178,7 @@
usart_send[0]=0x55;
usart_send[1]=0xAA;
Modbus_RegMap();
+ g_com_map[DEV_ROLE] = 1;
while(1)
{
if(g_com_map[0] != 0x55AA)
--
Gitblit v1.9.3