2022-05-05 / Simon Xue

Action:
1. [Add] Power Consumption Data Base and Tx to Power Cabinet.
2. [Add] DoComm Register 0x25. Sync Charge start and end time.
3. [Modify] Modify summary page charge time and Cost.
4. [Fix] Plugin page show when gun already plug in.
5. [Fix] Gun name and QR Code string.
6. [Add] Preparing show left or right gun.

Files
As the following commit history files.

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

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

@@ -15,6 +15,7 @@
 //------------------------------------------------------------------------------
 static char *rfidPortName = "/dev/ttyS2";
 
+static DcCommonInfo* ShmDcCommonData = NULL;
 static bool isCardScan = false;
 
 //------------------------------------------------------------------------------
@@ -259,6 +260,8 @@ void AuthorizeToCharge()
     struct SysConfigData *pSysConfig = (struct SysConfigData *)GetShmSysConfigData();
     struct SysInfoData *pSysInfo = (struct SysInfoData *)GetShmSysInfoData();
     SelectGunInfo *ShmSelectGunInfo = (SelectGunInfo *)GetShmSelectGunInfo();
+    struct ChargingInfoData* pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(pSysInfo->CurGunSelected);
+    ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
     if(!isAuthorizedComplete())
         StartSystemTimeoutDet(Timeout_Authorizing);
     else {
@@ -269,15 +272,18 @@ void AuthorizeToCharge()
             // 判斷後台回覆狀態
             if (canStartCharging()) {
             // LCM => Authorize complete
-                pSysInfo->SystemPage = _LCM_WAIT_PLUGIN;
+                if (!pDcChargingInfo->ConnectorPlugIn)
+                    pSysInfo->SystemPage = _LCM_WAIT_PLUGIN;
                 log_info("Wait Gun(%d) plugin",pSysInfo->CurGunSelected);
                 DetectPluginStart();
                 log_info("Gun(%d) Balance: %f",pSysInfo->CurGunSelected,
                         ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Balance);
             } else {
+                
                 // LCM => Authorize fail
                 pSysInfo->SystemPage = _LCM_START_AUTHORIZE_FAIL;
                 strcpy((char *)pSysConfig->UserId, "");
+                ShmDcCommonData->AuthroizeType = IdTokenType_Central;
             }
         }
         ClearAuthorizedFlag();
@@ -350,7 +356,7 @@ void CreateRfidFork(void)
         int module_type = MODULE_EWT;
 
         struct SysConfigData *pSysConfig = (struct SysConfigData *)GetShmSysConfigData();
-
+        ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
         //log_info("RFID fork Child's PID is %d", getpid());
 
         while (isContinue) {
@@ -439,6 +445,9 @@ void CreateRfidFork(void)
                 }
             }
             log_info("card number = %s", pSysConfig->UserId);
+            if (strlen((char*)pSysConfig->UserId) != 0) {
+                ShmDcCommonData->AuthroizeType = IdTokenType_ISO14443;
+            }
             if (rfid.cardType == ISO14443A) {
                 sethaltCard(fd, module_type);
             } else if (rfid.cardType == IS014443B) {

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.06.00.0000.00"; // Phihong version
-char* DebugVersion = "V2.06.00";      // Software debug version
+char *fwVersion = "V2.07.00.0000.00"; // Phihong version
+char* DebugVersion = "V2.07.01";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 
@@ -447,7 +447,6 @@ static void checkGunOTPState(uint8_t gunIndex)
                         ShmDcCommonData->ChillerTempErr[gunIndex].StatusBit.ChillerTubeOTP = YES;
                         RecordAlarmCode(gunIndex, "012332");
 
-                        log_info("Right Gun Chiller Tube OTP");
                     } else if (ShmDcCommonData->SystemTemp[2] != 0 && ShmDcCommonData->SystemTemp[3] < pSysInfo->OTPTempR) {
                         ShmDcCommonData->ChillerTempErr[gunIndex].StatusBit.ChillerTubeOTP = NO;
                     }
@@ -1472,11 +1471,7 @@ uint8_t isPrechargeStatus_ccs(uint8_t gunIndex)
     uint8_t result = 0x00;
     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(gunIndex);
 
-    if (ShmCcsData->CommProtocol == _CCS_COMM_V2GMessage_DIN70121) {
-        result = ShmCcsData->V2GMessage_DIN70121[pDcChargingInfo->type_index].PresentMsgFlowStatus;
-    }
-
-    return result;
+    return ShmCcsData->V2GMessage_DIN70121[pDcChargingInfo->type_index].PresentMsgFlowStatus;
 }
 
 bool isEvStopCharging_ccs(uint8_t gunIndex)
@@ -2616,10 +2611,12 @@ void CreateTimeoutFork(void)
                 if (GetClockTimeoutValue(pSysInfo->SystemTimeoutTimer) / uSEC_VAL >= TERMINATING_TIMEOUT) {
                     
                     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(pSysInfo->CurGunSelected);
-                    log_info("Terminating timeout");
+                    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;
@@ -2747,7 +2744,7 @@ int isReservationExpired(uint8_t gunIndex)
             result = YES;
         }
     }
-
+    log_info("Reservation result:%s", result == NO ? "cancel" : "confirm");
     return result;
 }
 
@@ -3105,7 +3102,19 @@ void ChangeStartOrStopDateTime(uint8_t isStart, uint8_t gunIndex)
         strcpy((char *)pDcChargingInfo->StopDateTime, cmdBuf);
     }
 }
+void GetChargeTranscationDateTime(uint8_t gunIndex)
+{
+    char cmdBuf[32];
+    struct timeb csuTime;
+    struct tm* tmCSU;
 
+    ftime(&csuTime);
+    tmCSU = localtime(&csuTime.time);
+
+    sprintf(ShmDcCommonData->pGunInfo[gunIndex].ChargeDuration, "%04d-%02d-%02d %02d:%02d:%02d", tmCSU->tm_year + 1900,
+        tmCSU->tm_mon + 1, tmCSU->tm_mday, tmCSU->tm_hour, tmCSU->tm_min,
+        tmCSU->tm_sec);
+}
 void ChangeGunSelectByIndex(uint8_t sel)
 {
     pSysInfo->CurGunSelected = sel;
@@ -3450,6 +3459,7 @@ static void autoStartCharging(uint8_t gunIndex)
                     ChangeGunSelectByIndex(gunIndex);
                     confirmSelGun(gunIndex);
                     pDcChargingInfo->isEVCCIDVerify = true;
+                    ShmDcCommonData->AuthroizeType = IdTokenType_MacAddress;
                     pSysInfo->SystemPage = _LCM_START_AUTHORIZING;
                     log_info("Get User(%d) ID:%s",gunIndex,pSysConfig->UserId);
                     setChargerMode(gunIndex, MODE_AUTHORIZING);
@@ -3461,6 +3471,7 @@ static void autoStartCharging(uint8_t gunIndex)
             ChangeGunSelectByIndex(gunIndex);
             confirmSelGun(gunIndex);
             pSysInfo->SystemPage = _LCM_START_AUTHORIZING;
+            ShmDcCommonData->AuthroizeType = IdTokenType_NoAuthorization;
             setChargerMode(gunIndex, MODE_AUTHORIZING);
             log_info("Get User(%d) ID:%s",gunIndex,pSysConfig->UserId);
         }
@@ -3827,6 +3838,8 @@ void ResetIdleData(uint8_t gunIndex)
     ClearDetectPluginFlag();
     //Jerry add
     memset(&ShmSelectGunInfo->PricesInfo[gunIndex], 0, sizeof(PricesInfo));
+    memset(&ShmDcCommonData->pGunInfo[gunIndex], 0, sizeof(GunInfo));
+    DB_Get_PowerConsumption(gunIndex);
     ShmSelectGunInfo->PricesInfo[gunIndex].Balance = FAIL_BALANCE_PRICES;
     destroySelGun(gunIndex);
     ResetDetAlarmStatus(gunIndex); //recovery OVP status code
@@ -3949,7 +3962,8 @@ int main(void)
     ShmSelectGunInfo = (SelectGunInfo *)GetShmSelectGunInfo();
 	
     ShmSysConfigAndInfo = (struct SysConfigAndInfo *)GetShmSysConfigAndInfo();
-    ShmStatusCodeData = (struct StatusCodeData *)GetShmStatusCodeData();	
+    ShmStatusCodeData = (struct StatusCodeData *)GetShmStatusCodeData();
+
     log_info(" ********************************************************");
     log_info(" ******************  FileSystem Boot up *****************");
     log_info(" ********************************************************");
@@ -4017,11 +4031,16 @@ int main(void)
             pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(_index);
 
             pDcChargingInfo->IsAvailable = DB_Get_Operactive(_index);
+            if (!DB_Get_PowerConsumption(_index)) {
+                DB_Insert_PowerConsumption(_index,0);
+            }
         }
         DB_Reboot_Record();
     }
     log_info("===== Create DB End ===== ");
 
+
+
     ChangeLcmByIndex(_LCM_VIEW);
 
     sleep(1);
@@ -4042,6 +4061,8 @@ int main(void)
 
     CreateWatchdog();
     int is_idle = TRUE;
+    time_t ShowEVStatusTimer[2] = { 0 };
+    int EVStatus[2];
     pSysInfo->OTPTemp = GUN_OTP_VALUE;
     pSysInfo->OTPTempR = GUN_OTP_RECOVERY;
 
@@ -4162,9 +4183,10 @@ int main(void)
                     log_info("============================= S_RESERVATION(%x) ============================= ", gunIndex);
                     ShmOCPP16Data->CsMsg.bits[gunIndex].ReserveNowConf = YES;
                 }
+                /*
                 if (!isReservationExpired(gunIndex)) {
                     pDcChargingInfo->SystemStatus = S_IDLE;
-                }
+                }*/
                 goto CheckStatus;
                 break;
             case S_FAULT:
@@ -4253,15 +4275,14 @@ CheckStatus:
                         }
                     }
 
-                    if (!GetIsCardScan() && pSysInfo->CurGunSelected == gunIndex) {
+                    if (!GetIsCardScan() && pSysInfo->CurGunSelected == gunIndex && !pDcChargingInfo->ConnectorPlugIn) {
                         pSysInfo->SystemPage = _LCM_WAIT_PLUGIN;
                         break;
                     }
                 }
                 if (pSysInfo->CurGunSelected == gunIndex &&
                     (pSysInfo->SystemPage != _LCM_START_AUTHORIZING &&
-                        pSysInfo->SystemPage != _LCM_START_AUTHORIZE_FAIL &&
-                        pSysInfo->SystemPage != _LCM_START_AUTHORIZE_FAIL)) {
+                        pSysInfo->SystemPage != _LCM_START_AUTHORIZE_FAIL )) {
                     pSysInfo->SystemPage = _LCM_START_SCAN;
                 }
 
@@ -4291,7 +4312,7 @@ CheckStatus:
 
                 if (ShmPsuData->SystemPresentPsuQuantity > 0 &&
                         ShmPsuData->SystemAvailablePower > 10 &&
-                        GetTimeoutValue(pDcChargingInfo->TimeoutTimer) >= 5000000) {
+                        GetTimeoutValue(pDcChargingInfo->TimeoutTimer) >= 1000000) {
                     setChargerMode(gunIndex, MODE_PREPARE_FOR_EV);
                 }
 
@@ -4413,7 +4434,7 @@ CheckStatus:
                 // 切換 D+ Relay to Precharge Relay
                 if (pDcChargingInfo->RelayK1K2Status == YES || pDcChargingInfo->PantographFlag == YES) {
                     pDcChargingInfo->PrechargeStatus = PRECHARGE_READY;
-                    pSysInfo->CurGunSelected == gunIndex;
+                    pSysInfo->CurGunSelected = gunIndex;
                     setChargerMode(gunIndex, MODE_CHARGING);
                 }
                 if (pSysInfo->CurGunSelected == gunIndex) {
@@ -4437,11 +4458,15 @@ CheckStatus:
                 }
                 ftime(&endChargingTime[gunIndex]);
                 pDcChargingInfo->PresentChargedDuration = DiffTimeb(startChargingTime[gunIndex], endChargingTime[gunIndex]);
-
+                GetChargeTranscationDateTime(gunIndex);
                 checkPileEndGfdResult(gunIndex, pDcChargingInfo->Type, pDcChargingInfo->SystemStatus);
 
                 checkEvBoardReqStop(pDcChargingInfo->SystemStatus, gunIndex);
-
+                if ((time((time_t*)NULL) - ShmDcCommonData->pGunInfo[gunIndex].RecordEnergyTime) >= 5) {
+                    ShmDcCommonData->pGunInfo[gunIndex].RecordEnergyTime = time((time_t*)NULL);
+                    if (ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption != 0)
+                        DB_Update_PowerConsumption(gunIndex, ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption);
+                }
                 // Check Stop Charging
                 AuthorizeStopCharging(gunIndex);
 
@@ -4465,6 +4490,8 @@ CheckStatus:
                     }
                     TheEndCharging(gunIndex);
                     StopGunInfoTimeoutDet(gunIndex);
+                    if (ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption != 0)
+                        DB_Update_PowerConsumption(gunIndex, ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption);
                 }
 
                 if (pSysWarning->Level == WARN_LV_ER) {
@@ -4498,18 +4525,29 @@ CheckStatus:
                     StopGunInfoTimeoutDet(gunIndex);
                     
                     pSysInfo->CurGunSelected = gunIndex;
+                    StartSystemTimeoutDet(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->finalcost_flag[gunIndex])
-                            StartSystemTimeoutDet(Timeout_Terminating);
-
                         if (!ShmDcCommonData->isIntoCharge[gunIndex]) {
                             setChargerMode(gunIndex, MODE_COMPLETE);
-                        } else if (ShmDcCommonData->finalcost_flag[gunIndex]) {
+                        } else if (ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
                             setChargerMode(gunIndex, MODE_COMPLETE);
                         }
                     }
@@ -4517,12 +4555,9 @@ CheckStatus:
                     if (isEvStopCharging_gb(gunIndex) == YES ||
                             isPrechargeStatus_gb(gunIndex) <= 0){
 
-                        if (!ShmDcCommonData->finalcost_flag[gunIndex])
-                            StartSystemTimeoutDet(Timeout_Terminating);
-
                         if (!ShmDcCommonData->isIntoCharge[gunIndex]) {
                             setChargerMode(gunIndex, MODE_COMPLETE);
-                        } else if (ShmDcCommonData->finalcost_flag[gunIndex]) {
+                        } else if (ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
                             setChargerMode(gunIndex, MODE_COMPLETE);
                         }
                     }
@@ -4533,16 +4568,14 @@ CheckStatus:
                              isPrechargeStatus_ccs(gunIndex) == 13 ||
                              isPrechargeStatus_ccs(gunIndex) == 14) ) {
 
-                        if (!ShmDcCommonData->finalcost_flag[gunIndex])
-                            StartSystemTimeoutDet(Timeout_Terminating);
-
                         if (!ShmDcCommonData->isIntoCharge[gunIndex]) {
                             setChargerMode(gunIndex, MODE_COMPLETE);
-                        } else if (ShmDcCommonData->finalcost_flag[gunIndex]) {
+                        } else if (ShmDcCommonData->pGunInfo[gunIndex].finalcost_flag) {
                             setChargerMode(gunIndex, MODE_COMPLETE);
                         }
                     }
                 }
