From eeea481d10c49eeff6a2cafa9b49d4fce3ace8f8 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 26 一月 2024 10:43:46 +0800
Subject: [PATCH] 1

---
 Src/radio/Lora.c |  302 +++++++++++++++++++++++++-------------------------
 1 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index a93473c..e61c977 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -16,6 +16,7 @@
 //#define USE_MODEM_FSK
 #define REGION_CN779 
 void Lora47xrx_Init(void);
+void Lora433_change(void);
 void Lora433rx_Init(void);
 uint32_t RxDutyCycle_RX_time   =128;
 uint32_t RxDutyCycle_SLEEP_time=256;
@@ -131,7 +132,7 @@
 }States_t;
 
 //#define RX_TIMEOUT_VALUE                            1000
-#define RX_TIMEOUT_VALUE                            6400
+#define RX_TIMEOUT_VALUE                            100
 #define BUFFER_SIZE                                 64 // Define the payload size here
 
 const uint8_t PingMsg[] = "PING";
@@ -159,18 +160,25 @@
 {
 //	HAL_GPIO_TogglePin(GPIOB, LED1_Pin);
 }
-void Lora_tx_mode( void )
-{
-Lora_status=LORA_TX_47X;
-            Radio.SetChannel( Loratx_frequency );
-            
-            Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 2,
-            7, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
-            false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 );
+//void Lora_tx_mode( void )
+//{
+//Lora_status=LORA_TX_47X;
+//        RadioEvents.TxDone = OnTxDone;
+//    RadioEvents.RxDone = OnRxDone;
+//    RadioEvents.TxTimeout = OnTxTimeout;
+//    RadioEvents.RxTimeout = OnRxTimeout;
+//    RadioEvents.RxError = OnRxError;
 
-}
-void Lora_rx_open( void )
-{
+//        Radio.Init( &RadioEvents );
+//            Radio.SetChannel( Loratx_frequency );
+//            
+//            Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 2,
+//            7, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
+//            false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 );
+
+//}
+//void Lora_rx_open( void )
+//{
 //    if(Lora_rx_open_flag==1)
 //    {
 //    Lora_Init();
@@ -199,24 +207,13 @@
 
 //        
 //    }
-}
+//}
+uint32_t lora_zhuangtai;
 void OnTxDone( void )
 {
     LED_TB_OFF;
-//    if(lora_yingda_num>1000)
-//    {
-//    lora_yingda_num=0;
-//    lora_yingda_flag=1;
-//    }
-    
-//    if(lora_yingda_flag==0)    
-//    Lora_rx_open_flag=1;
-//    else
-//    {}
     Radio.Standby();
-    
-// Lora433rx_Init();
-   Lora47xrx_Init();   
+     Radio.Rx( RX_TIMEOUT_VALUE ); 
 }
 
 extern uint32_t lp_time;
@@ -254,6 +251,7 @@
 					checksum = Checksum_u16(&usart_send[2],8+4*Lora_tx_ancnum);
 					memcpy(&usart_send[11+4*Lora_tx_ancnum],&checksum,2);
 }
+extern uint8_t lora_tx_flag;
 uint16_t current_count;
 u16 Lora_recevcount;
 extern uint16_t no_data_chongqi_num;
@@ -275,31 +273,7 @@
     no_data_chongqi_num=0;
     Radio.Standby();
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
-//    if(lora_yingda_flag)
-//    {
-//    memcpy(&lora_recv_devid,&RX_Buffer[4],2);
-//        if(lora_recv_devid==dev_id)
-//        {
-//        
-//        
-//        }
-//    }
-//    if(lora_yingda_flag==0)
-    {
-//        loraa_flag=0;
-//        HAL_GPIO_chongfuyingd_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_SET);
-//	    Delay_Ms(10);
-//        HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_RESET);
-//        uint16_t i=0;
-//        for(i=0;i<BufferSize;i++)
-//        {printf("R %d:\r\n",RX_Buffer[3]);}
-//        RX_TIMEOUTs++;
-//        printf("RX_num :%d\r\n",RX_TIMEOUTs);
-//        start_time=HAL_LPTIM_ReadCounter(&hlptim1);
-//        end_time=start_time+((32768/1000)*20);
-//        if(end_time>=32768)
-//	    {end_time-=32768;}
-//        current_time=HAL_LPTIM_ReadCounter(&hlptim1);
+
         HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_SET); //片选lora无效
 
         	id =  dwt_readdevid() ;
@@ -328,24 +302,7 @@
 //    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_RESET);            
             HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
             delay_ms(1);
-//            if(lp_time-lora_txtime_old>=1)
-//            {
-//            LED_TB_ON;    
-//            lora_txtime_old=lp_time;
-//            lora_seq_nb2++;
-//            lora_yingda_num++;
-//            Lora_tx_zubao();
-//            Lora_tx_mode();            
-//            Radio.Send( usart_send, 12+Lora_tx_ancnum*4);
-//            Lora_tx_ancnum=0;    
-//            }
-//            else
-//            {
             Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-//            }
