增加继电器控制时间，还有速度显示

zhyinch

2021-07-23 612814daf9bb44c4104ab3708d8a5fcba6f2a6d5

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

@@ -12,7 +12,34 @@
#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();
@@ -27,7 +54,8 @@
   Uart1_Init();
   Spi_Init();
   ADC_Configuration();
	
   IWDG_Config(IWDG_Prescaler_128 ,4095);   //10s
    IWDG_Feed();
   GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
}
u8 anchor_type;
@@ -44,11 +72,24 @@
   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[WAR_JDQ_TIME]>1000||g_com_map[WAR_JDQ_TIME]<0)
    {
        g_com_map[WAR_JDQ_TIME] = 1;
    }
    if(dist_threshold<300)
      {dist_threshold = 300;}
      if(dist_threshold>15000)
      {dist_threshold = 15000;}
}
void Program_Init(void)
{   float temp;
   u16 temp2;
@@ -72,13 +113,13 @@
   {
     g_com_map[COM_INTERVAL]=100;
   }
<<<<<<< HEAD
   g_com_map[VERSION] = 0x012a;
=======
   g_com_map[VERSION] = 0x0127;
>>>>>>> parent of 47d2701 (V1.41  è´Ÿæ•°ä¸è¾“出 ä¿®æ”¹å›žå¤485无显示BUG)

   g_com_map[VERSION] = 0x0133;
    dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]);
   ComMapCheck();	
   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;   
@@ -155,21 +196,21 @@
   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 +253,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,12 +266,13 @@
         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   
      }

   }
    
int main(void)
{