+
                 if (pSysInfo->CurGunSelected == gunIndex) {
                     pSysInfo->SystemPage = _LCM_STOPPING;
                 }
@@ -4576,7 +4609,7 @@ CheckStatus:
                 if (isModeChange(gunIndex)) {
                     log_info("============================= S_MAINTAIN(%x) ============================= ", gunIndex);
                     if (pSysInfo->FirmwareUpdate == YES) {
-                        pSysInfo->SystemPage == _LCM_MAINTAIN;
+                        pSysInfo->SystemPage = _LCM_MAINTAIN;
                         continue;
                     }
                     if (pDcChargingInfo->IsAvailable == NO )
@@ -4606,7 +4639,7 @@ CheckStatus:
                     log_info("============================= S_UPDATE ============================= ");
                 }
                 if (pSysInfo->FirmwareUpdate == YES) {
-                    pSysInfo->SystemPage == _LCM_MAINTAIN;
+                    pSysInfo->SystemPage = _LCM_MAINTAIN;
                     continue;
                 } else {
                 }

EVSE/Projects/DD360UCar/Apps/Config.h

@@ -152,12 +152,6 @@ enum _LCM_UAR_INDEX {
     _LCM_WAIT_PLUGIN            = 0x05,
     _LCM_PRECHARGE              = 0x06,
     _LCM_LINK_ERROR             = 0x07,
-    /*
-    _LCM_DETAIL_VIEW            = 0x08,
-    _LCM_STOP_RFID              = 0x09,
-    _LCM_STOP_APP               = 0x0A,
-    _LCM_STOP_RFID_FAIL         = 0x0B,
-    */
     _LCM_STOPPING               = 0x0C,
     _LCM_WAIT_PLUGOUT           = 0x0D,
     _LCM_SUMMARY                = 0x0E,
@@ -169,24 +163,7 @@ enum _LCM_UAR_INDEX {
     _LCM_CHARGING_DETECT        = 0x21,
     _LCM_PREPARECHARE           = 0x22,
 
-    /*
-    _LCM_VIEW                   = _LCM_SELECT_GUN,
-    _LCM_START_SCAN             = _LCM_IDLE,
-    _LCM_START_AUTHORIZING      = _LCM_AUTHORIZING,
-    _LCM_START_AUTHORIZE_FAIL   = _LCM_AUTHORIZ_FAIL,
-    _LCM_WAIT_PLUGIN            = _LCM_WAIT_FOR_PLUG,
-    _LCM_PRECHARGE              = _LCM_PRE_CHARGE,
-    _LCM_LINK_ERROR             = _LCM_AUTHORIZ_FAIL,
-    _LCM_DETAIL_VIEW            = _LCM_SELECT_GUN,
-    _LCM_STOP_RFID              = _LCM_IDLE,
-    _LCM_STOP_APP               = _LCM_IDLE,
-    _LCM_STOP_RFID_FAIL         = _LCM_AUTHORIZ_FAIL,
-    _LCM_STOPPING               = _LCM_PRE_CHARGE,
-    _LCM_WAIT_PLUGOUT           = _LCM_WAIT_FOR_PLUG,
-    _LCM_SUMMARY                = _LCM_COMPLETE,
-    _LCM_MAINTAIN               = _LCM_FIX,
-    _LCM_ERROR                  = _LCM_FIX,
-    */
+
 };
 enum _SELF_TEST_SEQ {
     _STEST_VERSION      = 0x00,
@@ -436,6 +413,13 @@ typedef struct StGunInfo {
     uint8_t EVLoseFlag;
     char ReservationID[32];
     uint8_t ReservationStatus;
+    char UserPriceString[255];
+    float PowerConsumption;
+    time_t RecordEnergyTime;
+    char ChargeStartTime[32];
+    char ChargeStopTime[32];
+    char ChargeDuration[32];
+    uint8_t withChiller;      //是否有水冷機
 } GunInfo;
 
 typedef struct Psu_VersionInfo{
@@ -543,11 +527,11 @@ typedef struct StDcCommonInfo {
     char QRCodeString[255];
     GunInfo pGunInfo[2];
     char DefaultPriceString[255];
-    char UserPriceString[255];
     PowerConsumptionValue pConsumption;
     uint8_t AuthroizeType; // 0: Central   1: eMAID    2: ISO14443 3: ISO15693 4: KeyCode  5: Local    6: MacAddress   7: NoAuthorization
     uint8_t showNetPackage;
     uint8_t showCanPackage;
+    int LcmFwVersion;
 } DcCommonInfo;
 
 #endif /* CONFIG_H_ */

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

@@ -14,7 +14,7 @@
 
 //------------------------------------------------------------------------------
 static sqlite3 *localDb;
-
+static DcCommonInfo* ShmDcCommonData = NULL;
 //------------------------------------------------------------------------------
 //===============================================
 // SQLite3 related routine
@@ -59,6 +59,11 @@ int DB_Open(void)
                             "`idx` INTEGER PRIMARY KEY AUTOINCREMENT, "
                             "`rebootDatetime` TEXT NOT NULL, unique(rebootDatetime) on conflict replace);";
 
+    char *createPowerConsumption = "CREATE TABLE IF NOT EXISTS power_consumption( "
+                         "idx INTEGER PRIMARY KEY AUTOINCREMENT, "
+                         "connector TEXT, "
+                         "val TEXT);";
+
     if (sqlite3_open(DB_FILE, &localDb)) {
         result = FAIL;
         log_info( "Can't open database: %s", sqlite3_errmsg(localDb));
@@ -88,6 +93,14 @@ int DB_Open(void)
             log_info( "Opened local record table successfully");
         }
 
+        //DS60-120
+        if (sqlite3_exec(localDb, createPowerConsumption, 0, 0, &errMsg) != SQLITE_OK) {
+            result = FAIL;
+            log_info("Create power consumption record table error message: %s", errMsg);
+        } else {
+            log_info("Opened power consumption record table successfully");
+        }
+
         if (sqlite3_exec(localDb, createrebootSql, 0, 0, &errMsg) != SQLITE_OK) {
             result = FAIL;
             log_info( "Create reboot record table error message: %s", errMsg);
@@ -99,6 +112,7 @@ int DB_Open(void)
         sqlite3_close(localDb);
     }
 
+    ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
     return result;
 }
 
@@ -171,7 +185,7 @@ int DB_Update_Operactive(uint8_t gunIndex, uint8_t IsAvailable)
                 "insert or replace into config (item, connector, val) values('IsAvailable', %d, %d);",
                 gunIndex,
                 IsAvailable); //DS60-120 add
-        log_info("sqlStr= %s", sqlStr);
+        //log_info("sqlStr= %s", sqlStr);
         if (sqlite3_exec(localDb, sqlStr, 0, 0, &errMsg) != SQLITE_OK) {
             result = FAIL;
             log_info( "update config error message: %s", errMsg);
@@ -222,6 +236,104 @@ int DB_Get_Operactive(uint8_t gunIndex)
     return result;
 }
 
+int DB_Insert_PowerConsumption(uint8_t gunIndex, float energy)
+{
+    uint8_t result = false;
+    char* errMsg = NULL;
+    char sqlStr[1024];
+    srand(time(NULL));
+
+    if (sqlite3_open(DB_FILE, &localDb)) {
+        result = FAIL;
+        log_info("Can't open database: %s", sqlite3_errmsg(localDb));
+        sqlite3_close(localDb);
+    } else {
+        //log_info("Local charging record database open successfully (%f).", energy);
+        sprintf(sqlStr,"insert into power_consumption (connector, val) values (%d, %f);",
+            gunIndex,
+            energy); //DS60-120 add
+        //log_info("sqlStr= %s", sqlStr);
+        if (sqlite3_exec(localDb, sqlStr, 0, 0, &errMsg) != SQLITE_OK) {
+            result = FAIL;
+            log_info("Insert power consumption error message: %s", errMsg);
+        } else {
+            log_info("Insert connector-%d config item PowerComsumption to %f", gunIndex, energy);
+        }
+
+        sqlite3_close(localDb);
+    }
+
+    return result;
+}
+
+int DB_Update_PowerConsumption(uint8_t gunIndex, float energy)
+{
+    uint8_t result = false;
+    char* errMsg = NULL;
+    char sqlStr[1024];
+    srand(time(NULL));
+
+    if (sqlite3_open(DB_FILE, &localDb)) {
+        result = FAIL;
+        log_info("Can't open database: %s", sqlite3_errmsg(localDb));
+        sqlite3_close(localDb);
+    } else {
+        //log_info("Local charging record database open successfully.");
+        sprintf(sqlStr,"update power_consumption set val = %f where connector = %d; ",
+                        energy,
+                        gunIndex); //DS60-120 add
+        //log_info("sqlStr= %s", sqlStr);
+        if (sqlite3_exec(localDb, sqlStr, 0, 0, &errMsg) != SQLITE_OK) {
+            result = FAIL;
+            log_info("update config error message: %s", errMsg);
+        } else {
+            //log_info("update connector-%d config item PowerComsumption to %f", gunIndex, energy);
+        }
+
+        sqlite3_close(localDb);
+    }
+
+    return result;
+}
+
+int DB_Get_PowerConsumption(uint8_t gunIndex)
+{
+    uint8_t result = true;
+    char* errMsg = NULL;
+    char sqlStr[1024];
+    char** rs;
+    int  rows, cols;
+
+    //sprintf(sqlStr, "select * from config where IsAvailable='IsAvailable' and connector=%d;", gunIndex);
+    sprintf(sqlStr, "select * from power_consumption where connector=%d;", gunIndex); //DS60-120 add
+    //DEBUG_INFO("sqlStr= %s", sqlStr);
+
+    if (sqlite3_open(DB_FILE, &localDb)) {
+        result = FAIL;
+        log_info("Can't open database: %s", sqlite3_errmsg(localDb));
+        sqlite3_close(localDb);
+    } else {
+        log_info("Local config query database open successfully.");
+        sqlite3_get_table(localDb, sqlStr, &rs, &rows, &cols, &errMsg);
+        if (rows > 0) {
+            for (int idxRow = 1; idxRow <= rows; idxRow++) {
+                ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption = atof(rs[(idxRow * cols) + 2]);
+                log_info("Query connector-%d PowerConsumption: %s", gunIndex, rs[(idxRow * cols) + 2]);
+                
+            }
+        } else {
+            log_info("Query connector-%d fail, set default value to operactive.", gunIndex);
+            result = false;
+        }
+
+        sqlite3_free_table(rs);
+        sqlite3_close(localDb);
+    }
+
+    return result;
+}
+
+
 int DB_Reboot_Record(void)
 {
     int result = PASS;

EVSE/Projects/DD360UCar/Apps/DataBase/DataBase.h

@@ -10,5 +10,7 @@ int DB_Reboot_Record(void);
 //for Module_EventLog
 int CreateEventRecord(void);
 int InsertEventRecord(uint8_t *statusCode);
-
+int DB_Get_PowerConsumption(uint8_t gunIndex);
+int DB_Insert_PowerConsumption(uint8_t gunIndex, float energy);
+int DB_Update_PowerConsumption(uint8_t gunIndex, float energy);
 #endif /* _DATA_BASE_H_ */

EVSE/Projects/DD360UCar/Apps/Define/define.c

@@ -256,7 +256,7 @@ char AlarmStatusCode[160][6]=
 "012344",   // AC: Meter IC communication timeout
 "012345",   // AC: Pilot negative error
 "012346",   // Psu Communication error with CSU
-"012347",   // reserved
+"012347",   // AC: Local power sharing communication error (Slave disconnect from Master)
 "012348",   // reserved
 "012349",   // reserved
 "012350",   // reserved

EVSE/Projects/DD360UCar/Apps/Define/define.h

@@ -385,8 +385,8 @@ struct TeleConfigData
 {
 	unsigned char		TelcomModelName[64];		//default: Null
 	unsigned char		TelcomSoftwareVer[64];		//default: Null
-	unsigned char		TelcomApn[255];				//default: Null
-	unsigned char		TelcomNetworkType;			//0: Auto	1: CDMA	 2: WCDMA  3: LTE  4: TD-SCDMA  5: UMTS  6: CDMA  7: HDR  8: CDMA/HDR
+    unsigned char       TelcomApn[255];             //default: Null
+    unsigned char       TelcomNetworkType;          //0: Auto   1: CDMA  2: WCDMA  3: LTE  4: TD-SCDMA  5: UMTS  6: CDMA  7: HDR  8: CDMA/HDR
 	int					TelcomRssi;					//dbm
 	unsigned char		TelcomChapPapId[256];		//default: Null
 	unsigned char		TelcomChapPapPwd[256];		//default: Null
@@ -592,6 +592,7 @@ struct SysConfigData
     unsigned char           MaintainServerSecurityProfile;      // Maintain server security profile 0~3
     unsigned char           MaintainServerSecurityPassword[41]; // Maintain server AuthorizationKey for security profile
     unsigned char           PowerSharingServerIP[512];          // Local power sharing server ip address
+    unsigned int            PowerSharingCapacityPower;          // Local power sharing capacity power
 };
 
 struct ChargingInfoData
@@ -879,6 +880,7 @@ struct ConnectorInfoData
     float                   CostDiscount;                   // connector user's Discount or couponPoint, unit: 1 point
     float                   EnergyCost;                     // connector user's energy cost, unit: 1 dollar
     float                   ParkingFee;                     // connector user's parking fee, unit: 1 dollar
+    float                   RemainAmount;                   // connector user's remain amount, unit: 1 dollar
 };
 
 typedef union
@@ -886,11 +888,7 @@ typedef union
     unsigned int SettingValue;
     struct
     {
-        unsigned int DispenserDisconnection:1;  // 0: no connection,  1: dispenser connected
-        unsigned int FlashConfigChanged:1;      // 0: no effect, 1: flash config has changed
-        unsigned int EnableWriteFlash:1;        // 0: no effect, 1: enable to write flash after timeout
-        unsigned int CleanWiringInfo:1;         // 0: no effect, 1: clean wiring info
-        unsigned int res:28;
+        unsigned int res:32;
     }bits;
 }CabinetSettingFlag;
 
@@ -904,6 +902,37 @@ typedef struct DC_METER_INFO
     unsigned char LinkStatus;                   // 0 = unknow ,1 = link , 2 miss link
 }DC_Meter_Info;
 
