🐞 fix:读esp32版本号单帧魔改版

source/app/api_can/can.c

@@ -438,7 +438,7 @@ void CheckRecvCan0Frame(stc_canfd_msg_t *stc_msg)//C CAN ��Ϣ���ջص
 		/*20200818Change By FJY*/
 		if(RxFinish != FINISH )
 		{
-			if(data.Data[0] == 0x10)  /*������֡*/
+			if((data.Data[0] == 0x10) || (data.Data[0] == 0x06))  /*������֡*/
 			{
 				//memset((void*)MultiplePack.Data, 0, 256);
 				memcpy((void*)MultiplePack.Data, (void*)stc_msg->stcData.au32Data, data.DataLen); 
@@ -487,10 +487,11 @@ void CheckRecvCan0Frame(stc_canfd_msg_t *stc_msg)//C CAN ��Ϣ���ջص
 					memcpy(MultiplePack.Data, data.Data + 5, 3);
 					MyRecvCount+=3;
 				}
-                if(data.Data[2] == 0x62 && data.Data[3] == 0x20 && data.Data[4] == 0x24)
+                if(data.Data[1] == 0x62 && data.Data[2] == 0x20 && data.Data[3] == 0x24)
 				{
-					memcpy(MultiplePack.Data, data.Data + 5, 3);
-					MyRecvCount+=3;
+					memcpy(MultiplePack.Data, data.Data + 4, 3);
+                    //RxFinish = FINISH;
+					//MyRecvCount+=3;
 				}
                 if(data.Data[2] == 0x62 && data.Data[3] == 0xF1 && data.Data[4] == 0x87)
 				{

source/bsp_source/bsp_button/bsp_app_AUTO.c

@@ -4,7 +4,7 @@
 #include "bsp_app_led_output.h"
 #include "bsp_app_tft_output.h"
 
-#define STATIC_BEGIN_CHECK_TIME 6*1000
+#define STATIC_BEGIN_CHECK_TIME 10*1000
 
 
 uint8_t AutoStep7_SubStep = 0;
@@ -647,8 +647,8 @@ void build_number6(void)
             
     }
     
-    if (BetweenTime(100,200) && RxFinish == FINISH ) {  //??????? 
-        GetNUM6(0);GetNUM6(1);GetNUM6(2);GetNUM6(3);GetNUM6(4);GetNUM6(5);GetNUM6(6);GetNUM6(7);
+    if (BetweenTime(100,200) /*&& RxFinish == FINISH*/ ) {  //??????? 
+        GetNUM6(0);GetNUM6(1);GetNUM6(2);//GetNUM6(3);GetNUM6(4);GetNUM6(5);GetNUM6(6);GetNUM6(7);
     }
     else if (BetweenTime(200,300) && MultiplePack.Data[0] != 0x0){
         CANSendEnable = ON; //??????????????
@@ -1907,7 +1907,7 @@ void StaticCurrentCheck(void)//???????
                  //  
                  //  SetStartTime(0);
                  //  AutoStep9Result = 1; //1:next 
-                 //  g_uiOtherCheckCurStep = AUTO_END;//????????
+                   //  g_uiOtherCheckCurStep = AUTO_END;//????????
                  //  StaticCurrent.enable = 0;
                 }
             }
@@ -2514,6 +2514,7 @@ void APP_AUTO(void)
                 build_number6();
                 //CanOutPutSeatBeltCheck();
             }
+            //ButtomCurrent.count++;
             break;  
         case 7:
             if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
@@ -2526,7 +2527,7 @@ void APP_AUTO(void)
             break;  
         case 8:
             if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
-                //ButtomCurrent.count++;
+                ButtomCurrent.count++;
             }
             else {
                 NUM8Flag ==NUM7_UDSStateSuc;