From 28fd85241a4550b61c35d2cbf947c995f41ef779 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 23 九月 2022 09:48:28 +0800
Subject: [PATCH] 1
---
源码/核心板/Src/main.c | 50 ++++++++++++++------------------------------------
1 files changed, 14 insertions(+), 36 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 4a4cf08..e6b1fa9 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"
@@ -91,7 +91,7 @@
{
module_power=67;
}
- g_com_map[VERSION] = 0x012F;
+ g_com_map[VERSION] = (1<<8)|49;
g_com_map[SW_TYPE] = SW_MODBUS;
temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;
temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
@@ -103,17 +103,17 @@
max_slotnum=g_com_map[COM_INTERVAL]/temp2;
current_slotpos=g_com_map[DEV_ID];
tyncpoll_time=(current_slotpos%max_slotnum)*slottime;
- 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]);
- }
+// 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]);
+// }
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]);
@@ -193,34 +193,12 @@
Device_Init();
Program_Init();
- Dw1000_Init();
- delay_ms(10);
- Dw1000_App_Init();
/* Loop forever initiating ranging exchanges. */
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
- usart_send[0]=0x55;
- usart_send[1]=0xAA;
- Modbus_RegMap();
+ printf("输出数组：1 1 2 3 5 8 13 21.....到1000位");
while(1)
{
- if(g_com_map[0] != 0x55AA)
- {
- while(1)
- IdleTask();
- }
- if(g_start_send_flag)
- {
- g_start_send_flag = 0;
- temp=dwt_readtempvbat(1);
- dw_vbat=(float)((temp&0xff)-173)/173+3.3;
- if(dw_vbat>2.8)
- Tag_App();
- }//else{
- IdleTask();
-// }
-//
-if(g_com_map[DEV_ROLE]==0)
- Anchor_App();
+
}
--
Gitblit v1.9.3