2022-06-01 / Simon Xue

Action:
1. [Add] Show each gun link error and plugout status.
2. [Modify] Maintain mode.

Files
As the following commit history files

Image Version: V2.07.XX.XXXX.XX

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

@@ -132,25 +132,20 @@ void CheckLeftButton()
 {
     DcCommonInfo* ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
     uint8_t gunIndex = 0;
+    pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(LEFT_GUN_NUM);
     switch (pSysInfo->SystemPage) {
         case _LCM_VIEW:
-            pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(LEFT_GUN_NUM);
             pSysInfo->CurGunSelected = LEFT_GUN_NUM;
             if(pDcChargingInfo->SystemStatus == S_IDLE || pDcChargingInfo->SystemStatus == S_RESERVATION) {
                 EnterAuthorizePage(LEFT_GUN_NUM);
                 pSysInfo->SystemPage = _LCM_START_SCAN;
             } else if (pDcChargingInfo->SystemStatus == S_CHARGING) {
                 showConfirmStopPage(LEFT_GUN_NUM);
-            } else if (pDcChargingInfo->SystemStatus == S_ALARM) {
+            } else if (pDcChargingInfo->SystemStatus == S_ALARM || 
+                pDcChargingInfo->SystemStatus == S_COMPLETE) {
                 // 有進入充電時
                 if (ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM]) {
-                    // 有插槍時顯示錯誤畫面
-                    if (pDcChargingInfo->ConnectorPlugIn) {
-                        pSysInfo->SystemPage = _LCM_ERROR;
-                    } else {
-                        // 未插槍時顯示結算畫面
-                        pSysInfo->SystemPage = _LCM_SUMMARY;
-                    }
+                    pSysInfo->SystemPage = _LCM_SUMMARY;
                 } else {
                     // 未進入充電時顯示連線錯誤
                     StopSystemTimeoutDet();
@@ -162,30 +157,32 @@ void CheckLeftButton()
         case _LCM_START_SCAN:
         case _LCM_START_AUTHORIZE_FAIL:
             if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
-                ReturnIDLE(pSysInfo->CurGunSelected);
+                ReturnIDLE(LEFT_GUN_NUM);
             }
             break;
         case _LCM_LINK_ERROR:
             if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
                 if (pDcChargingInfo->ConnectorPlugIn) {
-                    pSysInfo->SystemPage = _LCM_WAIT_PLUGOUT;
-                    StopSystemTimeoutDet();
-                    StartSystemTimeoutDet(Timeout_PlugOut);
+                    pSysInfo->SystemPage = _LCM_VIEW;
                 } else
-                    ReturnIDLE(pSysInfo->CurGunSelected);
+                    ReturnIDLE(LEFT_GUN_NUM);
             }
             break;
         case _LCM_SUMMARY:
             if (pSysInfo->CurGunSelected == RIGHT_GUN_NUM)
                 break;
-            log_info("Return View Page");
-            ReturnIDLE(pSysInfo->CurGunSelected);
+            if (pDcChargingInfo->ConnectorPlugIn) {
+                pSysInfo->SystemPage = _LCM_VIEW;
+            } else {
+                log_info("Return View Page");
+                ReturnIDLE(LEFT_GUN_NUM);
+            }
             break;
         case _LCM_ERROR:
             if (pSysInfo->CurGunSelected == RIGHT_GUN_NUM)
                 break;
             if (pDcChargingInfo->ConnectorPlugIn)
-                pSysInfo->SystemPage = _LCM_WAIT_PLUGOUT;
+                pSysInfo->SystemPage = _LCM_VIEW;
             else
                 pSysInfo->SystemPage = _LCM_SUMMARY;
             break;
@@ -213,9 +210,9 @@ void CheckRightButton()
 {
     uint8_t gunIndex = 0;
     DcCommonInfo* ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
+    pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(RIGHT_GUN_NUM);
     switch (pSysInfo->SystemPage) {
         case _LCM_VIEW:
-            pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(RIGHT_GUN_NUM);
             pSysInfo->CurGunSelected = RIGHT_GUN_NUM;
             if(pDcChargingInfo->SystemStatus == S_IDLE || pDcChargingInfo->SystemStatus == S_RESERVATION) {
                 EnterAuthorizePage(RIGHT_GUN_NUM);
@@ -223,17 +220,11 @@ void CheckRightButton()
             } else if (pDcChargingInfo->SystemStatus == S_CHARGING) {
                 //EnterDetailViewPage(RIGHT_GUN_NUM);
                 showConfirmStopPage(RIGHT_GUN_NUM);
-            } else if (pDcChargingInfo->SystemStatus == S_ALARM) {
+            } else if (pDcChargingInfo->SystemStatus == S_ALARM ||
+                pDcChargingInfo->SystemStatus == S_COMPLETE) {
                 // 有進入充電時
                 if (ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM]) {
-                    // 有插槍時顯示錯誤畫面
-                    if (pDcChargingInfo->ConnectorPlugIn) {
-                        pSysInfo->SystemPage = _LCM_ERROR;
-                    } else {
-                        // 未插槍時顯示結算畫面
-                        pSysInfo->SystemPage = _LCM_SUMMARY;
-                        //ReturnIDLE(RIGHT_GUN_NUM);
-                    }
+                    pSysInfo->SystemPage = _LCM_SUMMARY;
                 } else {
                     // 未進入充電時顯示連線錯誤
                     StopSystemTimeoutDet();
@@ -258,11 +249,9 @@ void CheckRightButton()
         case _LCM_LINK_ERROR:
             if (pSysInfo->CurGunSelected == RIGHT_GUN_NUM) {
                 if (pDcChargingInfo->ConnectorPlugIn) {
-                    pSysInfo->SystemPage = _LCM_WAIT_PLUGOUT;
-                    StopSystemTimeoutDet();
-                    StartSystemTimeoutDet(Timeout_PlugOut);
+                    pSysInfo->SystemPage = _LCM_VIEW;
                 } else
-                    ReturnIDLE(pSysInfo->CurGunSelected);
+                    ReturnIDLE(RIGHT_GUN_NUM);
             }
             break;
             /*
@@ -284,7 +273,7 @@ void CheckRightButton()
             if (pSysInfo->CurGunSelected == LEFT_GUN_NUM)
                 break;
             if (pDcChargingInfo->ConnectorPlugIn)
-                pSysInfo->SystemPage = _LCM_WAIT_PLUGOUT;
+                pSysInfo->SystemPage = _LCM_VIEW;
             else
                 pSysInfo->SystemPage = _LCM_SUMMARY;
             break;
@@ -298,8 +287,12 @@ void CheckRightButton()
         case _LCM_SUMMARY:
             if (pSysInfo->CurGunSelected == LEFT_GUN_NUM)
                 break;
-            log_info("Return View Page");
-            ReturnIDLE(pSysInfo->CurGunSelected);
+            if (pDcChargingInfo->ConnectorPlugIn) {
+                pSysInfo->SystemPage = _LCM_VIEW;
+            } else {
+                log_info("Return View Page");
+                ReturnIDLE(RIGHT_GUN_NUM);
+            }
             break;
     }
     

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.07.00.0000.00"; // Phihong version
-char* DebugVersion = "V2.07.01";      // Software debug version
+char* DebugVersion = "V2.07.02";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -2439,7 +2439,7 @@ void KillAllTask(void)
 void StartSystemTimeoutDet(uint8_t flag)
 {
     if (pSysInfo->SystemTimeoutFlag != flag) {
-        log_info("Set System Timeout Flag %d", flag);
+        //log_info("Set System Timeout Flag %d", flag);
         GetClockTime(&pSysInfo->SystemTimeoutTimer, NULL);
     }
     pSysInfo->SystemTimeoutFlag = flag;
@@ -2458,7 +2458,7 @@ void StartGunInfoTimeoutDet(uint8_t gunIndex, uint8_t flag)
     if (gunIndex < pSysConfig->TotalConnectorCount) {
         if (pDcChargingInfo->TimeoutFlag != flag) {
             gettimeofday(&pDcChargingInfo->TimeoutTimer, NULL);
-            log_info("Set Gun%d Timeout Flag %d", gunIndex,flag);
+            //log_info("Set Gun%d Timeout Flag %d", gunIndex,flag);
         }
         pDcChargingInfo->TimeoutFlag = flag;
     }
@@ -2627,12 +2627,7 @@ void CreateTimeoutFork(void)
                     destroySelGun(pSysInfo->CurGunSelected);
                 }
                 break;
-            case Timeout_PlugOut:
-                if (GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL >= PLUGOUT_TIMEOUT) {
-                    StopSystemTimeoutDet();
-                    pSysInfo->SystemPage = _LCM_VIEW;
-                }
-                break;
+
             }
             // 各槍
             for (uint8_t gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
@@ -2696,7 +2691,13 @@ void CreateTimeoutFork(void)
                     }
                     break;
                     */
-
+                case Timeout_PlugOut:
+                    if (GetTimeoutValue(pDcChargingInfo->TimeoutTimer) / uSEC_VAL >= PLUGOUT_TIMEOUT) {
+                        StopGunInfoTimeoutDet(gunIndex);
+                        destroySelGun(gunIndex); //jerry add
+                        pSysInfo->SystemPage = _LCM_VIEW;
+                    }
+                    break;
                 }
             }
             sleep(1);
@@ -3933,6 +3934,7 @@ int main(void)
     bool isModelNameMatch = true;
     uint8_t _ocppProfileChkFlag;
     uint8_t gunIndex = 0;
+    uint8_t isplugin[2] = {0};
     if (CreateAllCsuShareMemory() == FAIL) {
         log_error("create share memory error");
         return FAIL;
@@ -4129,13 +4131,6 @@ int main(void)
             }
 
         }
-        /*
-        if (is_idle == FALSE) {
-            ShmFanModuleData->SetFan1Speed = 7000;
-        } else {
-            ShmFanModuleData->SetFan1Speed = 0;
-        }
-        */
 
         checkChillerAlarmState();
 
@@ -4177,6 +4172,10 @@ int main(void)
                 }
                 autoStartCharging(gunIndex);
                 goto CheckStatus;