+typedef struct Bazel8Command
+{
+    unsigned char isReq:1;
+    unsigned char isRes:1;
+    unsigned char isWaitRes:1;
+    unsigned char isResultPass:1;
+} bazel8Command;
+
+typedef struct EventInfo
+{
+    int messageId;
+    char messageString[64];
+    unsigned char isGetOn:1;
+}eventInfo;
+
+typedef struct StartTxResp
+{
+    char statusCode[8];
+    char statusText[128];
+    char txnId[32];
+    unsigned char isGetOn:1;
+}startTxResp;
+
+struct BAZEL8
+{
+    eventInfo       event;
+    startTxResp     txResp;
+
+    bazel8Command   cmdPreAuth;
+};
+
 struct SysInfoData
 {
 	/**************System***************/
@@ -1001,6 +1030,7 @@ struct SysInfoData
     unsigned char           OTPTemp;                    // OTP Temperature
     unsigned char           OTPTempR;                   // OTP Recovery Temperature
     struct LCD_OVERRIDE     LcdOveride;                 // LCD override info (no use anymore)
+    struct BAZEL8           bazel8;                     // Bazel8 payment used
 };
 
 struct SysConfigAndInfo
@@ -1337,7 +1367,7 @@ char AlarmStatusCode[160][6]=
     "012344",   // AC: Meter IC communication timeout
     "012345",   // AC: Pilot negative error
     "012346",   // Psu Communication error with CSU
-    "012347",   // reserved
+    "012347",   // AC: Local power sharing communication error (Slave disconnect from Master)
     "012348",   // reserved
     "012349",   // reserved
     "012350",   // reserved
@@ -1509,15 +1539,16 @@ struct AlarmCodeData
             unsigned char PsuCanCommFault:1;                        //bit 1
             unsigned char PsuDcDcOtp:1;                             //bit 2
             unsigned char PsuDcDcOvp:1;                             //bit 3
-			unsigned char ChillerTubeOTP : 1;                       //bit 4
+            unsigned char ChillerTubeOTP : 1;                       //bit 4
             unsigned char :3;                                       //reserved bit 5 ~ bit 7
-    //AlarmVal[17]
+            //AlarmVal[17]
             unsigned char :8;                                       //reserved bit 0 ~ bit 7
             //AlarmVal[18]
             unsigned char MeterIcCommTimeout:1;                     //bit 0
             unsigned char PilotNegativeError:1;                     //bit 1
             unsigned char PsuComminicationErrWithCSU:1;             //bit 2
-            unsigned char :5;                                       //reserved bit 3 ~ bit 7
+            unsigned char LocalPowerSharingCommunicationError:1;    //bit 3
+            unsigned char :4;                                       //reserved bit 4 ~ bit 7
             //AlarmVal[19]
             unsigned char :8;                                       //reserved bit 0 ~ bit 7
 		}bits;

EVSE/Projects/DD360UCar/Apps/Makefile

@@ -110,12 +110,6 @@ CHKSYSTASK_SRC_FILES = $(patsubst %.o, %.c, $(CHKSYSTASK_OBJ_FILES))
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-#Simulation
-SIMULATION_OBJ_FILES = $(COMMON_OBJ_FILES) simulation.o
-SIMULATION_SRC_FILES = $(patsubst %.o, %.c, $(SIMULATION_OBJ_FILES))
-%.o: %.c
-	$(CC) $(CFLAGS) -c $<
-
 #Event Log
 EVENTLOG_OBJ_FILES = $(COMMON_OBJ_FILES) $(DataBaseLib)/DataBase.o \
 						$(EventLogLib)/Module_EventLogging.o
@@ -145,7 +139,7 @@ all: CopyFile apps
 apps: MainTask DoCommTask EvCommTask UpdateFWTask ChkSysTask \
 		EventLoggingTask InternalCommTask LcmControlTask \
 			PrimaryCommTask ReadCmdlineTask UnsafetyOutputTool \
-				SimulationApp FactoryConfigApp OtherTools CleanExec
+				FactoryConfigApp OtherTools CleanExec
 
 MainTask:
 	$(CC) $(DEFINE) $(MAIN_SRC_FILES) $(CFLAGS) $(TFLAGS) $(INC_FLAGS) $(SQLite3_H) $(ModuleUpgrade_H) $(RateCurrent_H) \
@@ -177,11 +171,6 @@ ChkSysTask:
 	#$(CC) $(DEFINE) $(CFLAGS) -c -o Module_ChkSysTask.o $(ChkSysTaskLib)/Module_ChkSysTask.c
 	#$(CC) -o Module_ChkSysTask Module_ChkSysTask.o 
 
-SimulationApp:
-	$(CC) $(DEFINE) $(SIMULATION_SRC_FILES) $(CFLAGS) $(TFLAGS) $(INC_FLAGS) -o simulation 
-	#$(CC) $(DEFINE) $(CFLAGS) -c -o simulation.o simulation.c
-	#$(CC) -o simulation simulation.o
-
 EventLoggingTask:
 	$(CC) $(DEFINE) $(EVENTLOG_SRC_FILES) $(CFLAGS) $(TFLAGS) $(INC_FLAGS) $(SQLite3_H) $(Lib_SQLite3) -o Module_EventLogging
 	#$(CC) $(DEFINE) $(CFLAGS) -c -o define.o $(DefineLib)/define.c
@@ -239,7 +228,6 @@ OtherTools:
 	cp -f Module_EvComm $(RootPath)
 	cp -f Module_UpdateFW $(RootPath)
 	cp -f Module_ChkSysTask $(RootPath)
-	cp -f simulation $(RootPath)
 	cp -f Module_EventLogging $(RootPath)
 	cp -f Module_InternalComm $(RootPath)
 	cp -f Module_LcmControl $(RootPath)
@@ -259,7 +247,6 @@ OtherTools:
 	cp -f Module_EvComm $(OutputPath)
 	cp -f Module_UpdateFW $(OutputPath)
 	cp -f Module_ChkSysTask $(OutputPath)
-	cp -f simulation $(OutputPath)
 	cp -f Module_EventLogging $(OutputPath)
 	cp -f Module_InternalComm $(OutputPath)
 	cp -f Module_LcmControl $(OutputPath)
@@ -279,7 +266,6 @@ CleanExec:
 	rm Module_EvComm
 	rm Module_UpdateFW
 	rm Module_ChkSysTask
-	rm simulation 
 	rm Module_EventLogging
 	rm Module_InternalComm
 	rm Module_LcmControl

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

@@ -61,6 +61,7 @@ static unsigned int LedIntensity = 0;
 static int TimeZoneOffset = 0;
 int RxLen;
 char Rxdata[1024];
+uint8_t _isplugin;
 //------------------------------------------------------------------------------
 static void removeFaultCodeToBuf(uint8_t *Code);
 static void addFaultCodeToBuf(uint8_t *Code);
@@ -199,7 +200,7 @@ static void setTcpStatus(uint8_t setValue)
 //------------------------------------------------------------------------------
 //--- TCP socket function ---
 //------------------------------------------------------------------------------
-static int sendTcpSocket(int fd, uint8_t* data, uint16_t dataLen)
+static int sendTcpSocket(int fd, uint8_t *data, uint16_t dataLen)
 {
     int size = -1;
     int i;
@@ -220,7 +221,7 @@ static int sendTcpSocket(int fd, uint8_t* data, uint16_t dataLen)
         printf("%s", _info);
     }
 
-    size = send(fd, data, dataLen, 0);
+    size = send(fd, data, dataLen , 0);
     if ((size < 0) || (errno == EAGAIN)) {
         if (size < 0) {
             log_error("Send Socket Size = %d, EAGAIN error %d:%s", size, errno, strerror(errno));
@@ -230,11 +231,11 @@ static int sendTcpSocket(int fd, uint8_t* data, uint16_t dataLen)
     return size;
 }
 
-static int recvTcpSocket(int fd, uint8_t* data, uint16_t dataLen, uint8_t ishead)
+static int recvTcpSocket(int fd, uint8_t *data, uint16_t dataLen,uint8_t ishead)
 {
     int size = -1;
     int i;
-    uint8_t* pdata = (uint8_t*)data;
+    uint8_t *pdata = (uint8_t *)data;
 
     size = recv(fd, pdata, dataLen, MSG_WAITALL);
     if ((errno == EAGAIN) || (size < 0)) {
@@ -255,7 +256,7 @@ static int recvTcpSocket(int fd, uint8_t* data, uint16_t dataLen, uint8_t ishead
         if (!ishead) {
             RxLen += sprintf(&Rxdata[RxLen], "\n");
             printf("%s", Rxdata);
-            strcpy(Rxdata, "");
+            strcpy(Rxdata,"");
         }
     }
 
@@ -525,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", _setTime);
+        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");
@@ -955,10 +956,6 @@ void AddDispenserReq(uint8_t* buff, MiscCommand* req)
     buff[5] = req->Value[3];
 }
 
-
-
-
-
 static int chargingcapabilityHandle(uint8_t *data, uint8_t plugNum)
 {
     uint8_t addr = 0;
@@ -1011,19 +1008,17 @@ static int chargingcapabilityHandle(uint8_t *data, uint8_t plugNum)
     ShmSelectGunInfo->PricesInfo[plugNum].TransactionId = ntohl(pAccountInfo->Transaction);
     ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost = transPricesUnit(ntohl(pAccountInfo->EnergyCost));
     ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee = transPricesUnit(ntohl(pAccountInfo->ParkingFee));
+    pAccountInfo->RemainAmount = ntohl(pAccountInfo->RemainAmount);
+    memcpy((char*)&ShmSelectGunInfo->PricesInfo[plugNum].RemainAmount, (char*)&pAccountInfo->RemainAmount, sizeof(uint32_t));
 
     if ((pricesInfo[plugNum].UserPrices != ShmSelectGunInfo->PricesInfo[plugNum].UserPrices) ||
             (pricesInfo[plugNum].Balance != ShmSelectGunInfo->PricesInfo[plugNum].Balance) ||
 			(pricesInfo[plugNum].Discount != ShmSelectGunInfo->PricesInfo[plugNum].Discount) ||
-			(pricesInfo[plugNum].TransactionId != ShmSelectGunInfo->PricesInfo[plugNum].TransactionId) ||
-            (pricesInfo[plugNum].EnergyCost != ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost) ||
-            (pricesInfo[plugNum].ParkingFee != ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee)) {
+			(pricesInfo[plugNum].TransactionId != ShmSelectGunInfo->PricesInfo[plugNum].TransactionId)) {
         pricesInfo[plugNum].UserPrices = ShmSelectGunInfo->PricesInfo[plugNum].UserPrices;
         pricesInfo[plugNum].Balance = ShmSelectGunInfo->PricesInfo[plugNum].Balance;
         pricesInfo[plugNum].Discount = ShmSelectGunInfo->PricesInfo[plugNum].Discount;
         pricesInfo[plugNum].TransactionId = ShmSelectGunInfo->PricesInfo[plugNum].TransactionId;
-        pricesInfo[plugNum].ParkingFee = ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee;
-        pricesInfo[plugNum].EnergyCost = ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost;
         if (ShmSelectGunInfo->PricesInfo[plugNum].TransactionId != 0) {
 
             //ShmDcCommonData->TransactionInfo[plugNum].TransactionId = ShmSelectGunInfo->PricesInfo[plugNum].TransactionId;
@@ -1037,12 +1032,22 @@ static int chargingcapabilityHandle(uint8_t *data, uint8_t plugNum)
                 ShmSelectGunInfo->PricesInfo[plugNum].Balance,
                 (uint8_t*)GetCurrency(pSysConfig->BillingData.Currency)
             );
-            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);
         }
+
     }
+    if ((pricesInfo[plugNum].EnergyCost != ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost) ||
+        (pricesInfo[plugNum].ParkingFee != ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee) ||
+        (pricesInfo[plugNum].RemainAmount != ShmSelectGunInfo->PricesInfo[plugNum].RemainAmount)) {
 
+        pricesInfo[plugNum].ParkingFee = ShmSelectGunInfo->PricesInfo[plugNum].ParkingFee;
+        pricesInfo[plugNum].EnergyCost = ShmSelectGunInfo->PricesInfo[plugNum].EnergyCost;
+        pricesInfo[plugNum].RemainAmount = ShmSelectGunInfo->PricesInfo[plugNum].RemainAmount;
+
+        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);
+        log_info("Remain Amount:%.2f", ShmSelectGunInfo->PricesInfo[plugNum].RemainAmount);
+    }
     return PASS;
 }
 
@@ -1231,26 +1236,27 @@ static int powerCabinetStatusProcess(uint8_t dataLen, uint8_t *data)
 void GetCabientDcmRevHandle(uint8_t *data)
 {
 	PCDCMVer *pVersion = (PCDCMVer *)&data[0];
-	strcpy(ShmDcCommonData->CabinetModelName , pVersion->CabinetModelName);
-	strcpy(ShmDcCommonData->CabinetBoolLoaderVersion, pVersion->CabinetBoolLoaderVersion);
-	strcpy(ShmDcCommonData->CabinetKernelVersion , pVersion->CabinetKernelVersion);
-	strcpy(ShmDcCommonData->CabinetRFSystemVersion , pVersion->CabinetRFSystemVersion);
-	strcpy(ShmDcCommonData->CabinetPrimaryVersion , pVersion->CabinetPrimaryVersion);
-	strcpy(ShmDcCommonData->CabinetIPAddr , pVersion->CabinetIPAddr);
+	strcpy((char*)ShmDcCommonData->CabinetModelName , (char *)pVersion->CabinetModelName);
+	strcpy((char*)ShmDcCommonData->CabinetBoolLoaderVersion, (char*)pVersion->CabinetBoolLoaderVersion);
+	strcpy((char*)ShmDcCommonData->CabinetKernelVersion , (char*)pVersion->CabinetKernelVersion);
+	strcpy((char*)ShmDcCommonData->CabinetRFSystemVersion , (char*)pVersion->CabinetRFSystemVersion);
+	strcpy((char*)ShmDcCommonData->CabinetPrimaryVersion , (char*)pVersion->CabinetPrimaryVersion);
+	strcpy((char*)ShmDcCommonData->CabinetIPAddr , (char*)pVersion->CabinetIPAddr);
 }
 void GetCabientOtherRevHandle(uint8_t *data)
 {
 	PCOthVer *pVersion = (PCOthVer *)&data[0];
-	strcpy(ShmDcCommonData->CabinetRelay0Version , pVersion->CabinetRelay0Version);
-	strcpy(ShmDcCommonData->CabinetRelay1Version , pVersion->CabinetRelay1Version);
-	strcpy(ShmDcCommonData->CabinetFanVersion , pVersion->CabinetFanVersion);
+	strcpy((char*)ShmDcCommonData->CabinetRelay0Version , (char*)pVersion->CabinetRelay0Version);
+	strcpy((char*)ShmDcCommonData->CabinetRelay1Version , (char*)pVersion->CabinetRelay1Version);
+	strcpy((char*)ShmDcCommonData->CabinetFanVersion , (char*)pVersion->CabinetFanVersion);
 }
 void GetCabientEachPsuRevHandle(uint8_t *data)
 {
 	PCnPsuVer *pVersion = (PCnPsuVer *)&data[0];
-	strcpy(ShmDcCommonData->PsuVer[pVersion->n_PSU].DCVersion, pVersion->DCVersion);
-	strcpy(ShmDcCommonData->PsuVer[pVersion->n_PSU].FPCVersion, pVersion->FPCVersion);
+	strcpy((char*)ShmDcCommonData->PsuVer[pVersion->n_PSU].DCVersion, (char*)pVersion->DCVersion);
+	strcpy((char*)ShmDcCommonData->PsuVer[pVersion->n_PSU].FPCVersion, (char*)pVersion->FPCVersion);
 }
