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 |  450 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 291 insertions(+), 159 deletions(-)

diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index b36232a..e61c977 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -10,12 +10,26 @@
 #include "stdio.h"
 #include "delay.h"
 #include "main.h"
+#include <stdlib.h>
 static RadioEvents_t RadioEvents;
 #define USE_MODEM_LORA
 //#define USE_MODEM_FSK
-#define REGION_CN779
+#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;
+#define LORA_FREQUENCY0 470200000
+#define LORA_FREQUENCY1 471200000
+#define LORA_FREQUENCY2 472200000
+#define LORA_FREQUENCY3 473200000
+#define LORA_FREQUENCY4 474200000
+uint16_t Lora_rece_error;
+#define LORA_RX_433 1
+#define LORA_TX_47X 2
+#define LORA_RX_47X 3
+uint8_t Lora_status=0;
 #if defined( REGION_AS923 )
 
 #define RF_FREQUENCY                                923000000 // Hz
@@ -118,7 +132,7 @@
 }States_t;
 
 //#define RX_TIMEOUT_VALUE                            1000
-#define RX_TIMEOUT_VALUE                            64000
+#define RX_TIMEOUT_VALUE                            100
 #define BUFFER_SIZE                                 64 // Define the payload size here
 
 const uint8_t PingMsg[] = "PING";
@@ -140,103 +154,126 @@
 void OnRxError( void );
 uint8_t  lora_chongfuyingda_flag;
 uint8_t Lora_rx_open_flag;
+extern u32 Loratx_frequency;
 void LedToggle(void)
 
 {
 //	HAL_GPIO_TogglePin(GPIOB, LED1_Pin);
 }
-void Lora_tx_mode( void )
-{
-            Radio.SetChannel( 470200000 );
-            Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, 0,
-            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 )
-{
-    if(Lora_rx_open_flag==1)
-    {
-    Lora_Init();
-    Lora_rx_open_flag=0;
-    }
-    if(lora_yingda_flag&&lora_chongfuyingda_flag==0)
-    {
-        printf("Lora:%d  %d\r\n",lora_yingda_flag,lora_chongfuyingda_flag);
-    lora_chongfuyingda_flag=1;
-    RadioEvents.TxDone = OnTxDone;
-    RadioEvents.RxDone = OnRxDone;
-    RadioEvents.TxTimeout = OnTxTimeout;
-    RadioEvents.RxTimeout = OnRxTimeout;
-    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.Init( &RadioEvents );
-    Radio.SetChannel( 500000000 );
-    Radio.SetRxConfig( MODEM_LORA, 0, 7,
-    LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
-    LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
-    0, false, 0, 0, true, 1 );
+//}
+//void Lora_rx_open( void )
+//{
+//    if(Lora_rx_open_flag==1)
+//    {
+//    Lora_Init();
+//    Lora_rx_open_flag=0;
+//    }
+//    if(lora_yingda_flag&&lora_chongfuyingda_flag==0)
+//    {
+//        printf("Lora:%d  %d\r\n",lora_yingda_flag,lora_chongfuyingda_flag);
+//    lora_chongfuyingda_flag=1;
+//    RadioEvents.TxDone = OnTxDone;
+//    RadioEvents.RxDone = OnRxDone;
+//    RadioEvents.TxTimeout = OnTxTimeout;
+//    RadioEvents.RxTimeout = OnRxTimeout;
+//    RadioEvents.RxError = OnRxError;
 
-    SX126xClearIrqStatus( IRQ_RADIO_ALL );
-//    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-        Radio.Rx( RX_TIMEOUT_VALUE ); 
+//    Radio.Init( &RadioEvents );
+//    Radio.SetChannel( 500000000 );
+//    Radio.SetRxConfig( MODEM_LORA, 0, 7,
+//    LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH_R,
+//    LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON,
+//    0, false, 0, 0, true, 1 );
 
-        
-    }
-}
+//    SX126xClearIrqStatus( IRQ_RADIO_ALL );
+////    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+//        Radio.Rx( RX_TIMEOUT_VALUE ); 
+
+//        
+//    }
+//}
+uint32_t lora_zhuangtai;
 void OnTxDone( void )
 {
-    if(lora_yingda_num>1000)
-    {
-    lora_yingda_num=0;
-    lora_yingda_flag=1;
-    }
-    
-    if(lora_yingda_flag==0)    
-    Lora_rx_open_flag=1;
-    else
-    {}
-            
+    LED_TB_OFF;
+    Radio.Standby();
+     Radio.Rx( RX_TIMEOUT_VALUE ); 
 }
