Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions packages/control/chargepoint/chargepoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,10 @@ def _set_values_at_start(self):
self.data.set.plug_time)

def remember_previous_values(self):
self.data.get.charge_state_prev = self.data.get.charge_state
Comment thread
rleidner marked this conversation as resolved.
Outdated
self.data.set.plug_state_prev = self.data.get.plug_state
self.data.set.current_prev = self.data.set.current
Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/get/charge_state_prev", self.data.get.charge_state_prev)
Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/plug_state_prev", self.data.set.plug_state_prev)
Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/current_prev", self.data.set.current_prev)

Expand Down Expand Up @@ -425,8 +427,8 @@ def check_phase_switch_completed(self):
self.data.control_parameter.state = ChargepointState.PHASE_SWITCH_AWAITED
if self._is_phase_switch_required() is False:
self.data.control_parameter.state = ChargepointState.CHARGING_ALLOWED
except Exception:
log.exception("Fehler in der Ladepunkt-Klasse von "+str(self.num))
except Exception as e:
log.exception("Fehler in der Ladepunkt-Klasse von "+str(self.num) + ", error=" + str(e))
Comment thread
rleidner marked this conversation as resolved.
Outdated

def initiate_phase_switch(self):
"""prüft, ob eine Phasenumschaltung erforderlich ist und führt diese durch.
Expand Down Expand Up @@ -703,6 +705,14 @@ def update(self, ev_list: Dict[str, Ev]) -> None:
self._pub_connected_vehicle(ev_list[f"ev{vehicle}"])
else:
self._pub_configured_ev(ev_list)
try:
# check für charging stop or charging interruption, if so force a soc query for the ev
if self.data.get.charge_state_prev and self.data.get.charge_state is False:
Pub().pub(f"openWB/set/vehicle/{self.data.config.ev}/get/force_soc_update", True)
log.debug(f"SoC-Abfrage nach Ladeunterbrechung, cp{self.num}, ev{self.data.config.ev}")
except Exception as e:
log.exception(f"Fehler bei Ladestop,cp{self.num}, err={e}")

# OCPP Start Transaction nach Anstecken
if ((self.data.get.plug_state and self.data.set.plug_state_prev is False) or
(self.data.set.ocpp_transaction_id is None and self.data.get.charge_state)):
Expand Down
1 change: 1 addition & 0 deletions packages/control/chargepoint/chargepoint_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def connected_vehicle_factory() -> ConnectedVehicle:
@dataclass
class Get:
charge_state: bool = False
charge_state_prev: bool = False
charging_current: Optional[float] = 0
charging_power: Optional[float] = 0
charging_voltage: Optional[float] = 0
Expand Down
1 change: 1 addition & 0 deletions packages/helpermodules/setdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ def process_chargepoint_topic(self, msg: mqtt.MQTTMessage):
"/set/perform_control_pilot_interruption" in msg.topic or
"/set/perform_phase_switch" in msg.topic or
"/set/ocpp_transaction_active" in msg.topic or
"/get/charge_state_prev" in msg.topic or
"/set/plug_state_prev" in msg.topic):
self._validate_value(msg, bool)
elif "/set/autolock_state" in msg.topic:
Expand Down
1 change: 1 addition & 0 deletions packages/helpermodules/update_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ class UpdateConfig:
"^openWB/chargepoint/[0-9]+/set/current$",
"^openWB/chargepoint/[0-9]+/set/energy_to_charge$",
"^openWB/chargepoint/[0-9]+/set/manual_lock$",
"^openWB/chargepoint/[0-9]+/get/charge_state_prev$",
"^openWB/chargepoint/[0-9]+/set/plug_state_prev$",
"^openWB/chargepoint/[0-9]+/set/plug_time$",
"^openWB/chargepoint/[0-9]+/set/rfid$",
Expand Down