2.60，临近配置1 可以配置物资还是手环。

WXK

2024-11-29 7411f11aa0e680f982e50bd3343d25b05e6ccec1

 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 -----------------------------------------------------------*/
@@ -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:
@@ -288,7 +288,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)|67;
   g_com_map[VERSION] = (2<<8)|60;
    
//   g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -337,6 +337,7 @@
  {
    Error_Handler();
  }
  printf("固件版本:SS双路定位标签-防撞标签 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
//g_com_map[NOMOVESLEEP_TIME]=5;
//   printf("标签ID: %d .\r\n",dev_id);
//   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
@@ -368,7 +369,7 @@
   {
         g_com_map[MOTORBEEPER_INDEX] = 1;
   }
   hardware_type   = g_com_map[MOTORBEEPER_INDEX];
   hardware_type   = /*NSH1;//*/g_com_map[MOTORBEEPER_INDEX];
   switch(hardware_type)
      {
        case 1:     
@@ -486,7 +487,7 @@
            HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);  
#endif
         }
      if(g_start_send_flag&&active_flag&&uwb_active_flag)
      if(g_start_send_flag&&active_flag/*&&uwb_active_flag*/)
   { static uint16_t blink_count=0;
      g_start_send_flag = 0;   
   //   GetPressAndTemp();