V2.73 修复震动问题

yincheng.zhong

2023-10-27 5c1253a1b81a85c49669898a6c193a919968bd47

 Src/main.c

@@ -31,7 +31,7 @@

#define NSH1 0x0001
#define GP   0x0002
#define DEBUG_MODE
//#define DEBUG_MODE
/* USER CODE END Includes */

/* Private typedef -----------------------------------------------------------*/
@@ -99,25 +99,51 @@
   u16 count=HAL_LPTIM_ReadCounter(&hlptim1);
 return count*LPTIMER_LSB/1000;
}   
extern volatile int32_t m_EUART_DMA_RXPtr;	
void UsartInit(void)
{
   waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
//   waitusart_timer = tag_frequency*USART_KEEPWAKE_TIME;
    MX_DMA_Init();
   MX_USART1_UART_Init();
 if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
   {
    Error_Handler();
   }
    m_EUART_DMA_RXPtr = 0;
}
static void MX_DMA_DeInit(void)
{

  /* DMA controller clock enable */
  __HAL_RCC_DMA1_CLK_DISABLE();

  /* DMA interrupt init */
  /* DMA1_Channel2_3_IRQn interrupt configuration */
 // HAL_NVIC_SetPriority(DMA1_Channel2_3_IRQn, 1, 0);
  HAL_NVIC_DisableIRQ(DMA1_Channel2_3_IRQn);

}
void UsartDeInit(void)
{
    GPIO_InitTypeDef GPIO_InitStruct = {0};
    waitusart_timer = 0;
    MX_DMA_DeInit();
    HAL_UART_DeInit(&huart1);
    GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_10;
    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
    GPIO_InitStruct.Pull = GPIO_NOPULL;
    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
}
uint16_t hardware_version,hardware_pici,hardware_type;
u16 current_time;
uint8_t state5v;
uint8_t state5v = 1;
void IdleTask(void)
{
	
         UART_CheckReceive();
   if(state5v)
    {
        UART_CheckReceive();
      UART_CheckSend();

    }
if(huart1.Instance->ISR&USART_ISR_FE)
   {
//   SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
@@ -136,9 +162,8 @@
      if(motor_keeptime>0)
      {
         motor_state = 2;
      }else{
         motor_state = 0;
      }
      //motor_state=2;
   switch(motor_state)
      {case 0:
         if(hardware_type==NSH1)
@@ -202,7 +227,11 @@
         LED_LG_OFF;      
      }      
   }else{
      state5v=0;
      if(state5v==1)
        {
            state5v=0;
            UsartDeInit();
        }
      LED_LR_OFF;
      LED_LG_OFF;
//   }
@@ -256,19 +285,25 @@



void ErrorConfig_Handler(void)
void CheckComMap(void)
{
      if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
    if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
   {
     g_com_map[COM_INTERVAL]=100;
   }
   if(g_com_map[IMU_THRES]>10)
   {g_com_map[IMU_THRES]=2;}
    if(g_com_map[POWER]>MAX_RFPOWER)
      {g_com_map[POWER]=MAX_RFPOWER;}
      if(g_com_map[POWER]<0)
      {g_com_map[POWER]=0;}
    if(g_com_map[POWER]>MAX_RFPOWER)
        {g_com_map[POWER]=MAX_RFPOWER;}
    if(g_com_map[POWER]<0)
        {g_com_map[POWER]=0;}
    if(g_com_map[STATIONARY_TIME]==0)
        {
        g_com_map[STATIONARY_TIME]=10;
        }
        
}
uint8_t uwb_active_flag = 0;
u8 active_flag=0;
void Program_Init(void)
{   float temp;
@@ -280,14 +315,14 @@
   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] = 0x0225;
   g_com_map[VERSION] = (2<<8)|73;
    
//   g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
//   g_com_map[DEV_ROLE]=1;
//      g_com_map[DEV_ID]=0x4009;
   //   g_com_map[DEV_ID]=0x4009;
//    g_com_map[ACTIVE_INDEX]=1;
   g_com_map[COM_INTERVAL]=50;
//   g_com_map[COM_INTERVAL]=50;
//   g_com_map[MAX_REPORT_ANC_NUM]=1;
//   g_com_map[NOMOVESLEEP_TIME]=10;
//         g_com_map[IMU_ENABLE]=0;
@@ -295,7 +330,8 @@
#endif
//g_com_map[NOMOVESLEEP_TIME]=10;
//   g_com_map[IMU_ENABLE]=0;
    g_com_map[COM_INTERVAL]=50;
//    g_com_map[COM_INTERVAL]=50;
CheckComMap();
   active_flag = g_com_map[ACTIVE_INDEX];
   if(active_flag==0)
   {   
@@ -308,11 +344,11 @@
   module_power = g_com_map[POWER];
   imu_enable=g_com_map[IMU_ENABLE];
   motor_enable=g_com_map[MOTOR_ENABLE];
	
   uwb_active_flag = g_com_map[UWB_ACTIVE_FLAG_IDX];
   group_id=g_com_map[GROUP_ID];
   dev_id = g_com_map[DEV_ID];
   //slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
      slottime = 5;
   slottime = 5;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
   slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
@@ -351,14 +387,15 @@

void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
//hardware_type=2;
if(hardware_type == 0)
    hardware_type = 1;
   GPIO_InitTypeDef GPIO_InitStruct = {0};
   if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
   {
         g_com_map[MOTORBEEPER_INDEX] = 2;
   }
   hardware_type   = g_com_map[MOTORBEEPER_INDEX];
   switch(hardware_type)
      {
        case 1:
	  
        case 1:	  
            HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
            GPIO_InitStruct.Pin = MOTOR_Pin;
            GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -370,6 +407,25 @@
         MX_TIM2_Init();
         break;
      }
}

void DoubleClickProcess(void)
{ char temp[50];
  uint8_t len;  
if(uwb_active_flag)
{
    uwb_active_flag = 0;
    HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
    HAL_Delay(3000);
    HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
}else{
    uwb_active_flag = 1;
    HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
    HAL_Delay(1000);
    HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
}
   g_com_map[UWB_ACTIVE_FLAG_IDX]= uwb_active_flag;
save_com_map_to_flash();
}
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
{
@@ -414,20 +470,21 @@
  /* USER CODE BEGIN 2 */
   LED_LG_ON;
   Program_Init();
   LIS3DH_Data_Init();	
    BarInit();
   Accelerometer_Init();	
 //   BarInit();
   Dw1000_Init();
   Dw1000_App_Init();
   HardWareTypeDiffConfig();
   dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
   dwt_entersleep();
   waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
//   waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
   DW_DISABLE;
    if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
   {
    Error_Handler();
   }
    
   
	
//   HAL_Delay(2000);
//   mcu_sleep();
   //LED0_BLINK;      
@@ -446,14 +503,14 @@
//      {
//      MODBUS_Poll();
//      }
if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
if(m_bEUARTTxEn==0&&(motor_state==0||motor_state==3))
         {   
#ifndef DEBUG_MODE   
            if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
#endif
         }
      if(g_start_send_flag&&active_flag)
    if(g_start_send_flag&&active_flag)
   { static uint16_t blink_count=0;
      g_start_send_flag = 0;   
   //   GetPressAndTemp();
@@ -464,6 +521,7 @@
//      HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
//      }
//      LED_TR_BLINK;
         __disable_irq();
      if(bat_percent>15)
      {   LED_TB_ON;
         Tag_App();
@@ -473,6 +531,7 @@
         Tag_App();
         LED_TR_OFF;      
      }
         __enable_irq();
      //LED0_BLINK;      
      IdleTask();   
      if(waitusart_timer>0)
@@ -508,7 +567,7 @@
  /** Configure LSE Drive Capability
  */
  HAL_PWR_EnableBkUpAccess();
  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
  __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);
  /** Initializes the RCC Oscillators according to the specified parameters
  * in the RCC_OscInitTypeDef structure.
  */
@@ -908,6 +967,8 @@
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
   

	
   HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
   HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);  
  /*Clear all related wakeup flags*/
@@ -920,7 +981,7 @@
extern u16 tagslotpos;
extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag;
float key_keeptime;
extern float motor_ontime;
extern float motor_ontime,button_delay;
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
   static uint8_t i=0;
@@ -928,10 +989,12 @@
   g_start_send_flag=1;
//   current_slotnum++;
//   SetNextPollTime(tagslotpos);
    if(button_delay<1)
    button_delay+=1/(float)tag_frequency;
   nomove_count+=1/(float)tag_frequency;
   if(motor_keeptime>0)
   {   
   motor_keeptime-=1/(float)tag_frequency;
        motor_keeptime-=1/(float)tag_frequency;
   }
    if(motor_keeptime<0)
    {motor_keeptime = 0;}