From 30f954046d1fb066587d57f369bace347a27e829 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 12 六月 2024 17:09:43 +0800
Subject: [PATCH] V1.24 双spi开发完成，功能正常，之前出现死机是因为uwb再次用之前要关中断再开中断就行了。
---
Src/radio/Lora.c | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index 42af5fa..77995db 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -14,6 +14,7 @@
#include "dw_mbx_tag.h"
#include "Flash.h"
#include "dw_driver.h"
+#include "WS2812.h"
static RadioEvents_t RadioEvents;
#define USE_MODEM_LORA
//#define USE_MODEM_FSK
@@ -184,7 +185,7 @@
}
else
{
- Radio.Rx( 100 );
+ Radio.Rx( 50 );
}
}
extern LPTIM_HandleTypeDef hlptim1;
@@ -239,13 +240,14 @@
// Delay_Ms(100);
}
extern uint8_t report_ancnum;
-static uint16_t delaytime = 771;
+static uint16_t delaytime = 1200;
static uint16_t source_id;
-uint8_t rec_index;
+uint8_t rec_index,rec_secdelay;
uint16_t rec_value,rec_delaytime,rx_count;
uint16_t rec_value,rec_delaytime,rx_count,datalen_offset;
-int16_t target_count;
-uint8_t shengji_flag;
+int32_t target_count;
+uint8_t shengji_flag,time=5;
+extern uint32_t uwbled,gpsled,loraled,powerled;
void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
{ uint16_t checksum1;
BufferSize = size;
@@ -257,9 +259,8 @@
lora_up_rec_flag=1;
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_RANGEPOLL)
{
- UWB_Wkup();
- MbxTagUwbRec();
- HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
+ UWB_RXStart(10);
+ delay_ms(time);
}
if(RX_Buffer[MSG_TYPE_IDX]==LORA_MSGTYPE_WGRESPTAG)
{
@@ -276,12 +277,19 @@
if(!memcmp(&wg_report_id,&RX_Buffer[SOURCE_ID_IDX],2))
{
wg_lost_count = 0;
+ loraled=GREEN;
switch(RX_Buffer[PWTAG_RW_FLAG_IDX])
{
case WGRSP_RWTAG_NONE:
current_count = HAL_LPTIM_ReadCounter(&hlptim1);
wg_report_freq = RX_Buffer[POLL_FREQ_IDX]+400;
memcpy(&rec_delaytime,&RX_Buffer[NEXTPOLL_TIME_IDX],2);
+ rec_secdelay = RX_Buffer[PWTAG_SECDELAY_IDX];
+ if(BufferSize!=13||rec_secdelay>20)
+ {
+ rec_secdelay = 0;
+ }
+
if(report_ancnum<2)
{
datalen_offset = report_ancnum*85;
@@ -302,6 +310,8 @@
break;
case WGRSP_RWTAG_WRITE:
rec_index = RX_Buffer[PWTAG_WRITE_IDX_IDX];
+ if(rec_index<=DEV_ID)
+ return;
if(rec_index==0xDD)
{
if(usart5_state==1)
@@ -351,6 +361,7 @@
}
if(!no_rx_flag&&LoraUp_flag==0)
{
+ if(RX_Buffer[MSG_TYPE_IDX]!=LORA_MSGTYPE_RANGEPOLL)
SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],UWB_CHANNEL_SF,0);
Radio.Rx(0);
}
@@ -419,16 +430,35 @@
Radio.Init( &RadioEvents );
SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,0); //切换lora接收频点
- if(active_flag)
- {
+// if(active_flag)
+// {
Radio.Rx( 0 );
- }else{
- Radio.Sleep();
- }
+// }else{
+// Radio.Sleep();
+// }
// Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+ RadioGetStatus();
}
+uint32_t IAP_JumpTo(uint32_t ApplicationAddress)
+{
+ uint32_t JumpAddress;
+
+ if (((*(uint32_t*)ApplicationAddress) & 0x2FFE0000 ) == 0x20000000)
+ {
+//HAL_NVIC_DisableIRQ(EXTI0_1_IRQn);
+// __disable_irq();
+ JumpAddress = *(uint32_t*) (ApplicationAddress + 4);
+
+ __set_MSP(*(uint32_t*) ApplicationAddress); //Set MSP
+
+ (*((void(*)(void))JumpAddress))();
+
+ return 1;
+ }
+ return 0;
+}
uint8_t send_lora_data[250];
//extern uint8_t lora_recbuffer[255];
uint8_t muqiandeshengjibao;
@@ -537,10 +567,11 @@
if(muqiandeshengjibao==final_bag_num)
{
uint16_t tmp11 ,result11;
- tmp11=0XBB;
+ tmp11=0XCC;
result11 = FLASH_Prepare(APP_1OR2_ADRESS, PAGE_SIZE);
if(result11)
- result11 = FLASH_Write(APP_1OR2_ADRESS, (const uint8_t*)&tmp11, 2);
+ result11 = FLASH_Write(APP_1OR2_ADRESS, (const uint8_t*)&tmp11, 2);
+ __disable_irq();
Delay_Ms(1500);
HAL_NVIC_SystemReset();
}
--
Gitblit v1.9.3