✨ feat:NFC学卡模式不发送车速

YueJin_test_bench/source/Appliciation/CAN_APP.c

@@ -54,7 +54,11 @@ void  Can_Set_Buff_200(uint8_t CopyData [])
         }
     }
 
-    pCANMsg->Sig.Vspeeed = Vspeed;
+    if(Student_Card_can_command == 0)
+    {
+        pCANMsg->Sig.Vspeeed = Vspeed;
+    }
+    
 
 }
 void  Can_Set_Buff_481(uint8_t CopyData [])
@@ -521,7 +525,8 @@ void  Can_Set_Buff_786(uint8_t CopyData [])
             pCANMsg->Msg[i] = Data_786_4[i];
             
         }
-        Diagnosis_banbenhao_flag_=4;
+        Diagnosis_banbenhao_flag_ = 4;
+        Diagnosis_banbenhao_flag  = 5;
 
     }
 

YueJin_test_bench/source/Driver/CAN/RSCAN.c

@@ -826,7 +826,6 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
                 {
                     canData2[i + 3] = canData1[i+1];
                 }
-                
                 /*第三步*/
                 canData2[10]=pstCANFrame->unCANData.u8CANData[1];
                 canData2[11]=pstCANFrame->unCANData.u8CANData[2];
@@ -846,7 +845,6 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
                     {
                         canData3[i] = canData1[i+5];
                     }
-
                 }
             }
             Diagnosis_banbenhao_flag=4;
@@ -872,12 +870,8 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
                     canData3[9]=0XFF;
                 }
             }
-
-
         }
         /*学卡信息回传*/
-        
-        
         if(pstCANFrame->u32CANID==0x453u)
         {
             if(Student_Card_can_command==0)
@@ -885,18 +879,18 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
                 if (pstCANFrame->unCANData.u8CANData[7] == 0x00)
                 {
                     //默认值
-                    can_car_Data[0] =pstCANFrame->unCANData.u8CANData[7];
+                    can_car_Data[0] = pstCANFrame->unCANData.u8CANData[7];
 
                 }
                 else if(pstCANFrame->unCANData.u8CANData[7] == 0x10)
                 {
                     //进行中
-                    can_car_Data[1] =pstCANFrame->unCANData.u8CANData[7];
+                    can_car_Data[1] = pstCANFrame->unCANData.u8CANData[7];
                 }
                 if (pstCANFrame->unCANData.u8CANData[7] == 0x20)
                 {
                      //成功
-                     can_car_Data[2] =pstCANFrame->unCANData.u8CANData[7];
+                     can_car_Data[2] = pstCANFrame->unCANData.u8CANData[7];
                 }
                 if (pstCANFrame->unCANData.u8CANData[7] == 0x30)
                 {
@@ -906,7 +900,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
                 if (pstCANFrame->unCANData.u8CANData[7] == 0x40)
                 {
                      //已经有相同卡存在
-                     can_car_Data[4] =pstCANFrame->unCANData.u8CANData[7];
+                     can_car_Data[4] = pstCANFrame->unCANData.u8CANData[7];
                 }
             }
             if(Query_Card_can_command==2)

YueJin_test_bench/utility/诊断工具1.10.11 x64/Option/Option.properties

 #new Option
-#Mon Jun 09 14:28:58 CST 2025
+#Tue Jun 24 13:52:32 CST 2025
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
@@ -9,7 +9,7 @@ DBFFilePath=
 MergeCrcTtpe=1
 MergeBootFilePath=
 IsMergeChangeAddress=false
-MergeFlashOutPutFilePath=D\:\\Desktop\\\u65B0\u5EFA\u6587\u4EF6\u5939 (2)
+MergeFlashOutPutFilePath=
 GPIOOutPutPath=
 MergeCanDBCPath=
 IsFilling=true
@@ -53,7 +53,7 @@ MergeFlashCompressionFormat=RLE24
 IsPlayMusic=false
 IsHexDisplay=true
 MergeLineInXLSPath=
-MergeFlashInPutFilePath=D\:\\Desktop\\\u65B0\u5EFA\u6587\u4EF6\u5939 (3)
+MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
 MergeOutPutFilePath=
 MergeAppFilePath=