Merge remote-tracking branch 'origin/DD360UCar'

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

@@ -98,7 +98,7 @@ static int isReachableInternet(void)
         while (fgets(buf, sizeof(buf), fp) != NULL) {
             if (strstr(buf, "inet addr:") > 0) {
                 sscanf(buf, "%*s%s", tmp);
-                substr(tmp, tmp, strspn(tmp, "addr:"), strlen(buf) - strspn(tmp, "addr:"));
+                substr(tmp, tmp, strspn(tmp, "addr:"), strlen(tmp) - strspn(tmp, "addr:"));
 
                 if (strcmp(tmp, (char *)pSysConfig->Eth0Interface.EthIpAddress) != EQUAL) {
                     strcpy((char *) pSysConfig->Eth0Interface.EthIpAddress, tmp);

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

@@ -262,10 +262,10 @@ void AuthorizeToCharge()
     SelectGunInfo *ShmSelectGunInfo = (SelectGunInfo *)GetShmSelectGunInfo();
     struct ChargingInfoData* pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(pSysInfo->CurGunSelected);
     ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
-    if(!isAuthorizedComplete())
-        StartSystemTimeoutDet(Timeout_Authorizing);
-    else {
-        //StopSystemTimeoutDet();
+    if (!isAuthorizedComplete()) {
+        //StartSystemTimeoutDet(Timeout_Authorizing);
+    } else {
+        StopGunInfoTimeoutDet(pSysInfo->CurGunSelected);
         StartSystemTimeoutDet(Timeout_WaitBalance);
         if (ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance != FAIL_BALANCE_PRICES) {
             StopSystemTimeoutDet();

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

@@ -82,8 +82,8 @@ uint8_t bd0_2_status = 0;
 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.04";      // Software debug version
+char *fwVersion = "V2.09.00.0000.00"; // Phihong version
+char* DebugVersion = "V2.09.00";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -277,6 +277,7 @@ static void GetFirmwareVersion(void)
 {
     // Get CSU root file system version
     sprintf((char *)pSysInfo->CsuRootFsFwRev, fwVersion);
+    sprintf((char*)ShmDcCommonData->DebugVersion, DebugVersion);
 
     uint8_t count = 0, chademo = 0, ccs = 0, gb = 0;
     for (uint8_t idx = 0; idx < 3; idx++) {
@@ -2607,19 +2608,6 @@ void CreateTimeoutFork(void)
                     StopSystemTimeoutDet();
                 }
                 break;
-            case Timeout_Terminating:
-                if (GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL >= TERMINATING_TIMEOUT) {
-                    
-                    pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(pSysInfo->CurGunSelected);
-                    log_info("Terminating timeout not get final cost");
-                    /*
-                    if (!ShmDcCommonData->finalcost_flag[pSysInfo->CurGunSelected] && pDcChargingInfo->ChargingFee < 0) {
-                        pDcChargingInfo->ChargingFee = pDcChargingInfo->PresentChargedEnergy * ShmDcCommonData->ChargingRate;
-                    }
-                    */
-                    setChargerMode(pSysInfo->CurGunSelected, S_COMPLETE);
-                }
-                break;
             case Timeout_LinkError:
                 if (GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL >= LINKERROR_TIMEOUT) {
                     StopSystemTimeoutDet();
@@ -2695,7 +2683,24 @@ void CreateTimeoutFork(void)
                     if (GetTimeoutValue(pDcChargingInfo->TimeoutTimer) / uSEC_VAL >= PLUGOUT_TIMEOUT) {
                         StopGunInfoTimeoutDet(gunIndex);
                         destroySelGun(gunIndex); //jerry add
-                        pSysInfo->SystemPage = _LCM_VIEW;
+                        setChargerMode(gunIndex, S_IDLE);
+                    }
+                    break;
+                case Timeout_GunAuthorizePage:
+                    if (GetTimeoutValue(pDcChargingInfo->TimeoutTimer) / uSEC_VAL >= GUN_AUTHORIZE_PAGE) {
+                        StopGunInfoTimeoutDet(gunIndex);
+                        destroySelGun(gunIndex); //jerry add
+                        pDcChargingInfo->SystemStatus = S_IDLE;
+                    }
+                    break;
+                case Timeout_Terminating:
+                    if (GetTimeoutValue(pDcChargingInfo->TimeoutTimer) / uSEC_VAL >= TERMINATING_TIMEOUT) {
+                        StopGunInfoTimeoutDet(gunIndex);
+                        pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(gunIndex);
+
+                        ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag = TRUE;
+
+                        setChargerMode(gunIndex, S_COMPLETE);
                     }
                     break;
                 }
@@ -4009,14 +4014,12 @@ int main(void)
              pSysInfo->SelfTestSeq,
              ShmPsuData->Work_Step);
 
-    if (pSysInfo->SelfTestSeq == _STEST_FAIL ||
-            ShmPsuData->Work_Step == _NO_WORKING ||
-            pInfoCode->InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES //DS60-120 add
-       ) {
-            for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
+    if (pSysInfo->SelfTestSeq == _STEST_FAIL ||ShmPsuData->Work_Step == _NO_WORKING ||
+        pInfoCode->InfoEvents.bits.CcsSeccTimeoutQCA7000Comm == YES ) {
+        ChangeLcmByIndex(_LCM_MAINTAIN);
+        for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
             setChargerMode(gunIndex, MODE_MAINTAIN);
         }
-        ChangeLcmByIndex(_LCM_MAINTAIN);
     } else {
         for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
             setChargerMode(gunIndex, MODE_IDLE);
@@ -4233,6 +4236,7 @@ CheckStatus:
                 if (isModeChange(gunIndex)) {
                     log_info("============================= S_AUTHORIZING(%x) ============================= ", gunIndex);
                     pSysInfo->SystemPage = _LCM_START_SCAN;
+                    StartGunInfoTimeoutDet(gunIndex, Timeout_GunAuthorizePage);
                 }
                 // 讀卡邏輯
                 ScannerCardProcess();
@@ -4250,6 +4254,7 @@ CheckStatus:
                             ChangeGunSelectByIndex(gunIndex);
                             //AddPlugInTimes(gunIndex);
                             setChargerMode(gunIndex, MODE_REASSIGN_CHECK);
+                            StopGunInfoTimeoutDet(gunIndex);
                             strcpy((char *)pDcChargingInfo->StartUserId, "");
                             ClearDetectPluginFlag();
                             continue;
@@ -4273,6 +4278,7 @@ CheckStatus:
                             strcpy((char *)pSysConfig->UserId, "");
                             // 當前操作的槍號，進入 Preparing
                             setChargerMode(gunIndex, MODE_REASSIGN_CHECK);
+                            StopGunInfoTimeoutDet(gunIndex);
                             ClearDetectPluginFlag();
                             continue;
                         }
@@ -4508,21 +4514,22 @@ CheckStatus:
                     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 {
-                        if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _LCM_LINK_ERROR) {
-                            pSysInfo->SystemPage = _LCM_VIEW;
+                    if (pSysInfo->CurGunSelected == gunIndex) {
+                        if (ShmDcCommonData->isIntoCharge[gunIndex]) {
+                            if (!ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
+                                pSysInfo->SystemPage = _LCM_STOPPING;
+                            } else if (pSysInfo->SystemPage != _LCM_SUMMARY) {
+                                pSysInfo->SystemPage = _LCM_VIEW;
+                            }
+                        } else {
+                            if (pSysInfo->CurGunSelected == gunIndex && pSysInfo->SystemPage != _LCM_LINK_ERROR) {
+                                pSysInfo->SystemPage = _LCM_VIEW;
+                            }
                         }
                     }
                 }
@@ -4538,42 +4545,23 @@ CheckStatus:
                     }
                     StopGunInfoTimeoutDet(gunIndex);
                     
-                    pSysInfo->CurGunSelected = gunIndex;
-                    StartSystemTimeoutDet(Timeout_Terminating);
+                    //pSysInfo->CurGunSelected = gunIndex;
+                    StartGunInfoTimeoutDet(gunIndex, Timeout_Terminating);
+
                     if (ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption != 0)
                         DB_Update_PowerConsumption(gunIndex, ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption);
                 }
-                // Show EV Board Status
-                if ((time((time_t*)NULL) - ShowEVStatusTimer[gunIndex]) > 3) {
-                    ShowEVStatusTimer[gunIndex] = time((time_t*)NULL);
-                    if (pDcChargingInfo->Type == _Type_Chademo) {
-                        EVStatus[gunIndex] = isPrechargeStatus_chademo(gunIndex);
-                    } else if (pDcChargingInfo->Type == _Type_GB) {
-                        EVStatus[gunIndex] = isPrechargeStatus_gb(gunIndex);
-                    } else if (pDcChargingInfo->Type == _Type_CCS_2) {
-                        EVStatus[gunIndex] = isPrechargeStatus_ccs(gunIndex);
-                    }
-                    log_info("EV Board Status:%d, Final Cost Flag:%d", EVStatus[gunIndex], ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag);
-                }
+
                 // For Precharging timeout
                 if (pDcChargingInfo->Type == _Type_Chademo) {
                     if (isEvStopCharging_chademo(gunIndex) == YES ||
                             isPrechargeStatus_chademo(gunIndex) <= 0 ) {
-                        if (!ShmDcCommonData->isIntoCharge[gunIndex]) {
-                            setChargerMode(gunIndex, MODE_COMPLETE);
-                        } else if (ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
-                            setChargerMode(gunIndex, MODE_COMPLETE);
-                        }
+                        setChargerMode(gunIndex, MODE_COMPLETE);
                     }
                 } else if (pDcChargingInfo->Type == _Type_GB) {
                     if (isEvStopCharging_gb(gunIndex) == YES ||
                             isPrechargeStatus_gb(gunIndex) <= 0){
-
-                        if (!ShmDcCommonData->isIntoCharge[gunIndex]) {
-                            setChargerMode(gunIndex, MODE_COMPLETE);
-                        } else if (ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
-                            setChargerMode(gunIndex, MODE_COMPLETE);
-                        }
+                        setChargerMode(gunIndex, MODE_COMPLETE);
                     }
                 } else if (pDcChargingInfo->Type == _Type_CCS_2) {
                     if (isEvStopCharging_ccs(gunIndex) == YES &&
@@ -4581,16 +4569,11 @@ CheckStatus:
                              isPrechargeStatus_ccs(gunIndex) == 0  ||
                              isPrechargeStatus_ccs(gunIndex) == 13 ||
                              isPrechargeStatus_ccs(gunIndex) == 14) ) {
-
-                        if (!ShmDcCommonData->isIntoCharge[gunIndex]) {
-                            setChargerMode(gunIndex, MODE_COMPLETE);
-                        } else if (ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
-                            setChargerMode(gunIndex, MODE_COMPLETE);
-                        }
+                        setChargerMode(gunIndex, MODE_COMPLETE);
                     }
                 }
 
-                if (pSysInfo->CurGunSelected == gunIndex) {
+                if (pSysInfo->CurGunSelected == gunIndex && !ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
                     pSysInfo->SystemPage = _LCM_STOPPING;
                 }
                 break;
@@ -4613,16 +4596,19 @@ CheckStatus:
                 }
 
                 if (!pDcChargingInfo->ConnectorPlugIn) {
-                    if (pSysInfo->CurGunSelected == gunIndex)
+                    if (pSysInfo->CurGunSelected == gunIndex) {
                         pSysInfo->SystemPage = _LCM_SUMMARY;
-                    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;
+                    if (pSysInfo->CurGunSelected == gunIndex) {
+                        if (!ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
+                            pSysInfo->SystemPage = _LCM_STOPPING;
+                        } else if(pSysInfo->SystemPage != _LCM_SUMMARY) {
+                            pSysInfo->SystemPage = _LCM_VIEW;
+                        }
                     }
+
                 }
                 break;
 

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

@@ -43,8 +43,10 @@
 #define CONN_PLUG_TIMEOUT                       (40)
 #define PLUGOUT_TIMEOUT                         (120)
 #define TERMINATING_TIMEOUT                     (30)
+#define GUN_AUTHORIZE_PAGE                      (120)
 #define WHILE_LOOP_TIME                         (10000)
 
+
 //#define log_info(format, args...) StoreLogMsg_1("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 //#define log_warn(format, args...) StoreLogMsg_1("[%s:%d][%s][Warn] "format, __FILE__, __LINE__, __FUNCTION__, ##args)
 //#define log_error(format, args...) StoreLogMsg_1("[%s:%d][%s][Error] "format, __FILE__, __LINE__, __FUNCTION__, ##args)

EVSE/Projects/DD360UCar/Apps/Config.h

@@ -532,6 +532,7 @@ typedef struct StDcCommonInfo {
     uint8_t showNetPackage;
     uint8_t showCanPackage;
     int LcmFwVersion;
+    char DebugVersion[32];
 } DcCommonInfo;
 
 #endif /* CONFIG_H_ */

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

@@ -526,7 +526,7 @@ static int qrCodeUrlInfoHandle(uint8_t *data)
     string2Date((char*)data, (uint8_t*)_setTime);
     //printf("SystemId =  %s", pSysConfig->SystemId);
     if (!timecmp(localTime, _setTime)) {
-        log_info("Set Timer:%s Time Zone:%d", _setTime,ShmDcCommonData->TZOffset);
+        //log_info("Set Timer:%s Time Zone:%d", _setTime,ShmDcCommonData->TZOffset);
         sprintf((char*)cmdBuf, "date -u -s \"%s\" >> /dev/null &", _setTime);
         system((char*)cmdBuf);
         system("hwclock -w -u");
@@ -1042,7 +1042,7 @@ static int chargingcapabilityHandle(uint8_t *data, uint8_t plugNum)
         pricesInfo[plugNum].ParkingFee = ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee;
         pricesInfo[plugNum].EnergyCost = ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost;
         pricesInfo[plugNum].RemainAmount = ShmSelectGunInfo->PricesInfo[plugNum].RemainAmount;
-
+        log_info(" ======== Gun%d Cost Information ========", plugNum);
         log_info("Total Cost:%.2f", pDcChargingInfo->ChargingFee);
         log_info("Parking Fee:%.2f", ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee);
         log_info("Energy Cost:%.2f", ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost);
@@ -2321,7 +2321,6 @@ static int CheckNetworkStatus(void)
 {
     char *ipAddr = (char *)&pSysConfig->Eth0Interface.EthIpAddress;
 
-    //printf("Check network IP Header = %s\n", ipAddr);
     if (strstr(ipAddr, CMP_ETH_IP_HEAD) != NULL) {
         return 1;
     }
@@ -2480,7 +2479,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
 					pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(plugNum);
 					//ShmDcCommonData->TransactionInfo[plugNum].Amount = pDcChargingInfo->ChargingFee;
 					ShmDcCommonData->pGunInfo[plugNum].finalcost_flag = TRUE;
-                    log_info("Set Final Cost Flag");
+                    //log_info("Set Final Cost Flag");
                 }
             }
             curReg = REG_PLUG_IN_STATE;

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

@@ -34,6 +34,8 @@ uint8_t TempArray_2[TempArraySize]={0};
 uint8_t ptemp_1 = 0;
 uint8_t ptemp_2 = 0;
 bool firstcircule = true;
+float EvTargetVolt[2] = { 0 };
+float EvTargetCur[2] = { 0 };
 
 //------------------------------------------------------------------------------
 extern bool AbnormalStopAnalysis(uint8_t gun_index, uint8_t *errCode);
@@ -319,6 +321,7 @@ void CANReceiver(int fd)
         ShmDcCommonData->EVDisconnectTime[0] = time((time_t*)NULL);
         ShmDcCommonData->EVDisconnectTime[1] = time((time_t*)NULL);
         //log_info("Module_EvRXComm Child's PID is %d", getpid());
+        int is_busy;
         CCS_PlugoutTimer[0] = time((time_t*)NULL);
         CCS_PlugoutTimer[1] = time((time_t*)NULL);
 
@@ -327,6 +330,7 @@ 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] && 
@@ -340,6 +344,7 @@ void CANReceiver(int fd)
                     system("/sbin/ip link set can0 type can bitrate 500000 restart-ms 100");
                     system("/sbin/ip link set can0 up");
                 }
+
                 CheckEvConnect(_index);
             }
             
@@ -418,23 +423,37 @@ void CANReceiver(int fd)
                     } else {
                         log_info("Conn %d, None Check. (%d) ", targetGun, frame.data[0]);
                     }
