Skip to content

Commit

Permalink
Merge master into Release (#2050)
Browse files Browse the repository at this point in the history
* Merge master into Beta (#2033)

* build UI (#2009)

* Update for Polestar auth change:client id and optional acceptance of terms and conditions

* add terser

* Added const for client_id

* Added blank line for Flake check

* fix heartbeat internal chargepoint (#2013)

* Build Display Theme: Cards

* Wiki (#2014)

* Wiki

* typos Wiki

* clear browser console at midnight

* Build Display Theme: Cards

* fix SolarEdge synergy units (#2026)

* reset boot_done before shutdown (#2027)

* fix solaredge synergy units (#2030)

* build

* Satellit: Fix telnet (#2032)

* Update version 2.1.6-RC.2

---------

Co-authored-by: PK <pk.hh8@online.de>
Co-authored-by: Lutz Bender <github@lutz-bender.de>
Co-authored-by: benderl <benderl@users.noreply.github.com>

* fix disable after unplugging (#2043)

* fix disable after unplugging

* Wiki

* fix

* Update version 2.1.6-Patch.1

---------

Co-authored-by: benderl <benderl@users.noreply.github.com>
Co-authored-by: Lutz Bender <github@lutz-bender.de>
Co-authored-by: PK <pk.hh8@online.de>
  • Loading branch information
4 people authored Dec 3, 2024
1 parent 9b5fded commit f717f28
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion docs/Identifikation.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Die openWB bietet die Möglichkeit, den Ladepunkt vor dem Laden zu entsperren und/oder das Fahrzeug zuzuordnen, welches geladen wird. Es gibt zwei grundlegende Konzepte, die für sich oder in Kombination genutzt werden können: Das Entsperren eines Ladepunkts und das Zuordnen eines Fahrzeugs.
Mit den verschiedenen Identifikations-Möglichkeiten kannst du die openWB grundsätzlich vor unbefugtem Laden schützen oder fahrzeugbasierte Funktionen nutzen. Es gibt zwei grundlegende Konzepte: Das Entsperren eines Ladepunkts und das Zuordnen eines Fahrzeugs.

Die Identifikation erfolgt über

Expand Down
20 changes: 13 additions & 7 deletions packages/control/chargepoint/chargepoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,21 @@ def _is_autolock_inactive(self) -> Tuple[bool, Optional[str]]:
return state, message

def _is_manual_lock_inactive(self) -> Tuple[bool, Optional[str]]:
if (self.data.set.manual_lock is False or
(self.data.get.rfid or
self.data.get.vehicle_id or
self.data.set.rfid) in self.template.data.valid_tags):
# Die Pro schickt je nach Timing auch nach Abstecken noch ein paar Zyklen den Tag. Dann darf der Ladepunkt
# nicht wieder entsperrt werden.
if (self.data.get.rfid or
self.data.get.vehicle_id or
self.data.set.rfid) in self.template.data.valid_tags:
Pub().pub(f"openWB/set/chargepoint/{self.num}/set/manual_lock", False)
charging_possible = True
message = None
else:
elif self.template.data.disable_after_unplug and self.data.get.plug_state is False:
Pub().pub(f"openWB/set/chargepoint/{self.num}/set/manual_lock", True)

if self.data.set.manual_lock:
charging_possible = False
message = "Keine Ladung, da der Ladepunkt gesperrt ist."
else:
charging_possible = True
message = None
return charging_possible, message

def _is_ev_plugged(self) -> Tuple[bool, Optional[str]]:
Expand Down Expand Up @@ -231,6 +236,7 @@ def _process_charge_stop(self) -> None:
if self.template.data.disable_after_unplug:
self.data.set.manual_lock = True
Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/manual_lock", True)
log.debug("/set/manual_lock True")
# Ev wurde noch nicht aktualisiert.
chargelog.save_and_reset_data(self, data.data.ev_data["ev"+str(self.data.set.charging_ev_prev)])
self.data.set.charging_ev_prev = -1
Expand Down
8 changes: 3 additions & 5 deletions packages/helpermodules/setdata.py
Original file line number Diff line number Diff line change
Expand Up @@ -623,20 +623,18 @@ def process_chargepoint_get_topics(self, msg):
self._validate_value(msg, int, [(0, 2)])
elif "/get/evse_current" in msg.topic:
self._validate_value(msg, float, [(0, 0), (6, 32), (600, 3200)])
elif ("/get/error_timestamp" in msg.topic or
"/get/rfid_timestamp" in msg.topic):
self._validate_value(msg, float)
elif ("/get/fault_str" in msg.topic or
"/get/state_str" in msg.topic or
"/get/heartbeat" in msg.topic or
"/get/rfid" in msg.topic or
"/get/vehicle_id" in msg.topic or
"/get/serial_number" in msg.topic):
self._validate_value(msg, str)
elif ("/get/error_timestamp" in msg.topic or
"/get/rfid_timestamp" in msg.topic):
self._validate_value(msg, float)
elif ("/get/soc" in msg.topic):
self._validate_value(msg, float, [(0, 100)])
elif "/get/rfid_timestamp" in msg.topic:
self._validate_value(msg, float)
elif "/get/simulation" in msg.topic:
self._validate_value(msg, "json")
else:
Expand Down
2 changes: 1 addition & 1 deletion web/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.6
2.1.6-Patch.1

0 comments on commit f717f28

Please sign in to comment.