+
+extern uint32_t lp_time;
+uint32_t lora_txtime_old;
 extern uint8_t frame_seq_nb2,rec_nearbase_num,ancidlist_num;
 uint16_t RX_TIMEOUTs;
 extern LPTIM_HandleTypeDef hlptim1;
 uint16_t current_time,start_time,end_time;
     uint16_t lora_recv_devid=0;
 u32 id;
-void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
+extern uint8_t Lora_tx_ancnum;
+extern uint16_t Lora_tx_ancid[50];
+extern uint16_t Lora_tx_ancdist[50];
+uint8_t power_and_key=0;
+extern u8 battary,button;
+u8 lora_seq_nb2;
+extern uint8_t stationary_flag;
+extern uint8_t anjian_flag;
+void Lora_tx_zubao( void )
 {
+    uint16_t checksum;
+                    usart_send[2] = 0x22;//正常模式 
+					usart_send[3] = 9+Lora_tx_ancnum*4;//数据段长度
+                    memcpy(&usart_send[4],&dev_id,2);
+					usart_send[6] = lora_seq_nb2;//包序
+                    power_and_key=stationary_flag<<1;//把按键跟静止2合1,发出去
+                    power_and_key=power_and_key+anjian_flag;;
+                    memcpy(usart_send+7,&bat_percent,1);
+                    memcpy(usart_send+8,&power_and_key,1);
+                    usart_send[9] = lora_yingda_flag;//lora等待应答位
+                    usart_send[10] = Lora_tx_ancnum;
+//                    usart_send[9] = lora_yingda_flag;
+					memcpy(&usart_send[11],&Lora_tx_ancid,2*Lora_tx_ancnum);				
+					memcpy(&usart_send[11+Lora_tx_ancnum*2],&Lora_tx_ancdist,2*Lora_tx_ancnum);
+					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;
+void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
+{   
+    if(Lora_status==LORA_RX_433)
+    {
+    Lora_recevcount=HAL_LPTIM_ReadCounter(&hlptim1);
+    Lora_recevcount=Lora_recevcount+197;//197代表6ms
+    if(Lora_recevcount>=32768)
+    {
+    Lora_recevcount -=32768;
+    }
+//    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
     BufferSize = size;
     memcpy( RX_Buffer, payload, BufferSize );
     RssiValue = rssi;
     SnrValue = snr;
-    
+    no_data_chongqi_num=0;
     Radio.Standby();
-    if(lora_yingda_flag)
-    {
-    memcpy(&lora_recv_devid,&RX_Buffer[4],2);
-        if(lora_recv_devid==dev_id)
-        {
-        
-        
-        }
-    }
-    if(lora_yingda_flag==0)
-    {
-        lora_chongfuyingda_flag=0;
-//        HAL_GPIO_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("RXD %d:\r\n",RX_Buffer[i]);}
-        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(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
+
         HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_SET); //片选lora无效
 
         	id =  dwt_readdevid() ;
@@ -251,121 +288,216 @@
         }
     }
 ////////            printf("Anchor_App\r\n");
+        current_count=HAL_LPTIM_ReadCounter(&hlptim1);
+		while(current_count<Lora_recevcount||current_count>Lora_recevcount+16384)
+		{
+			current_count=HAL_LPTIM_ReadCounter(&hlptim1);
+			if(current_count<Lora_recevcount-300)
+			{
+				break;
+			}
+		}
+//    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_RESET);
             Anchor_App();
-
-
+//    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(10);
-            
-            Lora_tx_mode();            
-            Radio.Send( usart_send, 12+rec_nearbase_num*4);
-            lora_yingda_num++;
-//              printf("RX_TIMEOUTs :%d\r\n",RX_TIMEOUTs);
-//        Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-//              printf("RX_TIMEOUTs :XXXX\r\n");
-//        			Radio.Rx( RX_TIMEOUT_VALUE ); 
-//				printf("Slave TXD XXXX\r\n");
-
+            delay_ms(1);
+            Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+    }
+    if(Lora_status==LORA_RX_47X)//。
+    {
+        BufferSize = size;
+        memcpy( RX_Buffer, payload, BufferSize );
+        RssiValue = rssi;
+        SnrValue = snr;
+        Radio.Standby();
+        if(RX_Buffer[0]==0x55&&RX_Buffer[1]==0xAA)
+        {
+            Lora433_change();
+            if(!memcmp(&g_com_map[DEV_ID],&RX_Buffer[4],2))
+            {Lora_rece_error=0;}
+        }
     }
 }
 
 void OnTxTimeout( void )
 {
-   
+       Radio.Standby();
+    Lora433_change();
 }
