Skip to content

Fix EV identification wildcards #2670

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 2 commits into from
Aug 18, 2025
Merged

Fix EV identification wildcards #2670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28e395
check for NoneType
ndrsnhs Aug 18, 2025
b726512
Merge branch 'openWB:master' into fix-ev-identification-wildcards
ndrsnhs Aug 18, 2025
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
11 changes: 5 additions & 6 deletions packages/control/ev/ev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,12 +468,11 @@ def get_ev_to_rfid(rfid: Optional[str] = None, vehicle_id: Optional[str] = None)
# Prüfung auf ein passendes Muster
# auch 'fnmatch()' ist case-insensitive
for tag_id in data.data.ev_data[vehicle].data.tag_id:
if vehicle_id is not None:
if fnmatch(vehicle_id, tag_id):
log.debug(f"MAC {vehicle_id} und gespeicherte Tag_ID {tag_id} stimmen überein. "
f"EV {data.data.ev_data[vehicle].num} zugeordnet.")
return data.data.ev_data[vehicle].num
if fnmatch(rfid, tag_id):
if vehicle_id is not None and fnmatch(vehicle_id, tag_id):
log.debug(f"MAC {vehicle_id} und gespeicherte Tag_ID {tag_id} stimmen überein. "
f"EV {data.data.ev_data[vehicle].num} zugeordnet.")
return data.data.ev_data[vehicle].num
if rfid is not None and fnmatch(rfid, tag_id):
log.debug(f"RFID {rfid} und gespeicherte Tag_ID {tag_id} stimmen überein. "
f"EV {data.data.ev_data[vehicle].num} zugeordnet.")
return data.data.ev_data[vehicle].num
Expand Down