From ed70b0682806d4659456fa28dd9bdd22fcb037ce Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 06 十二月 2024 16:38:03 +0800
Subject: [PATCH] 功率测试最新代码

---
 Src/main.c |  285 ++++++++++++++++++++++++--------------------------------
 1 files changed, 124 insertions(+), 161 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 92e041b..5a214f1 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -38,6 +38,7 @@
 #include "WS2812.h"
 #include "syn6288.h"
 #include "dw_mbx_tag.h"
+#include "GPS.h"
 #define NSH1 0x0001
 #define GP   0x0002
 #define FLASH_HARDWARE_VERSION_MAP		(uint32_t)0x08004F00    //硬件版本号和批次信息位置
@@ -70,7 +71,6 @@
 
 /* Private variables ---------------------------------------------------------*/
  ADC_HandleTypeDef hadc;
-DMA_HandleTypeDef hdma_adc;
 
 IWDG_HandleTypeDef hiwdg;
 
@@ -220,7 +220,6 @@
 		if(bat_percent>99)
 		{
             powerled=GREEN;
-     
 		}else{
             powerled=RED;           
 		}		
@@ -230,11 +229,6 @@
             state5v=0;
             UsartDeInit();
         }
-//    powerled=LEDOFF;
-//    Set4LEDColor(powerled,loraled,gpsled,uwbled);
-//    gpsled=LEDOFF;
-//    Set4LEDColor(powerled,loraled,gpsled,uwbled);    
-//	}
 }
         if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
 		{
@@ -247,34 +241,7 @@
 u16 total_slotnum,current_slotnum;
 extern int32_t offsettimeus;
 //u16 last_lpcount = 0;
-void SetNextPollTime(u16 time)
-{
-  int32_t lpcount1,lptime1,target_time1;
-int32_t last_lpcount1;
-//	if(current_slotnum>=total_slotnum)
-//		current_slotnum-=total_slotnum;
-//	
-//	target_time=((current_slotnum*g_com_map[COM_INTERVAL])+time)*1000;
-//	//if(target_time<90000)
-//	{
-//		lptime=target_time-offsettimeus;
-//		lpcount = lptime/LPTIMER_LSB;
-//	if(lpcount>LPTIMER_1S_COUNT)
-//		lpcount-=LPTIMER_1S_COUNT;
-//	if(lpcount<0)
-//	{
-//	lpcount+=LPTIMER_1S_COUNT;
-//	}
-    last_lpcount1=HAL_LPTIM_ReadCounter(&hlptim1);
-    lpcount1 = last_lpcount1+32.768*time;
-    while(lpcount1>LPTIMER_1S_COUNT)
-    {
-        lpcount1-=LPTIMER_1S_COUNT;
-    }
-//    last_lpcount = lpcount;
-	__HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount1+32768);
 
-}
 
 /* 返回ch字符在sign数组中的序号 */
 int getIndexOfSigns(char ch)
@@ -323,7 +290,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)|1;
 //    g_com_map[DEV_ID]=1158;
 //    #ifdef DEBUG_MODE
 //   // g_com_map[GROUP_ID]=21;
@@ -332,13 +299,13 @@
 //    //	g_com_map[MAX_REPORT_ANC_NUM]=1;
 //    //	g_com_map[NOMOVESLEEP_TIME]=10;
 //    #endif
-    g_com_map[GROUP_ID]=5;
+    g_com_map[GROUP_ID]=1;
 //    g_com_map[COM_INTERVAL] = 1000;
     if(g_com_map[COM_INTERVAL]<1000)
     {g_com_map[COM_INTERVAL] = 1000;}
     active_flag = g_com_map[ACTIVE_INDEX];
     module_power = g_com_map[POWER];
-    g_com_map[IMU_ENABLE] = 0;
+//    g_com_map[IMU_ENABLE] = 0;
 	imu_enable=g_com_map[IMU_ENABLE];
 	motor_enable=g_com_map[MOTOR_ENABLE];
 
@@ -352,11 +319,11 @@
     tag_frequency = 1000/g_com_map[COM_INTERVAL];
 	total_slotnum = 1000/g_com_map[COM_INTERVAL];
     nomovesleeptime = g_com_map[NOMOVESLEEP_TIME];
-	if(active_flag==0)
-	{   
-		imu_enable=1;
-		nomovesleeptime =10;		
-	}
+//	if(active_flag==0)
+//	{   
+//		imu_enable=1;
+//		nomovesleeptime =10;		
+//	}
 
  //   g_com_map[COM_INTERVAL]=100;
 		if(g_com_map[COM_INTERVAL]==0)