+                // 檢查預約
+                if (ShmDcCommonData->pGunInfo[gunIndex].ReservationStatus) {
+                    setChargerMode(gunIndex, MODE_RESERVATION);
+                }
                 break;
             case S_RESERVATION:
                 if (isModeChange(gunIndex)) {
@@ -4187,6 +4186,10 @@ int main(void)
                 if (!isReservationExpired(gunIndex)) {
                     pDcChargingInfo->SystemStatus = S_IDLE;
                 }*/
+                // 檢查預約
+                if (!ShmDcCommonData->pGunInfo[gunIndex].ReservationStatus) {
+                    setChargerMode(gunIndex, MODE_IDLE);
+                }
                 goto CheckStatus;
                 break;
             case S_FAULT:
@@ -4501,18 +4504,29 @@ CheckStatus:
                     break;
                 }
 
-                if (pSysInfo->CurGunSelected == gunIndex &&
-                    (pSysInfo->SystemPage != _LCM_ERROR && pSysInfo->SystemPage != _LCM_LINK_ERROR) ){
-                    if (pDcChargingInfo->ConnectorPlugIn) {
-                        if (pSysInfo->SystemPage != _LCM_WAIT_PLUGOUT)
+                if (!pDcChargingInfo->ConnectorPlugIn) {
+                    if (ShmDcCommonData->isIntoCharge[gunIndex]) {
+                        if (pSysInfo->CurGunSelected == gunIndex)
+                            pSysInfo->SystemPage = _LCM_SUMMARY;
+                        if (pSysInfo->SystemPage != _LCM_SUMMARY) {
+                            setChargerMode(gunIndex, MODE_IDLE);
+                        }
+                        StartGunInfoTimeoutDet(gunIndex, Timeout_PlugOut);
+                    } else {
+                        setChargerMode(gunIndex, MODE_IDLE);
+                    }
+                } else {
+                    if (ShmDcCommonData->isIntoCharge[gunIndex]) {
+                        if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _LCM_SUMMARY) {
                             pSysInfo->SystemPage = _LCM_VIEW;
-                        else {
                         }
                     } else {
-                        StopGunInfoTimeoutDet(gunIndex);
-                        pSysInfo->SystemPage = _LCM_SUMMARY;
+                        if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _LCM_LINK_ERROR) {
+                            pSysInfo->SystemPage = _LCM_VIEW;
+                        }
                     }
                 }
+                
 
                 break;
 
@@ -4589,18 +4603,25 @@ CheckStatus:
                     }
                     TheEndCharging(gunIndex);
                     StopSystemTimeoutDet();
