From 114944d512d07f1fdbfcaa13d582944e49b8961d Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 24 九月 2024 15:28:16 +0800
Subject: [PATCH] 1.31,修复不能测距的bug。

---
 Src/main.c |  605 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 397 insertions(+), 208 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index d92495c..1021ece 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -39,6 +39,7 @@
 #include "syn6288.h"
 #include "dw_mbx_tag.h"
 #include "GPS.h"
+#include "lora.h"
 #define NSH1 0x0001
 #define GP   0x0002
 #define FLASH_HARDWARE_VERSION_MAP		(uint32_t)0x08004F00    //硬件版本号和批次信息位置
@@ -46,11 +47,11 @@
 uint8_t chongqi_flag;
 uint32_t uwbled,gpsled,loraled,powerled;
 UART_WakeUpTypeDef Selection;
-uint8_t Close_RMC[20]="$CCMSG,RMC,1,0,*04\r\n";
-uint8_t Close_GSA[20]="$CCMSG,GSA,1,0,*0D\r\n";
-uint8_t Close_GSV[20]="$CCMSG,GSV,1,0,*1A\r\n";
-uint8_t Close_GLL[20]="$CCMSG,GLL,1,0,*1F\r\n";
-uint8_t Close_TXT[20]="$CCMSG,TXT,1,0,*00\r\n";
+uint8_t Close_RMC[100]="$CCMSG,RMC,1,0,*04\r\n$CCMSG,GSA,1,0,*0D\r\n$CCMSG,GSV,1,0,*1A\r\n$CCMSG,GLL,1,0,*1F\r\n$CCMSG,TXT,1,0,*00\r\n";
+//uint8_t Close_GSA[20]="$CCMSG,GSA,1,0,*0D\r\n";
+//uint8_t Close_GSV[20]="$CCMSG,GSV,1,0,*1A\r\n";
+//uint8_t Close_GLL[20]="$CCMSG,GLL,1,0,*1F\r\n";
+//uint8_t Close_TXT[20]="$CCMSG,TXT,1,0,*00\r\n";
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -71,7 +72,6 @@
 
 /* Private variables ---------------------------------------------------------*/
  ADC_HandleTypeDef hadc;
-DMA_HandleTypeDef hdma_adc;
 
 IWDG_HandleTypeDef hiwdg;
 
@@ -80,12 +80,15 @@
 UART_HandleTypeDef hlpuart1;
 UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart5;
+DMA_HandleTypeDef hdma_lpuart1_rx;
+DMA_HandleTypeDef hdma_lpuart1_tx;
 DMA_HandleTypeDef hdma_usart1_rx;
 DMA_HandleTypeDef hdma_usart1_tx;
-DMA_HandleTypeDef hdma_usart5_rx;
-DMA_HandleTypeDef hdma_usart5_tx;
 
 SPI_HandleTypeDef hspi1;
+SPI_HandleTypeDef hspi2;
+
+TIM_HandleTypeDef htim6;
 
 /* USER CODE BEGIN PV */
 
@@ -98,16 +101,19 @@
 static void MX_ADC_Init(void);
 static void MX_IWDG_Init(void);
 static void MX_LPTIM1_Init(void);
-static void MX_LPUART1_UART_Init(void);
 static void MX_USART1_UART_Init(void);
 static void MX_SPI1_Init(void);
+static void MX_LPUART1_UART_Init(void);
 static void MX_USART5_UART_Init(void);
+static void MX_TIM6_Init(void);
+static void MX_SPI2_Init(void);
 /* USER CODE BEGIN PFP */
 
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
+extern uint8_t shengji_flag;
 uint32_t dev_id;
 uint16_t heartbeat_timer,poll_timer,sync_timer;
 uint8_t aRxBuffer[1],group_id;
@@ -124,6 +130,7 @@
 uint8_t anjian_flag;
 uint8_t  stationary_flag;
 uint16_t stationary_num;
+uint16_t recv_end_time,ledon_time;
 u16 GetLPTime(void)
 {
 	u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
@@ -200,41 +207,58 @@
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 }
 uint16_t hardware_version,hardware_pici,hardware_type;
-uint8_t state5v = 1;
+uint8_t state5v;
 extern uint8_t du_flag;
 extern uint8_t xie_flag;
 float motor_keeptime;
 void IdleTask(void)