-
+    uint8_t tm;
+uint16_t Lora_rece_error;
 void OnRxTimeout( void )
 {
     Radio.Standby();
-    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-    printf("slave OnRxTimeout\r\n");	
-    
+    if(Lora_status==LORA_RX_47X) //470rx超时,先调时间发送,5次后还不行,换频段
+    {
+        Lora_rece_error++;
+        if(Lora_rece_error>5)
+        {
+            Loratx_frequency=Loratx_frequency+1000000;
+            if(Loratx_frequency>474000000)
+            {Loratx_frequency=470000000;}
+            Lora_rece_error=0;
+        }
+        else
+        {
+           tm= (rand()%100);
+        SetNextPollTime(tm);
+//            HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, tm);
+        }
+    }
+    Lora433_change();
 }
 
 void OnRxError( void )
 {
 
     Radio.Standby();
-    if(EnableMaster)
-    {
-        TX_Buffer[0] = 'P';
-        TX_Buffer[1] = 'I';
-        TX_Buffer[2] = 'N';
-        TX_Buffer[3] = 'G'; 
-        
-//        crc_value=RadioComputeCRC(TX_Buffer,4,CRC_TYPE_IBM);//计算得出要发送数据包CRC值
-//        TX_Buffer[4]=crc_value>>8;
-//        TX_Buffer[5]=crc_value;
-        //Radio.Send( TX_Buffer, 6);
-			  Radio.Send( TX_Buffer, 4);
-//			  HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_SET);
-//			  HAL_Delay_nMS( 1 );
-//			  HAL_GPIO_WritePin( OUT1_GPIO_Port, OUT1_Pin,GPIO_PIN_RESET);	  		
-			  printf("Master TXD PING!\r\n");
-    }
-    else
-    {
-      Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-        printf("slave OnRxError\r\n");	
-//        			Radio.Rx( RX_TIMEOUT_VALUE ); 
-
-    }
-  
+    Lora433_change();
 }
 
-void Lora_Init(void)
+//void Lora433rx_Init(void)
+//{
+//    Lora_status=LORA_RX_433;
+//    RadioEvents.TxDone = OnTxDone;
+//    RadioEvents.RxDone = OnRxDone;
+//    RadioEvents.TxTimeout = OnTxTimeout;
+//    RadioEvents.RxTimeout = OnRxTimeout;
+//    RadioEvents.RxError = OnRxError;
+//        Radio.Init( &RadioEvents );
+//        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.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");        
+//    }
+//       
+//}
+
+//void Lora47xrx_Init(void)
+//{   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( 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.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;
     RadioEvents.RxTimeout = OnRxTimeout;
     RadioEvents.RxError = OnRxError;
-//    printf("Lora_Init3\r\n");
+
+        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.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.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.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");        
-    }
-       
+        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