+                    if (pSysInfo->CurGunSelected == gunIndex) {
+                        pSysInfo->SystemPage = _LCM_VIEW;
+                    }
                 }
 
                 if (pSysInfo->SystemPage == _LCM_MAINTAIN) {
                     break;
                 }
 
-                if (pSysInfo->CurGunSelected == gunIndex) {
-                    if (pDcChargingInfo->ConnectorPlugIn) {
-                        pSysInfo->SystemPage = _LCM_WAIT_PLUGOUT;
-                    } else {
+                if (!pDcChargingInfo->ConnectorPlugIn) {
+                    if (pSysInfo->CurGunSelected == gunIndex)
                         pSysInfo->SystemPage = _LCM_SUMMARY;
-                        StartSystemTimeoutDet(Timeout_ReturnViewPage);
+                    if (pSysInfo->SystemPage != _LCM_SUMMARY) {
+                        setChargerMode(gunIndex, MODE_IDLE);
+                    }
+                    StartGunInfoTimeoutDet(gunIndex, Timeout_PlugOut);
+                } else {
+                    if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _LCM_SUMMARY) {
+                        pSysInfo->SystemPage = _LCM_VIEW;
                     }
                 }
                 break;
@@ -4612,8 +4633,9 @@ CheckStatus:
                         pSysInfo->SystemPage = _LCM_MAINTAIN;
                         continue;
                     }
