Skip to content

fix ocpp heartbeat #2133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 1 commit into from
Jan 10, 2025
Merged

fix ocpp heartbeat #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/control/ocpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def boot_notification(self: OptionalProtocol,
firmware_version=data.data.system_data["system"].data["version"],
meter_serial_number=serial_number
))
log.debug(f"BootNotification für Chargebox ID: {chargebox_id} gesendet.")
except Exception as e:
fault_state.from_exception(e)

Expand Down
4 changes: 2 additions & 2 deletions packages/control/ocpp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ def test_send_ocpp_data(mock_data, monkeypatch):
send_heart_beat_mock = Mock()
monkeypatch.setattr(data.data.optional_data, "send_heart_beat", send_heart_beat_mock)

data.data.optional_data.ocpp_boot_notification_sent = False
data.data.optional_data.data.ocpp.boot_notification_sent = False

data.data.optional_data._transfer_meter_values()

boot_notification_mock.call_args == (("cp1", "mqtt", "123456"),)
send_heart_beat_mock.call_args == (("cp1",),)
transfer_values_mock.call_args == (("cp1", 1, 0),)
assert data.data.optional_data.ocpp_boot_notification_sent is True
assert data.data.optional_data.data.ocpp.boot_notification_sent is True
6 changes: 3 additions & 3 deletions packages/control/optional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ def __init__(self):
self.et_module: ConfigurableElectricityTariff = None
self.data.dc_charging = hardware_configuration.get_hardware_configuration_setting("dc_charging")
Pub().pub("openWB/optional/dc_charging", self.data.dc_charging)
self.ocpp_boot_notification_sent = False
except Exception:
log.exception("Fehler im Optional-Modul")

Expand Down Expand Up @@ -104,13 +103,14 @@ def ocpp_transfer_meter_values(self):
def _transfer_meter_values(self):
for cp in data.data.cp_data.values():
try:
if self.ocpp_boot_notification_sent is False:
if self.data.ocpp.boot_notification_sent is False:
# Boot-Notfification nicht in der init-Funktion aufrufen, da noch nicht alles initialisiert ist
self.boot_notification(cp.data.config.ocpp_chargebox_id,
cp.chargepoint_module.fault_state,
cp.chargepoint_module.config.type,
cp.data.get.serial_number)
self.ocpp_boot_notification_sent = True
self.data.ocpp.boot_notification_sent = True
Pub().pub("openWB/set/optional/ocpp/boot_notification_sent", True)
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,
Expand Down
1 change: 1 addition & 0 deletions packages/control/optional_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def rfid_factory() -> Rfid:
@dataclass
class Ocpp:
active: bool = False
boot_notification_sent: bool = False
url: Optional[str] = None
version: str = "ocpp1.6"

Expand Down
12 changes: 5 additions & 7 deletions packages/helpermodules/setdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,13 +870,11 @@ def process_optional_topic(self, msg: mqtt.MQTTMessage):
self._validate_value(msg, bool)
elif "openWB/set/optional/int_display/rotation" in msg.topic:
self._validate_value(msg, int, [(0, 0), (90, 90), (180, 180), (270, 270)])
elif "openWB/set/optional/int_display/active" in msg.topic:
self._validate_value(msg, bool)
elif "openWB/set/optional/int_display/on_if_plugged_in" in msg.topic:
self._validate_value(msg, bool)
elif "openWB/set/optional/int_display/only_local_charge_points" in msg.topic:
self._validate_value(msg, bool)
elif "openWB/set/optional/int_display/pin_active" in msg.topic:
elif ("openWB/set/optional/int_display/active" in msg.topic or
"openWB/set/optional/ocpp/boot_notification_sent" in msg.topic or
"openWB/set/optional/int_display/on_if_plugged_in" in msg.topic or
"openWB/set/optional/int_display/only_local_charge_points" in msg.topic or
"openWB/set/optional/int_display/pin_active" in msg.topic):
self._validate_value(msg, bool)
elif "openWB/set/optional/int_display/pin_code" in msg.topic:
self._validate_value(msg, str)
Expand Down