-
-
-    }
     }
     if(Lora_status==LORA_RX_47X)//。
     {
@@ -356,9 +313,9 @@
         Radio.Standby();
         if(RX_Buffer[0]==0x55&&RX_Buffer[1]==0xAA)
         {
-            Lora_rece_error=0;
-            Lora433rx_Init();
-            Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+            Lora433_change();
+            if(!memcmp(&g_com_map[DEV_ID],&RX_Buffer[4],2))
+            {Lora_rece_error=0;}
         }
     }
 }
@@ -366,15 +323,12 @@
 void OnTxTimeout( void )
 {
        Radio.Standby();
-        Lora433rx_Init();
-    Lora_rx_open_flag=0;
-    
-    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+    Lora433_change();
 }
+    uint8_t tm;
 uint16_t Lora_rece_error;
 void OnRxTimeout( void )
 {
-    uint8_t i;
     Radio.Standby();
     if(Lora_status==LORA_RX_47X) //470rx超时,先调时间发送,5次后还不行,换频段
     {
@@ -382,91 +336,86 @@
         if(Lora_rece_error>5)
         {
             Loratx_frequency=Loratx_frequency+1000000;
+            if(Loratx_frequency>474000000)
+            {Loratx_frequency=470000000;}
             Lora_rece_error=0;
         }
         else
         {
-           i= (rand()%100);
-        SetNextPollTime(i);
+           tm= (rand()%100);
+        SetNextPollTime(tm);
+//            HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, tm);
         }
     }
-    Lora433rx_Init();
-    Lora_rx_open_flag=0;
-    
-    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-//    printf("slave OnRxTimeout\r\n");	
-    
+    Lora433_change();
 }
 
 void OnRxError( void )
 {
 
     Radio.Standby();
-    Lora433rx_Init();
-    Lora_rx_open_flag=0;
-    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+    Lora433_change();
 }
 
-void Lora433rx_Init(void)
-{
-    Lora_status=LORA_RX_433;
+//void Lora433rx_Init(void)
+//{
+//    Lora_status=LORA_RX_433;
 //    RadioEvents.TxDone = OnTxDone;
 //    RadioEvents.RxDone = OnRxDone;
 //    RadioEvents.TxTimeout = OnTxTimeout;
 //    RadioEvents.RxTimeout = OnRxTimeout;
 //    RadioEvents.RxError = OnRxError;
-////    printf("Lora_Init3\r\n");
 //        Radio.Init( &RadioEvents );
-        Radio.SetChannel( RF_FREQUENCY );		
+//        Radio.SetChannel( RF_FREQUENCY );		
 
-//        Radio.SetStandby( STDBY_RC );
-    
-//    Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
-//                                   LORA_SPREADING_FACTOR, LORA_CODINGRATE,
-//                                   LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON,
-//                                   true, 0, 0, LORA_IQ_INVERSION_ON, 3000 );
-																	 
-//		Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
-//                                   LORA_SPREADING_FACTOR, LORA_CODINGRATE,
-//                                   LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
-//                                   false, 0, 0, LORA_IQ_INVERSION_ON_T, 1000 );
-    
-//    Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
-//                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH,
-//                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
-//                                   0, true, 0, 0, LORA_IQ_INVERSION_ON, false );
-//					printf("Lora_Init1\r\n");												 
-		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
-                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
-                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
-                                   0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 1 );
-                                   
+////        Radio.SetStandby( STDBY_RC );
+//    
+////    Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
+////                                   LORA_SPREADING_FACTOR, LORA_CODINGRATE,
+////                                   LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON,
+////                                   true, 0, 0, LORA_IQ_INVERSION_ON, 3000 );
+//																	 
+////		Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
+////                                   LORA_SPREADING_FACTOR, LORA_CODINGRATE,
+////                                   LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
+////                                   false, 0, 0, LORA_IQ_INVERSION_ON_T, 1000 );
+//    
+////    Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
+////                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH,
+////                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+////                                   0, true, 0, 0, LORA_IQ_INVERSION_ON, false );
+////					printf("Lora_Init1\r\n");												 
 //		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
-//                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH,
+//                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
 //                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