-                    if (pDcChargingInfo->IsAvailable == NO )
-                        continue;
+                    if (pDcChargingInfo->IsAvailable == NO) {
+                        break;
+                    }
 
                     if (pSysWarning->Level != WARN_LV_ER) {
                         if (!DisplaySelfTestFailReason()) { //DS60-120 add
@@ -4630,8 +4652,20 @@ CheckStatus:
                     } else {
                         KillTask();
                     }
-                    if (pSysInfo->SelfTestSeq == _STEST_FAIL)
-                        StopProcessingLoop();
+                    //if (pSysInfo->SelfTestSeq == _STEST_FAIL)
+                    //    StopProcessingLoop();
+                }
+                if (pSysInfo->SelfTestSeq == _STEST_FAIL && pSysInfo->SystemTimeoutFlag != Timeout_SelftestChk) {
+                    SelfTestRun();
+                    StopSystemTimeoutDet();
+                    sleep(3);
+                    break;
+                }
+                if (pDcChargingInfo->IsAvailable && pSysInfo->SelfTestSeq == _STEST_COMPLETE) {
+                    setChargerMode(gunIndex, MODE_IDLE);
+                }
+                if (pSysInfo->CurGunSelected == gunIndex) {
+                    pSysInfo->SystemPage = _LCM_VIEW;
                 }
                 break;
             case S_UPDATE:

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

@@ -41,7 +41,7 @@
 #define GUN_PRECHARGING_TIMEOUT                 (60)
 #define EVCCID_LINK_TIMEOUT                     (120)
 #define CONN_PLUG_TIMEOUT                       (40)
-#define PLUGOUT_TIMEOUT                         (30)
+#define PLUGOUT_TIMEOUT                         (120)
 #define TERMINATING_TIMEOUT                     (30)
 #define WHILE_LOOP_TIME                         (10000)
 

EVSE/Projects/DD360UCar/Apps/DataBase/DataBase.c

