Skip to content
Merged
Changes from all commits
Commits
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: 7 additions & 2 deletions packages/helpermodules/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def setup_added_chargepoint():
" versetzen.", MessageType.ERROR)
return
chargepoint_config["id"] = new_id
chargepoint_config["name"] = f'{chargepoint_config["name"]} {new_id}'
try:
evu_counter = data.data.counter_all_data.get_id_evu_counter()
data.data.counter_all_data.hierarchy_add_item_below(
Expand Down Expand Up @@ -352,13 +353,14 @@ def removeChargepoint(self, connection_id: str, payload: dict) -> None:
def addChargepointTemplate(self, connection_id: str, payload: dict) -> None:
""" sendet das Topic, zu dem ein neues Ladepunkt-Profil erstellt werden soll.
"""
new_id = self.max_id_chargepoint_template + 1
# check if "payload" contains "data.copy"
if "data" in payload and "copy" in payload["data"]:
new_chargepoint_template = asdict(data.data.cp_template_data[f'cpt{payload["data"]["copy"]}'].data).copy()
new_chargepoint_template["name"] = f'Kopie von {new_chargepoint_template["name"]}'
else:
new_chargepoint_template = get_chargepoint_template_default()
new_id = self.max_id_chargepoint_template + 1
new_chargepoint_template["name"] = f'{new_chargepoint_template["name"]} {new_id}'
new_chargepoint_template["id"] = new_id
Pub().pub(f'openWB/set/chargepoint/template/{new_id}', new_chargepoint_template)
self.max_id_chargepoint_template = self.max_id_chargepoint_template + 1
Expand Down Expand Up @@ -461,6 +463,7 @@ def addChargeTemplate(self, connection_id: str, payload: dict) -> None:
new_charge_template = asdict(new_charge_template)
else:
new_charge_template = get_new_charge_template()
new_charge_template["name"] = f'{new_charge_template["name"]} {new_id}'
new_charge_template["id"] = new_id

Pub().pub("openWB/set/command/max_id/charge_template", new_id)
Expand Down Expand Up @@ -641,13 +644,14 @@ def removeComponent(self, connection_id: str, payload: dict) -> None:
def addEvTemplate(self, connection_id: str, payload: dict) -> None:
""" sendet das Topic, zu dem ein neues Fahrzeug-Profil erstellt werden soll.
"""
new_id = self.max_id_ev_template + 1
# check if "payload" contains "data.copy"
if "data" in payload and "copy" in payload["data"]:
new_ev_template = asdict(data.data.ev_template_data[f"et{payload['data']['copy']}"].data).copy()
new_ev_template["name"] = f'Kopie von {new_ev_template["name"]}'
else:
new_ev_template = dataclass_utils.asdict(EvTemplateData())
new_id = self.max_id_ev_template + 1
new_ev_template["name"] = f'{new_ev_template["name"]} {new_id}'
new_ev_template["id"] = new_id
self.max_id_ev_template = new_id
Pub().pub(f'openWB/set/vehicle/template/ev_template/{new_id}', new_ev_template)
Expand Down Expand Up @@ -676,6 +680,7 @@ def addVehicle(self, connection_id: str, payload: dict) -> None:
"""
new_id = self.max_id_vehicle + 1
vehicle_default = ev.get_vehicle_default()
vehicle_default["name"] = f'{vehicle_default["name"]} {new_id}'
for default in vehicle_default:
Pub().pub(f"openWB/set/vehicle/{new_id}/{default}", vehicle_default[default])
Pub().pub(f"openWB/set/vehicle/{new_id}/soc_module/config", {"type": None, "configuration": {}})
Expand Down