From 8942cbba84d86e04ff69f9e9fa7cb3e7f5c494b4 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 09 十月 2024 14:11:44 +0800
Subject: [PATCH] 免布线方案一对一纯uwb调通,现在带个lora唤醒

---
 keil/include/main/main.c |   80 +++++++++++++++++++--------------------
 1 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 9d45cf1..d176e66 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -281,20 +281,20 @@
 uint8_t flag_sleeptimer,flag_secondtask,secondtask_count;
 static void sleep_timer_callback(void *dev, uint32_t time)
 {
-    IO_control_init();
-    UWBPoll();
-    
-    
-    MotorPoll();
+//    IO_control_init();
+//    UWBPoll();
+//    
+//    
+//    MotorPoll();
 
-    if(secondtask_count++%2==0)
-    {
-        flag_secondtask = 1;
-    }else{
-        flag_secondtask = 0;
-    }
+//    if(secondtask_count++%2==0)
+//    {
+//        flag_secondtask = 1;
+//    }else{
+//        flag_secondtask = 0;
+//    }
 
-    flag_sleeptimer = 1;
+//    flag_sleeptimer = 1;
 
     //马达震动逻辑
     if(g_com_map[MOTOR_ENABLE])
@@ -338,6 +338,8 @@
 {
     Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理,UsartParseDataHandler为升级处理当调试时候改为
     parameter_init_anchor();//g_com_map表初始化角色默认为基站
+    g_com_map[DEV_ID]=0x6789;
+    g_com_map[GROUP_ID]=9;
     dev_id=g_com_map[DEV_ID];//这里不太对
     group_id=g_com_map[GROUP_ID];//组ID
     tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
@@ -505,13 +507,11 @@
 //            rf_delay_ms(1000);
 //            if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != OK)
 //            {
-////                DDL_Printf("tx fail \r\n");
 ////                rf_enter_continous_rx();
 //            }
 //            else
 //            {
 //                error_cnt ++;
-////                DDL_Printf("Tx cnt %d\r\n", cnt );
 //            }
         }
         if(rf_get_recv_flag() == RADIO_FLAG_RXDONE)
@@ -523,14 +523,11 @@
 //            {
 //                printf("0x%02x ", RxDoneParams.Payload[i]);
 //            }
-//            DDL_Printf("\r\n");
             error_cnt ++;
-//            DDL_Printf("###Rx cnt %d##\r\n", cnt);
         }
         if((rf_get_recv_flag() == RADIO_FLAG_RXTIMEOUT) || (rf_get_recv_flag() == RADIO_FLAG_RXERR))
         {
             rf_set_recv_flag(RADIO_FLAG_IDLE);
-//            DDL_Printf("Rxerr\r\n");
         }
 }
 void Board_LORA_NVIC_Init(GPIO_IRQ_HANDLER_T irq_handler)  //LORA 中断配置
@@ -589,20 +586,20 @@
     Board_LORA_NVIC_Init(Lora_irq_handler);
     Lora_init();
     rf_set_default_para();
-    
+//    
     rf_enter_continous_tx();
 //    rf_set_transmit_flag(RADIO_FLAG_TXDONE);
 //    rf_set_transmit_flag(RADIO_FLAG_TXDONE);
     if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != 0)
     {
         error_cnt++;
-//        printf("LORA Init Fail");
     }
     else
     {
         successful_cnt ++;
-//        printf("LORA Init OK\r\n");
     }     
+    
+    
 //  while (rf_get_transmit_flag() == RADIO_FLAG_IDLE) ;
 //   
 //  rf_set_transmit_flag(RADIO_FLAG_IDLE);
@@ -617,7 +614,7 @@
 //    gps_air780_power_change(0,1);//开启gps,4G 
 ////加速度计初始化必须在IO_control_init之前因为复用SDA引脚
 //    adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
-//		   Program_Init();
+		   Program_Init();
 //    uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
 //   
 //// Initialize low power mode
@@ -628,11 +625,10 @@
 //    sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
 
 //    board_acceleration_detection_init(move_handler);
-
-    
-    
+    Uwbinit();
     while (1)
     {
+        UwbRange();
 //        rf_irq_process();
 //        if(rf_get_transmit_flag() == RADIO_FLAG_TXDONE)
 //        {
@@ -650,23 +646,25 @@
 //        }
             
             
-//       
-             
-//            io14_state=gpio_pin_get_val(LORA_DIO);
-            rf_set_transmit_flag(RADIO_FLAG_IDLE);
-            rf_delay_ms(1000);
-            rf_enter_continous_tx();
-//            rf_set_transmit_flag(RADIO_FLAG_TXDONE);
-            if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != OK)
-            {
-//                DDL_Printf("tx fail \r\n");
-//                rf_enter_continous_rx();
-            }
-            else
-            {
-                successful_cnt ++;
-//                DDL_Printf("Tx cnt %d\r\n", cnt );
-            }
+////       
+//             
+////            io14_state=gpio_pin_get_val(LORA_DIO);
+//            rf_set_transmit_flag(RADIO_FLAG_IDLE);
+//            rf_delay_ms(1000);
+//            rf_enter_continous_tx();
+////            rf_set_transmit_flag(RADIO_FLAG_TXDONE);
+//            if(rf_continous_tx_send_data(tx_test_buf, TX_LEN) != OK)
+//            {
+////                rf_enter_continous_rx();
+//            }
+//            else
+//            {
+//                successful_cnt ++;
+//            }
+            
+            
+            
+            
 //          while (rf_get_transmit_flag() == RADIO_FLAG_IDLE) ;
 //           
 //          rf_set_transmit_flag(RADIO_FLAG_IDLE);

--
Gitblit v1.9.3