+
 static int responsePackeHandle(int fd, uint8_t *pResult, uint8_t plugNum, uint8_t reg)
 {
     int ret = PASS;
@@ -1499,9 +1505,9 @@ static int responsePackeHandle(int fd, uint8_t *pResult, uint8_t plugNum, uint8_
             return COMMAND_RESULT_NG;
         }
         gMoreInfoReq[plugNum].bits.UserPriceReq = NO;
-        if (strcmp((char*)ShmDcCommonData->UserPriceString, (char*)pCsuResult->Data.Data) != EQUAL) {
-            strcpy((char*)ShmDcCommonData->UserPriceString, (char*)pCsuResult->Data.Data);
-            log_info("User Price:%s", ShmDcCommonData->UserPriceString);
+        if (strcmp((char*)ShmDcCommonData->pGunInfo[plugNum].UserPriceString, (char*)pCsuResult->Data.Data) != EQUAL) {
+            strcpy((char*)ShmDcCommonData->pGunInfo[plugNum].UserPriceString, (char*)pCsuResult->Data.Data);
+            log_info("User Price:%s", ShmDcCommonData->pGunInfo[plugNum].UserPriceString);
         }
         break;
     case REG_RECEIPT_INFO:
@@ -1514,6 +1520,23 @@ static int responsePackeHandle(int fd, uint8_t *pResult, uint8_t plugNum, uint8_
             log_info("Gun%d Receipt:%s", plugNum, ShmDcCommonData->pGunInfo[plugNum].ReceiptInfo);
         }
         break;
+    case REG_READ_CHARGING_TIMESTAMP:
+        if (pCsuResult->Data.Result == COMMAND_RESULT_NG) {
+            return COMMAND_RESULT_NG;
+        }
+        if (rawDataLen <= 2) {
+            log_info("No Charging timestamp");
+            break;
+        }
+
+        strcpy((char*)ShmDcCommonData->pGunInfo[plugNum].ChargeStartTime, (char*)&pCsuResult->Data.Data[0]);
+        int timelen = strlen((char*)ShmDcCommonData->pGunInfo[plugNum].ChargeStartTime);
+        if (timelen != 0) {
+            timelen = strcpy((char*)ShmDcCommonData->pGunInfo[plugNum].ChargeStopTime, (char*)&pCsuResult->Data.Data[timelen+1]);
+        }
+        break;
+        
+        /*
     case REG_POWER_CONSUMPTION_INFO:
         if (pCsuResult->Data.Result == COMMAND_RESULT_NG) {
             return COMMAND_RESULT_NG;
@@ -1538,6 +1561,7 @@ static int responsePackeHandle(int fd, uint8_t *pResult, uint8_t plugNum, uint8_
         
         
         break;
+        */
     default:
         break;
     }
@@ -1578,18 +1602,17 @@ static int composeSocketData(int fd,
 
     //send command packet
     if ((size = sendTcpSocket(fd, (uint8_t *)&csuCmdPkt, sendPktLen)) < 0) {
-        log_error("TCP socket send packet fail = %d", size);
+        log_error("TCP socket send packet fail = reg %d  size = %d",reg, size);
         gDoCommGblData.DisConnCount++;
         return FAIL;
     }
 
     //receive result head
     if ((size = recvTcpSocket(fd, (uint8_t *)&csuResult.Head, sizeof(csuResult.Head),1)) < 0) {
-        log_error("TCP socket RX head fail = %d", size);
+        log_error("TCP socket RX head fail = reg %d size = %d",reg, size);
         // 若收不到以下封包，不產生錯誤
         if (reg != REG_CABINET_DCM_VERSION && reg != REG_CABINET_OTHER_VERSION &&
-            reg != REG_TOTAL_PSU_QUANTITY && reg != REG_PSU_VERSION &&
-            reg != REG_READ_CABINET_SYSTEMID) {
+            reg != REG_TOTAL_PSU_QUANTITY && reg != REG_PSU_VERSION ) {
             gDoCommGblData.DisConnCount++;
         }
         return FAIL;
@@ -1597,7 +1620,7 @@ static int composeSocketData(int fd,
 
     //receive result raw data
     if ((size = recvTcpSocket(fd, (uint8_t *)&csuResult.Data, csuResult.Head.DataLen,0)) < 0) {
-        log_error("TCP socket RX data fail = %d", size);
+        log_error("TCP socket RX data fail = reg %d size %d",reg, size);
         gDoCommGblData.DisConnCount++;
         return FAIL;
     }
@@ -1738,11 +1761,29 @@ static int writeDeductInfo(int fd, uint8_t id,uint8_t gunIndex, RecordTransactio
     return ret;
 }
 */
+
+static int readChargingTimeStamp(int fd, uint8_t id)
+{
+    int ret = PASS;
+    if ((ret = composeSocketData(fd,
+                                 id,
+                                 OP_READ_DATA,
+                                 REG_READ_CHARGING_TIMESTAMP,
+                                 0,
+                                 NULL)) == FAIL) {
+        return ret;
+    }
+
+    return ret;
+}
 static int writeWaitPlugItState(int fd, uint8_t id)
 {
     int ret = PASS;
     uint8_t data[2] = {pSysInfo->WaitForPlugit, 0};
-
+    if (_isplugin != pSysInfo->WaitForPlugit) {
+        log_info("Wait for plug:%s", pSysInfo->WaitForPlugit == 0 ? "disable" : "enable");
+        _isplugin = pSysInfo->WaitForPlugit;
+    }
     //printf("WaitForPlugit = %d", pSysInfo->WaitForPlugit);
 
     if ((ret = composeSocketData(fd,
@@ -1911,7 +1952,8 @@ static int writeUserID(int fd, uint8_t id, uint8_t *pUserID)
 
 static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
 {
-    uint8_t dataBuf[10] = {'\0'};
+    uint8_t dataBuf[15] = {'\0'};
+    uint32_t _consumption;
     ConnectorState *pConnState = (ConnectorState *)dataBuf;
     static char vendorErrorCodeTmp[2][WARNING_CODE_SIZE] = {0};
     int ret = PASS;
@@ -1972,6 +2014,9 @@ static int writeConnectorState(int fd, uint8_t plugNum, uint8_t id)
         }
     }
 
+    memcpy((char*)&_consumption, (char*)&ShmDcCommonData->pGunInfo[plugNum].PowerConsumption, sizeof(float));
+    pConnState->consumption = ntohl(_consumption);
+
     ret = composeSocketData(fd,
                             id,
                             OP_WRITE_DATA,
@@ -2223,6 +2268,7 @@ static int readUserPrice(int fd, uint8_t gunID)
 
     return ret;
 }
+/*
 static int readConsumptionInfo(int fd)
 {
     int ret = PASS;
@@ -2236,6 +2282,7 @@ static int readConsumptionInfo(int fd)
 
     return ret;
 }
+*/
 static int WriteModelName(int fd)
 {
     int ret = PASS;
@@ -2436,7 +2483,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("Gun %d get final cost %f", plugNum, pDcChargingInfo->ChargingFee);
+                    log_info("Set Final Cost Flag");
                 }
             }
             curReg = REG_PLUG_IN_STATE;
@@ -2509,8 +2556,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
         case REG_QRCODE_URL_INFO:
             if (gunID == 1) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > (LOOP_RETRY_TIME * 10) ||
-                    DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0
-                    ) {
+                    DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0 ) {
                     readQRcodeURLAndSystemDate(fd);
                     ftime(&gRegTimeUp[plugNum][curReg]);
                 }
@@ -2525,15 +2571,32 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
         //    readChargePermission(fd, gunID);
         //    break;
 
+        case REG_READ_CABINET_SYSTEMID:
+            if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > (LOOP_RETRY_TIME * 10) ||
+                DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
+                readSystemID(fd);
+                ftime(&gRegTimeUp[plugNum][curReg]);
+            }
+            curReg = REG_MISC_CONTROL;
+            //check misc command from power cabinet
+            /*
+            if (gDoCommGblData.MiscCmd != 0) {
+                if (gDoCommGblData.MiscCmd != REG_MISC_CONTROL) {
+                    log_error("misc command failed = %x", gDoCommGblData.MiscCmd);
+                }
+                curReg = gDoCommGblData.MiscCmd;
+            } else if (gMoreInfoReq[plugNum].Value != 0) {
+                curReg = REG_RESERVATION_IDTAG;
+            } else {
+                isContinue = 0;
+            }*/
+            break;
         case REG_MISC_CONTROL:
             readMiscCommand(fd, gunID);
 
-            if(gMoreInfoReq[plugNum].Value == 0)
-            {
+            if(gMoreInfoReq[plugNum].Value == 0) {
                 isContinue = 0;
-            }
-            else
-            {
+            } else {
                 curReg = REG_RESERVATION_IDTAG;
             }
             break;
@@ -2547,55 +2610,15 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
                 isContinue = 0;
             } else {
                 //power up write dispenser version and get power cabinet system ID
-                if ((writeCsuModuleVersion(fd) == PASS) &&
-                        (writeOtherModuleVersion(fd) == PASS) &&
-                        (readQRcodeURLAndSystemDate(fd) == PASS)
-                   ) {
+                if ((writeCsuModuleVersion(fd) == PASS) && (writeOtherModuleVersion(fd) == PASS) &&
+                     (readQRcodeURLAndSystemDate(fd) == PASS)) {
                     //gDoCommGblData.DisConnCount = 0;
                     isContinue = 0;
                 }
             }
             break;
 
-        //case REG_PRESENT_CHARGING_INFO:
-        //    break;
-
-
-
-        //case REG_WAIT_PLUG_IT_STATE:
-        //    if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > (LOOP_RETRY_TIME / 10)) {
-        //        writeWaitPlugItState(fd, gunID);
-        //        ftime(&gRegTimeUp[plugNum][curReg]);
-        //    }
-        //    isContinue = 0;
-        //    break;
-
-        //case REG_CABINET_DCM_VERSION:
-        //    break;
-
-        //case REG_CABINET_OTHER_VERSION:
-        //    break;
-
-        //case REG_TOTAL_PSU_QUANTITY:
-        //    break;
-
-        //case REG_PSU_VERSION:
-        //    break;
-
-
-        //case REG_DISPENSER_REQUEST:
-        //    break;
-
-
-        case REG_READ_CABINET_SYSTEMID:
-            if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
-                DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
-                readSystemID(fd);
-                ftime(&gRegTimeUp[plugNum][curReg]);
-            }
-            curReg = REG_POWER_CONSUMPTION_INFO;
-            break;
-
+            /*
         case REG_POWER_CONSUMPTION_INFO:
             if (pSysConfig->ShowInformation || ShmDcCommonData->DebugFlag) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
@@ -2616,10 +2639,9 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
                 isContinue = 0;
             }
             break;
-
+            */
         case REG_RESERVATION_IDTAG:
-            if (gMoreInfoReq[plugNum].bits.ReservationReq)
-            {
+            if (gMoreInfoReq[plugNum].bits.ReservationReq) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
                     DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
                     if (readReservationState(fd, gunID) == PASS)
@@ -2632,8 +2654,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
             curReg = REG_REMOTE_START_NO_ID;
             break;
         case REG_REMOTE_START_NO_ID:
-            if (gMoreInfoReq[plugNum].bits.RemoteStartNoID)
-            {
+            if (gMoreInfoReq[plugNum].bits.RemoteStartNoID) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
                     DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
                     if (readRemoteStartNoIDState(fd) == PASS)
@@ -2646,8 +2667,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
             curReg = REG_STATION_INFO;
             break;
         case REG_STATION_INFO:
-            if (gMoreInfoReq[plugNum].bits.StationInfoReq)
-            {
+            if (gMoreInfoReq[plugNum].bits.StationInfoReq) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
                     DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
 
@@ -2663,8 +2683,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
             break;
 
         case REG_READ_DEFAULT_PRICE:
-            if (gMoreInfoReq[plugNum].bits.DefaultPriceReq)
-            {
+            if (gMoreInfoReq[plugNum].bits.DefaultPriceReq) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
                     DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
                     readDefaultPrice(fd);
@@ -2674,8 +2693,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
             curReg = REG_READ_USER_PRICE;
             break;
         case REG_READ_USER_PRICE:
-            if (gMoreInfoReq[plugNum].bits.UserPriceReq)
-            {
+            if (gMoreInfoReq[plugNum].bits.UserPriceReq) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
                     DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
                     readUserPrice(fd,gunID);
@@ -2685,8 +2703,7 @@ static int messageTrigger(int fd, uint8_t plugNum, uint8_t gunID, uint8_t curReg
             curReg = REG_RECEIPT_INFO;
             break;
         case REG_RECEIPT_INFO:
-            if (gMoreInfoReq[plugNum].bits.ReceiptReq)
-            {
+            if (gMoreInfoReq[plugNum].bits.ReceiptReq) {
                 if (DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) > LOOP_RETRY_TIME ||
                     DiffTimeb(gRegTimeUp[plugNum][curReg], NowTime) < 0) {
                     readReceiptInfo(fd, gunID);
@@ -2750,10 +2767,18 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
     case S_MAINTAIN:
     case S_ALARM:
     case S_AUTHORIZING:
-        if(pDcChargingInfo->SystemStatus != S_ALARM)
-        {
-            DeductResultReq[plugNum] = NO;
+        
+        if(pDcChargingInfo->SystemStatus == S_ALARM &&
+            strlen((char*)ShmDcCommonData->pGunInfo[plugNum].ChargeStopTime) <= 1) {
+            ftime(&AuthNowTime);
+            if (DiffTimeb(gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP], AuthNowTime) > LOOP_RETRY_TIME ||
+                DiffTimeb(gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP], AuthNowTime) < 0
+                ) {
+                readChargingTimeStamp(fd, gunID);
+                ftime(&gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP]);
+            }
         }
+
         checkAuthorProcess(fd, plugNum);
 
         //authorization complete, write wait plug it state
@@ -2798,7 +2823,7 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
         }
 
         ftime(&AuthNowTime);
-        if (DiffTimeb(gRegTimeUp[plugNum][REG_CHARGING_PERMISSION], AuthNowTime) > LOOP_RETRY_TIME ||
+        if (DiffTimeb(gRegTimeUp[plugNum][REG_CHARGING_PERMISSION], AuthNowTime) > (LOOP_RETRY_TIME/2) ||
                 DiffTimeb(gRegTimeUp[plugNum][REG_CHARGING_PERMISSION], AuthNowTime) < 0
            ) {
             if (readChargePermission(fd, gunID) && readChargingCapability(fd, gunID)) {
@@ -2919,10 +2944,12 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
                 DiffTimeb(gRegTimeUp[plugNum][REG_CHARGING_PERMISSION], AuthNowTime) < 0
            ) {
             if (readChargePermission(fd, gunID) == 0) {
-                log_info("Stop charging by power cabinet's permission = %d, %d",
-                         plugNum,
-                         REG_CHARGING_PERMISSION);
-                pDcChargingInfo->StopChargeFlag = POWER_CABINET_STOP_CHARGING;
+                if (pDcChargingInfo->StopChargeFlag != POWER_CABINET_STOP_CHARGING) {
+                    log_info("Stop charging by power cabinet's permission = %d, %d",
+                        plugNum,
+                        REG_CHARGING_PERMISSION);
+                    pDcChargingInfo->StopChargeFlag = POWER_CABINET_STOP_CHARGING;
+                }
                 //printf("%d StopChargeFlag = %d\n", plugNum, pDcChargingInfo->StopChargeFlag);
             }
             ftime(&gRegTimeUp[plugNum][REG_CHARGING_PERMISSION]);
@@ -2936,8 +2963,18 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
             writePresentChargingInfo(fd, plugNum, gunID);
             ftime(&gRegTimeUp[plugNum][REG_PRESENT_CHARGING_INFO]);
         }
-        break;
 
+        // 獲得Charging時間
+        if (strlen((char*)ShmDcCommonData->pGunInfo[plugNum].ChargeStopTime) <= 1) {
+            ftime(&AuthNowTime);
+            if (DiffTimeb(gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP], AuthNowTime) > LOOP_RETRY_TIME ||
+                DiffTimeb(gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP], AuthNowTime) < 0
+                ) {
+                readChargingTimeStamp(fd, gunID);
+                ftime(&gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP]);
+            }
+        }
+        break;
     case S_COMPLETE:
         ftime(&AuthNowTime);
         if (DiffTimeb(gRegTimeUp[plugNum][REG_CHARGING_CAP], AuthNowTime) > LOOP_RETRY_TIME ||
@@ -2948,8 +2985,17 @@ static void systemStatusProcess(int fd, uint8_t totalGun, uint8_t plugNum, uint8
 				writeGroundFaultDetection(fd, 0, gunID);
             ftime(&gRegTimeUp[plugNum][REG_CHARGING_CAP]);
         }
+        // 獲得Charging時間
+        if (strlen((char*)ShmDcCommonData->pGunInfo[plugNum].ChargeStopTime) <= 1) {
+            ftime(&AuthNowTime);
+            if (DiffTimeb(gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP], AuthNowTime) > LOOP_RETRY_TIME ||
+                DiffTimeb(gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP], AuthNowTime) < 0
+                ) {
+                readChargingTimeStamp(fd, gunID);
+                ftime(&gRegTimeUp[plugNum][REG_READ_CHARGING_TIMESTAMP]);
+            }
+        }
         break;
-
     default:
         break;
     }
@@ -3057,7 +3103,7 @@ int main(int argc, char *argv[])
     }
 
     setTcpStatus(NORMAL);
-
+    gDoCommGblData.DisConnCount = 0;
     while (isContinue) {
         if (initDone == DISPENER_INIT_FAIL) {
             fd = networkCreatePorcess();

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

@@ -16,7 +16,7 @@
 #define TFTP_PULL_CMD                           "tftp"
 #define SIGTERM_MSG                             "SegmentFault.~~~~\n"
 
-#define MAX_REGISTER_NUM                        40
+#define MAX_REGISTER_NUM                        50
 
 #define CHECK_NETWORK_FAIL_COUNT                10//10
 #define CONNECT_SERVER_FAIL_COUNT               3//5
@@ -98,6 +98,7 @@
 #define REG_READ_USER_PRICE                     0x22
 #define REG_RECEIPT_INFO                        0x23
 #define REG_POWER_CONSUMPTION_INFO              0x24
+#define REG_READ_CHARGING_TIMESTAMP             0x25
 
 //------------------------------------------------------------------------------
 //--- dispenser result ---
@@ -220,7 +221,8 @@ typedef struct StConnectorState {
     uint8_t ConnectorTemp;
     uint8_t ChillerTemp;
     uint8_t PlugIn;
-    uint8_t Reserved[2];
+    uint32_t consumption;
+    uint8_t Reserved[1];
 } ConnectorState;
 
 typedef struct StConnectorIDTable {
@@ -325,6 +327,7 @@ typedef struct StAccountInfo {
     int Transaction;
     int EnergyCost;
     int ParkingFee;
+    uint32_t RemainAmount;
     uint8_t Reserved[1];
 } AccountInfo;
 

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

@@ -330,7 +330,7 @@ void CANReceiver(int fd)
                 // 檢查是否有收到EV小板訊號
                 if ((time((time_t*)NULL) - ShmDcCommonData->EVDisconnectTime[_index]) > 3 &&
                     !ShmDcCommonData->EVDisconnectFlag[_index] && 
-                    pDcChargingInfo->SystemStatus != S_UPDATE) {
+                    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);
@@ -536,9 +536,9 @@ void CANReceiver(int fd)
 
                 if (pDcChargingInfo->Type == _Type_Chademo) {
                     if (ShmCHAdeMOData->ev[gunTypeIndex].PresentMsgFlowStatus != frame.data[0]) {
-                        log_info("CHAdeMo change evboard status to %d",(int) frame.data[0]);
+                        log_info("Gun%d CHAdeMO board status = %d ", targetGun, ShmCHAdeMOData->ev[gunTypeIndex].PresentMsgFlowStatus);
+                        ShmCHAdeMOData->ev[gunTypeIndex].PresentMsgFlowStatus = frame.data[0];
                     }
-                    ShmCHAdeMOData->ev[gunTypeIndex].PresentMsgFlowStatus = frame.data[0];
 
                     ShmCHAdeMOData->ev[gunTypeIndex].EvDetection = frame.data[0];
                     ShmCHAdeMOData->ev[gunTypeIndex].SOC = pDcChargingInfo->EvBatterySoc;
@@ -546,7 +546,8 @@ void CANReceiver(int fd)
                     ShmCHAdeMOData->ev[gunTypeIndex].ChargingCurrentRequest = (pDcChargingInfo->EvBatterytargetCurrent * 10);
                 } else if (pDcChargingInfo->Type == _Type_GB) {
                     if (ShmGBTData->ev[gunTypeIndex].PresentMsgFlowStatus != frame.data[0]) {
-                        log_info("GBT change evboard status to %d", (int)frame.data[0]);
+                        log_info("Gun%d GB Board status = %d ", targetGun, ShmGBTData->ev[pDcChargingInfo->type_index].PresentMsgFlowStatus);
+                        ShmGBTData->ev[gunTypeIndex].PresentMsgFlowStatus = frame.data[0];
                     }
                     ShmGBTData->ev[gunTypeIndex].PresentMsgFlowStatus = frame.data[0];
 
@@ -556,10 +557,10 @@ void CANReceiver(int fd)
                     ShmGBTData->ev[gunTypeIndex].ChargingCurrentRequest = (pDcChargingInfo->EvBatterytargetCurrent * 10);
                 } else if (pDcChargingInfo->Type == _Type_CCS_2) {
                     if (ShmCcsData->CommProtocol == _CCS_COMM_V2GMessage_DIN70121) {
-                        if (ShmCcsData->V2GMessage_DIN70121[gunTypeIndex].PresentMsgFlowStatus != frame.data[0]) {
-                            //log_info("CCS change evboard status to %d", (int)frame.data[0]);
+                        if (ShmCcsData->V2GMessage_DIN70121[gunTypeIndex].PresentMsgFlowStatus != frame.data[0] && frame.data[0] != 0xFF) {
+                            log_info("Gun%d CCS board status = %d ", targetGun, ShmCcsData->V2GMessage_DIN70121[pDcChargingInfo->type_index].PresentMsgFlowStatus);
+                            ShmCcsData->V2GMessage_DIN70121[gunTypeIndex].PresentMsgFlowStatus = frame.data[0];
                         }
-                        ShmCcsData->V2GMessage_DIN70121[gunTypeIndex].PresentMsgFlowStatus = frame.data[0];
                     }
                 }
 
@@ -655,7 +656,13 @@ void CANReceiver(int fd)
                         printConnTemp = YES;
                     }
                     pDcChargingInfo->ConnectorTemp = maxConnTemp;
+                } else {
+                    /*
+                    log_info("Connector%d Tmep is zero:[%d,%d]", gunTypeIndex, ShmDcCommonData->ConnectorTemp[gunTypeIndex][0],
+                        ShmDcCommonData->ConnectorTemp[gunTypeIndex][1]);
+                        */
                 }
+
                 //紀錄槍頭和水冷機溫度, 在系統狀態變化或溫度大於150
                 if ((ShmDcCommonData->SystemModeChange[targetGun] == YES) ||
                     (printConnTemp == YES) ||
@@ -738,7 +745,6 @@ void CANReceiver(int fd)
                 }
                 break;
             case ACK_EVCCID_REQ:
-
                 if (frame.can_dlc > 0 && strcmp ( (char *)pDcChargingInfo->EVCCID, "" ) == EQUAL &&
                     pDcChargingInfo->Type == _Type_CCS_2)
                 {

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

@@ -1030,7 +1030,7 @@ int main(int argc, char *argv[])
                 //if (waitPsuVolwithRealyVol(gunIndex) == NO) {
                 //    continue;
                 //}
-
+                GetEvBatteryInfo(gunIndex, pDcChargingInfo->Evboard_id); //DS60-120 add
                 // 計算 Power
                 pDcChargingInfo->PresentChargingPower =
                     ((float)((pDcChargingInfo->PresentChargingVoltage) *
@@ -1050,6 +1050,8 @@ int main(int argc, char *argv[])
                         }
 
                         pDcChargingInfo->PresentChargedEnergy += changingPow;
+                        ShmDcCommonData->pGunInfo[gunIndex].PowerConsumption += changingPow;
+
                         pDcChargingInfo->PowerConsumption += pDcChargingInfo->PresentChargingPower;
                         chargingTime[gunIndex] = pDcChargingInfo->PresentChargedDuration;
                     }

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

@@ -77,6 +77,54 @@ unsigned long GetClockTimeoutValue(struct timespec _start_time)
 
     return ret;
 }
+void changeTimeFormat(char* str, struct tm *_trTime)
+{
+    //2022-04-29 06:22:00
+    int i;
+    char year[4];
+    char mon[2];
+    char day[2];
+    char hr[2];
+    char min[2];
+    char sec[2];
+    for (i = 0; i < 4; i++) {
+        year[i] = str[i];
+    }
+    _trTime->tm_year = atoi(year) - 1900;
+    for (i = 0; i < 2; i++) {
+        mon[i] = str[i+5];
+    }
+    _trTime->tm_mon = atoi(mon) - 1;
+
+    for (i = 0; i < 2; i++) {
+        day[i] = str[i + 8];
+    }
+    _trTime->tm_mday = atoi(day);
+
+    for (i = 0; i < 2; i++) {
+        hr[i] = str[i + 11];
+    }
+    _trTime->tm_hour = atoi(hr);
+    for (i = 0; i < 2; i++) {
+        min[i] = str[i + 14];
+    }
+    _trTime->tm_min = atoi(min);
+    for (i = 0; i < 2; i++) {
+        sec[i] = str[i + 17];
+    }
+    _trTime->tm_sec = atoi(sec);
+    _trTime->tm_isdst = 0;
+}
+int GetChargingDuration(char* st,char* et)
+{
+    struct tm StartTime,EndTime;
+    time_t t_start, t_end;
+    changeTimeFormat(st, &StartTime);
+    changeTimeFormat(et, &EndTime);
+    t_start = mktime(&StartTime);
+    t_end = mktime(&EndTime);
+    return difftime(t_end, t_start);
+}
 int CreateCommunicationLcmPort()
 {
     int fd;
@@ -124,12 +172,18 @@ void ReadMsgFromLcm(uint8_t *msg, uint8_t readLen)
             case CMD_REGISTER: {
                 // 頁面
                 strcpy((char *)pSysInfo->LcmHwRev, moduleName);
-                _currentPage = *(msg + 7);
+                //_currentPage = *(msg + 7);
             }
             break;
             }
         } else if (*(msg + 3) == CMD_MULTI_READ) {
-
+            short key = ((short)(*(msg + 4) << 8) + *(msg + 5));
+            if (key == _LCM_VERSION) {
+                if (strcmp((char*)pSysInfo->LcmHwRev, "") != EQUAL)
+                    strcpy((char*)pSysInfo->LcmHwRev, moduleName);
+                if (atoi((char*)(msg + 7)) != 0)
+                    ShmDcCommonData->LcmFwVersion = atoi((char*)(msg + 7));
+            }
 //          switch ((unsigned short) (*(msg + 4) << 8) + (unsigned short) *(msg + 5))
 //          {
 //              case BUTTON_GUN_INDEX:
@@ -153,7 +207,7 @@ void GetHrFormTimeString(char* time,char* hr)
         _temp_hr = atoi(hr) + 8 - 24;
         sprintf(hr, "%02d", _temp_hr);
     } else if( atoi(hr) == NULL ) {
-        strcmp(hr,"");
+        strcpy(hr,"");
     }
 }
 void GetMinFormTimeString(char* time,char* min)
@@ -163,7 +217,17 @@ void GetMinFormTimeString(char* time,char* min)
         min[i] = time[i+14];
     }
     if( atoi(min) == NULL || atoi(min) > 60) {
-        strcmp(min,"");
+        strcpy(min,"");
+    }
+}
+void GetSecFormTimeString(char* time, char* sec)
+{
+    //char tm[] = "2021-12-06 17:29:08:084";
+    for (int i = 0; i < 2; i++) {
+        sec[i] = time[i + 17];
+    }
+    if (atoi(sec) == NULL || atoi(sec) > 60) {
+        strcpy(sec, "");
     }
 }
 //================================================
@@ -303,7 +367,11 @@ void ChangeCurPage()
     //log_info("cur = %d ,system = %d, lcm = %d ",_currentPage, pSysInfo->SystemPage, pSysInfo->PageIndex);
     struct ChargingInfoData *pDcChargingInfo_0 = (struct ChargingInfoData *)GetDcChargingInfoData(LEFT_GUN_NUM);
     struct ChargingInfoData *pDcChargingInfo_1 = (struct ChargingInfoData *)GetDcChargingInfoData(RIGHT_GUN_NUM);
-
+    if (pSysWarning->Level == WARN_LV_ER) {
+        pSysInfo->SystemPage = _LCM_MAINTAIN;
+        if (ShmPrimaryMcuData->InputDet.bits.EmergencyButton)
+            pSysInfo->SystemPage = _LCM_EMERGENCY;
+    }
     
     switch (pSysInfo->SystemPage) {
         case _LCM_VIEW:
@@ -407,20 +475,33 @@ void ChangeCurPage()
                 pSysInfo->PageIndex = __CONFIRM_STOP_RIGHT;
             break;
         case _LCM_COMMUNICATION:
-            pSysInfo->PageIndex = __COMMUNICATION_PROCESS;
+            if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
+                pSysInfo->PageIndex = __PRECHARGE_LEFT_CONNECT;
+            } else {
+                pSysInfo->PageIndex = __PRECHARGE_RIGHT_CONNECT;
+            }
             break;
         case _LCM_CHARGING_DETECT:
-            pSysInfo->PageIndex = __GFD_PROCESS;
+            if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
+                pSysInfo->PageIndex = __PRECHARGE_LEFT_CHECK;
+            } else {
+                pSysInfo->PageIndex = __PRECHARGE_RIGHT_CHECK;
+            }
             break;
         case _LCM_PREPARECHARE:
-            pSysInfo->PageIndex = __PRECHARGE_PROCESS;
+            if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
+                pSysInfo->PageIndex = __PRECHARGE_LEFT_START;
+            } else {
+                pSysInfo->PageIndex = __PRECHARGE_RIGHT_START;
+            }
             break;
     }
     if (_currentPage != pSysInfo->PageIndex) {
-        //_currentPage = pSysInfo->PageIndex;
-        log_info("Change Page :%d", pSysInfo->PageIndex);
-        ChangeToOtherPage(pSysInfo->PageIndex);
+        log_info("Change Page from %d to %d", _currentPage, pSysInfo->PageIndex);
     }
