V1.24基站数量时间参数改到0.7，标签输出数据。6基站互测可以到40HZ--50ms

zhyinch

2020-07-25 239d693f7b7b567f0ee171afa0f3b8324a390403

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

@@ -46,6 +46,8 @@
}
u16 tyncpoll_time;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
void Program_Init(void)
{   float temp;
   u16 temp2;
@@ -65,25 +67,30 @@
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0112;	
   g_com_map[VERSION] = 0x0118;	
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]/4)+4;
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
   max_slotpos=g_com_map[COM_INTERVAL]/slottime;
   tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;   
   module_power = g_com_map[POWER];
   total_slotnum = 1000/g_com_map[COM_INTERVAL];
      if(module_power>67)
      {
         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{
   
//   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]);
//   }
   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]);
@@ -114,9 +121,10 @@
extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
uint32_t tagpos_binary;
extern u16 ancidlist_rec[20],ancidlist_send[20];
extern u16 target_time;
void IdleTask(void)
{
      main_logic();
		
         UART_CheckReceive();
      UART_CheckSend();
   if(heartbeat_timer>1000)
@@ -138,17 +146,20 @@
         tagpos_rec[i] = 0;
      }
   }

   if(target_time>1000)
   {target_time-=1000;}
   #ifdef USART_INTEGRATE_OUTPUT
   if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
   {u16 checksum;
            usart_send_flag=0;
            usart_send_anc[2] = 5;//正常模式
            usart_send_anc[2] = 4;//正常模式
            usart_send_anc[3] = anc_report_num*6+2;//正常模式
            checksum = Checksum_u16(&usart_send_anc[2],anc_report_num*6+2);
            memcpy(&usart_send_anc[4+anc_report_num*6],&checksum,2);
            UART_PushFrame(usart_send_anc,6+anc_report_num*6);
            anc_report_num=0;      
   }
   #endif
   if(g_com_map[CNT_UPDATE]==1)
   {
   uint32_t result = 0;
@@ -166,6 +177,25 @@
      //   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;
         save_com_map_to_flash();
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }

   }
int main(void)