+                    /*
                     if(pDcChargingInfo->RemoteStartFlag == YES) {
                         pSysInfo->CurGunSelected = targetGun;
-                    }
+                    }*/
                 }
                 pDcChargingInfo->PilotVoltage = frame.data[1];
                 // CCS 小板確認Pilot Voltage != 0
+                is_busy = FALSE;
+                for (_index = 0; _index < pSysConfig->TotalConnectorCount; _index++) {
+                    struct ChargingInfoData*  DcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(_index);
+                    if ((DcChargingInfo->SystemStatus >= S_AUTHORIZING && DcChargingInfo->SystemStatus <= S_PREPARING_FOR_EVSE) ||
+                        DcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST0 || DcChargingInfo->SystemStatus == S_CCS_PRECHARGE_ST1) {
+                        is_busy = TRUE;
+                        break;
+                    }
+                }
+
                 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) {
+
+                        if ((pDcChargingInfo->SystemStatus == S_COMPLETE || pDcChargingInfo->SystemStatus == S_ALARM) &&
+                        !is_busy){
                             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) {
+                        if ((pDcChargingInfo->SystemStatus == S_COMPLETE || pDcChargingInfo->SystemStatus == S_ALARM) &&
+                        !is_busy) {
                             pSysInfo->CurGunSelected = targetGun;
                         }
                     }
@@ -565,7 +584,15 @@ void CANReceiver(int fd)
                         }
                     }
                 }