+    _currentPage = pSysInfo->PageIndex;
+    ChangeToOtherPage(pSysInfo->PageIndex);
+    
 }
 
 /*
@@ -436,23 +517,24 @@ void ShowViewChargingSoc(uint8_t gunIndex,int soc)
 
     if (gunIndex == LEFT_GUN_NUM) {
         ChangeDisplay2Value(_LeftGun_Soc_Digits,(short)_ICON_Red_Num_0+digits);
-        ChangeDisplay2Value(_LeftGun_Soc_Tens,(short)_ICON_Red_Num_0+tens);
         if (hundreds == 0 ) {
             ChangeDisplay2Value(_LeftGun_Soc_Hundreds,(short)_ICON_Empty);
             if (tens == 0 )
                 ChangeDisplay2Value(_LeftGun_Soc_Tens,(short)_ICON_Empty);
+            else
+                ChangeDisplay2Value(_LeftGun_Soc_Tens, (short)_ICON_Red_Num_0 + tens);
         }
         else
             ChangeDisplay2Value(_LeftGun_Soc_Hundreds,(short)_ICON_Red_Num_1);
 
     } else {
-        //log_info("%d %d %d",hundreds,tens,digits);
         ChangeDisplay2Value(_RightGun_Soc_Digits,(short)_ICON_Red_Num_0+digits);
-        ChangeDisplay2Value(_RightGun_Soc_Tens,(short)_ICON_Red_Num_0+tens);
         if (hundreds == 0 ) {
             ChangeDisplay2Value(_RightGun_Soc_Hundreds,(short)_ICON_Empty);
             if (tens == 0)
                 ChangeDisplay2Value(_RightGun_Soc_Tens,(short)_ICON_Empty);
+            else
+                ChangeDisplay2Value(_RightGun_Soc_Tens, (short)_ICON_Red_Num_0 + tens);
         }
         else
             ChangeDisplay2Value(_RightGun_Soc_Hundreds,(short)_ICON_Red_Num_1);
@@ -497,7 +579,6 @@ void ShowViewChargingEngery(uint8_t gunIndex, float energy)
 }
 void ShowViewCharingMoney(uint8_t gunIndex,float money)
 {
-    uint8_t value[10] = { 0 };
     float data = money;
     if (money < 0)
         data = fabs(money);
@@ -549,7 +630,6 @@ void ShowConnectId()
 }
 void ShowViewLeftGunInfo()
 {
-    char value[5];
     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(LEFT_GUN_NUM);
     if (pDcChargingInfo->SystemStatus == S_IDLE ) {
         switch (pDcChargingInfo->CCSGunType) {
@@ -580,7 +660,13 @@ void ShowViewLeftGunInfo()
         }
     } else if (pDcChargingInfo->SystemStatus == S_CHARGING ) {
         ShowViewChargingSoc(LEFT_GUN_NUM,pDcChargingInfo->EvBatterySoc);
-        ShowViewChargingTime(LEFT_GUN_NUM,pDcChargingInfo->PresentChargedDuration);
+        if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) > 1) {
+            int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,
+                ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeDuration);
+            ShowViewChargingTime(LEFT_GUN_NUM, duration);
+        } else {
+            ShowViewChargingTime(LEFT_GUN_NUM, 0);
+        }
         ShowViewCharingMoney(LEFT_GUN_NUM,pDcChargingInfo->ChargingFee);
         ShowViewChargingPower(LEFT_GUN_NUM,pDcChargingInfo->PresentChargingPower);
         ShowViewChargingEngery(LEFT_GUN_NUM, pDcChargingInfo->PresentChargedEnergy);
@@ -634,8 +720,14 @@ void ShowViewRightGunInfo()
         sprintf((char *)value,"1 B");
         DisplayValueToLcm(_RightGun_location, (uint8_t *)value, sizeof(value));
     } else if (pDcChargingInfo->SystemStatus == S_CHARGING ) {
-        ShowViewChargingSoc(RIGHT_GUN_NUM,pDcChargingInfo->EvBatterySoc);
-        ShowViewChargingTime(RIGHT_GUN_NUM,pDcChargingInfo->PresentChargedDuration);
+        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);
+            ShowViewChargingTime(RIGHT_GUN_NUM, duration);
+        } else {
+            ShowViewChargingTime(RIGHT_GUN_NUM, 0);
+        }
         ShowViewCharingMoney(RIGHT_GUN_NUM,pDcChargingInfo->ChargingFee);
         ShowViewChargingPower(RIGHT_GUN_NUM,pDcChargingInfo->PresentChargingPower);
         ShowViewChargingEngery(RIGHT_GUN_NUM, pDcChargingInfo->PresentChargedEnergy);
@@ -740,7 +832,7 @@ void ClearQrCode()
 {
     char cmd[200];
     memset(cmd, 0, 200);
-    DisplayValueToLcm(_QR_CODE_AUTHORIZE, cmd, 200);
+    DisplayValueToLcm(_QR_CODE_AUTHORIZE, (uint8_t *)cmd, 200);
 }
 void ChangeQrCode()
 {
@@ -748,7 +840,7 @@ void ChangeQrCode()
     pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(pSysInfo->CurGunSelected);
 
     memset(cmd, 0 , 200);
-    int len = sprintf(cmd, "https://qrcode.u-power.app/connector?chargebox=%s&connectorno=%d", pSysConfig->SystemId, ShmDcCommonData->ConnectorId[pSysInfo->CurGunSelected]);
+    int len = sprintf(cmd, "https://qrcode.u-power.app/connector?chargebox=%s&connectorno=%d", ShmDcCommonData->QRCodeString, ShmDcCommonData->ConnectorId[pSysInfo->CurGunSelected]);
     //int len = sprintf(cmd, "http://www.u-power.com.tw/");
     if (len > 200) {
         log_info("QR Code URL length too long");
@@ -763,66 +855,148 @@ void ShowProgressBar()
         usleep(100000);
     }*/
 }