-{
+{uint16_t current_lptime = GetLPTime();
+    if(current_lptime-ledon_time>100||current_lptime<ledon_time-500)
+    {
+      //  Set4LEDColor(0,0,0,0);
+         Set4LEDColor_Off();
+    }
 	if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
-	{
-        	
+	{  state5v=1;
+        LoraInit();
+        HAL_UART_DMAStop(&hlpuart1); //  停止DMA传输,防止  
+        while(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))	
+      {
         UART_CheckReceive();
 		UART_CheckSend();
 		nomove_count = 0;
-       // bat_percent=Get_Battary();
-		if(state5v==0)
-		{
-			state5v=1;
-			UsartInit();
-		}
-		if(bat_percent>99)
+        
+		if(bat_percent>95)
 		{
             powerled=GREEN;
 		}else{
             powerled=RED;           
-		}		
+		}
+      }
+     HAL_NVIC_SystemReset();    
 	}else{
-        if(state5v==1)
-        {
-            state5v=0;
-            UsartDeInit();
-        }
+        state5v=0;
+            if(bat_percent>20)
+            {
+            powerled=BLUE;
+            }else{
+            powerled=RED;           
+            }
+        
+//        if(state5v==1)
+//        {
+//            state5v=0;
+//            UsartDeInit();
+//        }
 }
         if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
 		{
             SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
 		}
+        if(memcmp(g_com_map2,g_com_map,COM_MAP_SIZE)!=0)
+         {
+            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
+         }
 
 	}
 
@@ -282,7 +306,8 @@
 u8 active_flag,nomovesleeptime;
 
 void Program_Init(void)
-{	float temp;
+{	
+    float temp;
 	uint16_t temp2;
 	uint16_t i;
 	Usart1ParseDataCallback = UsartParseDataHandler;
@@ -291,7 +316,7 @@
 	hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
 	hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
 	//deca_sleep(1000);
-	g_com_map[VERSION] = (1<<8)|0;
+	g_com_map[VERSION] = (1<<8)|31;
 //    g_com_map[DEV_ID]=1158;
 //    #ifdef DEBUG_MODE
 //   // g_com_map[GROUP_ID]=21;
@@ -300,7 +325,7 @@
 //    //	g_com_map[MAX_REPORT_ANC_NUM]=1;
 //    //	g_com_map[NOMOVESLEEP_TIME]=10;
 //    #endif
-    g_com_map[GROUP_ID]=1;
+    g_com_map[GROUP_ID]=0;
 //    g_com_map[COM_INTERVAL] = 1000;
     if(g_com_map[COM_INTERVAL]<1000)
     {g_com_map[COM_INTERVAL] = 1000;}
@@ -331,6 +356,10 @@
 	{
 	  g_com_map[COM_INTERVAL]=1000;
 	}
+        if(g_com_map[LORA_POWER]>22)
+    {
+        g_com_map[LORA_POWER] = 22;
+    }
 	 if(module_power>67)
 		{module_power=67;}
 		if(module_power<0)
@@ -344,7 +373,7 @@
 //  }
 //g_com_map[NOMOVESLEEP_TIME]=5;
     printf("固件版本: URT-LORA-GPS版本 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
-	memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
+//	memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
 //	printf("DEVICE PAIRID: %d .\r\n",g_com_map[PAIR_ID]);
 //	printf("DEVICE ALARM DISTANCE: 1.%d 2.%d 3.%d .\r\n",g_com_map[ALARM_DISTANCE1],g_com_map[ALARM_DISTANCE2],g_com_map[ALARM_DISTANCE3]);
 
@@ -411,33 +440,51 @@
     HAL_ADC_DeInit(&hadc);
     HAL_ADCEx_DisableVREFINT();
 }
+extern u8 gps_chafenlingqi;
 uint16_t irq_num;
+u8 lora_irq_flag,lora_working_flag;
+//u8 uwb_irq_flag;
+extern uint8_t LoraUp_flag;
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
     if(GPIO_Pin == RADIO_DIO1_Pin)
     {
-        SystemClock_Config();
-//        HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
-//        HAL_GPIO_WritePin(RADIO_NSS_GPIO_Port, RADIO_NSS_Pin, GPIO_PIN_RESET); //片选lora有效
-//        l_bIsVibration = HIDO_TRUE;
-//        nomove_time=0;
-//        printf("RXD :77777\r\n");
-        irq_num++;
-        RadioIrqProcess();
+
+      //  SystemClock_Config();
+     irq_num++;
+        
+        if(LoraUp_flag)
+        {
+    RadioIrqProcess();
+        }
+        else
+        {
+        lora_irq_flag = 1;
+        }
     }
     if(GPIO_Pin == GPIO_PIN_1)//按键
     {
-         SystemClock_Config();
+      //   SystemClock_Config();
       anjian_flag=1;
     }
     if(GPIO_Pin == GPIO_PIN_0)//加速度
     {
-         SystemClock_Config();
+      //   SystemClock_Config();
         if(chongqi_flag==1)
         {
         HAL_NVIC_SystemReset();
         }
       nomove_count = 0;
+    }
+   if(GPIO_Pin == GPIO_PIN_9)//UWB
+    {
+//     if(!HAL_GPIO_ReadPin( RADIO_NSS_GPIO_Port, RADIO_NSS_Pin))
+//    {
+//        gps_chafenlingqi++;
+//        return;
+//    }
+//        uwb_irq_flag = 1;
+        MbxTagUwbRec();
     }
 }
 extern void Lora_tx_zubao( void );
@@ -450,7 +497,6 @@
 
 extern uint8_t GPSchangdu;
 uint8_t no_yingdaflag;
-extern  uint8_t GPS_GGAdate[200];
 uint8_t GPS_GGAdate111[200]="报警";
 
 
@@ -460,61 +506,36 @@
 }
 void GPS_Close_Init()
 {
-    
-    Delay_Ms(100);
-    HAL_UART_Transmit(&hlpuart1,Close_RMC,20,1000);
-    Delay_Ms(100);
-    HAL_UART_Transmit(&hlpuart1,Close_RMC,20,1000);
-    Delay_Ms(100);
-    HAL_UART_Transmit(&hlpuart1,Close_GSA,20,1000);
-    Delay_Ms(100);
-    HAL_UART_Transmit(&hlpuart1,Close_GSV,20,1000);
-    Delay_Ms(100);
-    HAL_UART_Transmit(&hlpuart1,Close_GLL,20,1000);
-    Delay_Ms(100);
-    HAL_UART_Transmit(&hlpuart1,Close_TXT,20,1000);
-    Delay_Ms(100);
+    HAL_UART_Transmit_DMA(&hlpuart1,Close_RMC,100);
+    Delay_Ms(150);
 }
