From f1e45e1c6903f7327e8c322099f2abc07794b662 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 04 八月 2021 11:45:45 +0800
Subject: [PATCH] V2.24 去掉恢复出厂设置操作，修改最大功率到67
---
源码/核心板/Src/main.c | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 9e0215c..c598084 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"
@@ -63,10 +63,10 @@
{module_power=MAX_RFPOWER;}
if(module_power<0)
{module_power=0;}
- if(g_com_map[MAX_REPORT_ANC_NUM]>10)
- {g_com_map[MAX_REPORT_ANC_NUM]=10;}
- if(g_com_map[MAX_REPORT_ANC_NUM]<1)
- {g_com_map[MAX_REPORT_ANC_NUM]=1;}
+// if(g_com_map[MAX_REPORT_ANC_NUM]>10)
+// {g_com_map[MAX_REPORT_ANC_NUM]=10;}
+// if(g_com_map[MAX_REPORT_ANC_NUM]<1)
+// {g_com_map[MAX_REPORT_ANC_NUM]=1;}
if(g_com_map[IMU_THRES]>10)
{g_com_map[IMU_THRES]=10;}
if(g_com_map[IMU_THRES]<1)
@@ -94,7 +94,7 @@
#endif
OUT485_ENABLE;
ComMapCheck();
- g_com_map[VERSION] = 0x0211;
+ g_com_map[VERSION] = 0x0217;
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;
@@ -123,7 +123,7 @@
for(i=0;i<255;i++)
{
- g_Tagdist[i]=0xffff;
+ g_Tagdist[i]=0x1ffff;
}
}
@@ -143,13 +143,15 @@
void HeatBeat(void)
{ u16 checksum;
GetPressAndHeight();
- intheight = Height*100+g_com_map[MAX_REPORT_ANC_NUM];
+ intheight = Height*100;//+g_com_map[MAX_REPORT_ANC_NUM];
if(synclost_count>5)
{
hbsend[6] = 0;
}else{
hbsend[6] = 1;
}
+ if(intheight!=0)
+ intheight+=(int16_t)g_com_map[MAX_REPORT_ANC_NUM];
memcpy(&hbsend[7],&intheight,4);
checksum = Checksum_u16(&hbsend[2],12);
memcpy(&hbsend[14],&checksum,2);
@@ -219,14 +221,14 @@
// Delay_ms(100);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
- if(g_com_map[CNT_REBOOT]==1)
- {
- g_com_map[CNT_REBOOT]=0;
- g_com_map[MAP_SIGN_INDEX]=0;
- save_com_map_to_flash();
- delay_ms(100);
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
+// if(g_com_map[CNT_REBOOT]==1)
+// {
+// g_com_map[CNT_REBOOT]=0;
+// g_com_map[MAP_SIGN_INDEX]=0;
+// save_com_map_to_flash();
+// delay_ms(100);
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+// }
if(g_com_map[CNT_RESTART]==1)
{
g_com_map[CNT_RESTART]=0;
--
Gitblit v1.9.3