1.50 SFD模式修改

zhyinch

2021-06-21 1f9d76141788c51f8fb893c9fbf8f63a21ca30ed

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

@@ -72,11 +72,7 @@
   {
     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] = 0x0132;
   g_com_map[SW_TYPE] =    SW_FANGZHUANG;
   dev_id = g_com_map[DEV_ID];
   slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
@@ -160,16 +156,16 @@
   }
   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();
               }
            }
//      uint32_t temp23;
//         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);