+#define GPS_SIZE 400
 extern uint16_t Lora_rece_error;
 extern uint16_t Beepchixutime;
-#define BleRxBufferSize 1
-uint8_t aRxBuffer[1],group_id,GPSRxBuffer[BleRxBufferSize];
-uint8_t ble_rx_success_flag;
+uint8_t group_id;
 uint8_t fangzhijinrushuimian_flag;
-uint8_t GPSchangdu;
-uint8_t GPS_GGAdate[200]={1,2,3,4,5,6,7,8,9};
-void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) 
-{
-    {
-//        GPS_RecvFsm(GPSRxBuffer[0]);
-        GPS_Recv_Poll(GPSRxBuffer[0]);
-//    GPS_zhongzhuandate[GPS_zhongzhuannum]=GPSRxBuffer[0];
-//    GPS_zhongzhuannum++;
-//    if(GPS_zhongzhuandate[GPS_zhongzhuannum-1]==0x0A&&GPS_zhongzhuandate[GPS_zhongzhuannum-2]==0x0D)
+uint8_t GPS_GGAdate[GPS_SIZE];
+//void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) 
+//{
 //    {
-////        HAL_UART_Transmit(&hlpuart1,ble_rxdate,5,1000);
-//    memcpy(GPS_GGAdate,GPS_zhongzhuandate,GPS_zhongzhuannum);
-//    GPSchangdu= GPS_zhongzhuannum;
-//    memset(GPS_zhongzhuandate,0,sizeof(GPS_zhongzhuandate));
-//        GPS_zhongzhuannum=0;
+//        GPS_RecvFsm(GPSRxBuffer[0]);
+//        GPS_Recv_Poll(GPSRxBuffer[0]);
+//    GPS_GGAdate[GPS_GGAdatenum]=GPSRxBuffer[0];
+//    GPS_GGAdatenum++;
+//    if(GPS_GGAdate[GPS_GGAdatenum-1]==0x0A&&GPS_GGAdate[GPS_GGAdatenum-2]==0x0D)
+//    {
+//       GPS_ParseGGA(GPS_GGAdate, GPS_GGAdatenum);
+//    memset(GPS_GGAdate,0,sizeof(GPS_GGAdate));
+//        GPS_GGAdatenum=0;
 //        fangzhijinrushuimian_flag=0;
-//        ble_rx_success_flag=1;
-//        if(GPSchangdu>40)
-//        {
-//            gpsled=BLUE;
-//        }
-//        else
-//        {
-//            gpsled=RED;
-//        }
 //    }
-    HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
-    }
-}
-uint8_t ble_rxdate111[3]={0x11,0x22,0x33};
-void HAL_UARTEx_WakeupCallback(UART_HandleTypeDef *huart)
-{
-        SystemClock_Config();
+//    HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
+//    }
+//}
+//uint8_t ble_rxdate111[3]={0x11,0x22,0x33};
+//void HAL_UARTEx_WakeupCallback(UART_HandleTypeDef *huart)
+//{
+//        SystemClock_Config();
 // HAL_UART_Transmit(&hlpuart1,(uint8_t*)ble_rxdate111,3,1000);
 ////  huart->RxState = HAL_UART_STATE_BUSY_RX;
 //        ble_rxzhongzhuandate[ble_zhongzhuannum]=BleRxBuffer[0];
@@ -526,10 +547,15 @@
 //    memset(ble_rxzhongzhuandate,0,sizeof(ble_rxzhongzhuandate));
 //    }
 //        if(lp_time>3)
-    fangzhijinrushuimian_flag=1;
-    HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
+//      if(HAL_UART_Receive_DMA(&hlpuart1,GPS_GGAdate, LPUART_SIZE))  
+//    {
+//     Error_Handler();
+//    }   
+//    fangzhijinrushuimian_flag=1;
+//    HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
 //    HAL_UART_Transmit(&hlpuart1,ble_rxdate,2,1000);
-}
+    
+//}
 extern uint8_t  yuyin_no_sleep_flag;
 extern uint8_t yuyin_sendflag;
 extern uint8_t xiafayuyin_data[200];
