V1.35 去掉恢复出厂设置功能，电梯客户测试

zhyinch

2020-11-19 29044bd524ee76b1d20772f7c9b46934df995812

 源码/核心板/Src/main.c

@@ -52,6 +52,7 @@
uint16_t vel_factor,pos_factor;

extern u8 module_power;
u16 slottime,max_slotnum,current_slotpos;
void Program_Init(void)
{uint16_t i;
   float temp;
@@ -86,14 +87,17 @@
      {
         module_power=67;
      }
      g_com_map[VERSION] = 0x0117;	
      g_com_map[VERSION] = 0x0123;	
   temp=(float)g_com_map[MAX_REPORT_ANC_NUM]*4/3;   
   temp2=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3;
   temp2=g_com_map[MAX_REPORT_ANC_NUM]*4/3;
   if(temp2<temp)
   {
      temp2++;
   }
      tyncpoll_time=g_com_map[DEV_ID]*(temp2);
   slottime=temp2;
   max_slotnum=g_com_map[COM_INTERVAL]/temp2;
   current_slotpos=g_com_map[DEV_ID];
   tyncpoll_time=(current_slotpos%max_slotnum)*slottime;
   if(g_com_map[DEV_ROLE])
   {
   printf("鏍囩ID: %d .\r\n",dev_id);
@@ -160,14 +164,14 @@
         //   Delay_ms(100);
            SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //杞浣嶅洖鍒癰ootloader   
   }
      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; //杞浣嶅洖鍒癰ootloader   
      }
//      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; //杞浣嶅洖鍒癰ootloader   
//      }
      if(g_com_map[CNT_RESTART]==1)
      {
         g_com_map[CNT_RESTART]=0;