-
+                if (pDcChargingInfo->EvBatterytargetVoltage > (EvTargetVolt[targetGun] + 3) ||
+                    pDcChargingInfo->EvBatterytargetVoltage < (EvTargetVolt[targetGun] - 3) ||
+                    pDcChargingInfo->EvBatterytargetCurrent >(EvTargetCur[targetGun] + 1) ||
+                    pDcChargingInfo->EvBatterytargetCurrent < (EvTargetCur[targetGun] - 1)) {
+                    log_info("Gun%d Battery TargetVoltage = %.1f , TargetCurrent = %.1f",
+                        targetGun, pDcChargingInfo->EvBatterytargetVoltage, pDcChargingInfo->EvBatterytargetCurrent);
+                    EvTargetVolt[targetGun] = pDcChargingInfo->EvBatterytargetVoltage;
+                    EvTargetCur[targetGun] = pDcChargingInfo->EvBatterytargetCurrent;
+                }
                 //log_info("EvBatterytargetVoltage = %f ", pDcChargingInfo->EvBatterytargetVoltage);
                 //log_info("EvBatterytargetCurrent = %f ", pDcChargingInfo->EvBatterytargetCurrent);
                 //log_info("BatteryVoltage = %d ",

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

@@ -396,25 +396,27 @@ static void SetPresentChargingOutputCap(void)
 
     //DS60-120 add
     if ((LogInfo[0][EV_LOG_OUTPUT_CAP_POW] <= pow1 - 5 ||
-            LogInfo[0][EV_LOG_OUTPUT_CAP_POW] >= pow1 + 5) ||
-            (LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] <= cur1 - 5 ||
-             LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] >= cur1 + 5) ||
-            (LogInfo[1][EV_LOG_OUTPUT_CAP_POW] <= pow2 - 5 ||
-             LogInfo[1][EV_LOG_OUTPUT_CAP_POW] >= pow2 + 5) ||
-            (LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] <= cur2 - 5 ||
-             LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] >= cur2 + 5)
-       ) {
-        //log_info("----------------------------------------------------- ");
-        log_info("To EV (Real) Power_1 = %.1f, Cur_1 = %.1f, Power_2 = %.1f, Cur_2 = %.1f",
-                 pow1 / 10, cur1 / 10, pow2 / 10, cur2 / 10);
-        //log_info("----------------------------------------------------- ");
-
+        LogInfo[0][EV_LOG_OUTPUT_CAP_POW] >= pow1 + 5) ||
+        (LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] <= cur1 - 5 ||
+            LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] >= cur1 + 5)
+        ) {
+        log_info("Gun0 To EV Power_1 = %3.1fkW, Cur_1 = %3.1fA", pow1 / 10, cur1 / 10);
         LogInfo[0][EV_LOG_OUTPUT_CAP_POW] = pow1;
         LogInfo[0][EV_LOG_OUTPUT_CAP_CUR] = cur1;
-        LogInfo[1][EV_LOG_OUTPUT_CAP_POW] = pow2;
-        LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] = cur2;
         chargingData_1->RealMaxCurrent = cur1;
         chargingData_1->RealMaxPower = pow1;