@@ -540,18 +566,9 @@
     if(yuyin_sendflag)
     {
     yuyin_sendflag=0;
-  //  SYN_FrameInfo(0,yuyin_yinliang);//设置音量等级V10
-   // delay_ms(10);
     SYN_FrameInfo(0,xiafayuyin_data); //播放内容
-//    HAL_UART_Receive_IT(&huart6, &Get_Uart6_data, 1);
     memset(xiafayuyin_data,0,sizeof(xiafayuyin_data)); 
     }
-//    if(Get_Uart6_data==0x4F)
-//    {
-//HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_RESET);
-//HAL_GPIO_WritePin(GPIOC, GPIO_PIN_12, GPIO_PIN_RESET);  
-//        Get_Uart6_data=0;
-//    }
 }
 void PowerDownDetect(void)
 {  
@@ -559,11 +576,13 @@
 static uint32_t powercount=0;
     if(HAL_GPIO_ReadPin(GPIOB,GPIO_PIN_12))
       {
-          delay_ms(1000);
+          delay_ms(500);
           if(HAL_GPIO_ReadPin(GPIOB,GPIO_PIN_12))
           {     
               while(1)
               {
+                  Set4LEDColor(RED,RED,RED,RED);
+                  recv_end_time=0;
                 if(HAL_GPIO_ReadPin(GPIOB,GPIO_PIN_12)==0) 
                 {
                     delay_ms(100);
@@ -573,10 +592,14 @@
           }
       }
 }
+uint8_t only_one_flag;
 uint8_t gotosleep_flag;
 uint8_t usart5_state,flag_onesecond;
 void Jingzhi_Poll(void)
 {
+    if(only_one_flag==0)
+    {
+        only_one_flag=1;
           powerled=LEDOFF;
           loraled=LEDOFF;
           gpsled=LEDOFF;
@@ -584,6 +607,7 @@
           HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET); //GuanGPS and lora 电源
           HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_RESET); //guan uwb 电源
           HAL_SPI_DeInit(&hspi1);
+          HAL_SPI_DeInit(&hspi2);
           HAL_GPIO_WritePin( RADIO_NSS_GPIO_Port, RADIO_NSS_Pin,GPIO_PIN_RESET);//lora  cs
           HAL_GPIO_WritePin( GPIOA, GPIO_PIN_4,GPIO_PIN_RESET);//uwb cs
           HAL_GPIO_WritePin( GPIOC, GPIO_PIN_3,GPIO_PIN_RESET);//LORA REST
@@ -593,6 +617,7 @@
 
           Set4LEDColor_Off(); //关led总电源
           chongqi_flag=1;
+    }
 }
 void OneSecondTask(void)
 {
@@ -601,20 +626,47 @@
         flag_onesecond = 0;
     }
 }
