Browse Source

1,修改故障日志地址大小端模式;
2,修改力矩助力停机判断条件。

dd 3 tháng trước cách đây
mục cha
commit
6b099abe45

+ 0 - 3
3.BasicFunction/Include/canAppl.h

@@ -697,12 +697,9 @@ typedef struct
 {
     UBYTE  ubControlFunCruise;
     UBYTE  ubControlSta;
-
-
 }CONTORLFUN_STRUCT;
 typedef struct
 {
-
     ULONG ulErrAStart_Address;
     ULONG ulErrEnd_Address;
 } MC_Error_Address_Struct;

+ 6 - 5
3.BasicFunction/Source/AssistCurve.c

@@ -428,9 +428,9 @@ void AssitCuvApplPerVolt(void)
     }
     //脚踏不动强制关闭
     if((ass_CalIn.uwcadLowStopCnt>=200) || (ass_CalIn.uwcadHighStopCnt>=200))
-      {
+    {
         ass_CalIn.uwStartRunPulse = 0;
-      }
+    }
 
     if((ass_CalIn.StartAssistEnble == FALSE) && (ass_CalIn.uwStartRunPulse > 1)) 
     {
@@ -674,7 +674,6 @@ void AssitCuvApplPerVolt(void)
             /* 启动判断*/
             if((ass_CalIn.uwGearSt > 0) && (BikeBrake_blGetstate() == FALSE) &&(BMS_RunInfo.Status.Status_Bit.Charge==FALSE))
             {
-//                if((ass_CalIn.blStopAssistEnble == FALSE) || (ass_CalIn.StartAssistEnble == TRUE))//5启动根据脉冲数
                 if(ass_CalIn.StartAssistEnble == TRUE)//5启动根据脉冲数
                 {
                     ass_CalCoef.swTorqFilterGain = 0;
@@ -768,7 +767,8 @@ void AssitCuvApplPerVolt(void)
             }
 
             /* 预启动阶段,停机判断 */
-            if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE) || (BMS_RunInfo.Status.Status_Bit.Charge==TRUE) || (ass_CalIn.blStopAssistEnble == TRUE))
+            if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE) || (BMS_RunInfo.Status.Status_Bit.Charge==TRUE) || \
+               ((ass_CalIn.blStopAssistEnble == TRUE) || (ass_CalIn.StartAssistEnble == FALSE)))
             {
                 Ass_FSM = PreStop;
             }
@@ -830,7 +830,8 @@ void AssitCuvApplPerVolt(void)
             ass_CalOut.swTorAssistCurrentTemp = ass_CalOut.swTorRefEnd;
 
             /* 预启动阶段,停机判断 */
-            if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE) || (BMS_RunInfo.Status.Status_Bit.Charge==TRUE) || (ass_CalIn.blStopAssistEnble == TRUE))
+            if((ass_CalIn.uwGearSt == 0) || (BikeBrake_blGetstate() == TRUE) || (BMS_RunInfo.Status.Status_Bit.Charge==TRUE) ||
+               ((ass_CalIn.blStopAssistEnble == TRUE) || (ass_CalIn.StartAssistEnble == FALSE)))
             {
                 Ass_FSM = PreStop;
             }

+ 10 - 5
3.BasicFunction/Source/usart.c

@@ -1190,7 +1190,6 @@ void DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD ID, UBYTE Mode, UWORD Cmd, U
                {
                    //do nothing
                }
-
                if (MC_UpcInfo.stBikeInfo2.uwSaveFlg == 1)
                {
                    cp_stFlg.ParaSaveEEFlg = TRUE;
@@ -1201,16 +1200,22 @@ void DataProcess(USART_Buf_TypeDef* ptUartTx, UWORD ID, UBYTE Mode, UWORD Cmd, U
                SendData(ptUartTx, ID_MC_BC,MODE_REPORT, 0xA903, (UBYTE *)"ACK");
                break;
            }
-            case 0x4E00: 
+        case 0x4E00:
         {
             SendData(ptUartTx, ID_MC_BC,MODE_REPORT, 0xBB20, (UBYTE *)MC_VerInfo.ProductLabel);
             break;
         }
         case 0x5200: //读取故障日志地址范围
         {
-            ManageError_Address.ulErrAStart_Address= StartServerManageError_Address;
-            ManageError_Address.ulErrEnd_Address=EndServerManageError_Address;
-            SendData(ptUartTx, ID_MC_TO_CDL, MODE_REPORT, 0xC008, (uint8_t *)&ManageError_Address.ulErrAStart_Address);
+            ManageError_Address.ulErrAStart_Address = ((StartServerManageError_Address & 0xFF000000) >> 24) | \
+                                                      ((StartServerManageError_Address & 0x00FF0000) >> 8) | \
+                                                      ((StartServerManageError_Address & 0x0000FF00) << 8) | \
+                                                      ((StartServerManageError_Address & 0x000000FF) << 24);
+            ManageError_Address.ulErrEnd_Address = ((EndServerManageError_Address & 0xFF000000) >> 24) | \
+                                                   ((EndServerManageError_Address & 0x00FF0000) >> 8) | \
+                                                   ((EndServerManageError_Address & 0x0000FF00) << 8) | \
+                                                   ((EndServerManageError_Address & 0x000000FF) << 24);
+            SendData(ptUartTx, ID_MC_TO_CDL, MODE_REPORT, 0xC008, (UBYTE *)&ManageError_Address.ulErrAStart_Address);
             break;
         }
         default: