2022-10-25 / Simon Xue [DD360Tcc]

Action:
1. [Modify] Get Parking Req timing.
2. [Modify] pkill ntpd when update FW.

Files
As the following commit history files

Image Version: V2.20.XX.XXXX.XX

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

@@ -715,7 +715,6 @@ void CreateRfidFork(void)
                     log_info("Gun%d Parking Fee PreAuthComplete Fail",sel_gun);
                     if (!ShmDcCommonData->TradeCancel) {
                         pSysInfo->SystemPage = _PAGE_AUTHORIZE_FAIL;
-                        
                     }
                 }
                 ShmDcCommonData->PreAuth_Result = 0;

EVSE/Projects/DD360Tcci/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 = "T2.20.00.0000.00"; // Phihong version
-char* DebugVersion = "T2.20.02";      // Software debug version
+char *fwVersion = "V2.20.00.0000.00"; // Phihong version
+char* DebugVersion = "V2.20.03";      // Software debug version
 //sqlite3 *localDb;
 bool isDb_ready;
 

EVSE/Projects/DD360Tcci/Apps/Config.h

@@ -476,6 +476,7 @@ enum _LCM_UPGRADE_RESULT {
 enum _TCC_PARKING_STATUS {
     _TCC_PARKING_NONE = 0,
     _TCC_PARKING_OCCUPENCY,
+    _TCC_PARKING_OCCUPENCY_Ready,
     _TCC_PARKING_REQ_PARKING_FEE,
     _TCC_WAIT_PAY,
     _TCC_ONLINEPAY_PASS,

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

@@ -894,9 +894,9 @@ static int miscCommandHandle(uint8_t dataLen, uint8_t plugNum, uint8_t *data)
         case MISC_CMD_PARKING_STATUS:
             if (gMoreInfoReq[plugNum].bits.ParkingReq != value) {
                 if (value == 0x0001 && pSysInfo->CurGunSelected == plugNum &&
-                    (pSysInfo->SystemPage >= _PAGE_BILL && pSysInfo->SystemPage <= _PAGE_PLUGIN ||
+                    (pSysInfo->SystemPage >= _PAGE_BILL && pSysInfo->SystemPage <= _PAGE_CHARGING ||
                     pSysInfo->SystemPage ==  _PAGE_DONATE_RIGHT)) {
-                    log_info("Gun%d already enter charging operate. Don't Enter Parking mode!",plugNum);
+                    //log_info("Gun%d already enter charging operate. Don't Enter Parking mode!",plugNum);
                     return FAIL;
                 }
                 if (value) {

EVSE/Projects/DD360Tcci/Apps/ModuleEvComm/AbnormalCCS.c

@@ -17,7 +17,8 @@ void ClearAbnormalStatus_CCS(uint8_t gun_index)
     struct InfoCodeData *pInfoCode = (struct InfoCodeData *)GetShmInfoCodeData();
     struct AlarmCodeData *pAlarmCode = (struct AlarmCodeData *)GetShmAlarmCodeData();
     struct ChargingInfoData *pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(gun_index);
-
+    memset(code, '\n', sizeof(code));
+    
     if (strncmp((char *)pDcChargingInfo->EvConnAlarmCode, "", 6) == EQUAL) {
         return;
     }

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

@@ -228,8 +228,11 @@ bool CreateBufferForLcmFile(char *file)
 
 unsigned long long getAvailableMemory()
 {
+    system("pkill ntpd");
+    sleep(1);
     long pages = sysconf(_SC_AVPHYS_PAGES);
     long page_size = sysconf(_SC_PAGE_SIZE);
+    log_info("Avaiable Memory size:%.1f MB",pages*page_size/(1024*1024));
     return pages * page_size;
 }