+uint8_t GPS_Close_time;
+uint8_t GPS_Close_flag=1;
+uint8_t debugnum;
 uint8_t Lora_send_flag;
+extern uint8_t rec_secdelay;
 void Lora_Send_Poll(void)
 {
-        if(Lora_send_flag)
-        {
-        Lora_send_flag=0;    
-//        LedTask();
-            loraled=BLUE;
+    
+    if(Lora_send_flag)
+    { 
+        debugnum++;
+        Lora_send_flag=0; 
+        if(rec_secdelay>0)
+            {
+                loraled=YELLOW;
+                rec_secdelay--;
+                return;
+            }        
+        loraled=BLUE;
         LoraReportPoll();
         flag_onesecond = 1;
-        
-Set4LEDColor_Off(); 
-        }
+    }
 
+}
+extern  volatile uint16_t rx_len ;  //接收一帧数据的长度
+extern volatile uint8_t recv_end_flag; //一帧数据接收完成标志
+void Lpuart_rx_Poll(void)
+{
+    if(recv_end_flag == 1)  //接收完成标志
+    {
+        uint16_t i;
+        recv_end_time=0;
+        for(i=0;i<GPS_SIZE;i++)
+        {GPS_RecvFsm(GPS_GGAdate[i]);}
+    //GPS_ParseGGA(GPS_GGAdate, rx_len);  
+        memset(GPS_GGAdate,0,GPS_SIZE);
+        rx_len = 0;//清除计数
+        recv_end_flag = 0;//清除接收结束标志位
+        fangzhijinrushuimian_flag=0;
+    }
+    HAL_UART_Receive_DMA(&hlpuart1,GPS_GGAdate,LPUART_SIZE);//重新打开DMA接收
 }
 /* USER CODE END 0 */
 
@@ -650,48 +702,54 @@
   MX_ADC_Init();
 //  MX_IWDG_Init();
   MX_LPTIM1_Init();
-  MX_LPUART1_UART_Init();
   MX_USART1_UART_Init();
   MX_SPI1_Init();
+  MX_LPUART1_UART_Init();
   MX_USART5_UART_Init();
+  MX_TIM6_Init();
+  MX_SPI2_Init();
   /* USER CODE BEGIN 2 */
-//    LED_LG_ON;
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_SET); //开GPS电源
-    delay_ms(10);
+    delay_ms(100);
     HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET); //开uwb电源
-//delay_ms(1000);
-
     Program_Init();
-    LIS3DH_Data_Init();	
+    MX_IWDG_Init(); //看门狗务必放到开GPS电源开uwb电源后面,否则GPS工作不正常。
+  HAL_GPIO_WritePin(GPIOC, GPIO_PIN_1, GPIO_PIN_SET);
+  GPIO_InitStruct.Pin = GPIO_PIN_1;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+#ifdef _USE_BAR
+//BarInit();
+#endif 
     Dw1000_Init();
-    //	HardWareTypeDiffConfig();
     dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
     dwt_entersleep();
+
+    LIS3DH_Data_Init();	
+    Set4LEDColor(RED,RED,RED,RED);
+    delay_ms(100);
+    Set4LEDColor_Off();
+    delay_ms(100);
+    LoraInit();
+//    delay_ms(1000);
+bat_percent=Get_Battary();
+        GPS_Close_flag=0;
+        GPS_Close_Init();      
+    if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, 0) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
+  {
+    Error_Handler();
+  } 
+//  HAL_UART_Receive_DMA(&hlpuart1,GPS_GGAdate,LPUART_SIZE);//重新打开DMA接收
+  __HAL_UART_ENABLE_IT(&hlpuart1, UART_IT_IDLE); //使能IDLE中断
      if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
     {
      Error_Handler();
     }
