From 58bf13b0569714d03afe101a3abb4d2419ec9e30 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 25 二月 2024 19:04:38 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora
---
Src/radio/Lora.c | 121 +++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 70 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index e1a6185..167c67d 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -11,7 +11,7 @@
#include "delay.h"
#include "dw_mbx_anc.h"
#include "Flash.h"
-
+#include "dw_mbx_anc.h"
#define USE_MODEM_LORA
//#define USE_MODEM_FSK
#define REGION_CN779
@@ -359,36 +359,41 @@
uint8_t final_bag_num;
uint16_t testflag;
uint32_t Zhongjian_data[60];
+uint16_t app1_or_app2;
void LoraUp_Poll()
{ uint16_t result ;
uint16_t crc16;
+ memcpy(&rec_wenjian_daxiao,&rxbuffer[WRITEPARA_VALUE_IDX],2);//文件大小
// rec_wenjian_daxiao=rxbuffer[WRITEPATE_VALUE_IDX];
if(rec_wenjian_daxiao>0XAC00)
{}//文件过大，超出范围
else
- {
+ {
+ memcpy(&wangguan_up_id,&rxbuffer[SOURCE_ID_IDX],2);//网关ID 占用2个字节
+ send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATE_CONFIRM;
+ memcpy(&send_lora_data[SOURCE_ID_IDX],&dev_id,2);//网关ID 占用2个字节
+ memcpy(&send_lora_data[DEST_ID_IDX],&wangguan_up_id,2);//标签或者基站的设备ID 2个字节
+// send_lora_data[MUQIAN_BAG]=0xFF;
+ crc16=Checksum_u16(send_lora_data,6);
+ memcpy(&send_lora_data[6],&crc16,2);
+ huifushengjibao_flag=0;
+ LoraUp_flag=1;
+ Radio.Send(send_lora_data,8);//基站发送升级确认回复
+ Delay_Ms(1000);
+ SwitchLoraSettings(LORA_UPCHANNEL_FRQ,LORA_UPCHANNEL_SF,22); //切换lora升级频点
+ delay_ms(200);
__disable_irq();
+// FLASH_Read(APP_1OR2_ADRESS,(uint8_t*)&app1_or_app2,2);
+ final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包
while(1)
{
- FLASH_Prepare(APP2_ADRESS, APP_SIZE);
+ FLASH_Prepare(APP2_ADRESS, APP_SIZE);
delay_ms(500);
if(testflag==0)
{break;}
}
// FLASH_Write(APP2_ADRESS, (const uint8_t*)&tmp111, 2);
- __enable_irq();
- final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包
-
- send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATE_CONFIRM;
- memcpy(&send_lora_data[WANGGUAN_ID],&wangguan_up_id,2);//网关ID 占用2个字节
- memcpy(&send_lora_data[JIZHAN_ID],&dev_id,2);//标签或者基站的设备ID 2个字节
- send_lora_data[MUQIAN_BAG]=0xFF;
- crc16=Cal_CRC16(send_lora_data,6);
- memcpy(&send_lora_data[6],&crc16,2);
- huifushengjibao_flag=0;
- LoraUp_flag=1;
- Radio.Send(send_lora_data,8);//基站发送升级确认回复
- Delay_Ms(2000);
+ __enable_irq();
while(1)
{
if(huifushengjibao_flag==1)
@@ -396,13 +401,13 @@
while(1)
{
send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_REQUEST;
- memcpy(&send_lora_data[WANGGUAN_ID],&wangguan_up_id,2);//网关ID 占用2个字节
- memcpy(&send_lora_data[JIZHAN_ID],&dev_id,2);//标签或者基站的设备ID 2个字节
+ memcpy(&send_lora_data[SOURCE_ID_IDX],&dev_id,2);//网关ID 占用2个字节
+ memcpy(&send_lora_data[DEST_ID_IDX],&wangguan_up_id,2);//标签或者基站的设备ID 2个字节
send_lora_data[MUQIAN_BAG]=muqiandeshengjibao;
- crc16=Cal_CRC16(send_lora_data,6);
- memcpy(&send_lora_data[6],&crc16,2);
+ crc16=Checksum_u16(send_lora_data,7);
+ memcpy(&send_lora_data[7],&crc16,2);
lora_up_rec_flag=0;
- Radio.Send(send_lora_data,8);//基站发送升级确认回复
+ Radio.Send(send_lora_data,9);//基站发送请求第x包
start_count1=HAL_LPTIM_ReadCounter(&hlptim1); //等待接收完成直到超时
end_count1=start_count1+32768/2;//500ms等待
@@ -411,25 +416,28 @@
current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
while(!lora_up_rec_flag)
{
-// current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
-// if(current_count1>=end_count1&¤t_count1<end_count1+15000)
-// {
-// break;
-// }
+ current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
+ if(current_count1>=end_count1&¤t_count1<end_count1+15000)
+ {
+ break;
+ }
delay_ms(100);
- Radio.Send(send_lora_data,8);
+ if(lora_up_rec_flag)
+ {break;}
+ Radio.Send(send_lora_data,9);
}
// while(1);
if(lora_up_rec_flag)
{
-
- crc16=Cal_CRC16(rxbuffer,6+ONE_BAG_DAXIAO);
- if(muqiandeshengjibao==rxbuffer[MUQIAN_BAG]&&!memcmp(&crc16,&rxbuffer[6+ONE_BAG_DAXIAO],2)&&!memcmp(&dev_id,&rxbuffer[JIZHAN_ID],2)&& !memcmp(&wangguan_up_id,&rxbuffer[WANGGUAN_ID],2))
+ crc16=Cal_CRC16(rxbuffer,DATA_IDX+ONE_BAG_DAXIAO);
+ if(muqiandeshengjibao==rxbuffer[MUQIAN_BAG]&&!memcmp(&crc16,&rxbuffer[DATA_IDX+ONE_BAG_DAXIAO],2)&&!memcmp(&dev_id,&rxbuffer[DEST_ID_IDX],2)&& !memcmp(&wangguan_up_id,&rxbuffer[SOURCE_ID_IDX],2))
{
memcpy(Zhongjian_data,&rxbuffer[DATA_IDX],ONE_BAG_DAXIAO);
-// __disable_irq();
- FLASH_Write(APP2_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO);
-// __enable_irq();
+// if(app1_or_app2==1)
+// FLASH_Write(APP1_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO);
+// else
+ FLASH_Write(APP2_ADRESS+ONE_BAG_DAXIAO*rxbuffer[MUQIAN_BAG],(uint8_t*)Zhongjian_data,ONE_BAG_DAXIAO);
+
muqiandeshengjibao++;
}
}
@@ -439,13 +447,20 @@
if(huifushengjibaoerror_num>=20)
{
huifushengjibaoerror_num=0;
- muqiandeshengjibao=0;
+ muqiandeshengjibao=0;
+ Delay_Ms(500);
+ HAL_NVIC_SystemReset();
break;
}
}
if(muqiandeshengjibao==final_bag_num)
{
- Delay_Ms(500);
+ uint16_t tmp11 ,result11;
+ tmp11=0XBB;
+ result11 = FLASH_Prepare(APP_1OR2_ADRESS, PAGE_SIZE);
+ if(result11)
+ result11 = FLASH_Write(APP_1OR2_ADRESS, (const uint8_t*)&tmp11, 2);
+ Delay_Ms(1500);
HAL_NVIC_SystemReset();
}
}
@@ -463,40 +478,6 @@
}
}
}
-// LoraUp_flag=1;
-// SetFlagLoraWaitSync(1);
-// while(1)
-// {
-// start_count1=HAL_LPTIM_ReadCounter(&hlptim1); //等待接收完成直到超时
-//// poll_timeout=500*10; //单位0.1ms
-// end_count1=start_count1+(5000<<2);
-// if(end_count1>=32768)
-// {end_count1-=32768;}
-// current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
-// while(GetFlagLoraWaitSync())
-// {
-// current_count1=HAL_LPTIM_ReadCounter(&hlptim1);
-// if(current_count1>=end_count1&¤t_count1<end_count1+15000)
-// {
-// break;
-// }
-// }
-// if(!GetFlagLoraWaitSync())
-// {
-// send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_REQUEST;
-// memcpy(&send_lora_data[WANGGUAN_ID],&wangguan_up_id,2);//网关ID 占用2个字节
-// memcpy(&send_lora_data[JIZHAN_ID],&dev_id,2);//标签或者基站的设备ID 2个字节
-// send_lora_data[MUQIAN_BAG]=mudeshengjibao;
-// crc16=Cal_CRC16(send_lora_data,6);
-// memcpy(&send_lora_data[6],&crc16,2);
-//
-// }
-// }
}
}
-uint8_t fsad;
-//void test1()
-//{
-// if(!memcmp(&dev_id,&rxbuffer[ANCTAG_DEVICEID_IDX],2))
-// {LoraUp_Poll();}
-//}
+
--
Gitblit v1.9.3