修改加速计驱动

zhyinch

2022-10-12 aeceb47ebd7883a54a9f7d842f26b6c061bf18d1

 Src/main.c

@@ -101,7 +101,7 @@
}   
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))
@@ -139,6 +139,7 @@
      }else{
         motor_state = 0;
      }
      //motor_state=2;
   switch(motor_state)
      {case 0:
         if(hardware_type==NSH1)
@@ -253,40 +254,9 @@
#define FIXSLOTPOS  4
u16 slotpos_intoatl;
uint16_t bigslot_num;
uint8_t fix_slotpos =FIXSLOTPOS; 
int32_t lpcount,lptime,target_time;
extern u16 tagslotpos;
void SetNextPollTime(u16 slotpos) //时间片逻辑：上来默认计算一个时间，时间同步之后，就近选择时间片。SetNextPollTime会调整下次发送
{

#ifdef FIXSLOT
   fix_slotpos =FIXSLOTPOS;
   fix_slotpos = g_com_map[ALARM_DISTANCE2];
   slotpos = fix_slotpos;
   tagslotpos = fix_slotpos;
#endif

   while(current_slotnum>=tag_frequency)
   {   current_slotnum-=tag_frequency;}
   slotpos_intoatl = current_slotnum*bigslot_num+slotpos;

   if(current_slotnum==19)
   {slotpos_intoatl = current_slotnum*bigslot_num+slotpos;}
   target_time=(slotpos_intoatl*SLOTTIME_MS+100)*100;
	
   //if(target_time<90000)
   {
      lptime=target_time-offsettimeus+1200;
      lpcount = lptime/LPTIMER_LSB;
   if(lpcount>LPTIMER_1S_COUNT)
      lpcount-=LPTIMER_1S_COUNT;
   if(lpcount<0)
   {
   lpcount+=LPTIMER_1S_COUNT;
   }
   __HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
}
}
void ErrorConfig_Handler(void)
{
      if(g_com_map[COM_INTERVAL]==0||g_com_map[COM_INTERVAL]>1000)
@@ -311,14 +281,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] = 0x0220;
   g_com_map[VERSION] = 0x022c;
    
//   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]=100;
   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;
@@ -326,7 +296,7 @@
#endif
//g_com_map[NOMOVESLEEP_TIME]=10;
//   g_com_map[IMU_ENABLE]=0;
//    g_com_map[COM_INTERVAL]=1000;
//    g_com_map[COM_INTERVAL]=50;
   active_flag = g_com_map[ACTIVE_INDEX];
   if(active_flag==0)
   {   
@@ -335,7 +305,7 @@
      g_com_map[NOMOVESLEEP_TIME]=10;
      g_com_map[MOTOR_ENABLE]=0;
   }
g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
//g_com_map[HEIGHTOFFEST_INDEX]=g_com_map[MAX_REPORT_ANC_NUM];
   module_power = g_com_map[POWER];
   imu_enable=g_com_map[IMU_ENABLE];
   motor_enable=g_com_map[MOTOR_ENABLE];
@@ -343,7 +313,7 @@
   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;
@@ -382,24 +352,24 @@

void HardWareTypeDiffConfig(void)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
//hardware_type=2;
if(hardware_type == 0)
    hardware_type = 2;
   GPIO_InitTypeDef GPIO_InitStruct = {0};
   //if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
   {
         g_com_map[MOTORBEEPER_INDEX] = 1;
   }
   hardware_type   = g_com_map[MOTORBEEPER_INDEX];
   switch(hardware_type)
      {
        case 1:
	  
       HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
  GPIO_InitStruct.Pin = MOTOR_Pin;
  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
  GPIO_InitStruct.Pull = GPIO_NOPULL;
  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
        case 1:	  
            HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
            GPIO_InitStruct.Pin = MOTOR_Pin;
            GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
            GPIO_InitStruct.Pull = GPIO_NOPULL;
            GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
            HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
         break;
      case 2:
         MX_TIM2_Init();
            BarInit();
         break;
      }
}
@@ -438,7 +408,7 @@
  /* Initialize all configured peripherals */
  MX_GPIO_Init();
  MX_LPTIM1_Init();
   MX_DMA_Init();
  MX_DMA_Init();
  MX_USART1_UART_Init();
  MX_SPI1_Init();
  MX_ADC_Init();
@@ -446,14 +416,14 @@
  /* 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))
   {
@@ -478,9 +448,15 @@
//      {
//      MODBUS_Poll();
//      }
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)
   { static uint16_t blink_count=0;
      SystemClock_Config();
      g_start_send_flag = 0;   
   //   GetPressAndTemp();
//      if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
@@ -490,6 +466,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();
@@ -499,21 +476,14 @@
         Tag_App();
         LED_TR_OFF;      
      }
         __enable_irq();
      //LED0_BLINK;      
      IdleTask();   
      if(waitusart_timer>0)
      {
         waitusart_timer--;
      }
         if(m_bEUARTTxEn==0&&waitusart_timer==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
         }
		
 
			
   }else{
   IdleTask();   
   }
@@ -958,11 +928,10 @@
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
   static uint8_t i=0;
   i++;
      
   SystemClock_Config();
   g_start_send_flag=1;
   current_slotnum++;
   SetNextPollTime(tagslotpos);
//   current_slotnum++;
//   SetNextPollTime(tagslotpos);
   nomove_count+=1/(float)tag_frequency;
   if(motor_keeptime>0)
   {