-    delay_ms(1000);
-    GPS_Close_Init();
-    HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
-
-    Set4LEDColor(RED,RED,RED,RED);
-    HAL_Delay(500);
-    Set4LEDColor(GREEN,GREEN,GREEN,GREEN);
-    HAL_Delay(500);
-    Set4LEDColor_Off();
-    HAL_Delay(500);
-    LoraInit();
-    
-#ifdef _USE_BAR
-BarInit();
-#endif 
-    if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, 0) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
-  {
-    Error_Handler();
-  }
-//    Lora47X_Init();
-//    Radio.Sleep();
+    HAL_TIM_Base_Start_IT(&htim6);
+    memcpy(g_com_map2,g_com_map,COM_MAP_SIZE);
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -704,34 +762,54 @@
       if(gotosleep_flag==1)
       {
           Jingzhi_Poll();
+//          HAL_IWDG_Refresh(&hiwdg);
           HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
       }
       else
       {
+//      HAL_IWDG_Refresh(&hiwdg);
+          if(lora_irq_flag)
+          {
+              lora_irq_flag = 0;
+              lora_working_flag = 1;
+              RadioIrqProcess();
+              lora_working_flag = 0;
+          }
+//          if(uwb_irq_flag)
+//          {
+//              MbxTagUwbRec();
+//              uwb_irq_flag=0;
+//          }
+      Lpuart_rx_Poll();
       OneSecondTask();
       IdleTask();	
       PowerDownDetect();
       Lora_Send_Poll();
-    #ifndef DEBUG_MODE	
-    if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))	
-  {      
-      if(fangzhijinrushuimian_flag==0&&yuyin_no_sleep_flag==0)
-          {
-      if(usart5_state==0)
-      {
-      usart5_state=1;
-      Usart5DeInit();
-      }
-    Selection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
-    HAL_UARTEx_EnableClockStopMode(&hlpuart1);
-    HAL_UARTEx_EnableStopMode( &hlpuart1 );
-    HAL_UARTEx_StopModeWakeUpSourceConfig( &hlpuart1, Selection );
-    __HAL_UART_ENABLE_IT(&hlpuart1, UART_IT_WUF);   
-//    Set4LEDColor_Off();              
-    HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
-          }
-  }
-    #endif
+      TTSchaxun_Busy();
+      LoraUp_Poll();
+//    #ifndef DEBUG_MODE	
+//    if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))	
+//  {      
+//      if(fangzhijinrushuimian_flag==0&&yuyin_no_sleep_flag==0)
+//          {
+//      if(usart5_state==0)
+//      {
+//      usart5_state=1;
+//      Usart5DeInit();
+//      }
+//      if(GPS_Close_flag==0)
+//      {
+//    Selection.WakeUpEvent = UART_WAKEUP_ON_STARTBIT;
+//    HAL_UARTEx_EnableClockStopMode(&hlpuart1);
+//    HAL_UARTEx_EnableStopMode( &hlpuart1 );
+//    HAL_UARTEx_StopModeWakeUpSourceConfig( &hlpuart1, Selection );
+//    __HAL_UART_ENABLE_IT(&hlpuart1, UART_IT_WUF);   
+//      }
+////    Set4LEDColor_Off();              
+//    HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
+//          }
+//  }
+//    #endif
       }
   }
   /* USER CODE END 3 */
@@ -790,7 +868,7 @@
   PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART1|RCC_PERIPHCLK_LPUART1
                               |RCC_PERIPHCLK_LPTIM1;
   PeriphClkInit.Usart1ClockSelection = RCC_USART1CLKSOURCE_PCLK2;
-  PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_LSE;
+  PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
   PeriphClkInit.LptimClockSelection = RCC_LPTIM1CLKSOURCE_LSE;
 
   if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
@@ -823,7 +901,7 @@
   hadc.Init.OversamplingMode = DISABLE;
   hadc.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV2;
   hadc.Init.Resolution = ADC_RESOLUTION_12B;
-  hadc.Init.SamplingTime = ADC_SAMPLETIME_1CYCLE_5;
+  hadc.Init.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
   hadc.Init.ScanConvMode = ADC_SCAN_DIRECTION_FORWARD;
   hadc.Init.DataAlign = ADC_DATAALIGN_RIGHT;
   hadc.Init.ContinuousConvMode = DISABLE;
@@ -845,14 +923,6 @@
   */
   sConfig.Channel = ADC_CHANNEL_1;
   sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
