Explorar o código

删除无效函数;bug修复:1.收到OBC在线检测反馈时,不产生应答;2.TRIP里程超9999.9km时,对TRIP时间和TRIP里程清零;3.收到TRIP清除指令时,对TRIP时间清除。

Ye Jin hai 1 ano
pai
achega
cae6905d4e

+ 5 - 3
User project/3.BasicFunction/Source/can.c

@@ -442,7 +442,7 @@ void DataProcess(UWORD ID, UBYTE Mode, UWORD Cmd, UBYTE Data[]) /* parasoft-supp
         {
             if (power_stPowStateOut.powerstate == POWER_ON_END)
             {
-                SendData(ID_MC_TO_PBU, MODE_REPORT, 0x1305, (UBYTE *)"READY");
+                //SendData(ID_MC_TO_PBU, MODE_REPORT, 0x1305, (UBYTE *)"READY");
             }
             break;
         }
@@ -508,8 +508,10 @@ void DataProcess(UWORD ID, UBYTE Mode, UWORD Cmd, UBYTE Data[]) /* parasoft-supp
                 SendData(ID_MC_TO_PBU, MODE_REPORT, 0x5303, (UBYTE *)"ACK");
                 MC_RunInfo.Ride_Km = 0;
                 MC_RunInfo.Ride_Time = 0;
-                cp_stHistoryPara.ulTripSum=0;
-                cp_stHistoryPara.ulTripSumTime=0;
+                cp_stHistoryPara.ulTripSum = 0;
+                cp_stHistoryPara.ulTripSumTime = 0;
+                cp_stHistoryPara.ulODOTime = cp_stHistoryPara.ulODOTime + (cp_stBikeRunInfoPara.ulRiTime >> 10) / 60;
+                cp_stBikeRunInfoPara.ulRiTime = 0;
             }
             break;
         }

+ 13 - 8
User project/3.BasicFunction/Source/canAppl.c

@@ -718,17 +718,22 @@ void Can_Trip_Cal(void)
 
     MC_RideLog.ODO_Km = cp_stHistoryPara.ulODOTrip;
     MC_RideLog.TRIP_Km = cp_stHistoryPara.ulTripSum;
-    if(MC_RideLog.TRIP_Km > 99999)
-    {
-        MC_RideLog.TRIP_Km = 99999;
-    }
-    if(MC_RunInfo.Ride_Km > 99999)
-    {
-        MC_RunInfo.Ride_Km = 99999;
-    }
 
     MC_RideLog.ODO_Time = cp_stHistoryPara.ulODOTime + (cp_stBikeRunInfoPara.ulRiTime >> 10) / 60;      // min
     MC_RideLog.TRIP_Time = cp_stHistoryPara.ulTripSumTime + (cp_stBikeRunInfoPara.ulRiTime >> 10) / 60; // min
+    
+    /*TRIP里程超9999.9km时,清除TRIP里程和时间*/
+    if(MC_RideLog.TRIP_Km > 99999)
+    {
+       cp_stHistoryPara.ulTripSum = 0;
+       cp_stHistoryPara.ulTripSumTime = 0;
+       MC_RunInfo.Ride_Km = 0;
+       MC_RunInfo.Ride_Time = 0;
+       MC_RideLog.TRIP_Km = 0;
+       MC_RideLog.TRIP_Time = 0;
+       cp_stHistoryPara.ulODOTime = cp_stHistoryPara.ulODOTime + (cp_stBikeRunInfoPara.ulRiTime >> 10) / 60;
+       cp_stBikeRunInfoPara.ulRiTime = 0;
+    }
 }
 
 void Can_RemainTrip_Cal(void)

+ 0 - 2
User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/CodePara.h

@@ -322,8 +322,6 @@ extern ULONG               cp_ulSystickCnt;
  Exported Function Call Prototypes
 *************************************************************************/
 void CodeParaInit(void);
-void CodeHistoryParaDelete(void);
-void CPHistoryInfoCalTiming(void);
 /************************************************************************
  Flag Define (N/A)
 *************************************************************************/

+ 0 - 34
User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/CodePara.c

@@ -265,37 +265,3 @@ void CodeParaInit(void)
     }
     cp_stBikeRunInfoPara.uwAvePowerCNT = 0;
 }
-
-void CodeHistoryParaDelete(void)
-{
-    cp_stHistoryPara.uwOpenTimes = 0;
-    cp_stHistoryPara.ulUsedTime = 0;
-    cp_stHistoryPara.uwNTCTempMaxCe = 0;
-    cp_stHistoryPara.uwNTCTempMinCe = 0;
-
-    cp_stHistoryPara.uwAlamHOcurTimes = 0;
-    cp_stHistoryPara.uwAlamSOcurTimes = 0;
-    cp_stHistoryPara.uwAlamOHeatTimes = 0;
-    cp_stHistoryPara.uwAlamRotorLockTimes = 0;
-    cp_stHistoryPara.uwAlamPhsLossTimes = 0;
-    cp_stHistoryPara.uwAlamOVolTimes = 0;
-    cp_stHistoryPara.uwAlamUVolTimes = 0;
-    cp_stHistoryPara.uwAlamComOTimeTimes = 0;
-
-    cp_stHistoryPara.uwG1AvgPwrConsumption = 100;
-    cp_stHistoryPara.uwG2AvgPwrConsumption = 160;
-    cp_stHistoryPara.uwG3AvgPwrConsumption = 190;
-    cp_stHistoryPara.uwG4AvgPwrConsumption = 270;
-    cp_stHistoryPara.uwG5AvgPwrConsumption = 180;
-
-    cp_stHistoryPara.ulODOTrip = 0;
-    cp_stHistoryPara.ulODOTime = 0;
-
-    cp_stHistoryPara.ulTripSum = 0;
-    cp_stHistoryPara.ulTripSumTime = 0;
-
-    cp_stHistoryPara.uwTorSensorAlamTimes = 0;
-    cp_stHistoryPara.uwCadSensorAlamTimes = 0;
-    cp_stHistoryPara.uwBikeSpdSensorAlamTimes = 0;
-    cp_stHistoryPara.uwPosSensorAlamTimes = 0;
-}