@@ -370,10 +337,6 @@
 
 	current_slotnum=1;
 //	current_time=GetLPTime();
-		if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, 0) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
-  {
-    Error_Handler();
-  }
 //  		if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, slot_startcount) != HAL_OK)  //system time is 1010ms   1 puls=30.518us
 //  {
 //    Error_Handler();
@@ -463,11 +426,17 @@
     }
     if(GPIO_Pin == GPIO_PIN_1)//按键
     {
+         SystemClock_Config();
       anjian_flag=1;
     }
     if(GPIO_Pin == GPIO_PIN_0)//加速度
     {
-        
+         SystemClock_Config();
+        if(chongqi_flag==1)
+        {
+        HAL_NVIC_SystemReset();
+        }
+      nomove_count = 0;
     }
 }
 extern void Lora_tx_zubao( void );
@@ -478,29 +447,6 @@
 uint8_t lora_tx_flag;
 uint8_t lora_txanchor_power_flag;
 
-u8 lora_seq_nb1;
-static uint8_t send_frame1[EUART_RX_BUF_SIZE];
-uint8_t data_length1;
-void LoraSendComMap(uint8_t data_length, uint8_t index)
-{
-	uint16_t checksum = 0;
-	send_frame1[0] = 0x55;
-	send_frame1[1] = 0xAA;
-	send_frame1[2] = 0x39;
-	send_frame1[3] = data_length+5;
-	send_frame1[4] = 3;
-	send_frame1[5] = index;
-	send_frame1[6] = data_length;
-	memcpy(&send_frame1[7], &g_com_map[index], data_length);
-	for(int i = 0; i<(data_length+5); i++)
-	{
-		checksum += send_frame1[2+i];
-	}
-	checksum = Checksum_u16(&send_frame1[2],5+data_length);
-	memcpy(&send_frame1[7+data_length],&checksum,2);
-	data_length1=data_length+9;
-//	UART_PushFrame(send_frame1, data_length+9);	
-}
 extern uint8_t GPSchangdu;
 uint8_t no_yingdaflag;
 extern  uint8_t GPS_GGAdate[200];
@@ -534,35 +480,33 @@
 uint8_t aRxBuffer[1],group_id,GPSRxBuffer[BleRxBufferSize];
 uint8_t ble_rx_success_flag;
 uint8_t fangzhijinrushuimian_flag;
-uint8_t GPS_zhongzhuandate[200];
-uint8_t GPS_zhongzhuannum;
 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_zhongzhuandate[GPS_zhongzhuannum]=GPSRxBuffer[0];
-    GPS_zhongzhuannum++;
-    if(GPS_zhongzhuandate[GPS_zhongzhuannum-1]==0x0A&&GPS_zhongzhuandate[GPS_zhongzhuannum-2]==0x0D)
-    {
-//        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;
-        fangzhijinrushuimian_flag=0;
-        ble_rx_success_flag=1;
-        if(GPSchangdu>40)
-        {
-            gpsled=BLUE;
-//    Set4LEDColor(powerled,loraled,gpsled,uwbled);
-        }
-        else
-        {
-            gpsled=RED;
-//    Set4LEDColor(powerled,loraled,gpsled,uwbled);z
-        }
-    }
+//        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)
+//    {
+////        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;
+//        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);
     }
 }
@@ -585,13 +529,6 @@
     HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
 //    HAL_UART_Transmit(&hlpuart1,ble_rxdate,2,1000);
 }
-//void GPS_rx_Poll()
-//{
-//  if(ble_rx_success_flag)
-//  {
-//  ble_rx_success_flag=0;
-//  }
-//}
 extern uint8_t  yuyin_no_sleep_flag;
 extern uint8_t yuyin_sendflag;
 extern uint8_t xiafayuyin_data[200];
@@ -602,8 +539,8 @@
     if(yuyin_sendflag)
     {
     yuyin_sendflag=0;
-    SYN_FrameInfo(0,yuyin_yinliang);//设置音量等级V10
-    delay_ms(10);
+  //  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)); 
@@ -635,6 +572,7 @@
           }
       }
 }