@@ -178,7 +178,7 @@ int DB_Update_Operactive(uint8_t gunIndex, uint8_t IsAvailable)
         log_info( "Can't open database: %s", sqlite3_errmsg(localDb));
         sqlite3_close(localDb);
     } else {
-        log_info( "Local charging record database open successfully (%d).", IsAvailable);
+        //log_info( "Local charging record database open successfully (%d).", IsAvailable);
 
         //sprintf(sqlStr, "insert or replace into config (IsAvailable, connector, val) values('IsAvailable', %d, %d);", gunIndex, IsAvailable);
         sprintf(sqlStr,

EVSE/Projects/DD360UCar/Apps/ModuleChkSysTask/Module_ChkSysTask.c

@@ -230,8 +230,12 @@ void main(void)
     pSysInfo = (struct SysInfoData *)GetShmSysInfoData();
     ShmOCPP16Data = (struct OCPP16Data *)GetShmOCPP16Data();
     ShmSysConfigAndInfo = (struct SysConfigAndInfo *)GetShmSysConfigAndInfo();
-    ShmStatusCodeData = (struct StatusCodeData *)GetShmStatusCodeData();	
+    ShmStatusCodeData = (struct StatusCodeData *)GetShmStatusCodeData();
+	ShmOCPP16Data = (struct OCPP16Data*)GetShmOCPP16Data();
     MappingGunChargingInfo("CheckSystem Task");
+
+	ShmOCPP16Data->CsMsg.bits[0].ChangeAvailabilityReq = YES;
+	ShmOCPP16Data->CsMsg.bits[1].ChangeAvailabilityReq = YES;
     while(true)
     {
       	for (uint8_t gun = 0; gun < pSysConfig->TotalConnectorCount; gun++) {

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

@@ -1418,13 +1418,10 @@ static int responsePackeHandle(int fd, uint8_t *pResult, uint8_t plugNum, uint8_
             if(reservationState)
             {
                 log_info("id = %d reservation idTag: %s", pCsuResult->Head.ID, (char *)&ReservationIdTag[plugNum][0]);
-                pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(plugNum);
+
                 strcpy(&ShmDcCommonData->pGunInfo[plugNum].ReservationID[0], (char*)&pCsuResult->Data.Data[1]);
-                
-                pDcChargingInfo->SystemStatus = S_RESERVATION;
             } else {
-                if (pDcChargingInfo->SystemStatus == S_RESERVATION && pSysInfo->WaitForPlugit == NO)
-                    pDcChargingInfo->SystemStatus = S_IDLE;
+                strcpy(&ShmDcCommonData->pGunInfo[plugNum].ReservationID[0], "");
             }
         }
         ReservationState[plugNum] = reservationState;
@@ -1525,7 +1522,7 @@ static int responsePackeHandle(int fd, uint8_t *pResult, uint8_t plugNum, uint8_
             return COMMAND_RESULT_NG;
         }
         if (rawDataLen <= 2) {
-            log_info("No Charging timestamp");
+            //log_info("No Charging timestamp");
             break;
         }
 

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

@@ -422,22 +422,24 @@ void CANReceiver(int fd)
                         pSysInfo->CurGunSelected = targetGun;
                     }
                 }
-                // CCS 小板確認拔除三秒
-                if (pDcChargingInfo->Type == _Type_CCS_2) {
-                    if (frame.data[0] == UNPLUG) {
-                        if ((time((time_t*)NULL) - CCS_PlugoutTimer[targetGun]) > 3) {
-                            if (pDcChargingInfo->ConnectorPlugIn != frame.data[0])
-                                log_info("CCS Conn %d, Unplug. ", targetGun);
-                        } else {
-                            frame.data[0] = PLUG;
+                pDcChargingInfo->PilotVoltage = frame.data[1];
+                // CCS 小板確認Pilot Voltage != 0
+                if (pDcChargingInfo->Type == _Type_CCS_2 && pDcChargingInfo->PilotVoltage != 0) {
+                    if (frame.data[0] == UNPLUG && pDcChargingInfo->ConnectorPlugIn != frame.data[0]) {
+                        log_info("Conn %d, Unplug. ", targetGun);
+                        if (pDcChargingInfo->SystemStatus == S_COMPLETE || pDcChargingInfo->SystemStatus == S_ALARM) {
+                            pSysInfo->CurGunSelected = targetGun;
+                        }
+                    }
+                    pDcChargingInfo->ConnectorPlugIn = frame.data[0];
+                } else {
+                    if (frame.data[0] == UNPLUG && pDcChargingInfo->ConnectorPlugIn != frame.data[0]) {
+                        if (pDcChargingInfo->SystemStatus == S_COMPLETE || pDcChargingInfo->SystemStatus == S_ALARM) {
+                            pSysInfo->CurGunSelected = targetGun;
                         }
-                    } else {
-                        CCS_PlugoutTimer[targetGun] = time((time_t*)NULL);
-                        frame.data[0] = PLUG;
                     }
+                    pDcChargingInfo->ConnectorPlugIn = frame.data[0];
                 }
-                pDcChargingInfo->ConnectorPlugIn = frame.data[0];
-                pDcChargingInfo->PilotVoltage = frame.data[1];           
 
                 //log_info("index = %d, ConnectorPlugIn = %x, data[0] = %x ",
                 //         targetGun,

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

@@ -546,13 +546,11 @@ static void SetPresentChargingOutputPower(void)
             (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] >= cur2 + CHK_CUR_RANGE) ||
             (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] <= cur2 - CHK_CUR_RANGE)
        ) {
-        log_info("G1->Out Vol(%s)=%.1f,Out Cur=%.1f - G2->Out Vol(%s) = %.1f, Out Cur = %.1f",
-                 isPsuVol1 == true ? "P" : "R",
-                 vol1 / 10,
-                 cur1 / 10,
-                 isPsuVol2 == true ? "P" : "R",
-                 vol2 / 10,
-                 cur2 / 10);
+        log_info("G1-> Vol=%.1f, Cur=%.1f - G2-> Vol = %.1f, Cur = %.1f",
+            vol1 / 10,
+            cur1 / 10,
+            vol2 / 10,
+            cur2 / 10);
 
         LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] = vol1;
         LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] = cur1;

EVSE/Projects/DD360UCar/Apps/ModuleInternalComm/RelayBoard.c

@@ -1709,7 +1709,7 @@ static void LEDBoardProcess(void)
         return;
     }
     pSysConfig->LedInfo.Intensity = LED_INTENSITY_BRIGHTEST;
