Skip to content

fix rfid none type #2648

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
benderl merged 1 commit into from
Aug 11, 2025
Merged

fix rfid none type #2648

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
9 changes: 6 additions & 3 deletions packages/control/ev/ev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,13 +449,13 @@ def reset_phase_switch(self, control_parameter: ControlParameter):
str(data.data.counter_all_data.get_evu_counter().data.set.reserved_surplus))


def get_ev_to_rfid(rfid: str, vehicle_id: Optional[str] = None) -> Optional[int]:
def get_ev_to_rfid(rfid: Optional[str] = None, vehicle_id: Optional[str] = None) -> Optional[int]:
""" ermittelt zum übergebenen ID-Tag das Fahrzeug

Parameter
---------
rfid: string
ID-Tag
ID-Tag vom RFID-Leser oder Display
vehicle_id: string
MAC-Adresse des ID-Tags (nur openWB Pro)

Expand All @@ -464,6 +464,9 @@ def get_ev_to_rfid(rfid: str, vehicle_id: Optional[str] = None) -> Optional[int]
vehicle: int
Nummer des EV, das zum Tag gehört
"""
if rfid is None and vehicle_id is None:
log.debug("Kein Fahrzeug zugeordnet, da weder RFID noch MAC übergeben wurden.")
return None
for vehicle in data.data.ev_data:
try:
if "ev" in vehicle:
Expand All @@ -474,7 +477,7 @@ def get_ev_to_rfid(rfid: str, vehicle_id: Optional[str] = None) -> Optional[int]
if vehicle_id is not None and vehicle_id.lower() in lowered_vehicle_tags:
log.debug(f"MAC {vehicle_id} wird EV {data.data.ev_data[vehicle].num} zugeordnet.")
return data.data.ev_data[vehicle].num
if rfid.lower() in lowered_vehicle_tags:
if rfid is not None and rfid.lower() in lowered_vehicle_tags:
log.debug(f"RFID {rfid} wird EV {data.data.ev_data[vehicle].num} zugeordnet.")
return data.data.ev_data[vehicle].num
# Prüfung auf ein passendes Muster
Expand Down