+void ShowChargeTime(int addr,int _time)
+{
+    int tens, digits;
+    tens = _time / 10;
+    digits = _time % 10;
+    ChangeDisplay2Value(addr, tens);
+    ChangeDisplay2Value(addr+2, digits);
+}
+void ShowSummaryMoney(int addr, int money)
+{
+    int dig, tens, hund, thou,shift;
+    if (addr == _Summary_total_money) {
+        shift = 42;
+    } else {
+        shift = 100;
+    }
+    if (money > 9999) {
+        money = 9999;
+    }
+    thou = money / 1000;
+    hund = (money / 100) % 10;
+    tens = (money / 10) % 10;
+    dig = money % 10;
+    
+    ChangeDisplay2Value(addr + 6, thou == 0 ? _ICON_Empty : thou+shift);
+    if (thou == 0) {
+        ChangeDisplay2Value(addr + 4, hund == 0 ? _ICON_Empty : hund + shift);
+        if (addr == _Summary_cal_discount)
+            ChangeDisplay2Value(addr + 8, _ICON_Empty);
+        if (hund == 0) {
+            ChangeDisplay2Value(addr + 2, tens == 0 ? _ICON_Empty : tens + shift);
+        } else {
+            ChangeDisplay2Value(addr + 2, tens + shift);
+        }
+    } else {
+        ChangeDisplay2Value(addr + 4, hund + shift);
+        ChangeDisplay2Value(addr + 2, tens + shift);
+    }
+    ChangeDisplay2Value(addr, dig + shift);
+
+    // 給UPOINT負號
+    if (addr == _Summary_cal_discount) {
+        if (thou == 0) {
+            if (hund == 0) {
+                if (tens == 0) {
+                    ChangeDisplay2Value(addr + 2, _ICON_negative);
+                } else {
+                    ChangeDisplay2Value(addr + 4, _ICON_negative);
+                }
+            } else {
+                ChangeDisplay2Value(addr + 6, _ICON_negative);
+            }
+        } else {
+            ChangeDisplay2Value(addr + 8, _ICON_negative);
+        }
+    }
+
+}
+void ShowSummaryMoneyDash(int addr)
+{
+    if (addr == _Summary_total_money) {
+        ChangeDisplay2Value(addr , _ICON_DASH_SINGLE);
+        ChangeDisplay2Value(addr + 2, _ICON_DASH_SINGLE);
+        ChangeDisplay2Value(addr + 4, _ICON_Empty);
+        ChangeDisplay2Value(addr + 6, _ICON_Empty);
+    } else {
+        ChangeDisplay2Value(addr, _ICON_DASH_SINGLE);
+        ChangeDisplay2Value(addr + 2, _ICON_DASH_SINGLE);
+        ChangeDisplay2Value(addr + 4, _ICON_Empty);
+        ChangeDisplay2Value(addr + 6, _ICON_Empty);
+        ChangeDisplay2Value(addr + 8, _ICON_Empty);
+    }
+}
 void ShowSummaryPage()
 {
     float data;
-    uint8_t value[10] = {0};
-    char start_hr[3],start_min[3],end_hr[3],end_min[3];
+    char start_hr[3],start_min[3],start_sec[3],end_hr[3],end_min[3],end_sec[3];
     int t_hr;
-    long eng = 0;
     pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(pSysInfo->CurGunSelected);
+
     // Show Money
-    data = pDcChargingInfo->ChargingFee;
-    sprintf((char *)value,"%.1f",data);
-    int discount,settlement = 0;
-
-    discount = ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount;
-    ChangeDisplay2Value(_Summary_cal_discount, discount*(-1));
-    settlement = (int)pDcChargingInfo->ChargingFee - discount;
-    ChangeDisplay2Value(_Summary_total_money, (int)pDcChargingInfo->ChargingFee);
-    ChangeDisplay2Value(_Summary_cal_Total_money, (int)pDcChargingInfo->ChargingFee);
+    if (ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].finalcost_flag) {
+        ShowSummaryMoney(_Summary_total_money, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].RemainAmount);
+        ShowSummaryMoney(_Summary_cal_Total_money, (int)pDcChargingInfo->ChargingFee);
+        ShowSummaryMoney(_Summary_cal_discount, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount);
+    } else {
+        // 未收到Final cost
+        ShowSummaryMoneyDash(_Summary_total_money);
+        ShowSummaryMoneyDash(_Summary_cal_Total_money);
+        ShowSummaryMoneyDash(_Summary_cal_discount);
+    }
     /*
     log_info("start time:%s",pDcChargingInfo->StartDateTime);
     log_info("stop time:%s",pDcChargingInfo->StopDateTime);*/
 
-    GetHrFormTimeString(pDcChargingInfo->StartDateTime,start_hr);
-    GetMinFormTimeString(pDcChargingInfo->StartDateTime,start_min);
-    GetHrFormTimeString(pDcChargingInfo->StopDateTime,end_hr);
-    GetMinFormTimeString(pDcChargingInfo->StopDateTime,end_min);
+    GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_hr);
+    GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,start_min);
+    GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_sec);
+    GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime,end_hr);
+    GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime,end_min);
+    GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_sec);
 
     t_hr = atoi(start_hr) + (ShmDcCommonData->TZOffset / 60);
     if (t_hr >= 24)
         t_hr -= 24;
-    if (!ShmDcCommonData->isIntoCharge[pSysInfo->CurGunSelected]) {
-        t_hr = 0;
-        strcpy(start_min,"0");
+    if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) == 0) {
+        ShowChargeTime(_Summary_Start_time_hr,0);
+        ShowChargeTime(_Summary_Start_time_min, 0);
+        ShowChargeTime(_Summary_Start_time_sec, 0);
+    } else {
+        ShowChargeTime(_Summary_Start_time_hr, t_hr);
+        ShowChargeTime(_Summary_Start_time_min, atoi(start_min));
+        ShowChargeTime(_Summary_Start_time_sec, atoi(start_sec));
     }
-    ChangeDisplay2Value(_Summary_Start_time_hr, t_hr);
-    ChangeDisplay2Value(_Summary_Start_time_min, atoi(start_min));
     t_hr = atoi(end_hr) + (ShmDcCommonData->TZOffset / 60);
     if (t_hr >= 24)
         t_hr -= 24;
-    if (!ShmDcCommonData->isIntoCharge[pSysInfo->CurGunSelected]) {
-        t_hr = 0;
-        strcpy(end_min, "0");
+    if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime) == 0) {
+        ShowChargeTime(_Summary_end_time_hr, 0);
+        ShowChargeTime(_Summary_end_time_min, 0);
+        ShowChargeTime(_Summary_end_time_sec, 0);
+    } else {
+        ShowChargeTime(_Summary_end_time_hr, t_hr);
+        ShowChargeTime(_Summary_end_time_min, atoi(end_min));
+        ShowChargeTime(_Summary_end_time_sec, atoi(end_sec));
     }
-    ChangeDisplay2Value(_Summary_end_time_hr, t_hr);
-    ChangeDisplay2Value(_Summary_end_time_min, atoi(end_min));
     /*
     DisplayValueToLcm(_Summary_Start_time_hr, (uint8_t *)start_hr, sizeof(start_hr));
     DisplayValueToLcm(_Summary_Start_time_min, (uint8_t *)start_min, sizeof(start_min));
     DisplayValueToLcm(_Summary_end_time_hr, (uint8_t *)end_hr, sizeof(end_hr));
     DisplayValueToLcm(_Summary_end_time_min, (uint8_t *)end_min, sizeof(end_min));
     */
-
-    uint8_t _min = (pDcChargingInfo->PresentChargedDuration)/60;
-    uint8_t _sec = (pDcChargingInfo->PresentChargedDuration) % 60;
+    int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,
+        ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime);
+    //uint8_t _min = (pDcChargingInfo->PresentChargedDuration)/60;
+    //uint8_t _sec = (pDcChargingInfo->PresentChargedDuration) % 60;
     /*
     sprintf((char *)value,"%d",min);
     DisplayValueToLcm(_Summary_duration_time, (uint8_t *)value, sizeof(value));
     */
