From 97091dac1bfcad87e0e3f8bb3fc718c1254d97d2 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 15 八月 2025 13:50:06 +0800
Subject: [PATCH] 2.3，加入下发开关uwb接收
---
keil/include/main/main.c | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index bfa8c65..b34dd9a 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -168,15 +168,15 @@
// }else{
// gps_open_flag=1;
// }
- g_com_map[MODBUS_MODE] = 0;
+// g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
ip0 = (g_com_map[TCP_IP_0]>>12&0xf)*1000+(g_com_map[TCP_IP_0]>>8&0xf)*100+(g_com_map[TCP_IP_0]>>4&0xf)*10+(g_com_map[TCP_IP_0]&0xf);
ip1 = (g_com_map[TCP_IP_1]>>12&0xf)*1000+(g_com_map[TCP_IP_1]>>8&0xf)*100+(g_com_map[TCP_IP_1]>>4&0xf)*10+(g_com_map[TCP_IP_1]&0xf);
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|0;
- LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
+ g_com_map[VERSION] = (2<<8)|3;
+ LOG_INFO(TRACE_MODULE_APP,"设备ID: %x 小组id %d .\r\n",dev_id,g_com_map[GROUP_ID]);
// if(gpio_pin_get_val(MODE_CHANGE_PIN))
// LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_Air_tag模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
// else{
@@ -502,7 +502,14 @@
//LOG_INFO(TRACE_MODULE_APP," 切换6\r\n");
SwitchLoraSettings(478,7,22);
Uwb_init();//默认为我们测距配置
+ if(g_com_map[MODBUS_MODE]==0)
+ {
OpenUWB();
+ }
+ if(g_com_map[MODBUS_MODE]==1)
+ {
+ CloseUWB();
+ }
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
uart_receive(UART_ID0,m_EUART0_DMA_RXBuf,EUART0_RX_BUF_SIZE,uart0_receive_callback);
power_init();
@@ -524,16 +531,16 @@
}
Lora_Tx_Poll();
// LoraUp_Poll();//网关升级
- if(!gpio_pin_get_val(SLEEP_PIN))
- {
- delay_ms(300);
- //LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//会打断休眠
- //gpio_pin_clr(LORA_NRST);//lora休眠
- //spi_close(SPI_ID0);
- lora_in_sleep();
- power_init();
- mcu_deep_sleep();
- }
+// if(!gpio_pin_get_val(SLEEP_PIN))
+// {
+// delay_ms(300);
+// //LOG_INFO(TRACE_MODULE_APP, "进入休眠模式\r\n");//会打断休眠
+// //gpio_pin_clr(LORA_NRST);//lora休眠
+// //spi_close(SPI_ID0);
+// lora_in_sleep();
+// power_init();
+// mcu_deep_sleep();
+// }
IdleTask();
}
}
--
Gitblit v1.9.3