From 027bc1bbfe61d1c28617340b7886586c38ac4eec Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 07 十一月 2023 09:17:58 +0800
Subject: [PATCH] lora免布线标签5hz版本  没有调试好  先提交  目前不用

---
 Src/radio/Lora.c |  129 ++++++++++++++++++++++++++++---------------
 1 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/Src/radio/Lora.c b/Src/radio/Lora.c
index b36232a..e1d7542 100644
--- a/Src/radio/Lora.c
+++ b/Src/radio/Lora.c
@@ -186,31 +186,69 @@
 }
 void OnTxDone( void )
 {
+    LED_TB_OFF;
     if(lora_yingda_num>1000)
     {
     lora_yingda_num=0;
     lora_yingda_flag=1;
     }
-    
+//    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
     if(lora_yingda_flag==0)    
     Lora_rx_open_flag=1;
     else
     {}
             
 }
+
+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;
+void Lora_tx_zubao( void )
 {
+    uint16_t checksum;
+                    usart_send[2] = 0x12;//正常模式 
+					usart_send[3] = 8+Lora_tx_ancnum*4;//数据段长度
+                    memcpy(&usart_send[4],&dev_id,2);
+					usart_send[6] = lora_seq_nb2;//包序
+                    power_and_key=battary<<1;//把按键跟电量2合1,发出去
+                    power_and_key=power_and_key+button;
+                    memcpy(usart_send+7,&power_and_key,1);
+                    usart_send[8] = lora_yingda_flag;//lora等待应答位
+                    usart_send[9] = Lora_tx_ancnum;//lora等待应答位
+//                    usart_send[9] = lora_yingda_flag;
+					memcpy(&usart_send[10],&Lora_tx_ancid,2*Lora_tx_ancnum);				
+					memcpy(&usart_send[10+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[10+4*Lora_tx_ancnum],&checksum,2);
+}
+uint16_t current_count;
+u16 Lora_recevcount;
+extern uint8_t no_data_chongqi_num;
+void OnRxDone( uint8_t *payload, uint16_t size, int16_t rssi, int8_t snr )
+{   
+//    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
+    Lora_recevcount=HAL_LPTIM_ReadCounter(&hlptim1);
+    Lora_recevcount=Lora_recevcount+197;//197代表6ms
+    if(Lora_recevcount>=32768)
+    {
+    Lora_recevcount -=32768;
+    }
     BufferSize = size;
     memcpy( RX_Buffer, payload, BufferSize );
     RssiValue = rssi;
     SnrValue = snr;
-    
+    no_data_chongqi_num=0;
     Radio.Standby();
     if(lora_yingda_flag)
     {
@@ -228,10 +266,10 @@
 //	    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]);}
+//        for(i=0;i<BufferSize;i++)
+        {printf("R %d:\r\n",RX_Buffer[3]);}
         RX_TIMEOUTs++;
-        printf("RX_num :%d\r\n",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)
@@ -251,34 +289,57 @@
         }
     }
 ////////            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(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);
+//            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);
+//            }
 
+//HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_RESET);
     }
 }
 
 void OnTxTimeout( void )
 {
-   
+       Radio.Standby();
+        Lora_Init();
+    Lora_rx_open_flag=0;
+    
+    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
 }
 
 void OnRxTimeout( void )
 {
     Radio.Standby();
+        Lora_Init();
+    Lora_rx_open_flag=0;
+    
     Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
-    printf("slave OnRxTimeout\r\n");	
+//    printf("slave OnRxTimeout\r\n");	
     
 }
 
@@ -286,31 +347,9 @@
 {
 
     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 ); 
-
-    }
-  
+        Lora_Init();
+    Lora_rx_open_flag=0;
+    Radio.SetRxDutyCycle(RxDutyCycle_RX_time,RxDutyCycle_SLEEP_time);
 }
 
 void Lora_Init(void)

--
Gitblit v1.9.3