-    ChangeDisplay2Value(_Summary_duration_min, (int)_min);
-    ChangeDisplay2Value(_Summary_duration_sec, (int)_sec);
+    ChangeDisplay2Value(_Summary_duration_min, (int)duration/60);
+    ChangeDisplay2Value(_Summary_duration_sec, (int)duration%60);
 
     if (pDcChargingInfo->PresentChargedEnergy > 0.001 &&
             pDcChargingInfo->PresentChargedEnergy <= ENERGY_MAX_KWH) {
@@ -850,13 +1024,6 @@ void ShowSummaryPage()
 }
 void ProcessPageInfo()
 {
-    if (pSysWarning->Level == WARN_LV_ER) {
-    	pSysInfo->SystemPage = _LCM_MAINTAIN;
-        if (ShmPrimaryMcuData->InputDet.bits.EmergencyButton)
-            pSysInfo->SystemPage = _LCM_EMERGENCY;
-        return;;
-    }
-
     switch (pSysInfo->SystemPage) {
     case _LCM_VIEW:
         // Confirm Charging Gun Number.
@@ -908,6 +1075,8 @@ void DemoFunction()
     uint8_t value[10];
     struct timeb  SeqEndTime;
     struct tm *tm;
+    int t_hr;
+    char start_hr[3], start_min[3], start_sec[3], end_hr[3], end_min[3], end_sec[3];
     ChangeDisplay2Value(_Animation_Running, 1);
     ChangeDisplay2Value(_Animation_Communcation, 1);
     ChangeDisplay2Value(_Animation_GFD, 1);
@@ -1067,23 +1236,57 @@ void DemoFunction()
 
             DisplayValueToLcm(_Count_Down_Time, (uint8_t *)value, sizeof(value));
             if (pSysInfo->PageIndex == 17 || pSysInfo->PageIndex == 28) {
-                //for (i = 0; i <= 100; i++) {
-                    ChangeDisplay2Value(_Summary_total_money, 888);
-                    ChangeDisplay2Value(_Summary_cal_Total_money, 888);
-                    ChangeDisplay2Value(_Summary_Start_time_hr, 6);
-                    ChangeDisplay2Value(_Summary_Start_time_min, 6);
-                    ChangeDisplay2Value(_Summary_end_time_hr, 8);
-                    ChangeDisplay2Value(_Summary_end_time_min, 8);
-                    ChangeDisplay2Value(_Summary_duration_min, 88);
-                    ChangeDisplay2Value(_Summary_duration_sec, 88);
-
-                    ChangeDisplay2LongValue(_Summary_cap, 88888);
+                for (i = 0; i <= 9999; i++) {
+                    strcpy((char*)ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, "2022-05-15 16:42:11");
+                    strcpy((char*)ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, "2022-05-15 16:47:44");
+
+                    GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_hr);
+                    GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_min);
+                    GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_sec);
+                    GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_hr);
+                    GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_min);
+                    GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_sec);
+
+                    t_hr = atoi(start_hr) + (ShmDcCommonData->TZOffset / 60);
+                    if (t_hr >= 24)
+                        t_hr -= 24;
+                    if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) == 0) {
+                        ShowChargeTime(_Summary_Start_time_hr, 0);
+                        ShowChargeTime(_Summary_Start_time_min, 0);
+                        ShowChargeTime(_Summary_Start_time_sec, 0);
+                    } else {
+                        ShowChargeTime(_Summary_Start_time_hr, t_hr);
+                        ShowChargeTime(_Summary_Start_time_min, atoi(start_min));
+                        ShowChargeTime(_Summary_Start_time_sec, atoi(start_sec));
+                    }
+                    t_hr = atoi(end_hr) + (ShmDcCommonData->TZOffset / 60);
+                    if (t_hr >= 24)
+                        t_hr -= 24;
+                    if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime) == 0) {
+                        ShowChargeTime(_Summary_end_time_hr, 0);
+                        ShowChargeTime(_Summary_end_time_min, 0);
+                        ShowChargeTime(_Summary_end_time_sec, 0);
+                    } else {
+                        ShowChargeTime(_Summary_end_time_hr, t_hr);
+                        ShowChargeTime(_Summary_end_time_min, atoi(end_min));
+                        ShowChargeTime(_Summary_end_time_sec, atoi(end_sec));
+                    }
+
                     ChangeDisplay2Value(_Summary_cal_discount,88);
-                    ChangeDisplay2Value(_Summary_cal_Settlement,888);
                     ChangeDisplay2Value(_Summary_max_power, 888);
                     ChangeDisplay2Value(_Summary_average_power, 888);
-                    sleep(5);
-                //}
+                    if (i < 100) {
+                        ShowSummaryMoneyDash(_Summary_total_money);
+                        ShowSummaryMoneyDash(_Summary_cal_Total_money);
+                        ShowSummaryMoneyDash(_Summary_cal_discount);
+                    } else {
+                        ShowSummaryMoney(_Summary_total_money, i);
+                        ShowSummaryMoney(_Summary_cal_Total_money, i);
+                        ShowSummaryMoney(_Summary_cal_discount, i);
+                    }
+
+                    usleep(100000);
+                }
             }
             break;
         case __START_AUTHORIZE_:
@@ -1100,12 +1303,6 @@ void DemoFunction()
             break;
         case 29:
             break;
-        case 21:
-            ShowCabientVersion();
-            break;
-        case 22:
-            ShowDispenserVersion();
-            break;
         case 5:
             pSysInfo->CurGunSelected = 0;
             ChangeQrCode();
@@ -1304,9 +1501,28 @@ void ChangeWarningFunc()
         DisplayValueToLcm(_Icon_Warming0 + ((i) * 2), cmd, 2);
     }
 }
