V1.22 去掉标签串口输出

zhyinch

2020-07-24 2e895d0a7b81c6216457ddd23690c1249ceb993d

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

@@ -11,13 +11,16 @@
#include "global_param.h"
#include "ADC.h"

//#define DEBUG_MODE

void Device_Init(void)
{
   RCC_Configuration();
   //SystemInit();
   NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000);
   Nvic_Init();
   Systick_Init();
//   Systick_Init();
   TIM3_Int_Init();
   Led_Init();
   Beep_Init();
   DW_GPIO_Init();
@@ -41,24 +44,54 @@
   checksum = Checksum_u16(&hbsend[2],12);
   memcpy(&hbsend[14],&checksum,2);
}
u16 tyncpoll_time;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
void Program_Init(void)
{uint16_t i;
{   float temp;
   u16 temp2;
   uint16_t i;
   Usart1ParseDataCallback = UsartParseDataHandler;
   parameter_init();
   //deca_sleep(1000);
   HeartBeatInit();
#ifdef DEBUG_MODE
//   g_com_map[DEV_ROLE]=1;
//      g_com_map[DEV_ID]=1;
//   g_com_map[COM_INTERVAL]=100;
//   g_com_map[MAX_REPORT_ANC_NUM]=3;
//      g_com_map[NEARBASE_NUM]=1;  
//      g_com_map[NEARBASE_ID1]=2;
   g_com_map[ANC_FLAG]=1;
      save_com_map_to_flash();
#endif
   OUT485_ENABLE;
   g_com_map[VERSION] = 0x0116;	
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*0.4)+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{
	
   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]);

@@ -82,9 +115,16 @@
{ 
UART_PushFrame(hbsend,16);
}
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer;
int16_t sync_timer;
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)
{
		
         UART_CheckReceive();
      UART_CheckSend();
   if(heartbeat_timer>1000)
@@ -93,24 +133,69 @@
      if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
      HeatBeat();
   }
   if(poll_timer>=g_com_map[COM_INTERVAL]-tag_delaytime)
   if(flag_newsecond)
   {
      poll_timer=0;
      if(g_com_map[ANC_POLL]||g_com_map[DEV_ROLE])
     flag_newsecond=0;
      tagpos_binary=0;
      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
      ancidlist_num=0;
      for(u8 i=0;i<max_slotpos;i++)
      {
         if(g_com_map[DEV_ROLE]==0)
         {int8_t correction_time;
            correction_time=tag_timer-(GROUP_TAG_NUM+1)*3;
            tag_delaytime=correction_time;
                     if(tag_delaytime>g_com_map[COM_INTERVAL]/2)
                     {
                     tag_delaytime=tag_delaytime-g_com_map[COM_INTERVAL];
                     }
         }
      g_start_send_flag=1;
         if(tagpos_rec[i])
            tagpos_binary|=1<<i;
         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] = 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;
      u16 tmp = 0xAAAA;
   __disable_irq();
   result = FLASH_Prepare(0x8004A38, 2);
   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;
         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)
@@ -125,18 +210,21 @@
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
   usart_send[0]=0x55;
   usart_send[1]=0xAA;
   usart_send_anc[0]=0x55;
   usart_send_anc[1]=0xAA;

   while(1)
   {
      IdleTask();		
   g_start_sync_flag=0;
   if(g_start_send_flag)
   {
      g_start_send_flag = 0;
		
      g_start_send_flag = 0;		
      Tag_App();
   }
	
      IdleTask();		
if(g_com_map[DEV_ROLE]==0)
      Anchor_App();

   }
}