From ee0d5aab5ecbbd265660cba45c8a1946005b8f8c Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期三, 18 九月 2024 13:49:17 +0800 Subject: [PATCH] v1.30,把gcom表1搬到表2的时候往后挪,防止保存出错一直重启。 --- Src/radio/Lora.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c index 768a5d9..da6839b 100644 --- a/Src/radio/Lora.c +++ b/Src/radio/Lora.c @@ -331,7 +331,7 @@ } HAL_GPIO_WritePin(GPIOC, GPIO_PIN_7, GPIO_PIN_SET); HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_SET); - memcpy(&xiafayuyin_data,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX); + memcpy(&xiafayuyin_data,&RX_Buffer[PWTAG_WRITE_VALUE_IDX],BufferSize-PWTAG_WRITE_VALUE_IDX-2); yuyin_sendflag=1; yuyinzidongguan_time=0; yuyin_no_sleep_flag=1; @@ -493,10 +493,11 @@ memcpy(&send_lora_data[6],&crc16,2); huifushengjibao_flag=0; LoraUp_flag=1; +// SwitchLoraSettings(LORA_UPCHANNEL_FRQ,LORA_UPCHANNEL_SF,22); //切换lora升级频点 Radio.Send(send_lora_data,8);//基站发送升级确认回复 Delay_Ms(1000); SwitchLoraSettings(LORA_UPCHANNEL_FRQ,LORA_UPCHANNEL_SF,22); //切换lora升级频点 - delay_ms(200); + delay_ms(200); __disable_irq(); // FLASH_Read(APP_1OR2_ADRESS,(uint8_t*)&app1_or_app2,2); final_bag_num=(rec_wenjian_daxiao/220)+1;//计算一共要请求多少包 @@ -511,6 +512,7 @@ __enable_irq(); while(1) { +// huifushengjibao_flag=1; if(huifushengjibao_flag==1) {lora_up_rec_flag=1; while(1) -- Gitblit v1.9.3