+    }
+
+    if ((LogInfo[1][EV_LOG_OUTPUT_CAP_POW] <= pow2 - 5 ||
+        LogInfo[1][EV_LOG_OUTPUT_CAP_POW] >= pow2 + 5) ||
+        (LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] <= cur2 - 5 ||
+        LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] >= cur2 + 5)
+       ) {
+        log_info("Gun1 To EV Power_2 = %3.1fkW, Cur_2 = %3.1fA", pow2 / 10, cur2 / 10);
+
+        LogInfo[1][EV_LOG_OUTPUT_CAP_POW] = pow2;
+        LogInfo[1][EV_LOG_OUTPUT_CAP_CUR] = cur2;
+
 
         if (pSysConfig->TotalConnectorCount == 2) {
             chargingData_2->RealMaxCurrent = cur2;
@@ -538,22 +540,27 @@ static void SetPresentChargingOutputPower(void)
 
     //DS60-120 add
     if ((LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] >= vol1 + CHK_VOL_RANGE) ||
-            (LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] <= vol1 - CHK_VOL_RANGE) ||
-            (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] >= cur1 + CHK_CUR_RANGE) ||
-            (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] <= cur1 - CHK_CUR_RANGE) ||
-            (LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] >= vol2 + CHK_VOL_RANGE) ||
-            (LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] <= vol2 - CHK_VOL_RANGE) ||
-            (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-> 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 - CHK_VOL_RANGE) ||
+        (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] >= cur1 + CHK_CUR_RANGE) ||
+        (LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] <= cur1 - CHK_CUR_RANGE)) {
+
+        log_info("Gun0 Set Output Voltage=%3.1fV, Cur=%3.1fA",
+                vol1 / 10,
+                cur1 / 10);
 
         LogInfo[0][EV_LOG_NOW_OUTPUT_VOL] = vol1;
         LogInfo[0][EV_LOG_NOW_OUTPUT_CUR] = cur1;
+    }
+
+    if ((LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] >= vol2 + CHK_VOL_RANGE) ||
+        (LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] <= vol2 - CHK_VOL_RANGE) ||
+        (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] >= cur2 + CHK_CUR_RANGE) ||
+        (LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] <= cur2 - CHK_CUR_RANGE)) {
+
+        log_info("Gun1 Set Output Voltage=%3.1fV, Cur=%3.1fA",
+                vol2 / 10,
+                cur2 / 10);
+
         LogInfo[1][EV_LOG_NOW_OUTPUT_VOL] = vol2;
         LogInfo[1][EV_LOG_NOW_OUTPUT_CUR] = cur2;
     }

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

