Преглед изворни кода

2021-11-17 / Wendell
Actions
1. [fix] selfTest logic

Files
1. As follow commit history

Image version : V1.05.XX.XXXX.XX

Wendell пре 3 година
родитељ
комит
0bee34b2ed

+ 10 - 5
EVSE/Projects/DO360/Apps/Module_ChargerSelfTest.c

@@ -48,6 +48,7 @@
 #define     PSU_SELF_TIMEOUT        60                  // unit: 1s
 #define     PSU_RETRY_TIMEOUT       60                  // unit: 1s
 #define     MAX_PSU_RETRY_CNT       3
+#define     EMG_BTN_INTERVAL        1                   // unit: 1s
 
 struct SysConfigAndInfo         *ShmSysConfigAndInfo;
 struct StatusCodeData           *ShmStatusCodeData;
@@ -284,7 +285,7 @@ int main(void)
             continue;
         }
 
-        if(!_selfTestTimeout)
+        if(!_selfTestTimeout && ShmSysConfigAndInfo->SysInfo.BootingStatus != BOOT_COMPLETE)
         {
             if(ShmSysConfigAndInfo->SysInfo.FirmwareUpdate == YES || ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq == YES)
             {
@@ -592,11 +593,15 @@ int main(void)
                 ShmSysConfigAndInfo->SysInfo.SelfTestSeq = _STEST_FAIL;
                 ShmSysConfigAndInfo->SysInfo.BootingStatus = BOOT_COMPLETE;
 
-                if(ShmPrimaryMcuData->InputDet.bits.EmergencyButton == NORMAL)
+                if(GetTimeoutValue(_TestStep_time) / uSEC_VAL >= EMG_BTN_INTERVAL)
                 {
-                    // bypass cabinet switch detection
-                    SetSelfTestSate(_STEST_FAIL);
-                    LOG_INFO("Emergency button recover, Soft Reset!");
+                    if(ShmPrimaryMcuData->InputDet.bits.EmergencyButton == NORMAL)
+                    {
+                        // bypass cabinet switch detection
+                        SetSelfTestSate(_STEST_FAIL);
+                        LOG_INFO("Emergency button recover, Soft Reset!");
+                    }
+                    GetClockTime(&_TestStep_time);
                 }
                 break;
 

BIN
EVSE/Projects/DO360/Images/FactoryDefaultConfig.bin


BIN
EVSE/Projects/DO360/Images/ramdisk.gz