1

yincheng.zhong

2023-03-28 3203b700d2d66b316843f310b135c916a74fafe6

 Src/main.c

@@ -133,12 +133,12 @@
if(g_com_map[MOTOR_ENABLE])
{
    
      if(motor_keeptime>0)
      {
         motor_state = 2;
      }else{
         motor_state = 0;
      }
//      if(motor_keeptime>0)
//      {
//         motor_state = 2;
//      }else{
//         motor_state = 0;
//      }
      //motor_state=2;
   switch(motor_state)
      {case 0:
@@ -208,31 +208,7 @@
      LED_LG_OFF;
//   }
}
   if(g_com_map[CNT_UPDATE]==1)
   {
   uint32_t result = 0;
      uint16_t tmp = 0xAAAA;
   __disable_irq();
   result = FLASH_Prepare(0x8004A38, 128);
   if(result)
      result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2); 
   __enable_irq();
      printf("进入升级模式\r\n");
   g_com_map[CNT_UPDATE]=0;
   save_com_map_to_flash();
   delay_ms(100);
      //   STMFLASH_Write_NoCheck(0x8004A38,0xAAAA);
      //   Delay_ms(100);
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
   }
         if(g_com_map[CNT_REBOOT]==1)
      {
         g_com_map[CNT_REBOOT]=0;
         g_com_map[MAP_SIGN_INDEX]=0;
         save_com_map_to_flash();
         delay_ms(100);
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }

      if(g_com_map[CNT_RESTART]==1)
      {
         g_com_map[CNT_RESTART]=0;
@@ -281,7 +257,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] = (2<<8)|60;
   g_com_map[VERSION] = (2<<8)|1;
    
//   g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -331,7 +307,7 @@
//   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
//   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
   

    printf("固件版本:标签-定位防撞-青岛 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
//   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]);

@@ -357,7 +333,7 @@
   {
         g_com_map[MOTORBEEPER_INDEX] = 2;
   }
   hardware_type   = g_com_map[MOTORBEEPER_INDEX];
   hardware_type   = 1;//g_com_map[MOTORBEEPER_INDEX];;
   switch(hardware_type)
      {
        case 1:     
@@ -459,6 +435,7 @@
      if(g_start_send_flag&&active_flag)
   { static uint16_t blink_count=0;
      g_start_send_flag = 0;   
        static u8 uwbcount =0;
   //   GetPressAndTemp();
//      if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
//      {
@@ -477,6 +454,7 @@
         Tag_App();
         LED_TR_OFF;      
      }
    
         __enable_irq();
      //LED0_BLINK;      
      IdleTask();   
@@ -924,19 +902,31 @@
  /*Enter the Standby mode*/
  HAL_PWR_EnterSTANDBYMode();   
}
extern u16 tagslotpos;
extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag,current_sync_sec,tagpoll_sync_sec;

extern u16 tagslotpos,current_slotpos;
extern uint8_t tx_near_msg[80],stationary_flag,gotosleep_flag,current_sync_sec,tagpoll_sync_sec,flag_tagnewpos;
float key_keeptime;
extern float motor_ontime;
extern  uint16_t rec_tagperiod;
void GetRandomPos(void)
{
    current_slotpos = HAL_LPTIM_ReadCounter(&hlptim1)%max_slotpos;  //如果丢失连接超过5次就随机换个时间片
    tagpoll_sync_sec = current_slotpos/200;
    tagslotpos = current_slotpos%200;
    flag_tagnewpos = 0;
}
void HAL_LPTIM_CompareMatchCallback(LPTIM_HandleTypeDef *hlptim)
{
   static uint8_t i=0;
   SystemClock_Config();
	
//   current_slotnum++;
//   SetNextPollTime(tagslotpos);
   
if(tag_frequency>1)
{	
    g_start_send_flag=1;
}else{
   if(current_slotpos>=max_slotpos)
   {
    GetRandomPos();
   }
    if(current_sync_sec==tagpoll_sync_sec)
    {
        g_start_send_flag=1;
@@ -946,6 +936,7 @@
    {
        current_sync_sec=0;
    } 
}
   nomove_count+=1/(float)tag_frequency;
   if(motor_keeptime>0)
   {