Browse Source

Merge pull request #74 from SwitchEV/fix/terminate_session_meter_receipt_res

Fix: Terminate session after Metering Receipt when requesting STOP Charging.
Marc Mültin 4 years ago
parent
commit
7d89c9a15c

+ 7 - 0
RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java

@@ -99,6 +99,13 @@ public class WaitForMeteringReceiptRes extends ClientState {
 						return getSendMessage(getCurrentDemandReq(), V2GMessages.CURRENT_DEMAND_RES);
 					}
 				} else {
+					/* Check if the EV controller triggered a pause of a charging session. 
+					 * If not, indicate a termination of the charging session. This will be
+					 * evaluated in the state WaitForPowerDeliveryRes
+					 */
+					if (getCommSessionContext().getChargingSession() == null)
+						getCommSessionContext().setChargingSession(ChargingSessionType.TERMINATE);
+					
 					return getSendMessage(getPowerDeliveryReq(ChargeProgressType.STOP), 
 										  V2GMessages.POWER_DELIVERY_RES,
 										  " (ChargeProgress = STOP_CHARGING)");