Skip to content
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

rfid identification with openWB Pro #1313

Merged
merged 2 commits into from
Dec 20, 2023
Merged

rfid identification with openWB Pro #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1944578
Mixin
LKuemmel Nov 20, 2023
59104bf
fix
LKuemmel Dec 20, 2023
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
3 changes: 2 additions & 1 deletion packages/control/algorithm/additional_current_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
import pytest

from control.algorithm import additional_current
from control.chargepoint.chargepoint import Chargepoint, ChargepointData, Set
from control.chargepoint.chargepoint import Chargepoint, ChargepointData
from control.chargepoint.chargepoint_data import Set
from control.chargepoint.control_parameter import ControlParameter
from control.ev import ChargeTemplate, Ev
from control.loadmanagement import LimitingValue
Expand Down
3 changes: 2 additions & 1 deletion packages/control/algorithm/filter_chargepoints_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from control import data
from control.algorithm import filter_chargepoints
from control.chargemode import Chargemode
from control.chargepoint.chargepoint import Chargepoint, ChargepointData, Log, Set
from control.chargepoint.chargepoint import Chargepoint, ChargepointData
from control.chargepoint.chargepoint_data import Log, Set
from control.counter_all import CounterAll
from control.ev import ControlParameter, Ev, EvData, Get

Expand Down
3 changes: 2 additions & 1 deletion packages/control/algorithm/surplus_controlled_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

from control.algorithm import surplus_controlled
from control.algorithm.surplus_controlled import SurplusControlled
from control.chargepoint.chargepoint import Chargepoint, ChargepointData, Get, Set
from control.chargepoint.chargepoint import Chargepoint, ChargepointData
from control.chargepoint.chargepoint_data import Get, Set
from control.chargepoint.control_parameter import ControlParameter
from control.ev import ChargeTemplate, Ev