+
+void GetDeviceInfoStatus(short address, uint8_t len)
+{
+    uint8_t cmd[8];
+    memset(cmd, 0x00, sizeof(cmd));
+    uint8_t msg[11];
+    memset(msg, 0x00, sizeof(msg));
+
+    cmd[0] = CMD_TITLE_1;
+    cmd[1] = CMD_TITLE_2;
+    cmd[2] = 0x04;
+    cmd[3] = CMD_MULTI_READ;
+    cmd[4] = (address >> 8) & 0xff;
+    cmd[5] = (address >> 0) & 0xff;
+    cmd[6] = len;
+
+    WriteCmdToLcm(cmd, ARRAY_SIZE(cmd));
+    usleep(5000);
+    ReadMsgFromLcm(msg, ARRAY_SIZE(msg));
+}
 int main(void)
 {
-    bool defaulttext = false;
     if (CreateAllCsuShareMemory() == FAIL) {
         log_error("create share memory error");
         return FAIL;
@@ -1336,23 +1552,29 @@ int main(void)
     //return 0;
     uint8_t index = 35;
     ShmDcCommonData->PSU_Number = 12;
+    uint8_t _verShowCount = 5;
     while (_port != -1) {
         if (strcmp((char *)pSysInfo->LcmHwRev, moduleName) != 0x00) {
+            GetDeviceInfoStatus(_LCM_VERSION, 3);
             GetCurrentPage();
             sleep(1);
 
             ShmStatusCodeData->AlarmCode.AlarmEvents.bits.LcmModuleCommFail = true;
-
+            if (_verShowCount > 0) {
+                log_info("LCM Version = V.%03d \n", ShmDcCommonData->LcmFwVersion);
+                _verShowCount--;
+            }
         } else {
             // Show Default Text
+            /*
             if (!defaulttext) {
                 ShowCabientVersionDefaultText();
                 ShowDispenserVersionDefautlText();
                 defaulttext = true;
             }
+            */
             ShmStatusCodeData->AlarmCode.AlarmEvents.bits.LcmModuleCommFail = false;
 
-
             if(pSysConfig->TotalConnectorCount>=2) {
                 if (pDcChargingInfo_0->SystemStatus == S_IDLE) {
                     ChargeMaxPower_0 = 0;
@@ -1393,7 +1615,6 @@ int main(void)
             // 換頁處理
             GetCurrentPage(); //DS60-120 add
             ChangeCurPage();
-
             changeWarningPriority >= 30 ? changeWarningPriority = 0 : changeWarningPriority++;
             //*/
             /*
@@ -1414,7 +1635,7 @@ int main(void)
             ChangeToOtherPage(DemoPage[ShmDcCommonData->DemoCount]);
             GetCurrentPage();
             DemoFunction();
-            ShmDcCommonData->DemoCount >= 21 ? ShmDcCommonData->DemoCount = 0 : ShmDcCommonData->DemoCount++;
+            ShmDcCommonData->DemoCount >= 1 ? ShmDcCommonData->DemoCount = 0 : ShmDcCommonData->DemoCount++;
             //*/
             usleep(100000);
 

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

@@ -61,11 +61,14 @@
 #define __ERROR_PAGE_RIGHT      0x001D
 #define __WAIT_PLUGIN_RIGHT     0x001E
 #define __START_SCAN_RIGHT      0x001F
-#define __COMMUNICATION_PROCESS        0x0020
-#define __GFD_PROCESS           0x0021
-#define __PRECHARGE_PROCESS     0x0022
+#define __PRECHARGE_LEFT_CONNECT        0x0020
+#define __PRECHARGE_LEFT_CHECK           0x0021
+#define __PRECHARGE_LEFT_START     0x0022
 #define __VIEW_L_FAIL_R_IDLE    0x0023
 #define __VIEW_L_IDLE_R_FAIL    0x0024
+#define __PRECHARGE_RIGHT_CONNECT 0x0025
+#define __PRECHARGE_RIGHT_CHECK   0x0026
+#define __PRECHARGE_RIGHT_START   0x0027
 
 // ICON Map Address
 #define _LeftGun_type_pic_U         0x0001
@@ -126,10 +129,15 @@
 #define _Detail_Cap_Num             0x0350
 #define _Detail_Money_Num           0x0360
 #define _Summary_total_money        0x0400
+
 #define _Summary_Start_time_hr      0x0410
-#define _Summary_Start_time_min     0x0420
+#define _Summary_Start_time_min     0x0414
+#define _Summary_Start_time_sec     0x0418
+
 #define _Summary_end_time_hr        0x0430
-#define _Summary_end_time_min       0x0440
+#define _Summary_end_time_min       0x0434
+#define _Summary_end_time_sec       0x0438
+
 #define _Summary_duration_min       0x0450
 #define _Summary_max_power          0x0460
 #define _Summary_average_power      0x0470
@@ -145,8 +153,11 @@
 #define _Text_Warming3              0x1130
 #define _Text_Warming4              0x1140
 #define _Text_SystemID              0x1150
-
-int DemoPage[22] = {
+#define _LCM_VERSION                0x1160
+int DemoPage[2] = {
+    17, // Left Gun summary
+    28, // Right Gun summary
+    /*
     1, // All Idle
     5, // Left Gun authorize
     6, // Authorizing
@@ -169,6 +180,7 @@ int DemoPage[22] = {
     26, // Right Gun stop
     27, // Right Gun Plug out
     28, // Right Gun summary
+    */
 };
 
 enum _ICON_LIST_ {
@@ -250,7 +262,8 @@ enum _ICON_LIST_ {
     _ICON_SPIN_5,
     _ICON_SPIN_6,
     _ICON_SPIN_7,
-    _ICON_BTY_10 = 110,
+    _ICON_negative = 110,
+
     _ICON_BTY_12 = 112,
     _ICON_BTY_14 = 114,
     _ICON_BTY_16 = 116,
@@ -296,6 +309,8 @@ enum _ICON_LIST_ {
     _ICON_BTY_96 = 196,
     _ICON_BTY_98 = 198,
     _ICON_BTY_100 = 200,
+    _ICON_DASH_TWO = 233,
+    _ICON_DASH_SINGLE = 234,
 };
 
 

EVSE/Projects/DD360UCar/Apps/ModulePrimary/Module_PrimaryComm.c

@@ -187,17 +187,20 @@ static void checkChillerStatus(Gpio_out *gpio)
     struct ChargingInfoData *pDcChargingInfo = NULL;
     static ChillerInfo fChillerInfo[2] = {0}, *pChillerInfo = NULL;
     static ChillerInfo _chiller;
-    struct FanModuleData* ShmFanModuleData = (struct FanModuleData*)GetShmFanModuleData();;
+    struct FanModuleData* ShmFanModuleData = (struct FanModuleData*)GetShmFanModuleData();
+    DcCommonInfo* ShmDcCommonData = (DcCommonInfo*)GetShmDcCommonData();
     Gpio_out *pGpio = (Gpio_out *)gpio;
 
     if ((strncmp((char *)&pSysConfig->ModelName[7], "V", 1) == 0) ||
             (strncmp((char *)&pSysConfig->ModelName[7], "F", 1) == 0)) {
         chillerCount++;
+        ShmDcCommonData->pGunInfo[0].withChiller = TRUE;
     }
 
     if ((strncmp((char *)&pSysConfig->ModelName[9], "V", 1) == 0) ||
             (strncmp((char *)&pSysConfig->ModelName[9], "F", 1) == 0)) {
         chillerCount++;
+        ShmDcCommonData->pGunInfo[1].withChiller = TRUE;
     }
 
     if (chillerCount == 0) {
@@ -205,7 +208,9 @@ static void checkChillerStatus(Gpio_out *gpio)
         return;
     }
 
-    for (gunIndex = 0; gunIndex < chillerCount; gunIndex++) {
+    for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
+        if (!ShmDcCommonData->pGunInfo[gunIndex].withChiller)
+            continue;
         pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(gunIndex);
         pChillerInfo = (ChillerInfo *)&fChillerInfo[gunIndex];
 
@@ -256,7 +261,7 @@ static void checkChillerStatus(Gpio_out *gpio)
     }
 
     uint8_t _chillerNeedOn = NO;
-    for (gunIndex = 0; gunIndex < chillerCount; gunIndex++)
+    for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++)
     {
         pChillerInfo = (ChillerInfo *)&fChillerInfo[gunIndex];
         if(pChillerInfo->ChillerSwitch == YES)

EVSE/Projects/DD360UCar/Apps/ReadCmdline.c

@@ -43,6 +43,7 @@
 #include "./SelectGun/SelectGun.h"
 #include "Config.h"
 #include "./CSU/main.h"
+#include "./DataBase/DataBase.h"
 
 //------------------------------------------------------------------------------
 #define CMD_KEY_WAIT                                (1)
@@ -322,64 +323,20 @@ void RunSelfProc()
 
 void GetFwVerProc(void)
 {
-    int _index = 0;
-    int isContinue = 1;
-    char *usageMsg = "Usage:\n"
-                     "      model\n"
-                     "      407\n"
-                     "      conn index, ex: conn 0 | 1\n"
-                     "      relay\n"
-                     "      fan\n"
-                     "      dc\n"
-                     "      led\n"
-                     "      ac\n"
-                     "      exit | c | C\n"
-                     "      help | ? | h\n";
-
-    while (isContinue) {
-        if (readCmdKey(CMD_KEY_WAIT) == NO) {
-            continue;
-        }
-
-        if (strcmp(newString[0], "407") == 0) {
-            printf("407 FW Version = %s\n", ShmPrimaryMcuData->version);
-        } else if (strcmp(newString[0], "model") == 0) {
-            printf("ModelName = %s\r\n", pSysConfig->ModelName);
-        } else if (strcmp(newString[0], "conn") == 0) {
-            if (strcmp(newString[1], "-1") == 0  ||
-                    strcmp(newString[1], "") == 0 ||
-                    atoi(newString[1]) >= pSysConfig->TotalConnectorCount
-               ) {
-                printf("index over flow\r\n");
-                continue;
-            }
-
-            _index = atoi(newString[1]);
-
-            if (_index == 0) {
-                printf("Gun 0 FW Version = %s \n", pSysInfo->Connector1FwRev);
-            } else if (_index == 1) {
-                printf("Gun 1 FW Version = %s \n", pSysInfo->Connector2FwRev);
-            }
-        } else if (strcmp(newString[0], "relay") == 0) {
-            printf("RB Version = %s \n", pSysInfo->RelayModuleFwRev);
-        } else if (strcmp(newString[0], "fan") == 0) {
-            printf("FAN Version = %s \n", pSysInfo->FanModuleFwRev);
-        } else if (strcmp(newString[0], "dc") == 0) {
-            printf("DC Main Version = %s \n", pSysInfo->CsuRootFsFwRev);
-        } else if (strcmp(newString[0], "led") == 0) {
-            printf("LED Version = %s \n", pSysInfo->LedModuleFwRev);
-        } else if (strcmp(newString[0], "ac") == 0) {
-            pAcChargingInfo = (struct ChargingInfoData *)GetAcChargingInfoData(0);
-
-            printf("AC Version = %s \n", pAcChargingInfo->version);
-        } else if (exitCmd() == YES) {
-            return;
-        } else if (helpCmd() == YES) {
-            printf ("%s\n", usageMsg);
-        }
+    printf("ModelName = %s\r\n", pSysConfig->ModelName);
+    printf("DC Main Version = %s \n", pSysInfo->CsuRootFsFwRev);
+    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);
+    printf("Relay Board Version = %s \n", pSysInfo->RelayModuleFwRev);
+    printf("FAN Version = %s \n", pSysInfo->FanModuleFwRev);
+    printf("LED Version = %s \n", pSysInfo->LedModuleFwRev);
+    printf("LCM FW Version = V.%03d \n", ShmDcCommonData->LcmFwVersion);
+    printf("Dispenser Network Information checked: IP = % s Netmask = % s, Gateway = % s \n",
+        pSysConfig->Eth0Interface.EthIpAddress,
+        pSysConfig->Eth0Interface.EthSubmaskAddress,
+        pSysConfig->Eth0Interface.EthGatewayAddress);
 
-    }//while
 }
 
 void CreateOneError(char *v1)
@@ -1055,7 +1012,6 @@ int printTimeMsg(const char *fmt, ...)
     va_list args;
     struct timeb  SeqEndTime;
     struct tm *tm;
-    struct SysConfigData *pSysConfig = (struct SysConfigData *)GetShmSysConfigData();
 
     va_start(args, fmt);
     rc = vsnprintf(buffer, sizeof(buffer), fmt, args);
@@ -1102,7 +1058,7 @@ static void resdGunAndChillerTemp(void)
 
                 pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(i);
 
-                printTimeMsg("get gun %d temp = %3d, chiller = %3d, ConnTemp = %3d, %3d,SysTemp = %3d, %3d, %3d, %3d\r\n",
+                printTimeMsg("get gun %d temp = %3d, chiller = %3d, ConnTemp = %3d, %3d, SysTemp = %3d, %3d, %3d, %3d\r\n",
                              i,
                              pDcChargingInfo->ConnectorTemp,
                              pDcChargingInfo->ChillerTemp,
@@ -1198,15 +1154,24 @@ static void writeGunAndChillerTemp(void)
         }
 
         if (strcmp(newString[0], "chiller") == 0) {//修改水冷機溫度值
-            if (_GunIndex >= 1) {
+            if (_GunIndex >= 2) {
                 _GunIndex = 0; //只會有一個水冷機
+                printf("Select Gun Error");
+                continue;
             }
 
             pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(_GunIndex);
-            pDcChargingInfo->ChillerTemp = atoi(newString[2]);
-            printf("set %d chiller temperature = %d\r\n",
+            //pDcChargingInfo->ChillerTemp = atoi(newString[2]);
+            ShmDcCommonData->SystemTemp[0] = atoi(newString[2]);
+            ShmDcCommonData->SystemTemp[1] = atoi(newString[3]);
+            ShmDcCommonData->SystemTemp[2] = atoi(newString[4]);
+            ShmDcCommonData->SystemTemp[3] = atoi(newString[5]);
+            printf("set %d chiller temperature = %d %d %d %d\r\n",
                    _GunIndex,
-                   pDcChargingInfo->ChillerTemp);
+                ShmDcCommonData->SystemTemp[0],
+                ShmDcCommonData->SystemTemp[1],
+                ShmDcCommonData->SystemTemp[2],
+                ShmDcCommonData->SystemTemp[3]);
         } else if (strcmp(newString[0], "conn") == 0) {//修改槍頭溫度值
             pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(_GunIndex);
 
@@ -1235,9 +1200,14 @@ void showCANBUSPage(char* v1)
     else
         printf("Show CAN Bus Package off\n");
 }
+void ShowPowerConsumption(char* v1) 
+{
+    printf("Gun0 PowerConsumption:%.4f\n", ShmDcCommonData->pGunInfo[0].PowerConsumption);
+    printf("Gun1 PowerConsumption:%.4f\n", ShmDcCommonData->pGunInfo[1].PowerConsumption);
+}
+
 static void writeOTPTemp(void)
 {
-    uint8_t _GunIndex = 0;
     int isContinue = 1;
     uint32_t sleepTime = 500000;
     char* usageMsg = "Usage:\n"
@@ -1287,7 +1257,6 @@ static void writeOTPTemp(void)
 
 int main(void)
 {
-    uint8_t _GunIndex = 0;
     int isContinue = 1;
     char *usageMsg = "Usage:\n"
                      "       state <index>                     : get gun state\n"
@@ -1310,6 +1279,7 @@ int main(void)
                      "       tempR                             : print connector header and chiller temperature\r\n"
     			     "       btnl                              : press left button\n"
     			  	 "       btnr                              : press right button\n"
+                     "       powerconsumption                  : Show Power Consumption\n"
                      "\r\n";
 
     if (CreateAllCsuShareMemory() == FAIL) {
@@ -1491,6 +1461,8 @@ int main(void)
             showNetworkPage(newString[1]);
         } else if (strcmp(newString[0], "candump") == 0) { //印出網路封包
             showCANBUSPage(newString[1]);
+        } else if (strcmp(newString[0], "powerconsumption") == 0) { //印出網路封包
+            ShowPowerConsumption(newString[1]);
         } else {
             printf("%s\n", usageMsg);
         }

EVSE/Projects/DD360UCar/Apps/Script/copy_from_D.sh

@@ -65,6 +65,7 @@ typedef struct StPricesInfo {
     int TransactionId;
     float EnergyCost;
     float ParkingFee;
+    float RemainAmount;
 } PricesInfo;
 
 //typedef struct StOperativeInfo {

EVSE/Projects/DD360UCar/Apps/simulation.c

@@ -1,171 +0,0 @@
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/shm.h>
-#include <sys/mman.h>
-#include <linux/wireless.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-
-#include <unistd.h>
-#include <stdarg.h>
-#include <stdio.h>      /*標準輸入輸出定義*/
-#include <stdlib.h>     /*標準函數庫定義*/
-#include <stdint.h>
-#include <unistd.h>     /*Unix 標準函數定義*/
-#include <fcntl.h>      /*檔控制定義*/
-#include <termios.h>    /*PPSIX 終端控制定義*/
-#include <errno.h>      /*錯誤號定義*/
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-#include <ctype.h>
-#include <ifaddrs.h>
-#include <math.h>
-#include <stdbool.h>
-
-#include "./ShareMemory/shmMem.h"
-#include "./Define/define.h"
-#include "./SelectGun/SelectGun.h"
-#include "Config.h"
-
-#include "simulation.h"
-
-static struct SysConfigData *pSysConfig = NULL;
-static struct SysInfoData *pSysInfo = NULL;
-
-static struct FaultCodeData *pFaultCode = NULL;
-static struct AlarmCodeData *pAlarmCode = NULL;
-static struct CHAdeMOData *ShmCHAdeMOData = NULL;
-static struct GBTData *ShmGBTData = NULL;
-static struct CcsData *ShmCcsData = NULL;
-static DcCommonInfo *ShmDcCommonData = NULL;
-static SelectGunInfo *ShmSelectGunInfo = NULL;
-struct ChargingInfoData *pDcChargingInfo = NULL;
-static struct WARNING_CODE_INFO *pSysWarning = NULL;
-void SetFaultTest()
-{
-    pAlarmCode->AlarmEvents.bits.CcsLiquidChillerWaterLevelWarning = NO;
-    pFaultCode->FaultEvents.bits.CcsLiquidChillerWaterLevelFault = NO;
-    pAlarmCode->AlarmEvents.bits.DisconnectedFromDo = NORMAL;
-    pSysWarning->Level = WARN_LV_NL;
-
-}
-void SetSelfTest(bool status)
-{
-    uint8_t index = 0;
-    struct SysConfigData *pSysConfig = (struct SysConfigData *)GetShmSysConfigData();
-    struct SysInfoData *pSysInfo = (struct SysInfoData *)GetShmSysInfoData();
-
-    struct CHAdeMOData *ShmCHAdeMOData = (struct CHAdeMOData *)GetShmCHAdeMOData();
-    struct GBTData *ShmGBTData = (struct GBTData *)GetShmGBTData();
-    struct CcsData *ShmCcsData = (struct CcsData *)GetShmCcsData();
-
-    struct RelayModuleData *ShmRelayModuleData = (struct RelayModuleData *)GetShmRelayModuleData();
-    ShmRelayModuleData->SelfTest_Comp = status;
-
-    if (status) {
-        strcpy((char*)pSysInfo->RelayModuleFwRev,SIM_VERSION);
-        strcpy((char*)pSysInfo->FanModuleFwRev,SIM_VERSION);
-        strcpy((char*)pSysInfo->CsuPrimFwRev,SIM_VERSION);
-        for (index = 0; index < pSysConfig->TotalConnectorCount; index++) {
-            pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(index);
-            if (pDcChargingInfo->Type == _Type_Chademo) {
-                strcpy((char*)ShmCHAdeMOData->evse[pDcChargingInfo->type_index].version,SIM_VERSION);
-            } else if (pDcChargingInfo->Type == _Type_GB) {
-                strcpy((char*)ShmGBTData->evse[pDcChargingInfo->type_index].version,SIM_VERSION);
-            } else if (pDcChargingInfo->Type == _Type_CCS_2) {
-                strcpy((char*)ShmCcsData->V2GMessage_DIN70121[pDcChargingInfo->type_index].version,SIM_VERSION);
-            }
-            ShmDcCommonData->GunRelayWeldingOccur[index] = false;
-        }
-    }
-}
-
-void main()
-{
-    uint8_t gunIndex = 0;
-
-
-    if (CreateAllCsuShareMemory() == FAIL) {
-        printf("create share memory error");
-        return;
-    }
-
-    MappingGunChargingInfo("Simulation Task");
-
-    pSysConfig = (struct SysConfigData *)GetShmSysConfigData();
-    pSysInfo = (struct SysInfoData *)GetShmSysInfoData();
-    pAlarmCode = (struct AlarmCodeData *)GetShmAlarmCodeData();
-    pFaultCode = (struct FaultCodeData *)GetShmFaultCodeData();
-    ShmDcCommonData = (DcCommonInfo *)GetShmDcCommonData();
-    ShmCHAdeMOData = (struct CHAdeMOData *)GetShmCHAdeMOData();
-    ShmGBTData = (struct GBTData *)GetShmGBTData();
-    ShmCcsData = (struct CcsData *)GetShmCcsData();
-    ShmSelectGunInfo = (SelectGunInfo *)GetShmSelectGunInfo();
-    SetSelfTest(SELFTESTRESULT);
-
-    while (1) {
-        for (gunIndex = 0; gunIndex < pSysConfig->TotalConnectorCount; gunIndex++) {
-            pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(gunIndex);
-
-            switch (pDcChargingInfo->SystemStatus) {
-            case S_IDLE:
-                // Authorizing data
-                strcpy((char *)&pSysConfig->UserId, USER_ID);
-                break;
-            case S_REASSIGN_CHECK:
-                break;
-            case S_REASSIGN:
-                break;
-            case S_PREPARNING:
-                //ShmPsuData->SystemPresentPsuQuantity = 500;
-                //ShmPsuData->SystemAvailablePower = 500;
-                break;
-            case S_PREPARING_FOR_EV:
-                pDcChargingInfo->GunLocked = START;
-                break;
-            case S_PREPARING_FOR_EVSE:
-                pDcChargingInfo->GroundFaultStatus = GFD_PASS;
-                break;
-            case S_CCS_PRECHARGE_ST0:
-            case S_CCS_PRECHARGE_ST1:
-                ShmCcsData->V2GMessage_DIN70121[pDcChargingInfo->type_index].PresentMsgFlowStatus = 45;
-                sleep(1);
-                pDcChargingInfo->RelayK1K2Status = YES;
-                break;
-
-            case S_CHARGING:
-                break;
-            case S_TERMINATING:
-                break;
-            case S_COMPLETE:
-                break;
-            case S_ALARM:
-                break;
-            case S_FAULT:
-                SetFaultTest();
-                break;
-            case S_RESERVATION:
-                break;
-            case S_BOOKING:
-                break;
-            case S_MAINTAIN:
-                break;
-            case S_DEBUG:
-                break;
-            case S_UPDATE:
-                break;
-            }
-        }
-        usleep(100);
-    }
-    return;
-}
-

EVSE/Projects/DD360UCar/Apps/simulation.h

@@ -1,8 +0,0 @@
-#ifndef _SIMULATIONEV_H_
-#define _SIMULATIONEV_H_
-#define SELFTESTRESULT  1
-#define SIM_VERSION     "Test"
-#define USER_ID         "AutoStartCharging"
-
-#endif
-

build_rootfs_copy.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 sudo rm /dev/ram*
 sleep 3
-rm /mnt/e/Temp/IMAGE/*
 #sudo make DD360Audi-rootfs
 #cp /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/Projects/DD360Audi/Images/* /mnt/e/Image/DD360Audi/
 #sudo make DD360-rootfs
 #cp /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/Projects/DD360/Images/* /mnt/e/Image/DD360/
 #sudo make DD360ComBox-rootfs
 #cp /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/Projects/DD360ComBox/Images/* /mnt/e/Image/DD360ComBox/
+sudo cp -r /mnt/d/Phihong/Project/DD360UCar/Apps/* /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/Projects/DD360UCar/Apps
 sudo make DD360UCar-rootfs
 cp /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/EVSE/Projects/DD360UCar/Images/* /mnt/d/Image/DD360UCar/