@@ -383,7 +383,6 @@ 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_0->SystemStatus == S_FAULT )&&
                 pDcChargingInfo_1->SystemStatus == S_CHARGING) {
                 if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
@@ -412,7 +411,7 @@ void ChangeCurPage()
                 (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;
+                    pSysInfo->PageIndex = __VIEW_L_FAIL_R_FAIL;
                 } 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]) {
@@ -429,35 +428,34 @@ void ChangeCurPage()
                 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) {
+            } 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) {
+            } 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) {
+            } 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) {
+            } 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) {
+            } 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) {
+            } 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) {
+            } 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) {
+                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 &&
+            } 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;
@@ -476,7 +474,14 @@ void ChangeCurPage()
                 else
                     pSysInfo->PageIndex = __VIEW_L_FAIL_R_MAINTAIN;
             } else {
-                pSysInfo->PageIndex = __VIEW_ALL_IDLE_;
+                if (pDcChargingInfo_0->SystemStatus == S_CHARGING) {
+                    pSysInfo->PageIndex = __VIEW_LEFT_CHARGE_;
+                } else if (pDcChargingInfo_1->SystemStatus == S_CHARGING) {
+                    pSysInfo->PageIndex = __VIEW_RIGHT_CHARGE_;
+                } else {
+                    pSysInfo->PageIndex = __VIEW_ALL_IDLE_;
+                }
+                
             }
             break;
         case _LCM_START_SCAN:
