V1.62

zhyinch

2022-02-18 4a13529748c983ff0d5627a28365ad7737141016

 Ô´Âë/ºËÐÄ°å/Src/main.c

@@ -100,7 +100,7 @@
      {dist_threshold = 15000;}
}
u16 JDQ_time;
u16 g_commap_antdelay;
int16_t g_commap_antdelay;
void Program_Init(void)
{   float temp;
   u16 temp2;
@@ -109,6 +109,7 @@
   parameter_init();
   //deca_sleep(1000);
   HeartBeatInit();
   Modbus_RegMap();
#ifdef DEBUG_MODE
//   g_com_map[DEV_ROLE]=1;
//      g_com_map[DEV_ID]=1;
@@ -119,12 +120,36 @@
   g_com_map[ANC_FLAG]=1;
      save_com_map_to_flash();
#endif
//    
//    g_com_map[COM_INTERVAL]=100;
//      g_com_map[MAX_REPORT_ANC_NUM]=10;
//      g_com_map[GROUP_ID]=0;
//      g_com_map[DIST_OFFSET]=-116;

//         g_com_map[DEV_ROLE] =0x0;  //基站
//	
//      g_com_map[ANC_POLL]=1;
//      g_com_map[ALARM_DEV] = 0;
//      g_com_map[ALARM_DISTANCE1] = 0;   //默认报警距离50cm
//      g_com_map[ALARM_DISTANCE2] = 900;   //默认报警距离50cm
//      g_com_map[ALARM_DISTANCE3] = 1400;   //默认报警距离50cm
//         g_com_map[RELAY2_DISTANCE1] = 0;   //默认报警距离50cm
//      g_com_map[RELAY2_DISTANCE2] = 900;   //默认报警距离50cm
//      g_com_map[RELAY2_DISTANCE3] = 1400;   //默认报警距离50cm
//        g_com_map[WAR_JDQ_TIME] = 1; //1秒
//      g_com_map[POWER]=30;
//        g_com_map[SPEEDFILTER_THRES]=10000;
//      g_com_map[FILTER_COEFFICIENT]=40;
//        g_com_map[ANT_LENGTH]=0;
//        g_com_map[NOMOVESLEEP_TIME]=728;
      
        
   OUT485_ENABLE;
   ComMapCheck();   
   g_com_map[VERSION] = 0x0138;
   g_com_map[VERSION] = 1<<8|63;
    FLASH_Read(FLASH_HARDWARE_FLAG, (uint8_t*)&g_com_map[HARDWAREFLAG_INDEX], 16);
    dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
    g_commap_antdelay = (float)g_com_map[ANT_LENGTH]*5.8;
    g_commap_antdelay = g_com_map[ANT_LENGTH];
    JDQ_time = g_com_map[WAR_JDQ_TIME]*10;
   g_com_map[SW_TYPE] =    SW_FANGZHUANG;
   dev_id = g_com_map[DEV_ID];
@@ -142,18 +167,18 @@
         module_power=67;
      }
   
//   if(g_com_map[DEV_ROLE])
//   {
//   printf("标签ID: %d .\r\n",dev_id);
//   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
//   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
//   }else{
//	
//   anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
//   printf("基站ID: %x .\r\n",dev_id);
//   printf("基站类型: %c .\r\n",anchor_type+0x41);
//   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
//   }
   if(g_com_map[DEV_ROLE])
   {
   printf("标签ID: %d .\r\n",dev_id);
   printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]);
   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
   }else{
	
   anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM];
   printf("基站ID: %x .\r\n",dev_id);
   printf("基站类型: %c .\r\n",anchor_type+0x41);
   printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]);
   }
   OUT485_DISABLE;
//   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]);
@@ -161,7 +186,7 @@
   
   for(i=0;i<255;i++)
   {
      g_Tagdist[i]=0xffff;
      g_Tagdist[i]=0x1ffff;
   }
}