Expand Down
294 changes: 14 additions & 280 deletions packages/control/chargepoint/chargepoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
Tag-Liste: Tags, mit denen der Ladepunkt freigeschaltet werden kann. Ist diese leer, kann mit jedem Tag der Ladepunkt
freigeschaltet werden.
"""
from dataclasses import asdict, dataclass, field
from dataclasses import asdict
import dataclasses
import logging
import threading
import traceback
from typing import Dict, List, Optional, Tuple
from typing import Dict, Optional, Tuple

from control import chargelog
from control import cp_interruption
from control import data
from control.chargemode import Chargemode
from control.chargepoint.chargepoint_data import ChargepointData, ConnectedConfig, ConnectedInfo, ConnectedSoc, Get
from control.chargepoint.chargepoint_template import CpTemplate
from control.chargepoint.control_parameter import ControlParameter, control_parameter_factory
from control.chargepoint.control_parameter import ControlParameter
from control.chargepoint.rfid import ChargepointRfidMixin
from control.ev import Ev
from control import phase_switch
from control.chargepoint.chargepoint_state import ChargepointState
from dataclass_utils.factories import empty_dict_factory, currents_list_factory, voltages_list_factory
from helpermodules.constants import NO_ERROR
from helpermodules.phase_mapping import convert_single_evu_phase_to_cp_phase
from helpermodules.pub import Pub
from helpermodules import timecheck
Expand Down Expand Up @@ -59,202 +59,7 @@ def get_chargepoint_get_default() -> Dict:
log = logging.getLogger(__name__)


@dataclass
class ConnectedSoc:
fault_str: str = NO_ERROR
fault_state: int = 0
range_charged: float = 0
range_unit: str = "km"
range: float = 0
soc: int = 0
timestamp: Optional[str] = None


@dataclass
class ConnectedSocConfig:
configured: str = ""


@dataclass
class ConnectedInfo:
id: int = 0
name: str = "Ladepunkt"


@dataclass
class ConnectedConfig:
average_consumption: float = 17
charge_template: int = 0
chargemode: str = "stop"
current_plan: Optional[int] = 0
ev_template: int = 0
priority: bool = False
time_charging_in_use: bool = False


def connected_config_factory() -> ConnectedConfig:
return ConnectedConfig()


def connected_info_factory() -> ConnectedInfo:
return ConnectedInfo()


def connected_soc_factory() -> ConnectedSoc:
return ConnectedSoc()


@dataclass
class ConnectedVehicle:
config: ConnectedConfig = field(default_factory=connected_config_factory)
info: ConnectedInfo = field(default_factory=connected_info_factory)
soc: ConnectedSoc = field(default_factory=connected_soc_factory)


@dataclass
class Log:
chargemode_log_entry: str = "_"
imported_at_mode_switch: float = 0
imported_at_plugtime: float = 0
imported_since_mode_switch: float = 0
imported_since_plugged: float = 0
range_charged: float = 0
time_charged: float = 0
timestamp_start_charging: Optional[float] = None


def connected_vehicle_factory() -> ConnectedVehicle:
return ConnectedVehicle()


@dataclass
class Get:
charge_state: bool = False
connected_vehicle: ConnectedVehicle = field(default_factory=connected_vehicle_factory)
currents: List[float] = field(default_factory=currents_list_factory)
daily_imported: float = 0
daily_exported: float = 0
evse_current: Optional[float] = None
exported: float = 0
fault_str: str = NO_ERROR
fault_state: int = 0
imported: float = 0
phases_in_use: int = 0
plug_state: bool = False
power: float = 0
rfid_timestamp: Optional[float] = None
rfid: Optional[str] = None
soc: Optional[float] = None
soc_timestamp: Optional[int] = None
state_str: Optional[str] = None
voltages: List[float] = field(default_factory=voltages_list_factory)


def ev_factory() -> Ev:
return Ev(0)


def log_factory() -> Log:
return Log()


@dataclass
class Set:
change_ev_permitted: bool = False
charging_ev: int = -1
charging_ev_prev: int = -1
current: float = 0
energy_to_charge: float = 0
loadmanagement_available: bool = True
log: Log = field(default_factory=log_factory)
manual_lock: bool = False
phases_to_use: int = 0
plug_state_prev: bool = False
plug_time: Optional[float] = None
required_power: float = 0
rfid: Optional[str] = None
target_current: float = 0 # Sollstrom aus fest vorgegebener Stromstärke
charging_ev_data: Ev = field(default_factory=ev_factory)


@dataclass
class Config:
configuration: Dict = field(default_factory=empty_dict_factory)
ev: int = 0
name: str = "Standard-Ladepunkt"
type: Optional[str] = None
template: int = 0
connected_phases: int = 3
phase_1: int = 0
auto_phase_switch_hw: bool = False
control_pilot_interruption_hw: bool = False
id: int = 0

def __post_init__(self):
self.event_update_state: threading.Event

@property
def ev(self) -> int:
return self._ev

@ev.setter
def ev(self, ev: int):
self._ev = ev
try:
self.event_update_state.set()
except AttributeError:
pass

def __getstate__(self):
state = self.__dict__.copy()
if state.get('event_update_state'):
del state['event_update_state']
return state

def __setstate__(self, state):
self.__dict__.update(state)


def get_factory() -> Get:
return Get()


def set_factory() -> Set:
return Set()


def config_factory() -> Config:
return Config()


@dataclass
class ChargepointData:
control_parameter: ControlParameter = field(default_factory=control_parameter_factory)
get: Get = field(default_factory=get_factory)
set: Set = field(default_factory=set_factory)
config: Config = field(default_factory=config_factory)

def set_event(self, event: Optional[threading.Event] = None) -> None:
self.event_update_state = event
if event:
self.config.event_update_state = event

def __getstate__(self):
# Copy the object's state from self.__dict__ which contains
# all our instance attributes. Always use the dict.copy()
# method to avoid modifying the original state.
state = self.__dict__.copy()
# Remove the unpicklable entries.
if state.get('event_update_state'):
del state['event_update_state']
return state

def __setstate__(self, state):
# Restore instance attributes (i.e., filename and lineno).
self.__dict__.update(state)


class Chargepoint:
class Chargepoint(ChargepointRfidMixin):
""" geht alle Ladepunkte durch, prüft, ob geladen werden darf und ruft die Funktion des angesteckten Autos auf.
"""
MAX_FAILED_PHASE_SWITCHES = 3
Expand Down Expand Up @@ -487,12 +292,14 @@ def prepare_cp(self) -> Tuple[int, Optional[str]]:
try:
# Für Control-Pilot-Unterbrechung set current merken.
self.set_current_prev = self.data.set.current
self.__validate_rfid()
self._validate_rfid()
charging_possible, message = self.is_charging_possible()
if charging_possible:
if self.data.get.rfid is not None:
self._link_rfid_to_cp()
num, message_ev = self.template.get_ev(self.data.set.rfid, self.data.config.ev)
num, message_ev = self.template.get_ev(self.data.set.rfid,
self.data.get.vehicle_id,
self.data.config.ev)
if message_ev:
message = message_ev
if num != -1:
Expand Down Expand Up @@ -760,81 +567,6 @@ def check_min_max_current(self, required_current: float, phases: int, pv: bool =
self.set_state_and_log(msg)
return required_current

def _link_rfid_to_cp(self) -> None:
""" Wenn der Tag einem EV zugeordnet worden ist, wird der Tag unter set/rfid abgelegt und muss der Timer
zurückgesetzt werden.
"""
rfid = self.data.get.rfid
cp2_num = self.find_duo_partner()
# Tag wird diesem LP der Duo zugewiesen oder es ist keine Duo
if ((cp2_num is not None and
# EV am anderen Ladepunkt, am eigenen wurde zuerst angesteckt
((data.data.cp_data[f"cp{cp2_num}"].data.get.plug_state and
timecheck.get_difference(self.data.set.plug_time,
data.data.cp_data[f"cp{cp2_num}"].data.set.plug_time) < 0) or
# kein EV am anderen Duo-Ladepunkt
data.data.cp_data[f"cp{cp2_num }"].data.get.plug_state is False)) or
# keine Duo
cp2_num is None):
self.data.set.rfid = rfid
Pub().pub("openWB/chargepoint/"+str(self.num)+"/set/rfid", rfid)
self.chargepoint_module.clear_rfid()

self.data.get.rfid = None
Pub().pub("openWB/chargepoint/"+str(self.num)+"/get/rfid", None)
self.data.get.rfid_timestamp = None
Pub().pub(f"openWB/set/chargepoint/{self.num}/get/rfid_timestamp", None)

def __validate_rfid(self) -> None:
"""Prüft, dass der Tag an diesem Ladepunkt gültig ist und dass dieser innerhalb von 5 Minuten einem EV
zugeordnet wird.
"""
msg = ""
if self.data.get.rfid is not None:
if data.data.optional_data.data.rfid.active:
if (self.data.set.log.imported_at_plugtime == 0 or
self.data.set.log.imported_at_plugtime == self.data.get.imported):
rfid = self.data.get.rfid
if self.data.get.rfid_timestamp is None:
self.data.get.rfid_timestamp = timecheck.create_timestamp()
Pub().pub(f"openWB/set/chargepoint/{self.num}/get/rfid_timestamp",
self.data.get.rfid_timestamp)
return
else:
if (timecheck.check_timestamp(self.data.get.rfid_timestamp, 300) or
self.data.get.plug_state is True):
return
else:
self.data.get.rfid_timestamp = None
if rfid in self.template.data.valid_tags or len(self.template.data.valid_tags) == 0:
Pub().pub(f"openWB/set/chargepoint/{self.num}/get/rfid_timestamp", None)
msg = "Es ist in den letzten 5 Minuten kein EV angesteckt worden, dem " \
f"der ID-Tag {rfid} zugeordnet werden kann. Daher wird dieser verworfen."
else:
msg = f"Der ID-Tag {rfid} ist an diesem Ladepunkt nicht gültig."
else:
msg = "Nach Ladestart wird kein anderer ID-Tag akzeptiert."
else:
msg = "Identifikation von Fahrzeugen ist nicht aktiviert."
self.data.get.rfid = None
Pub().pub(f"openWB/set/chargepoint/{self.num}/get/rfid", None)
self.chargepoint_module.clear_rfid()
self.set_state_and_log(msg)

def find_duo_partner(self) -> Optional[int]:
try:
# Wurde ein zweiter Ladepunkt an einer Duo konfiguriert?
if self.data.config.type == "external_openwb" or self.data.config.type == "internal_openwb":
for cp2 in data.data.cp_data.values():
if (cp2.num != self.num and
self.data.config.configuration["ip_address"] == cp2.data.config.configuration[
"ip_address"]):
return cp2.num
return None
except Exception:
log.exception("Fehler in der allgemeinen Ladepunkt-Klasse")
return None

def set_required_currents(self, required_current: float) -> None:
control_parameter = self.data.control_parameter
try:
Expand All @@ -851,10 +583,12 @@ def set_required_currents(self, required_current: float) -> None:
def update_ev(self, ev_list: Dict[str, Ev]) -> None:
# Für Control-Pilot-Unterbrechung set current merken.
self.set_current_prev = self.data.set.current
self.__validate_rfid()
self._validate_rfid()
charging_possible = self.is_charging_possible()[0]
if charging_possible:
vehicle = self.template.get_ev(self.data.get.rfid or self.data.set.rfid, self.data.config.ev)[0]
vehicle = self.template.get_ev(self.data.get.rfid or self.data.set.rfid,
self.data.get.vehicle_id,
self.data.config.ev)[0]
charging_ev = self._get_charging_ev(vehicle, ev_list)
self._pub_connected_vehicle(charging_ev)
else:
Expand Down
Loading