@@ -907,7 +912,7 @@ void ShowGunCountDownTimer()
     int min,sec;
     uint8_t value[10] = {0};
     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(pSysInfo->CurGunSelected);
-    int tm = 30 - (GetTimeoutValue(pDcChargingInfo->TimeoutTimer) / uSEC_VAL);
+    int tm = 120 - (GetTimeoutValue(pDcChargingInfo->TimeoutTimer) / uSEC_VAL);
     // GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL
     min = tm/60;
     sec = tm%60;
@@ -1118,7 +1123,7 @@ void ProcessPageInfo()
     case _LCM_START_SCAN:
         ChangeQrCode();
         ShowSelectGunIcon();
-        ShowCountDownTimer();
+        ShowGunCountDownTimer();
         break;
     case _LCM_START_AUTHORIZING:
     case _LCM_PRECHARGE:

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

@@ -95,7 +95,7 @@
 #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
+#define __VIEW_L_FAIL_R_FAIL       0x0041
 
 // ICON Map Address
 #define _LeftGun_type_pic_U         0x0001

EVSE/Projects/DD360UCar/Apps/ModuleUpdateFW/Module_UpdateFW.c

@@ -168,6 +168,13 @@ static int InitCanBus(void)
     return fd;
 }
 
+unsigned long long getAvailableMemory()
+{
+    long pages = sysconf(_SC_AVPHYS_PAGES);
+    long page_size = sysconf(_SC_PAGE_SIZE);
+    return pages * page_size;
+}
+
 static int CheckUpdateProcess(void)
 {
     //bool isPass = true;
@@ -188,6 +195,12 @@ static int CheckUpdateProcess(void)
     DcCommonInfo *ShmDcCommonData = (DcCommonInfo *)GetShmDcCommonData();
     struct ChargingInfoData *pDcChargingInfo = NULL;
 
+    if (getAvailableMemory() < (200 * 1024 * 1024))
+    {
+        log_info("Available memory (%.2f Bytes) less than 200 MBytes, free cache first.\n", getAvailableMemory() / (1024 * 1024.0));
+        system("echo 3 > /proc/sys/vm/drop_caches");
+    }
+
     pSysConfig = (struct SysConfigData *)GetShmSysConfigData();
     d = opendir("/mnt/");
     if (d) {
@@ -225,7 +238,7 @@ static int CheckUpdateProcess(void)
                         ((unsigned int)ptr[18]) << 8  |
                         ((unsigned int)ptr[19]));
                 log_info("Typed...%x ", Type);
-
+                free(ptr);
                 switch (Type) {
                 case 0x10000001:
                 case 0x10000002:
@@ -379,9 +392,11 @@ static int CheckUpdateProcess(void)
                     //return isPass;
                     break;
                 }
+            } else {
+                free(ptr);
             }
             free(new_str);
-            free(ptr);
+ 
         }
     }
     free(dir);

EVSE/Projects/DD360UCar/Apps/ReadCmdline.c

@@ -325,6 +325,7 @@ void GetFwVerProc(void)
 {
     printf("ModelName = %s\r\n", pSysConfig->ModelName);
     printf("DC Main Version = %s \n", pSysInfo->CsuRootFsFwRev);
+    printf("DC Debug Version = %s \n", ShmDcCommonData->DebugVersion);
     printf("407 FW Version = %s\n", ShmPrimaryMcuData->version);
     printf("Gun 0 FW Version = %s \n", pSysInfo->Connector1FwRev);
     printf("Gun 1 FW Version = %s \n", pSysInfo->Connector2FwRev);

EVSE/Projects/DD360UCar/Apps/timeout.h

@@ -53,6 +53,7 @@ enum Timeout_flag {
 	Timeout_LinkError              = 16,
 	Timeout_PlugOut                = 17,
 	Timeout_Terminating            = 18,
+    Timeout_GunAuthorizePage       = 19,
 };
 
 //------------------------------------------------------------------------------