2021-10-14 / Simon Xue

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

@@ -82,7 +82,7 @@ uint8_t bd0_2_status = 0;
 uint8_t bd1_1_status = 0;
 uint8_t bd1_2_status = 0;
 
-char *fwVersion = "V1.17.00.0000.00"; // "V0.16.00.0000.00";
+char *fwVersion = "V1.16.00.0000.00"; // "V0.16.00.0000.00";
 
 //sqlite3 *localDb;
 bool isDb_ready;
@@ -1642,9 +1642,10 @@ void _DetectPlugInTimeout(void)
 		setChargerMode(pSysInfo->CurGunSelected, S_TERMINATING);
 #elif DD360 || DD360Combox
 	setChargerMode(pSysInfo->CurGunSelected, S_COMPLETE);
-    systemPageRestoreInit();
+	pSysInfo->SystemPage = _LCM_COMPLETE;
+	return;
 #endif
-
+    systemPageRestoreInit();
 }
 
 void _DetectEvChargingEnableTimeout(uint8_t gunIndex)
@@ -1678,6 +1679,8 @@ void _DetectEvseChargingEnableTimeout(uint8_t gunIndex)
 		setChargerMode(pSysInfo->CurGunSelected, S_TERMINATING);
 #elif DD360 || DD360Combox
 	setChargerMode(pSysInfo->CurGunSelected, S_COMPLETE);
+	pSysInfo->SystemPage = _LCM_COMPLETE;
+	return;
 #endif
         _AutoReturnTimeout();
     }
@@ -1691,6 +1694,8 @@ void _PrepareTimeout(uint8_t gunIndex)
 		setChargerMode(pSysInfo->CurGunSelected, S_TERMINATING);
 #elif DD360 || DD360Combox
 	setChargerMode(pSysInfo->CurGunSelected, S_COMPLETE);
+	pSysInfo->SystemPage = _LCM_COMPLETE;
+	return;
 #endif
     pAlarmCode->AlarmEvents.bits.PsuNoResource = YES;
     _AutoReturnTimeout();
@@ -1704,6 +1709,8 @@ void _CcsPrechargeTimeout(uint8_t gunIndex)
 		setChargerMode(pSysInfo->CurGunSelected, S_TERMINATING);
 #elif DD360 || DD360Combox
 	setChargerMode(pSysInfo->CurGunSelected, S_COMPLETE);
+	pSysInfo->SystemPage = _LCM_COMPLETE;
+	return;
 #endif
 }
 
@@ -3738,9 +3745,9 @@ void ResetDetAlarmStatus(uint8_t gun)
 
 static void autoStartChargingForComBox(uint8_t gunIndex)
 {
-#if !defined DD360ComBox
+#if defined DD360Audi
     return ;
-#endif //!defined DD360ComBox
+#endif //defined DD360Audi
 
     if ( (pSysInfo->SystemPage >= _LCM_AUTHORIZING && pSysInfo->SystemPage <= _LCM_AUTHORIZ_FAIL) ||
         pDcChargingInfo->isVerify ) {

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

@@ -801,8 +801,7 @@ int main(int argc, char *argv[])
                         pDcChargingInfo->StopChargeFlag = NO;
                     }
                 }
-
-#ifdef DD360ComBox
+#if !defined DD360Audi
                     // Set Ev board in communication mode
                     // Get EVCCID for authorize when gun plug-in only for CCS
                     if(pDcChargingInfo->Type == _Type_CCS_2 && priorityLow == 5) {
@@ -811,7 +810,7 @@ int main(int argc, char *argv[])
                            SendCommunicationOnly(gunIndex);
                         }
                     }
-#endif 
+#endif
                 if (priorityLow == 1) {
                     pDcChargingInfo->PresentChargedEnergy   = 0;
                     pDcChargingInfo->PresentChargingPower   = 0;