-  if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure for the selected ADC regular channel to be converted.
-  */
-  sConfig.Channel = ADC_CHANNEL_VREFINT;
   if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
   {
     Error_Handler();
@@ -1082,6 +1152,82 @@
 }
 
 /**
+  * @brief SPI2 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_SPI2_Init(void)
+{
+
+  /* USER CODE BEGIN SPI2_Init 0 */
+
+  /* USER CODE END SPI2_Init 0 */
+
+  /* USER CODE BEGIN SPI2_Init 1 */
+
+  /* USER CODE END SPI2_Init 1 */
+  /* SPI2 parameter configuration*/
+  hspi2.Instance = SPI2;
+  hspi2.Init.Mode = SPI_MODE_MASTER;
+  hspi2.Init.Direction = SPI_DIRECTION_2LINES;
+  hspi2.Init.DataSize = SPI_DATASIZE_8BIT;
+  hspi2.Init.CLKPolarity = SPI_POLARITY_LOW;
+  hspi2.Init.CLKPhase = SPI_PHASE_1EDGE;
+  hspi2.Init.NSS = SPI_NSS_SOFT;
+  hspi2.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2;
+  hspi2.Init.FirstBit = SPI_FIRSTBIT_MSB;
+  hspi2.Init.TIMode = SPI_TIMODE_DISABLE;
+  hspi2.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
+  hspi2.Init.CRCPolynomial = 7;
+  if (HAL_SPI_Init(&hspi2) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN SPI2_Init 2 */
+__HAL_SPI_ENABLE(&hspi2);
+  /* USER CODE END SPI2_Init 2 */
+
+}
+
+/**
+  * @brief TIM6 Initialization Function
+  * @param None
+  * @retval None
+  */
+static void MX_TIM6_Init(void)
+{
+
+  /* USER CODE BEGIN TIM6_Init 0 */
+
+  /* USER CODE END TIM6_Init 0 */
+
+  TIM_MasterConfigTypeDef sMasterConfig = {0};
+
+  /* USER CODE BEGIN TIM6_Init 1 */
+
+  /* USER CODE END TIM6_Init 1 */
+  htim6.Instance = TIM6;
+  htim6.Init.Prescaler = 32-1;
+  htim6.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htim6.Init.Period = 1000-1;
+  htim6.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+  if (HAL_TIM_Base_Init(&htim6) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
+  if (HAL_TIMEx_MasterConfigSynchronization(&htim6, &sMasterConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN TIM6_Init 2 */
+
+  /* USER CODE END TIM6_Init 2 */
+
+}
+
+/**
   * Enable DMA controller clock
   */
 static void MX_DMA_Init(void)
@@ -1091,11 +1237,8 @@
   __HAL_RCC_DMA1_CLK_ENABLE();
 
   /* DMA interrupt init */
-  /* DMA1_Channel1_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
-  HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
   /* DMA1_Channel2_3_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 1, 0);
+  HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel2_3_IRQn);
   /* DMA1_Channel4_5_6_7_IRQn interrupt configuration */
   HAL_NVIC_SetPriority(DMA1_Channel4_5_6_7_IRQn, 0, 0);
@@ -1123,25 +1266,23 @@
   HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13|GPIO_PIN_7|GPIO_PIN_8, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOC, RADIO_NSS_Pin|RADIO_nRESET_Pin|GPIO_PIN_4, GPIO_PIN_SET);
-
-  /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOA, GPIO_PIN_4|GPIO_PIN_8, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0|GPIO_PIN_2|GPIO_PIN_4|GPIO_PIN_5
-                          |GPIO_PIN_7, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(GPIOC, GPIO_PIN_4, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_10|SCL_Pin|SDA_Pin|GPIO_PIN_6, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GPIOB, RADIO_NSS_Pin|RADIO_nRESET_Pin|SCL_Pin|SDA_Pin
+                          |GPIO_PIN_6, GPIO_PIN_SET);
+
+  /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_7, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12|GPIO_PIN_15, GPIO_PIN_RESET);
 
-  /*Configure GPIO pins : PC13 RADIO_NSS_Pin RADIO_nRESET_Pin PC4
-                           PC7 PC8 */
-  GPIO_InitStruct.Pin = GPIO_PIN_13|RADIO_NSS_Pin|RADIO_nRESET_Pin|GPIO_PIN_4
-                          |GPIO_PIN_7|GPIO_PIN_8;
+  /*Configure GPIO pins : PC13 PC4 PC7 PC8 */
+  GPIO_InitStruct.Pin = GPIO_PIN_13|GPIO_PIN_4|GPIO_PIN_7|GPIO_PIN_8;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@@ -1160,9 +1301,9 @@
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : PB0 PB2 PB10 PB4
+  /*Configure GPIO pins : RADIO_NSS_Pin PB2 RADIO_nRESET_Pin PB4
                            PB5 PB6 PB7 */
-  GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_2|GPIO_PIN_10|GPIO_PIN_4
+  GPIO_InitStruct.Pin = RADIO_NSS_Pin|GPIO_PIN_2|RADIO_nRESET_Pin|GPIO_PIN_4
                           |GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -1183,7 +1324,7 @@
 
   /*Configure GPIO pins : SCL_Pin SDA_Pin */
   GPIO_InitStruct.Pin = SCL_Pin|SDA_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
@@ -1194,18 +1335,18 @@
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
+  /*Configure GPIO pins : PC9 RADIO_DIO1_Pin */
+  GPIO_InitStruct.Pin = GPIO_PIN_9|RADIO_DIO1_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+
   /*Configure GPIO pins : PA8 PA12 PA15 */
   GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_12|GPIO_PIN_15;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-  /*Configure GPIO pin : RADIO_DIO1_Pin */
-  GPIO_InitStruct.Pin = RADIO_DIO1_Pin;
-  GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
-  GPIO_InitStruct.Pull = GPIO_NOPULL;
-  HAL_GPIO_Init(RADIO_DIO1_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pin : INPUT_5V_Pin */
   GPIO_InitStruct.Pin = INPUT_5V_Pin;
@@ -1217,7 +1358,7 @@
   HAL_NVIC_SetPriority(EXTI0_1_IRQn, 2, 0);
   HAL_NVIC_EnableIRQ(EXTI0_1_IRQn);
 
-  HAL_NVIC_SetPriority(EXTI4_15_IRQn, 2, 0);
+  HAL_NVIC_SetPriority(EXTI4_15_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(EXTI4_15_IRQn);
 
 }
@@ -1256,12 +1397,18 @@
 uint16_t no_data_chongqi_num;
 uint8_t no_yingdatime;
 #define YUYINSTOP_TIME 10
-void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
+uint8_t bat_time;
+void Bat_Percent_Poll()
 {
-//    uint8_t pinlv;
-    SystemClock_Config();
-    HAL_IWDG_Refresh(&hiwdg);
-Set4LEDColor(powerled,loraled,gpsled,uwbled);
+    bat_time++;
+    if(bat_time>100)
+    {
+        bat_time=0;
+    bat_percent=Get_Battary();
+    }
+}
+void Yuying_Poll()
+{
     yuyinzidongguan_time++;
     if(yuyinzidongguan_time>YUYINSTOP_TIME)
     {
@@ -1270,19 +1417,61 @@
     HAL_GPIO_WritePin(GPIOC, GPIO_PIN_12, GPIO_PIN_RESET); 
     yuyin_no_sleep_flag=0;
     }
-    Lora_send_flag=1;
-    if(nomove_count++>g_com_map[STATIONARY_TIME])
+}
+#define NOGPS_RESET_TIME 300
+u8 state_count = 0;
+void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
+{
+ if(chongqi_flag==0&&shengji_flag==0)
+ {
+//    SystemClock_Config();
+    Set4LEDColor(uwbled,gpsled,loraled,powerled); //代码有BUG需要执行2次,否则电源灯不亮
+    Set4LEDColor(uwbled,gpsled,loraled,powerled);
+    //Set4LEDColor(powerled,loraled,gpsled,uwbled);
+    ledon_time = GetLPTime();
+    Bat_Percent_Poll();
+    if(state5v==0)
     {
-        stationary_flag = 1;
-    } else {
-        stationary_flag = 0;
+        if(yuyin_no_sleep_flag==0)
+        {
+            recv_end_time++;
+            if(recv_end_time>NOGPS_RESET_TIME)
+            {HAL_NVIC_SystemReset();}
+        }
+        Yuying_Poll();
+        state_count++;
+        switch(state_count)
+        {
+            case 0:
+                
+                break;
+            case 1:
+                break;
+            case 2:
+                break;
+        }
+        Lora_send_flag=1;
+        if(nomove_count++>g_com_map[STATIONARY_TIME])
+        {
+            stationary_flag = 1;
+        } 
+        else 
+        {
+            stationary_flag = 0;
+        }
+        if(nomove_count>=g_com_map[NOMOVESLEEP_TIME]-1&&imu_enable)
+        {
+            gotosleep_flag=1;
+        } else {
+            gotosleep_flag=0;
+        }
     }
-    if(nomove_count>=g_com_map[NOMOVESLEEP_TIME]-1&&imu_enable)
-    {
-        gotosleep_flag=1;
-    } else {
-        gotosleep_flag=0;
-    }
+//    powerled=LEDOFF;
+//    loraled=LEDOFF;
+//    gpsled=LEDOFF;
+//    uwbled=LEDOFF;
+//    Set4LEDColor_Off();
+ }
 }
 /* USER CODE END 4 */
 

--
Gitblit v1.9.3