From 477554cd05c061057dc634ba703415305628b07a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 26 六月 2020 19:02:48 +0800
Subject: [PATCH] 修改slottime
---
源码/核心板/Src/main.c | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 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 a145aa0..eeb6ac9 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"
@@ -46,6 +46,8 @@
}
u16 tyncpoll_time;
u16 slottime,max_slotpos;
+extern u8 module_power;
+extern u16 total_slotnum;
void Program_Init(void)
{ float temp;
u16 temp2;
@@ -65,25 +67,30 @@
save_com_map_to_flash();
#endif
OUT485_ENABLE;
- g_com_map[VERSION] = 0x0112;
+ g_com_map[VERSION] = 0x0113;
dev_id = g_com_map[DEV_ID];
- slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
+ slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+2;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
+ module_power = g_com_map[POWER];
+ total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ if(module_power>67)
+ {
+ module_power=67;
+ }
+ if(g_com_map[DEV_ROLE])
+ {
+ printf("标签ID: %d .\r\n",dev_id);
+ printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
+ printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+ }else{
-// if(g_com_map[DEV_ROLE])
-// {
-// printf("标签ID: %d .\r\n",dev_id);
-// printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
-// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
-// }else{
-//
-// anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
-// printf("基站ID: %x .\r\n",dev_id);
-// printf("基站类型: %c .\r\n",anchor_type+0x41);
-// printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
-// }
+ anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
+ printf("基站ID: %x .\r\n",dev_id);
+ printf("基站类型: %c .\r\n",anchor_type+0x41);
+ printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
+ }
OUT485_DISABLE;
// printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
// printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
@@ -116,7 +123,7 @@
extern u16 ancidlist_rec[20],ancidlist_send[20];
void IdleTask(void)
{
- main_logic();
+
UART_CheckReceive();
UART_CheckSend();
if(heartbeat_timer>1000)
@@ -142,7 +149,7 @@
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
{u16 checksum;
usart_send_flag=0;
- usart_send_anc[2] = 5;//正常模式
+ usart_send_anc[2] = 4;//正常模式
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);
@@ -166,6 +173,21 @@
// 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;
+ save_com_map_to_flash();
+ delay_ms(100);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
}
int main(void)
--
Gitblit v1.9.3