From 1e1b1b9f73152b17b960c5c2b1531d66ca4ddbe0 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 26 五月 2025 18:15:11 +0800
Subject: [PATCH] 移植完新版lora和新版测距代码，lora传输有问题未解决
---
keil/include/main/main.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 3f00e85..0417d55 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -170,8 +170,12 @@
port = g_com_map[TCP_PORT];
g_com_map[VERSION] = (1<<8)|0;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
- LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_Air_tag_免布线模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
- LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
+ 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{
+ LOG_INFO(TRACE_MODULE_APP,"固件版本:MK_免布线模式 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ }
+ //LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
}
void MinuteTask(void)
{
@@ -300,10 +304,11 @@
// Configure IO_04 for RF Switch
gpio_pin_set_dir(IO_PIN_4, GPIO_DIR_OUT, 0);
#else
- Program_Init();
+
spi_init();
// 模式判断脚和spi nrst脚初始化
board_mode_pin_init();
+ Program_Init();
// board_led_on(BOARD_LED_1);
#endif
Board_LORA_NVIC_Init(Lora_irq_handler);
@@ -353,7 +358,7 @@
// Disable watchdog timer
wdt_close(WDT_ID0);
LOG_INFO(TRACE_MODULE_APP, "UCI FiRa example\r\n");
- if(gpio_pin_get_val(MODE_CHANGE_PIN))
+ if(gpio_pin_get_val(MODE_CHANGE_PIN))//记得改回来与正式的相反
{
// Platform init for WSF
PalSysInit();
--
Gitblit v1.9.3