-    if (GetTimeoutValue(_led_priority_time) / 1000 >= 1000) {
+    if (GetTimeoutValue(_led_priority_time) / 1000 >= 500) {
 
         //if (pSysConfig->TotalConnectorCount == 1) {
         //    pDcChargingInfo0 = (struct ChargeingInfoData *)GetDcChargingInfoData(0);

EVSE/Projects/DD360UCar/Apps/ModuleLcmCtrl/Module_LcmControl.c

@@ -383,16 +383,100 @@ void ChangeCurPage()
                 pSysInfo->PageIndex = __VIEW_RIGHT_CHARGE_;
             } else if(pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_CHARGING) {
                 pSysInfo->PageIndex = __VIEW_ALL_CHARGE_;
-            } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && pDcChargingInfo_1->SystemStatus == S_CHARGING) {
-                pSysInfo->PageIndex = __VIEW_L_FAIL_R_CHARGE;
-            } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_ALARM) {
-                pSysInfo->PageIndex = __VIEW_L_CHARGE_R_FAIL;
-            } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && pDcChargingInfo_1->SystemStatus == S_IDLE) {
-                pSysInfo->PageIndex = __VIEW_L_FAIL_R_IDLE;
-            } else if (pDcChargingInfo_0->SystemStatus == S_IDLE && pDcChargingInfo_1->SystemStatus == S_ALARM) {
-                pSysInfo->PageIndex = __VIEW_L_IDLE_R_FAIL;
-            } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && pDcChargingInfo_1->SystemStatus == S_ALARM) {
-                pSysInfo->PageIndex = __VIEW_ALL_FAIL;
+
+            } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT )&&
+                pDcChargingInfo_1->SystemStatus == S_CHARGING) {
+                if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_LINK_R_CHARGE;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_FAIL_R_CHARGE;
+            } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && 
+                (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
+                if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_CHARGE_R_LINK;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_CHARGE_R_FAIL;
+            } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT) &&
+                pDcChargingInfo_1->SystemStatus == S_IDLE) {
+                if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_LINK_R_IDLE;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_FAIL_R_IDLE;
+            } else if (pDcChargingInfo_0->SystemStatus == S_IDLE &&
+                (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
+                if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_IDLE_R_LINK;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_IDLE_R_FAIL;
+            } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT) &&
+                (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
+                if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM] &&
+                    pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM]) {
+                    pSysInfo->PageIndex = __VIEW_L_OUT_R_OUT;
+                } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM]) {
+                    pSysInfo->PageIndex = __VIEW_L_LINK_R_FAIL;
+                } else if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM]) {
+                    pSysInfo->PageIndex = __VIEW_L_FAIL_R_LINK;
+                } else
+                    pSysInfo->PageIndex = __VIEW_ALL_FAIL;
+            } else if (pDcChargingInfo_0->SystemStatus == S_IDLE && pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
+                pSysInfo->PageIndex = __VIEW_L_IDLE_R_MAINTAIN;
+            } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_IDLE) {
+                pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_IDLE;
+            } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
+                pSysInfo->PageIndex = __VIEW_L_CHARGE_R_MAINTAIN;
+            } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_CHARGING) {
+                pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_CHARGE;
+            } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
+                pSysInfo->PageIndex = __MAINTAIN_PAGE_;
+
+            } else if (pDcChargingInfo_0->SystemStatus == S_IDLE && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
+                pDcChargingInfo_1->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_IDLE_R_OUT;
+            } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_IDLE &&
+                pDcChargingInfo_0->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_OUT_R_IDLE;
+            } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
+                pDcChargingInfo_1->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_CHARGE_R_OUT;
+            } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_CHARGING &&
+                pDcChargingInfo_0->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_OUT_R_CHARGE;
+            } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
+                pDcChargingInfo_1->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_OUT;
+            } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_MAINTAIN &&
+                pDcChargingInfo_0->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_OUT_R_MAINTAIN;
+            } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
+                pDcChargingInfo_0->ConnectorPlugIn && pDcChargingInfo_1->ConnectorPlugIn) {
+                pSysInfo->PageIndex = __VIEW_L_OUT_R_OUT;
+            } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT) &&
+                pDcChargingInfo_1->SystemStatus == S_COMPLETE && pDcChargingInfo_1->ConnectorPlugIn) {
+                if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_LINK_R_OUT;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_FAIL_R_OUT;
+            } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_0->ConnectorPlugIn &&
+                (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
+                if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_OUT_R_LINK;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_OUT_R_FAIL;
+            } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && 
+                (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
+                if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_LINK;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_FAIL;
+            } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT ) &&
+                pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
+                if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
+                    pSysInfo->PageIndex = __VIEW_L_LINK_R_MAINTAIN;
+                else
+                    pSysInfo->PageIndex = __VIEW_L_FAIL_R_MAINTAIN;
+            } else {
+                pSysInfo->PageIndex = __VIEW_ALL_IDLE_;
             }
             break;
         case _LCM_START_SCAN:
