From b13574876322e59f75f26ac38f72c6b19c9d4aba Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 27 六月 2025 14:02:08 +0800
Subject: [PATCH] 刚解决完网关下发会导致异常问题，但蓝牙那边mk给蓝牙发未配置成功未解决，开始调lora功耗
---
keil/include/src/Radio/lora_1268.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/keil/include/src/Radio/lora_1268.c b/keil/include/src/Radio/lora_1268.c
index e3c848a..dccdedf 100644
--- a/keil/include/src/Radio/lora_1268.c
+++ b/keil/include/src/Radio/lora_1268.c
@@ -370,7 +370,8 @@
// gpio_pin_clr(LORA_IRQ);
//gpio_pin_clr(LORA_NRST);
//gpio_pin_clr(LORA_NRST);//lora休眠
- Radio.Standby();
+// Radio.Standby();
+
Radio.Sleep();
}
////States_t State = LOWPOWER;
@@ -396,8 +397,9 @@
if(flag_writepara_needreset) //配置写入完成设备需要重启
{
- printf("网关下发配置写入完成，重启");
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ LOG_INFO(TRACE_MODULE_APP,"网关下发配置写入完成,重启\r\n");
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ sys_reset(0);
}
Radio.Standby();
if(LoraUp_flag)
@@ -445,6 +447,7 @@
uint8_t rxdone=0;
extern uint16_t set_mk_time;
extern mk_send_message_to_BLE(void);
+uint8_t tt4=1;
void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
{
uint16_t checksum1;
@@ -522,6 +525,7 @@
LoraSendComMap(WGRSP_RWTAG_READ);
break;
case WGRSP_RWTAG_WRITE:
+
rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
switch(rec_index)
{
@@ -534,18 +538,17 @@
default :
memcpy(&rec_value,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],2);
g_com_map[rec_index/2] = rec_value;
-// if(rec_index/2==POWER)//新增判断
-// {
-// memcpy(&set_mk_time,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],2);
-// //mk_send_message_to_BLE(); //发送给蓝牙
-// //LOG_INFO(TRACE_MODULE_APP, "修改成功g_com表为%#x,时间为%#x\r\n",g_com_map[POWER],set_mk_time);
-// }
- // save_com_map_to_flash();
+ if(rec_index/2==POWER)//新增判断
+ {
+ memcpy(&set_mk_time,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],2);
+ mk_send_message_to_BLE(); //发送给蓝牙
+ //LOG_INFO(TRACE_MODULE_APP, "修改成功g_com表为%#x,时间为%#x\r\n",g_com_map[POWER],set_mk_time);
+ }
+ save_com_map_to_flash();
LoraRspWriteCommap(SUBMSG_WRITE_ANCPARA);
flag_writepara_needreset = 1;
no_rx_flag = 1;
}
-
break;
case WGRSP_RWTAG_UPDATE:
rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
@@ -571,7 +574,7 @@
}
}
-LOG_INFO(TRACE_MODULE_APP, "进入回复2\r\n");
+
if(!no_rx_flag)
{
if(lora_jianting_flag&&LoraUp_flag==0)
@@ -580,6 +583,7 @@
Radio.Rx(0);
}
}
+
}
void OnTxTimeout( void )
--
Gitblit v1.9.3