代码规范

User project/1.FrameLayer/Source/TimeTask_Event.c

@@ -67,13 +67,13 @@ void  Event_1ms(void)
     if (cadence_stFreGetOut.uwForwardCnt > 0)
     {
         cadence_stFreGetOut.uwForwardCnt = 0;
-        ass_stTorqMafValue.value = torsensor_stTorSensorOut.uwTorquePu;
+        ass_stTorqMafValue.swValue = torsensor_stTorSensorOut.uwTorquePu;
         ass_voMoveAverageFilter(&ass_stTorqMafValue);
         
         /* Iqref maf test, dont add torq obs */
         if(ass_CalOut.blTorqPIFlg)
         {
-            ass_stUqLimMafValue.value = ass_stTorqPIOut.swIRefPu;
+            ass_stUqLimMafValue.swValue = ass_stTorqPIOut.swIRefPu;
             ass_voMoveAverageFilter(&ass_stUqLimMafValue);
             tstMafClrFlg = FALSE;
         }
@@ -114,7 +114,7 @@ void  Event_1ms(void)
     ass_CalIn.uwSpdFbkAbsPu = scm_uwSpdFbkLpfAbsPu;
     ass_CalIn.swSpdFbkPu = scm_stSpdFbkLpf.slY.sw.hi;
     ass_CalIn.uwBaseSpdrpm = cof_uwVbRpm;
-    ass_CalIn.uwtorque = ass_stTorqMafValue.AverValue; //torsensor_stTorSensorOut.uwTorqueLPFPu;
+    ass_CalIn.uwtorque = ass_stTorqMafValue.slAverValue; //torsensor_stTorSensorOut.uwTorqueLPFPu;
     ass_CalIn.uwtorquelpf = torsensor_stTorSensorOut.uwTorqueLPFPu;
     ass_CalIn.uwtorquePer = torsensor_stTorSensorOut.uwTorquePu;
     ass_CalIn.swCurFdbPu = scm_swIqFdbLpfPu;

User project/1.FrameLayer/Source/tbc.c

@@ -123,15 +123,15 @@ void tbc_voDownIsr(void)
     if (switch_flg.SysFault_Flag == TRUE && tbc_pvt_blErrorFlag == 0)
     {
         tbc_pvt_blErrorFlag = TRUE;
-        stErrorLog.ErrorCode = alm_unCode.all;
-        stErrorLog.RunTime = MC_RunInfo.Ride_Time;
-        stErrorLog.RunInfo = MC_RunInfo;
-        stErrorLog.IqCurrentPu = scm_swIqFdbLpfPu;
-        stErrorLog.IqVoltagePu = scm_swUqRefPu;
-        stErrorLog.IdCurrentPu = scm_swIdFdbLpfPu;
-        stErrorLog.IdVoltagePu = scm_swUdRefPu;
+        que_stErrorLog.ErrorCode = alm_unCode.all;
+        que_stErrorLog.RunTime = MC_RunInfo.Ride_Time;
+        que_stErrorLog.RunInfo = MC_RunInfo;
+        que_stErrorLog.IqCurrentPu = scm_swIqFdbLpfPu;
+        que_stErrorLog.IqVoltagePu = scm_swUqRefPu;
+        que_stErrorLog.IdCurrentPu = scm_swIdFdbLpfPu;
+        que_stErrorLog.IdVoltagePu = scm_swUdRefPu;
 
-        que_ubPushIn( &stFlashErrorLog, &stErrorLog, 1);  
+        que_ubPushIn(&que_stFlashErrorLog, &que_stErrorLog, 1);  
     }
     else if(switch_flg.SysFault_Flag == FALSE)
     {

User project/3.BasicFunction/Include/AssistCurve.h

@@ -336,12 +336,12 @@ typedef struct
 
 typedef struct
 {
-    SWORD  value;
-    UWORD  length; // 6: 2^6 value to average
-    SLONG  sum;
-    SLONG  AverValue;
-    SWORD *buffer;
-    UWORD  index;
+    SWORD  swValue;
+    UWORD  uwLength; // 6: 2^6 value to average
+    SLONG  slSum;
+    SLONG  slAverValue;
+    SWORD *swBuffer;
+    UWORD  uwIndex;
     BOOL   blSecFlag;
 } MAF_IN;
 

User project/3.BasicFunction/Source/AssistCurve.c

@@ -285,7 +285,7 @@ void ass_voAssitCoef(void)
         ass_CalCoef.uwStartUpTimeCadenceCnt = CADENCE_NUMBERS_PULSES;
     }
     /*设置滑动平均滤波踏频数*/
-    ass_stTorqMafValue.length = ass_ParaSet.uwTorLPFCadNm;
+    ass_stTorqMafValue.uwLength = ass_ParaSet.uwTorLPFCadNm;
 
     ass_CalCoef.swCadanceGain = 0;
     ass_CalCoef.uwSwitch1TorqThreshold = ((ULONG)TORQUE_SWITCH1_THRESHOLD << 14) / TORQUEBASE;
@@ -627,26 +627,26 @@ static SWORD AssitCuvApplPerVolt(void)
         else
         {       
         }        
-        /* Reduce Voltage Limit When MAFTorq < Switch1TorqThreshold */     
-//          if(ass_CalIn.uwtorque >= ass_CalCoef.uwSwitch1TorqThreshold)
-//          {             
-//              ass_CalOut.swVoltLimitPu +=  ass_CalCoef.uwStartUpGainAddStep;
-//          }
-//          else if (ass_CalIn.uwtorque <= ass_CalCoef.uwSwitch1TorqThreshold)
-//          {
-//              ass_CalOut.swVoltLimitPu -=  ass_CalCoef.uwSpeedConstantCommand;
-//          }
-//          else
-//          {}
-//        
-//          if (ass_CalOut.swVoltLimitPu > scm_swVsDcpLimPu)
-//          {
-//              ass_CalOut.swVoltLimitPu = scm_swVsDcpLimPu;
-//          }
-//          else if (ass_CalOut.swVoltLimitPu <= (swTmpVoltPu + ass_ParaSet.uwStartUpCadNm))
-//          {
-//              ass_CalOut.swVoltLimitPu =  swTmpVoltPu + ass_ParaSet.uwStartUpCadNm;
-//          }
+
+        /* Reduce Voltage Limit When LPFTorq < Switch1TorqThreshold */     
+        // if(ass_CalIn.uwtorquelpf >= ass_CalCoef.uwSwitch1TorqThreshold)
+        // {             
+        //     ass_CalOut.swVoltLimitPu +=  ass_CalCoef.uwStartUpGainAddStep;
+        // }
+        // else if (ass_CalIn.uwtorquelpf <= ass_CalCoef.uwSwitch1TorqThreshold)
+        // {
+        //     ass_CalOut.swVoltLimitPu -=  ass_CalCoef.uwSpeedConstantCommand;
+        // }
+        // else
+        // {}
+        // if (ass_CalOut.swVoltLimitPu > scm_swVsDcpLimPu)
+        // {
+        //     ass_CalOut.swVoltLimitPu = scm_swVsDcpLimPu;
+        // }
+        // else if (ass_CalOut.swVoltLimitPu <= (swTmpVoltPu + ass_ParaSet.uwStartUpCadNm))
+        // {
+        //     ass_CalOut.swVoltLimitPu =  swTmpVoltPu + ass_ParaSet.uwStartUpCadNm;
+        // }
 
         /* Torque Clzloop Test */
         if (ass_CalOut.swVoltLimitPu < scm_swVsDcpLimPu)
@@ -1077,14 +1077,12 @@ static SWORD AssitCuvApplPerVolt(void)
         
         /* Torq Clzloop Test */      
         if(ass_CalIn.uwtorquelpf <= ass_CalCoef.uwSwitch1TorqThreshold)
-        //if(torsensor_test_Lpf.slY.sw.hi <= ass_CalCoef.uwSwitch1TorqThreshold)
         { 
             if(!ass_CalOut.blTorqPIFlg)
             {
                  /* Initial value */
-                 ////ass_stTorqPIOut.slIRefPu = (SLONG)ass_CalOut.swTorRefTarget << 15;//(SLONG)ass_CalOut.swAssitCurRef << 15;
                  ass_stTorqPIOut.slIRefPu = 0;
-                 swCurSwitch = abs(ass_CalOut.swTorRefTarget);//abs(ass_CalOut.swAssitCurRef);
+                 swCurSwitch = abs(ass_CalOut.swTorRefTarget); //abs(ass_CalOut.swAssitCurRef);
                  ass_CalOut.blTorqPIFlg = TRUE;
             }
  
@@ -1093,8 +1091,7 @@ static SWORD AssitCuvApplPerVolt(void)
             ass_stTorqPIIn.swImaxPu = 0; 
             ass_stTorqPIIn.swIminPu = -swCurSwitch;
             ass_voAssitTorqPI(&ass_stTorqPIIn,&ass_stTorqPIOut);
-            //ass_CalOut.swTorAssistCurrentTemp = ass_CalIn.swDirection *(swCurSwitch + ass_stTorqPIOut.swIRefPu);
-            ass_CalOut.swTorAssistCurrentTemp = ass_CalIn.swDirection *(swCurSwitch + ass_stUqLimMafValue.AverValue);
+            ass_CalOut.swTorAssistCurrentTemp = ass_CalIn.swDirection *(swCurSwitch + ass_stUqLimMafValue.slAverValue);
         }
         else
         {
@@ -1305,36 +1302,36 @@ void ass_voAssist(void)
  */
 void ass_voMoveAverageFilter(MAF_IN *in)
 {
-    in->sum -= in->buffer[in->index];
-    in->buffer[in->index] = in->value;
-    in->sum += (SQWORD)in->value;
+    in->slSum -= in->swBuffer[in->uwIndex];
+    in->swBuffer[in->uwIndex] = in->swValue;
+    in->slSum += (SQWORD)in->swValue;
     if (!in->blSecFlag)
     {
-        in->AverValue = (SLONG)(in->sum / (in->index + 1));
+        in->slAverValue = (SLONG)(in->slSum / (in->uwIndex + 1));
     }
     else
     {
-        in->AverValue = (SLONG)(in->sum / in->length);
+        in->slAverValue = (SLONG)(in->slSum / in->uwLength);
     }
-    in->index++;
+    in->uwIndex++;
 
-    if (in->index >= in->length)
+    if (in->uwIndex >= in->uwLength)
     {
         in->blSecFlag = TRUE;
-        in->index = 0;
+        in->uwIndex = 0;
     }
 }
 
 void ass_voMoveAverageFilterClear(MAF_IN *in)
 {
     UWORD i;
-    in->index = 0;
-    in->sum = 0;
+    in->uwIndex = 0;
+    in->slSum = 0;
     in->blSecFlag = FALSE;
 
     for (i = 0; i < 64; i++)
     {
-        in->buffer[i] = 0;
+        in->swBuffer[i] = 0;
     }
 }
 

User project/3.BasicFunction/Source/canAppl.c

@@ -510,7 +510,7 @@ void Can_voMC_Run_200ms(void)
     SizeMCUP = sizeof(MC_UpcInfo.stAssistInfo);
     if (MC_BC_COM == 0)
     {
-        MC_RunInfoToCDL.Torque = ((ULONG)ass_stTorqMafValue.value * TORQUEBASE / 10) >> 14;           // 0.1 Nm
+        MC_RunInfoToCDL.Torque = ((ULONG)ass_stTorqMafValue.swValue * TORQUEBASE / 10) >> 14;           // 0.1 Nm
         MC_RunInfoToCDL.CadenceDir = (MC_CadenceDir_Struct_t)cadence_stFreGetOut.cadence_dir; // 踩踏方向 0-正,1-反,2-停止，
         MC_RunInfoToCDL.Cadence = (cadence_stFreGetOut.uwLPFFrequencyPu * cof_uwVbRpm) >> 20; // rpm
         MC_RunInfoToCDL.GearSt = MC_ControlCode.GearSt;

User project/3.BasicFunction/Source/flash_master.c

@@ -109,16 +109,16 @@ void flash_voParaInit(void)
 void flash_voErrorWrite(void)
 {
     UWORD count_len = sizeof(FLASH_ERROR_QUEUE) / 2;
-    FLASH_voWriteMoreData(StartServerManageErrorFlashAddress, (UWORD *)(&stFlashErrorLog), count_len);
+    FLASH_voWriteMoreData(StartServerManageErrorFlashAddress, (UWORD *)(&que_stFlashErrorLog), count_len);
 }
 
 void flash_voErrorRead(void)
 {
     UWORD count_len = sizeof(FLASH_ERROR_QUEUE) / 2;
-    FLASH_voReadMoreData(StartServerManageErrorFlashAddress, (UWORD *)(&stFlashErrorLog), count_len);
+    FLASH_voReadMoreData(StartServerManageErrorFlashAddress, (UWORD *)(&que_stFlashErrorLog), count_len);
     
-    if(stFlashErrorLog.ubHead == 0xFF)
+    if(que_stFlashErrorLog.ubHead == 0xFF)
     {
-       que_voInit(&stFlashErrorLog);
+       que_voInit(&que_stFlashErrorLog);
     }   
 }

User project/3.BasicFunction/Source/power.c

@@ -113,6 +113,11 @@ void power_voPowerManagement(ULONG ulAutoPowerOffDelayTime, ULONG SysTickCnt, UL
                     SendData(ID_MC_BC, MODE_REPORT, 0x1808, (uint8_t *)"SHUTDOWN");
                 }
             }
+            else
+            {
+                power_stPowStateOut.uwPowerShutdnCnt = 0;
+            }
+
             //Do not auto power off
             if(ulAutoPowerOffDelayTime == 0)
             {

User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/queue.h

@@ -53,8 +53,8 @@ typedef struct
     ERROR_LOG stLog[QUEUE_SIZE];
 } FLASH_ERROR_QUEUE;
 
-extern ERROR_LOG         stErrorLog;
-extern FLASH_ERROR_QUEUE stFlashErrorLog;
+extern ERROR_LOG         que_stErrorLog;
+extern FLASH_ERROR_QUEUE que_stFlashErrorLog;
 /************************************************************************
 Exported Function Call Prototypes (N/A)
 ************************************************************************/

User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/queue.c

@@ -31,8 +31,8 @@ Revising History (ECL of this file):
 /******************************************************************************************************************************************************
 **  \brief parameter
 ******************************************************************************************************************************************************/
-ERROR_LOG         stErrorLog;
-FLASH_ERROR_QUEUE stFlashErrorLog;
+ERROR_LOG         que_stErrorLog;
+FLASH_ERROR_QUEUE que_stFlashErrorLog;
 /******************************************************************************************************************************************************
 **  \brief
 ******************************************************************************************************************************************************/