Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
18 changes: 12 additions & 6 deletions packages/control/chargepoint/chargepoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -702,12 +702,18 @@ def update(self, ev_list: Dict[str, Ev]) -> None:
# 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)):
self.data.set.ocpp_transaction_id = data.data.optional_data.start_transaction(
self.data.config.ocpp_chargebox_id,
self.chargepoint_module.fault_state,
self.num,
self.data.set.rfid or self.data.get.rfid or self.data.get.vehicle_id,
self.data.get.imported)

# only start OCPP transaction if chargebox ID is not none
if (self.data.config.ocpp_chargebox_id is not None):
# only start OCPP transaction if rfid tag or vehicle ID is set
if (self.data.set.rfid or self.data.get.rfid or self.data.get.vehicle_id):

self.data.set.ocpp_transaction_id = data.data.optional_data.start_transaction(
self.data.config.ocpp_chargebox_id,
self.chargepoint_module.fault_state,
self.num,
self.data.set.rfid or self.data.get.rfid or self.data.get.vehicle_id,
self.data.get.imported)
if self.data.get.plug_state and self.data.set.plug_state_prev is False:
self.data.control_parameter.timestamp_chargemode_changed = create_timestamp()
# SoC nach Anstecken aktualisieren
Expand Down
2 changes: 2 additions & 0 deletions packages/control/ocpp.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ def transfer_values(self: OptionalProtocol,
chargebox_id: str,
fault_state: FaultState,
connector_id: int,
transaction_id: int,
imported: int) -> None:
try:
self._process_call(chargebox_id, fault_state, call.MeterValues(
connector_id=connector_id,
transaction_id=transaction_id,
meter_value=[{"timestamp": self._get_formatted_time(),
"sampledValue": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/control/optional.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,6 @@ def _transfer_meter_values(self):
if cp.data.set.ocpp_transaction_id is not None:
self.send_heart_beat(cp.data.config.ocpp_chargebox_id, cp.chargepoint_module.fault_state)
self.transfer_values(cp.data.config.ocpp_chargebox_id,
cp.chargepoint_module.fault_state, cp.num, int(cp.data.get.imported))
cp.chargepoint_module.fault_state, cp.num, cp.data.set.ocpp_transaction_id, int(cp.data.get.imported))
except Exception:
log.exception("Fehler im OCPP-Optional-Modul")