@@ -497,7 +581,7 @@ void ChangeCurPage()
             break;
     }
     if (_currentPage != pSysInfo->PageIndex) {
-        log_info("Change Page from %d to %d", _currentPage, pSysInfo->PageIndex);
+        log_info("Gun%d Change Page from %d to %d",pSysInfo->CurGunSelected, _currentPage, pSysInfo->PageIndex);
     }
     _currentPage = pSysInfo->PageIndex;
     ChangeToOtherPage(pSysInfo->PageIndex);
@@ -660,9 +744,9 @@ void ShowViewLeftGunInfo()
         }
     } else if (pDcChargingInfo->SystemStatus == S_CHARGING ) {
         ShowViewChargingSoc(LEFT_GUN_NUM,pDcChargingInfo->EvBatterySoc);
-        if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) > 1) {
-            int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,
-                ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeDuration);
+        if (strlen(ShmDcCommonData->pGunInfo[LEFT_GUN_NUM].ChargeStartTime) > 1) {
+            int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[LEFT_GUN_NUM].ChargeStartTime,
+                ShmDcCommonData->pGunInfo[LEFT_GUN_NUM].ChargeDuration);
             ShowViewChargingTime(LEFT_GUN_NUM, duration);
         } else {
             ShowViewChargingTime(LEFT_GUN_NUM, 0);
@@ -721,9 +805,9 @@ void ShowViewRightGunInfo()
         DisplayValueToLcm(_RightGun_location, (uint8_t *)value, sizeof(value));
     } else if (pDcChargingInfo->SystemStatus == S_CHARGING ) {
         ShowViewChargingSoc(RIGHT_GUN_NUM,pDcChargingInfo->EvBatterySoc);        
-        if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) > 1) {
-            int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,
-                ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeDuration);
+        if (strlen(ShmDcCommonData->pGunInfo[RIGHT_GUN_NUM].ChargeStartTime) > 1) {
+            int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[RIGHT_GUN_NUM].ChargeStartTime,
+                ShmDcCommonData->pGunInfo[RIGHT_GUN_NUM].ChargeDuration);
             ShowViewChargingTime(RIGHT_GUN_NUM, duration);
         } else {
             ShowViewChargingTime(RIGHT_GUN_NUM, 0);

EVSE/Projects/DD360UCar/Apps/ModuleLcmCtrl/Module_LcmControl.h

@@ -37,6 +37,7 @@
 #define __VIEW_ALL_FAIL         0x000B
 #define __VIEW_L_FAIL_R_CHARGE  0x000C
 #define __VIEW_L_CHARGE_R_FAIL  0x000D
+
 /*
 #define __DETAIL_VIEW_          0x000B
 #define __STOP_SCAN_RFID_       0x000C
@@ -69,6 +70,32 @@
 #define __PRECHARGE_RIGHT_CONNECT 0x0025
 #define __PRECHARGE_RIGHT_CHECK   0x0026
 #define __PRECHARGE_RIGHT_START   0x0027
+#define __VIEW_L_IDLE_R_MAINTAIN  0x0028
+#define __VIEW_L_MAINTAIN_R_IDLE  0x0029
+#define __VIEW_L_CHARGE_R_MAINTAIN 0x002A
+#define __VIEW_L_MAINTAIN_R_CHARGE 0x002B
+#define __VIEW_L_IDLE_R_OUT        0x002C
+#define __VIEW_L_OUT_R_IDLE        0x002D
+#define __VIEW_L_CHARGE_R_OUT      0x002E
+#define __VIEW_L_OUT_R_CHARGE      0x002F
+#define __VIEW_L_MAINTAIN_R_OUT    0x0030
+#define __VIEW_L_OUT_R_MAINTAIN    0x0031
+#define __VIEW_L_OUT_R_OUT         0x0032
+#define __VIEW_L_FAIL_R_OUT        0x0033
+#define __VIEW_L_OUT_R_FAIL        0x0034
+#define __VIEW_L_LINK_R_IDLE       0x0035
+#define __VIEW_L_LINK_R_CHARGE     0x0036
+#define __VIEW_L_LINK_R_OUT        0x0037
+#define __VIEW_L_LINK_R_FAIL       0x0038
+#define __VIEW_L_LINK_R_MAINTAIN   0x0039
+#define __VIEW_L_IDLE_R_LINK       0x003A
+#define __VIEW_L_CHARGE_R_LINK     0x003B
+#define __VIEW_L_OUT_R_LINK        0x003C
+#define __VIEW_L_FAIL_R_LINK       0x003D
+#define __VIEW_L_MAINTAIN_R_LINK   0x003E
+#define __VIEW_L_MAINTAIN_R_FAIL   0x003F
+#define __VIEW_L_FAIL_R_MAINTAIN   0x0040
+#define __VIEW_L_OUT_R_OUT         0x0041
 
 // ICON Map Address
 #define _LeftGun_type_pic_U         0x0001