From 53bb6e5ba5b3d3c1b0088a0e7e58f37cbba90cac Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 26 十二月 2023 15:45:54 +0800
Subject: [PATCH] 1

---
 Src/radio/Lora.c |  223 ++++++++++++++++++++-----------------------------------
 1 files changed, 80 insertions(+), 143 deletions(-)

diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index e61c977..9cbe85e 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -30,47 +30,11 @@
 #define LORA_TX_47X 2
 #define LORA_RX_47X 3
 uint8_t Lora_status=0;
-#if defined( REGION_AS923 )
-
-#define RF_FREQUENCY                                923000000 // Hz
-
-#elif defined( REGION_AU915 )
-
-#define RF_FREQUENCY                                915000000 // Hz
-
-#elif defined( REGION_CN779 )
 
 #define RF_FREQUENCY                              433000000 // Hz
 #define RF_FREQUENCY_R                              500000000 // Hz
 #define RF_FREQUENCY_T                              470200000 // Hz
-
-
-#elif defined( REGION_EU868 )
-
-#define RF_FREQUENCY                                868000000 // Hz
-
-#elif defined( REGION_KR920 )
-
-#define RF_FREQUENCY                                920000000 // Hz
-
-#elif defined( REGION_IN865 )
-
-#define RF_FREQUENCY                                865000000 // Hz
-
-#elif defined( REGION_US915 )
-
-#define RF_FREQUENCY                                915000000 // Hz
-
-#elif defined( REGION_US915_HYBRID )
-
-#define RF_FREQUENCY                                915000000 // Hz
-
-#else
-
-    #error "Please define a frequency band in the compiler 'options."
-
-#endif
-
+void LoraSendComMap(uint8_t data_length, uint8_t index);
 #define TX_OUTPUT_POWER                             22        // 22 dBm
 
 extern bool IrqFired;
@@ -211,7 +175,11 @@
 uint32_t lora_zhuangtai;
 void OnTxDone( void )
 {
-    LED_TB_OFF;
+    if(bat_percent>20)
+    {LED_TR_OFF;}
+    else
+    {LED_TB_OFF;}
+    
     Radio.Standby();
      Radio.Rx( RX_TIMEOUT_VALUE ); 
 }
@@ -232,11 +200,12 @@
 u8 lora_seq_nb2;
 extern uint8_t stationary_flag;
 extern uint8_t anjian_flag;
+uint16_t Lora_wangguanid=0;
 void Lora_tx_zubao( void )
 {
     uint16_t checksum;
                     usart_send[2] = 0x22;//正常模式 
-					usart_send[3] = 9+Lora_tx_ancnum*4;//数据段长度
+					usart_send[3] = 11+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,发出去
@@ -248,16 +217,28 @@
 //                    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);
+                    memcpy(&usart_send[11+Lora_tx_ancnum*4],&Lora_wangguanid,2);
+					checksum = Checksum_u16(&usart_send[2],11+4*Lora_tx_ancnum);
+					memcpy(&usart_send[13+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;
+uint8_t du_flag;
+uint8_t xie_flag;
+extern uint8_t no_yingdaflag;
+uint16_t Beepchixutime;
 void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
 {   
-    if(Lora_status==LORA_RX_433)
+        BufferSize = size;
+        memcpy( RX_Buffer, payload, BufferSize );
+        RssiValue = rssi;
+        SnrValue = snr;
+        Radio.Standby();
+printf("收到lora\r\n");
+//    if(Lora_status==LORA_RX_433)
+    if(RX_Buffer[0]==0x50&&RX_Buffer[1]==0x49)
     {
     Lora_recevcount=HAL_LPTIM_ReadCounter(&hlptim1);
     Lora_recevcount=Lora_recevcount+197;//197代表6ms
@@ -266,12 +247,12 @@
     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();
+//    BufferSize = size;
+//    memcpy( RX_Buffer, payload, BufferSize );
+//    RssiValue = rssi;
+//    SnrValue = snr;
+//    no_data_chongqi_num=0;
+//    Radio.Standby();
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
 
         HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_SET); //片选lora无效
@@ -303,20 +284,58 @@
             HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
             delay_ms(1);
             Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
+        printf("接收到uwb测距:%d",Lora_tx_ancdist[0]);
     }
-    if(Lora_status==LORA_RX_47X)//。
+    if(RX_Buffer[0]==0x55&&RX_Buffer[1]==0xEE)
     {
-        BufferSize = size;
-        memcpy( RX_Buffer, payload, BufferSize );
-        RssiValue = rssi;
-        SnrValue = snr;
-        Radio.Standby();
-        if(RX_Buffer[0]==0x55&&RX_Buffer[1]==0xAA)
+//        BufferSize = size;
+//        memcpy( RX_Buffer, payload, BufferSize );
+//        RssiValue = rssi;
+//        SnrValue = snr;
+//        Radio.Standby();
+        if(RX_Buffer[0]==0x55&&RX_Buffer[1]==0xEE&&!memcmp(&dev_id,&RX_Buffer[4],2))
         {
-            Lora433_change();
-            if(!memcmp(&g_com_map[DEV_ID],&RX_Buffer[4],2))
-            {Lora_rece_error=0;}
+            if(RX_Buffer[6]==0)//不需要操作,正常应答
+            {
+                Lora_rece_error=0;
+            memcpy( &Lora_wangguanid, &RX_Buffer[2], 2 );
+            }
+            if(RX_Buffer[6]==2) //读操作,下一次lora发送的时候要发出去
+            {    
+//                no_yingda_time=5;
+                 Lora_rece_error=0;
+                if(no_yingdaflag==0)
+                {
+            du_flag=1;
+            LoraSendComMap(RX_Buffer[8],RX_Buffer[7]>>1);	
+                }                    
+            }
+            if(RX_Buffer[6]==1)//写操作
+            {
+                 Lora_rece_error=0;
+//                uint16_t rxbuff1;
+//                xie_flag=1;
+//                memcpy(&rxbuff1, &RX_Buffer[9], 2);
+//                memcpy((uint8_t*)&g_com_map + RX_Buffer[7], &rxbuff1, RX_Buffer[8]);
+//                no_yingda_time=5;
+                 if(no_yingdaflag==0)
+                 {
+                     if(RX_Buffer[7]==0x10)
+                     {
+                     Beep_On();
+                     memcpy(&Beepchixutime, &RX_Buffer[9], 2);
+                     }
+                     else
+                     {
+                memcpy((uint8_t*)&g_com_map + RX_Buffer[7], &RX_Buffer[9], RX_Buffer[8]);
+                save_com_map_to_flash();
+                delay_ms(100);
+                NVIC_SystemReset();
+                     }
+                 }
+            }
         }
+        Lora433_change();
     }
 }
 
@@ -339,11 +358,12 @@
             if(Loratx_frequency>474000000)
             {Loratx_frequency=470000000;}
             Lora_rece_error=0;
+            Lora_wangguanid=0;
         }
         else
         {
            tm= (rand()%100);
-        SetNextPollTime(tm);
+//        SetNextPollTime(tm);
 //            HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, tm);
         }
     }
@@ -357,89 +377,6 @@
     Lora433_change();
 }
 
-//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;
@@ -500,4 +437,4 @@
             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