2022-07-26 / Simon Xue

Action:
1. [Mod] Plugin flag modify.
2. [Mod] Set System Time when idle.

Files
As the following commit history files

Image Version: V2.09.XX.XXXX.XX

EVSE/Projects/DD360UCar/Apps/CSU/main.c

@@ -83,7 +83,7 @@ uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
 char *fwVersion = "V2.09.00.0000.00"; // Phihong version
-char* DebugVersion = "V2.09.00";      // Software debug version
+char* DebugVersion = "V2.09.01";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -2943,7 +2943,7 @@ void OcppRemoteStartChk()
             if (ShmOCPP16Data->CsMsg.bits[_index].RemoteStartTransactionReq == YES &&
                 !isDetectPlugin(_index)) {
                 if (pDcChargingInfo->SystemStatus == S_IDLE ||
-                    pDcChargingInfo->SystemStatus == MODE_AUTHORIZING ||
+                    pDcChargingInfo->SystemStatus == S_AUTHORIZING ||
                     pDcChargingInfo->SystemStatus == S_RESERVATION) {
                     pDcChargingInfo->RemoteStartFlag = YES;
                     //ShmDcCommonData->is_RemoteStart[_index] = TRUE;
@@ -3459,26 +3459,27 @@ static void autoStartCharging(uint8_t gunIndex)
     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(gunIndex);
 
     if ( (pSysInfo->SystemPage >= _LCM_START_AUTHORIZING && pSysInfo->SystemPage <= _LCM_LINK_ERROR) ||
-        pDcChargingInfo->isEVCCIDVerify && strcmp( (char *)pSysConfig->UserId , "" ) != EQUAL) {
-            return;
+        (pDcChargingInfo->isEVCCIDVerify && strcmp( (char *)pSysConfig->UserId , "" ) != EQUAL)) {
+        return;
     }
 
-    if ((pDcChargingInfo->ConnectorPlugIn == YES) &&
-            (pDcChargingInfo->SystemStatus == S_IDLE ) 
-       ) {
+    if ((pDcChargingInfo->ConnectorPlugIn == YES) && 
+        (pDcChargingInfo->SystemStatus == S_IDLE) ) {
         if(!pSysConfig->AuthorisationMode) {
             if (pSysConfig->isAuthrizeByEVCCID && !pDcChargingInfo->isEVCCIDVerify &&
                     pDcChargingInfo->Type == _Type_CCS_2)  {
                 // LCM show linking pic. & timeout 2 min
+                /*
                 if( pSysInfo->CurGunSelected == gunIndex ) {
                     systemPageRestoreInit();
                     pSysInfo->SystemPage = _LCM_PRECHARGE;
                 }
+                */
                 StartGunInfoTimeoutDet(gunIndex,Timeout_EVCCID_Link);
                 // Getting EVCCID
                 if( strcmp( (char *)pDcChargingInfo->EVCCID, "" ) != EQUAL ) {
                     log_info("Authorizing EVCCID");
-                    StopSystemTimeoutDet();
+                    StopGunInfoTimeoutDet(gunIndex);
                     strcpy((char *)pSysConfig->UserId, (char *)pDcChargingInfo->EVCCID);
                     ChangeGunSelectByIndex(gunIndex);
                     confirmSelGun(gunIndex);

EVSE/Projects/DD360UCar/Apps/ModuleDoComm/DoComm.c

@@ -355,18 +355,28 @@ static void ClearAuthorizedFlag(void)
     pSysInfo->AuthorizeFlag = NO;
 }
 
-static void ClearDetectPluginFlag(void)
+void ClearDetectPluginFlag(int gunIndex)
 {
-    pSysInfo->WaitForPlugit = NO;
+    pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(gunIndex);
+
+    if (pDcChargingInfo->RemoteStartFlag == YES) {
+        pDcChargingInfo->RemoteStartFlag = NO;
+    }
+    ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit = NO;
+
+
+    if (pSysInfo->OrderCharging != NO_DEFINE) {
+        pSysInfo->OrderCharging = NO_DEFINE;
+    }
 }
 
-static bool isDetectPlugin(void)
+bool isDetectPlugin(int gunIndex)
 {
-    if (pSysInfo->WaitForPlugit == YES) {
-        return YES;
+    if (ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit == YES) {
+        return true;
     }
 
-    return NO;
+    return false;
 }
 
 static void destroySelectGun(uint8_t curGun)
@@ -772,7 +782,7 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
                          ShmSelectGunInfo->SelGunInfo.LeftGun == SEL_GUN_ATHOR)) {
                     ShmSelectGunInfo->SelGunInfo.LeftGun = SEL_GUN_RELEASE;
                     strcpy((char *)pSysConfig->UserId, "");
-                    pSysInfo->WaitForPlugit = NO;
+                    ClearDetectPluginFlag(plugNum);
                     sleep(1); //Jerry add
                     pSysInfo->SystemPage = _LCM_VIEW;
                     GetClockTime(&pSysInfo->SystemTimeoutTimer, NULL);
@@ -784,7 +794,7 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
                          ShmSelectGunInfo->SelGunInfo.RightGun == SEL_GUN_ATHOR)) {
                     ShmSelectGunInfo->SelGunInfo.RightGun = SEL_GUN_RELEASE;
                     strcpy((char *)pSysConfig->UserId, "");
-                    pSysInfo->WaitForPlugit = NO;
+                    ClearDetectPluginFlag(plugNum);
                     sleep(1); //Jerry add
                     pSysInfo->SystemPage = _LCM_VIEW;
                     GetClockTime(&pSysInfo->SystemTimeoutTimer, NULL);
@@ -811,7 +821,8 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
             }
 
             strcpy((char *)pSysConfig->UserId, "");
-            pSysInfo->WaitForPlugit = NO;
+
+            ClearDetectPluginFlag(plugNum);
             pSysInfo->SystemPage = _LCM_VIEW;
             GetClockTime(&pSysInfo->SystemTimeoutTimer, NULL);
             pSysInfo->SystemTimeoutFlag = Timeout_None;
@@ -828,10 +839,10 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
                 break;
             }
 
-            if (isDetectPlugin() == YES) {
-                ClearDetectPluginFlag();
+            if (isDetectPlugin(plugNum) == YES) {
+                ClearDetectPluginFlag(plugNum);
                 strcpy((char *)pSysConfig->UserId, "");
-                pSysInfo->WaitForPlugit = NO;
+                ShmDcCommonData->pGunInfo[plugNum].WaitForPlugit = NO;
                 pSysInfo->SystemPage = _LCM_VIEW;
                 GetClockTime(&pSysInfo->SystemTimeoutTimer, NULL);
                 pSysInfo->SystemTimeoutFlag = Timeout_None;
@@ -1783,7 +1794,7 @@ static int writeWaitPlugItState(int fd, uint8_t id, uint8_t gunIndex)
     int ret = PASS;
     uint8_t data[2] = { ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit, 0 };
     if (_isplugin[gunIndex] != ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit) {
-        //log_info("Wait Gun%d for plug:%s", gunIndex, ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit == 0 ? "disable" : "enable");
+        log_info("Wait Gun%d for plug:%s", gunIndex, ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit == 0 ? "disable" : "enable");
         _isplugin[gunIndex] = ShmDcCommonData->pGunInfo[gunIndex].WaitForPlugit;
     }
     //printf("WaitForPlugit = %d", pSysInfo->WaitForPlugit);

EVSE/Projects/DD360UCar/Apps/ModuleEvComm/Module_EvRxComm.c

@@ -27,6 +27,7 @@ static struct GBTData *ShmGBTData = NULL;
 static struct CcsData *ShmCcsData = NULL;
 static struct FanModuleData *ShmFanModuleData = NULL;
 static DcCommonInfo *ShmDcCommonData = NULL;
+struct StatusCodeData* ShmStatusCodeData;
 
 #define TempArraySize 10
 uint8_t TempArray_1[TempArraySize]={0};
@@ -317,6 +318,7 @@ void CANReceiver(int fd)
         ShmCcsData = (struct CcsData *)GetShmCcsData();
         ShmDcCommonData = (DcCommonInfo *)GetShmDcCommonData();
         ShmFanModuleData = (struct FanModuleData *)GetShmFanModuleData();
+        ShmStatusCodeData = (struct StatusCodeData*)GetShmStatusCodeData();
 
         ShmDcCommonData->EVDisconnectTime[0] = time((time_t*)NULL);
         ShmDcCommonData->EVDisconnectTime[1] = time((time_t*)NULL);
@@ -330,19 +332,23 @@ void CANReceiver(int fd)
 
             for (_index = 0; _index < pSysConfig->TotalConnectorCount; _index++) {
                 pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(_index);
-
-                // 檢查是否有收到EV小板訊號
-                if ((time((time_t*)NULL) - ShmDcCommonData->EVDisconnectTime[_index]) > 3 &&
-                    !ShmDcCommonData->EVDisconnectFlag[_index] && 
-                    pDcChargingInfo->SystemStatus != S_UPDATE && !ShmDcCommonData->DebugFlag) {
-                    ShmDcCommonData->EVDisconnectTime[_index] = time((time_t*)NULL);
-                    ShmDcCommonData->EVDisconnectFlag[_index] = TRUE;
-                    log_error("Lost ev board %d can bus data!!!!", _index);
-
-                    system("/sbin/ip link set can0 down");
-                    sleep(1);
-                    system("/sbin/ip link set can0 type can bitrate 500000 restart-ms 100");
-                    system("/sbin/ip link set can0 up");
+                if (pSysInfo->SelfTestSeq == _STEST_COMPLETE && !ShmStatusCodeData->AlarmCode.AlarmEvents.bits.SystemTaskLost) {
+                    // 檢查是否有收到EV小板訊號
+                    if ((time((time_t*)NULL) - ShmDcCommonData->EVDisconnectTime[_index]) > 5 &&
+                        !ShmDcCommonData->EVDisconnectFlag[_index] &&
+                        pDcChargingInfo->SystemStatus != S_UPDATE && !ShmDcCommonData->DebugFlag) {
+                        ShmDcCommonData->EVDisconnectTime[_index] = time((time_t*)NULL);
+                        ShmDcCommonData->EVDisconnectFlag[_index] = TRUE;
+                        log_error("Lost ev board %d can bus data!!!!", _index);
+
+                        system("/sbin/ip link set can0 down");
+                        sleep(1);
+                        system("/sbin/ip link set can0 type can bitrate 500000 restart-ms 100");
+                        system("/sbin/ip link set can0 up");
+                    }
+                } else {
+                    ShmDcCommonData->pGunInfo[targetGun].EVLoseTimer = time((time_t*)NULL);
+                    ShmDcCommonData->pGunInfo[targetGun].EVLoseFlag = FALSE;
                 }
 
                 CheckEvConnect(_index);