-//                                   0, false, 0, 0, LORA_IQ_INVERSION_ON, true );
-    
+//                                   0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 1 );
+//                                   
+////		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
+////                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH,
+////                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+////                                   0, false, 0, 0, LORA_IQ_INVERSION_ON, true );
+//    
 
 
-    {
-       SX126xClearIrqStatus( IRQ_RADIO_ALL );
-//        SX126xSetDioIrqParams( IRQ_RX_DONE | IRQ_CRC_ERROR,
-// IRQ_RX_DONE | IRQ_CRC_ERROR,
-// IRQ_RADIO_NONE, IRQ_RADIO_NONE
-// );
-//            SX126xSetDioIrqParams( IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
-//       IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
-//       IRQ_RADIO_NONE,
-//       IRQ_RADIO_NONE );
-       Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-//        Radio.Rx( RX_TIMEOUT_VALUE ); 
-//       printf("I am Slave!\r\n");        
-    }
-       
-}
+//    {
+////       SX126xClearIrqStatus( IRQ_RADIO_ALL );
+////        SX126xSetDioIrqParams( IRQ_RX_DONE | IRQ_CRC_ERROR,
+//// IRQ_RX_DONE | IRQ_CRC_ERROR,
+//// IRQ_RADIO_NONE, IRQ_RADIO_NONE
+//// );
+////            SX126xSetDioIrqParams( IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
+////       IRQ_RADIO_ALL, //IRQ_RX_DONE | IRQ_RX_TX_TIMEOUT,
+////       IRQ_RADIO_NONE,
+////       IRQ_RADIO_NONE );
+//       Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+////        Radio.Rx( RX_TIMEOUT_VALUE ); 
+////       printf("I am Slave!\r\n");        
+//    }
+//       
+//}
 
-void Lora47xrx_Init(void)
-{   Lora_status=LORA_RX_47X;
+//void Lora47xrx_Init(void)
+//{   Lora_status=LORA_RX_47X;
 //    RadioEvents.TxDone = OnTxDone;
 //    RadioEvents.RxDone = OnRxDone;
 //    RadioEvents.TxTimeout = OnTxTimeout;
@@ -474,25 +423,26 @@
 //    RadioEvents.RxError = OnRxError;
 
 //        Radio.Init( &RadioEvents );
-        Radio.SetChannel( Loratx_frequency );		
+//        Radio.SetChannel( Loratx_frequency );		
 
-										 
-		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, 7,
-                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
-                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
-                                   0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 0 );
-                                   
-    {
-       SX126xClearIrqStatus( IRQ_RADIO_ALL );
+//										 
+//		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, 7,
+//                           LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
+//                           LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+//                           0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 0 );
+//                                   
+//    {
+////       SX126xClearIrqStatus( IRQ_RADIO_ALL );
 
-//       Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-        Radio.Rx( RX_TIMEOUT_VALUE ); 
-//       printf("I am Slave!\r\n");        
-    }
-       
-}
-void Lora_Init(void)
+////       Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+//        Radio.Rx( RX_TIMEOUT_VALUE ); 
+////       printf("I am Slave!\r\n");        
+//    }
+//       
+//}
+void Lora47X_Init(void)
 {
+    Lora_status=LORA_RX_47X;
     RadioEvents.TxDone = OnTxDone;
     RadioEvents.RxDone = OnRxDone;
     RadioEvents.TxTimeout = OnTxTimeout;
@@ -500,4 +450,54 @@
     RadioEvents.RxError = OnRxError;
 
         Radio.Init( &RadioEvents );
+        Radio.SetChannel( Loratx_frequency );		
+    
+        Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 2,
+        7, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
+        false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 );
+										 
+		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, 7,
+                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
+                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+                                   0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 0 );
 }
+void Lora433_change(void)
+{
+    Lora_status=LORA_RX_433;
+//            Radio.SetChannel( RF_FREQUENCY );
+//            SX126x.ModulationParams.Params.LoRa.SpreadingFactor=5;
+//            SX126x.ModulationParams.Params.LoRa.Bandwidth=2;
+//            SX126x.ModulationParams.Params.LoRa.CodingRate=1;
+//            SX126xSetModulationParams( &SX126x.ModulationParams );
+//    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+//    
+//        Lora_status=LORA_RX_47X;
+    RadioEvents.TxDone = OnTxDone;
+    RadioEvents.RxDone = OnRxDone;
+    RadioEvents.TxTimeout = OnTxTimeout;
+    RadioEvents.RxTimeout = OnRxTimeout;
+    RadioEvents.RxError = OnRxError;
+
+        Radio.Init( &RadioEvents );
+        Radio.SetChannel( RF_FREQUENCY );		
+    
+        Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 2,
+        5, LORA_CODINGRATE,LORA_PREAMBLE_LENGTH_T, LORA_FIX_LENGTH_PAYLOAD_ON,
+        false, 0, 0, LORA_IQ_INVERSION_ON_T, 3000 );
+										 
+		Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
+                                   LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
+                                   LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+                                   0, false, 0, 0, LORA_IQ_INVERSION_ON_R, 1 );
+                                   
+        Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+                                   
+}
+void Lora47X_change(void)
+{
+            Radio.SetChannel( Loratx_frequency );
+            SX126x.ModulationParams.Params.LoRa.SpreadingFactor=7;
+            SX126x.ModulationParams.Params.LoRa.Bandwidth=2;
+            SX126x.ModulationParams.Params.LoRa.CodingRate=1;
+            SX126xSetModulationParams( &SX126x.ModulationParams );
+}
\ No newline at end of file

--
Gitblit v1.9.3