From cea7f6ca7f65b036892965a6e0ffd22d5afcd190 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 01 三月 2024 09:34:54 +0800
Subject: [PATCH] 功能测试代码开发完成

---
 Src/application/dw_app.c |  110 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 82 insertions(+), 28 deletions(-)

diff --git a/Src/application/dw_app.c b/Src/application/dw_app.c
index c040cb8..927d98e 100644
--- a/Src/application/dw_app.c
+++ b/Src/application/dw_app.c
@@ -72,7 +72,7 @@
 #define FINAL_MSG_FINAL_TX_TS_IDX 18
 #define FINAL_MSG_TS_LEN 4
 
-#define _UWB_4G
+//#define _UWB_4G
 
 static dwt_config_t config = {
 #ifdef _UWB_4G
@@ -250,15 +250,57 @@
 typedef enum{	Next_Poll_RANGE,
                 Next_Poll_LORASYNC,
 }nextpoll_enum;
+#define UWB 0
+#define LORA 1
+static uint8_t lora_sendbuffer[40];
+static uint16_t wg_report_id=0xffff;
+uint8_t seq_num;
+static u16 checksum;
+#define SEQNUM_IDX          6   //标签报文序号 
+#define BAT_IDX             7   //标签电量
+#define STATE_IDX           8
+#define ANCID_IDX           30   //校验在4*ancnum+ANCID_IDX 位置
+#define LORA5_CHANNEL_FRQ 484
+#define LORA5_CHANNEL_SF 7
+uint8_t poll_state;
+void Lora_Poll(void)
+{
+
+    SwitchLoraSettings(LORA5_CHANNEL_FRQ,LORA5_CHANNEL_SF,22);
+    lora_sendbuffer[MSG_TYPE_IDX] = LORA_MSGTYPE_TAGMSGTOWG_GPS;
+    lora_sendbuffer[MSG_LENGTH] = 30;
+    memcpy(&lora_sendbuffer[SOURCE_ID_IDX],&g_com_map[DEV_ID],2);
+    memcpy(&lora_sendbuffer[DEST_ID_IDX],&wg_report_id,2);
+    lora_sendbuffer[SEQNUM_IDX] = seq_num++;
+    lora_sendbuffer[BAT_IDX] = bat_percent;
+    lora_sendbuffer[STATE_IDX] = 0;
+//    memcpy(&lora_sendbuffer[GPS_JINGDU_IDX],&gps_jingdu,8);
+//    memcpy(&lora_sendbuffer[GPS_WEIDU_IDX],&gps_jingdu,8);
+//    lora_sendbuffer[GPS_STATE_IDX] = gps_state;
+//    lora_sendbuffer[GPS_SATEL_NUM_IDX] = gps_satel_num;
+//    lora_sendbuffer[GPS_SPOWER_IDX] = gps_signalpower;
+//    lora_sendbuffer[GPS_CHAFENLINGQI] = gps_chafenlingqi;
+//    lora_sendbuffer[ANCNUM_IDX] = report_ancnum;
+//    memcpy(&lora_sendbuffer[ANCID_IDX],report_ancid,report_ancnum*2);
+//    memcpy(&lora_sendbuffer[ANCID_IDX+report_ancnum*2],report_ancdist,report_ancnum*2);
+    checksum = Checksum_u16(lora_sendbuffer,4*0+ANCID_IDX);
+    memcpy(&lora_sendbuffer[ANCID_IDX+0*4],&checksum,2);
+    Radio.Send(lora_sendbuffer,ANCID_IDX+0*4+2);
+}
 nextpoll_enum next_poll_state;
 extern uint8_t sync_lost_count;
+extern uint8_t Lorahuifu_flag;
+extern  int16_t intheight;
+extern   u16 uwbdistance;
 void Tag_App(void)//发送模式(TAG标签)
 {  	
-    SyncStateSwitch();
-  if(next_poll_state==Next_Poll_RANGE)  //读取本次的工作状态 测距还是同步
+//    SyncStateSwitch();
+  if(poll_state==UWB)  //读取本次的工作状态 测距还是同步
   {
+      poll_state=LORA;
     current_count=HAL_LPTIM_ReadCounter(&hlptim1);
-
+//    g_com_map[LORA_POWER]=22;
+//    g_com_map2[LORA_POWER]=22;
     SwitchLoraSettings(UWB_CHANNEL_FRQ+g_com_map[GROUP_ID],5,g_com_map[LORA_POWER]); //切换lora接收频点  
 
     memcpy(&lora_start_poll_buff[ANC_ID_IDX],&g_com_map[DEV_ID],2);
@@ -267,33 +309,45 @@
     delay_us(700);
     MBXANCPoll();
 	dwt_entersleep();
-    next_poll_state = Next_Poll_LORASYNC;
+//    next_poll_state = Next_Poll_LORASYNC;
   }else{
-     LoraSyncRecPoll();
-      if(GetRangeState())  //获取当前测距状态,是否开启。如果开启下次为测距,否为同步
+      poll_state=UWB;
+      Lora_Poll();
+      if(intheight!=0)
+      printf("高度值:%d\r\n",intheight);
+      if(uwbdistance!=0)
+      printf("UWB测距值:%d\r\n",uwbdistance);
+            
+      if(Lorahuifu_flag)
       {
-        next_poll_state = Next_Poll_RANGE;
-      }else{
-        next_poll_state = Next_Poll_LORASYNC;
-      }      
-  }
-  Radio.Sleep();
-  if(next_poll_state == Next_Poll_LORASYNC)  //设定下一次的唤醒时间
-  {
-//      if(sync_state==Sync_Lost)
-//      {
-//          target_count = GetLoraSyncCount()-(18000)/LPTIMER_LSB+sync_lost_count*1000;
-//      }else
-      {
-        target_count = GetLoraSyncCount()-(18000)/LPTIMER_LSB;  //比上次收到的lora提前17ms唤醒(lora接收大概17ms),如果在同步间隔内,则会快速进入休眠。
+      Lorahuifu_flag=0;    
+      printf("收到网关回复,LORA成功\r\n");
       }
-      if(target_count<0)
-      target_count+=32768;
-    __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
-  }else{
-
-    target_count = GetUwbPollCount(); //测距提前2ms唤醒
-    __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+//     LoraSyncRecPoll();
+//      if(GetRangeState())  //获取当前测距状态,是否开启。如果开启下次为测距,否为同步
+//      {
+//        next_poll_state = Next_Poll_RANGE;
+//      }else{
+//        next_poll_state = Next_Poll_LORASYNC;
+//      }      
   }
+//  Radio.Sleep();
+//  if(next_poll_state == Next_Poll_LORASYNC)  //设定下一次的唤醒时间
+//  {
+////      if(sync_state==Sync_Lost)
+////      {
+////          target_count = GetLoraSyncCount()-(18000)/LPTIMER_LSB+sync_lost_count*1000;
+////      }else
+//      {
+//        target_count = GetLoraSyncCount()-(18000)/LPTIMER_LSB;  //比上次收到的lora提前17ms唤醒(lora接收大概17ms),如果在同步间隔内,则会快速进入休眠。
+//      }
+//      if(target_count<0)
+//      target_count+=32768;
+//    __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+//  }else{
+
+//    target_count = GetUwbPollCount(); //测距提前2ms唤醒
+//    __HAL_LPTIM_COMPARE_SET(&hlptim1, target_count);
+//  }
   
 }

--
Gitblit v1.9.3