+uint8_t gotosleep_flag;
 uint8_t usart5_state,flag_onesecond;
 void Jingzhi_Poll(void)
 {
@@ -661,6 +599,27 @@
     {
         flag_onesecond = 0;
     }
+}
+uint8_t debugnum;
+uint8_t Lora_send_flag;
+void Lora_Send_Poll(void)
+{
+        if(Lora_send_flag)
+        {
+            debugnum++;
+        Lora_send_flag=0;    
+//        LedTask();
+            loraled=BLUE;
+        LoraReportPoll();
+        flag_onesecond = 1;
+        
+          powerled=LEDOFF;
+          loraled=LEDOFF;
+          gpsled=LEDOFF;
+          uwbled=LEDOFF;
+Set4LEDColor_Off(); 
+        }
+
 }
 /* USER CODE END 0 */
 
@@ -708,22 +667,46 @@
 //delay_ms(1000);
 
     Program_Init();
+    if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
+    {
+     Error_Handler();
+    }
+        g_com_map[POWER]=67;
+    Dw1000_Init();
+//    Dw1000_App_Init();
+    Delay_Ms(10);
+        dwt_configcontinuousframemode(124800);
+        dwt_writetxfctrl(13, 0);
+        dwt_starttx(DWT_START_TX_IMMEDIATE);
+        while(1)
+        {		
+        IdleTask();	
+        }
     LIS3DH_Data_Init();	
     Dw1000_Init();
     //	HardWareTypeDiffConfig();
     dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
     dwt_entersleep();
-     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(GREEN,RED,RED,RED);
+
+    Set4LEDColor(RED,RED,RED,RED);
     HAL_Delay(500);
-    Set4LEDColor(GREEN,GREEN,GREEN,RED);
+    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();
   /* USER CODE END 2 */
@@ -735,10 +718,17 @@
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
+      if(gotosleep_flag==1)
+      {
+          Jingzhi_Poll();
+          HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+      }
+      else
+      {
       OneSecondTask();
       IdleTask();	
       PowerDownDetect();
-      
+      Lora_Send_Poll();
     #ifndef DEBUG_MODE	
     if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))	
   {      
@@ -754,12 +744,12 @@
     HAL_UARTEx_EnableStopMode( &hlpuart1 );
     HAL_UARTEx_StopModeWakeUpSourceConfig( &hlpuart1, Selection );
     __HAL_UART_ENABLE_IT(&hlpuart1, UART_IT_WUF);   
-    Set4LEDColor_Off();              
+//    Set4LEDColor_Off();              
     HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
           }
   }
     #endif
-    
+      }
   }
   /* USER CODE END 3 */
 }
@@ -850,7 +840,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;
@@ -872,14 +862,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();
@@ -1118,9 +1100,6 @@
   __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_EnableIRQ(DMA1_Channel2_3_IRQn);
@@ -1281,50 +1260,34 @@
 uint8_t lora_yingdatime;
 extern uint8_t lora_chongfuyingda_flag;
 uint16_t no_data_chongqi_num;
-
 uint8_t no_yingdatime;
+#define YUYINSTOP_TIME 10
 void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
 {
 //    uint8_t pinlv;
     SystemClock_Config();
-    Set4LEDColor(uwbled,gpsled,loraled,powerled);
-    LoraReportPoll();
-    lp_time++;
-
-    no_data_chongqi_num++;
-    stationary_num++;
-
-    flag_onesecond = 1;
-    if(no_yingdaflag==1)
-    {
-    no_yingdatime++;
-        if(no_yingdatime>=5)
-        {
-            no_yingdaflag=0;
-            no_yingdatime=0;
-        }
-    }
-
-    if( no_data_chongqi_num>600)
-    {NVIC_SystemReset();}
-    SetNextPollTime(0);
- 
-    if(lp_time%(g_com_map[COM_INTERVAL]/1000)==0)
-    {
-        lora_txanchor_power_flag=0;
-    }
-
-    if(stationary_num>=30)
-    {stationary_num=0;
-    stationary_flag=1;
-    }
+    HAL_IWDG_Refresh(&hiwdg);
+Set4LEDColor(powerled,loraled,gpsled,uwbled);
     yuyinzidongguan_time++;
-    if(yuyinzidongguan_time>10)
+    if(yuyinzidongguan_time>YUYINSTOP_TIME)
     {
-        yuyinzidongguan_time=0;
-        HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_RESET);
-        HAL_GPIO_WritePin(GPIOC, GPIO_PIN_12, GPIO_PIN_RESET); 
-        yuyin_no_sleep_flag=0;
+    yuyinzidongguan_time=0;
+    HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_RESET);
+    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])
+    {
+        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;
     }
 }
 /* USER CODE END 4 */

--
Gitblit v1.9.3