V1.61 修改成中断模式，测试不丢包。

zhyinch

2022-02-10 a6e5c60a9ec30574bf7c3d584046444b15f8680f

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

@@ -2,6 +2,7 @@
#include "Rcc_Nvic_Systick.h"
#include "Usart.h"
#include "Spi.h"
#include "Flash.h"
#include "led.h"
#include "beep.h"
#include "dw_driver.h"
@@ -12,13 +13,40 @@
#include "ADC.h"

//#define DEBUG_MODE
/*
 * rlv:重装载寄存器的值，取值范围为：0-0XFFF
 * å‡½æ•°è°ƒç”¨ä¸¾ä¾‹ï¼š
 * IWDG_Config(IWDG_Prescaler_64 ,625);  // IWDG 1s è¶…时溢出 
 *                        ï¼ˆ64/40）*625 = 1s
 */

void IWDG_Config(uint8_t prv ,uint16_t rlv)
{    
    // ä½¿èƒ½ é¢„分频寄存器PR和重装载寄存器RLR可写
    IWDG_WriteAccessCmd( IWDG_WriteAccess_Enable );
    
    // è®¾ç½®é¢„分频器值
    IWDG_SetPrescaler( prv );
    
    // è®¾ç½®é‡è£…载寄存器值
    IWDG_SetReload( rlv );
    
    // æŠŠé‡è£…载寄存器的值放到计数器中
    IWDG_ReloadCounter();
    
    // ä½¿èƒ½ IWDG
    IWDG_Enable();    
}
void IWDG_Feed(void)
{
    IWDG_ReloadCounter();
}
void Device_Init(void)
{
   RCC_Configuration();
   //SystemInit();
   NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000);
   Nvic_Init();
	
//   Systick_Init();
   TIM3_Int_Init();
   Led_Init();
@@ -27,7 +55,9 @@
   Uart1_Init();
   Spi_Init();
   ADC_Configuration();
	
   //IWDG_Config(IWDG_Prescaler_128 ,4095);   //10s
   Nvic_Init();
  IWDG_Feed();
   GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -44,11 +74,35 @@
   checksum = Checksum_u16(&hbsend[2],12);
   memcpy(&hbsend[14],&checksum,2);
}

uint16_t vel_factor,pos_factor;
u16 tyncpoll_time;
u16 tyncpoll_time,dist_threshold,group_id;
u16 slottime,max_slotpos;
extern u8 module_power;
extern u16 total_slotnum;
void ComMapCheck(void)
{

    if(g_com_map[ANT_LENGTH]>10000)
    {
        g_com_map[ANT_LENGTH] = 0;
    }
    if(g_com_map[WAR_JDQ_TIME]>1000||g_com_map[WAR_JDQ_TIME]<0)
    {
        g_com_map[WAR_JDQ_TIME] = 1;
    }
       if(g_com_map[COM_INTERVAL]==0)
   {
     g_com_map[COM_INTERVAL]=100;
   }
    if(dist_threshold<300)
      {dist_threshold = 300;}
      if(dist_threshold>15000)
      {dist_threshold = 15000;}
}
extern u8 needanchorrx;  
u16 JDQ_time;
int16_t g_commap_antdelay;
void Program_Init(void)
{   float temp;
   u16 temp2;
@@ -57,6 +111,7 @@
   parameter_init();
   //deca_sleep(1000);
   HeartBeatInit();
   Modbus_RegMap();
#ifdef DEBUG_MODE
//   g_com_map[DEV_ROLE]=1;
//      g_com_map[DEV_ID]=1;
@@ -67,18 +122,40 @@
   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;
   if(g_com_map[COM_INTERVAL]==0)
   {
     g_com_map[COM_INTERVAL]=100;
   }
<<<<<<< HEAD
   g_com_map[VERSION] = 0x012a;
=======
   g_com_map[VERSION] = 0x0127;
>>>>>>> parent of 47d2701 (V1.41  è´Ÿæ•°ä¸è¾“出 ä¿®æ”¹å›žå¤485无显示BUG)
   ComMapCheck();	
   g_com_map[VERSION] = 1<<8|61;
    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 = 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];
        group_id=g_com_map[GROUP_ID];
   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;   
@@ -92,18 +169,19 @@
         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])
   {
      needanchorrx = 0;
   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{
   needanchorrx = 1;
   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]);
@@ -111,7 +189,7 @@
   
   for(i=0;i<255;i++)
   {
      g_Tagdist[i]=0xffff;
      g_Tagdist[i]=0x1ffff;
   }
}

@@ -150,26 +228,26 @@
{
      
         UART_CheckReceive();
      UART_CheckSend();
   //   UART_CheckSend();
   
   if(heartbeat_timer>1000)
   {
      heartbeat_timer=0;
      if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
      if(g_com_map[HEARTBEAT])
      HeatBeat();
   }
   if(flag_newsecond)
   {
      uint32_t temp23;
         temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
         if(temp23!=0x4A480022)
         {
            temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
               if(temp23!=0x4A480022)
               {
                  NVIC_SystemReset();
               }
            }
//         temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
//         if(temp23!=0x4A480022)
//         {
//            temp23 =  dwt_read32bitreg(CHAN_CTRL_ID) ;
//               if(temp23!=0x4A480022)
//               {
//                  NVIC_SystemReset();
//               }
//            }
     flag_newsecond=0;
      tagpos_binary=0;
      memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
@@ -212,12 +290,10 @@
      //   Delay_ms(100);
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
   }
         if(g_com_map[CNT_REBOOT]==1)
      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);
         FactorySettings();
			
         SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }
      if(g_com_map[CNT_RESTART]==1)
@@ -227,16 +303,20 @@
         delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }
            if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
        if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
      {
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader   
      }
		
      g_com_map[RELAY1_STATE_INDEX] = READ_RELAY1;
      g_com_map[RELAY2_STATE_INDEX] = READ_RELAY2;

   }

int main(void)
{
 
   Device_Init();
    Device_Init();
   //StartUpTest();
   Program_Init();
   Dw1000_Init();
@@ -248,19 +328,23 @@
   usart_send[1]=0xAA;
   usart_send_anc[0]=0x55;
   usart_send_anc[1]=0xAA;

   dwt_setrxtimeout(0);//设定接收超时时间，0位没有超时时间
   dwt_rxenable(0);//打开接收
   while(1)
   {
   g_start_sync_flag=0;
//   g_start_sync_flag=0;
   if(g_start_send_flag)
   {
      g_start_send_flag = 0;      
      Tag_App();
      //needanchorrx = 1;
   }
      IdleTask();      
if(g_com_map[DEV_ROLE]==0)
      Anchor_App();

//if(g_com_map[DEV_ROLE]==0)
//    {needanchorrx = 0;
//         Anchor_App();
//       // Anchor_Start();
//    }
   }
}