1

yincheng.zhong

2023-03-28 3203b700d2d66b316843f310b135c916a74fafe6

 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:
@@ -257,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)|62;
   g_com_map[VERSION] = (2<<8)|1;
    
//   g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
@@ -307,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]);

@@ -919,9 +919,10 @@
{
   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();
@@ -935,6 +936,7 @@
    {
        current_sync_sec=0;
    } 
}
   nomove_count+=1/(float)tag_frequency;
   if(motor_keeptime>0)
   {