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

Jump to bottom

Fix: Using PhysicalValueType instead of int #19

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Fix: Using PhysicalValueType instead of int #19

Show file tree
Hide file tree
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
25 changes: 8 additions & 17 deletions iso15118/evcc/states/din_spec_states.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
EVSENotification,
SelectedService,
SelectedServiceList,
PVEVTargetCurrentDin,
)
from iso15118.shared.messages.din_spec.body import (
CableCheckReq,
Expand Down Expand Up @@ -60,6 +61,7 @@
IsolationLevel,
Namespace,
Protocol,
UnitSymbol,
)
from iso15118.shared.messages.iso15118_2.msgdef import V2GMessage as V2GMessageV2
from iso15118.shared.messages.iso15118_20.common_types import (
Expand Down Expand Up @@ -199,22 +201,11 @@ async def select_energy_transfer_mode(self):
communication session and reuse for resumed session, otherwise request
from EV controller.
"""
if evcc_settings.RESUME_REQUESTED_ENERGY_MODE:
logger.debug(
"Reusing energy transfer mode "
f"{evcc_settings.RESUME_REQUESTED_ENERGY_MODE} "
"from previously paused session"
)
self.comm_session.selected_energy_mode = (
evcc_settings.RESUME_REQUESTED_ENERGY_MODE
)
evcc_settings.RESUME_REQUESTED_ENERGY_MODE = None
else:
self.comm_session.selected_energy_mode = (
await self.comm_session.ev_controller.get_energy_transfer_mode(
Protocol.DIN_SPEC_70121
)
self.comm_session.selected_energy_mode = (
await self.comm_session.ev_controller.get_energy_transfer_mode(
Protocol.DIN_SPEC_70121
)
)

def select_auth_mode(self, auth_option_list: List[AuthEnum]):
self.comm_session.selected_auth_option = None
Expand Down Expand Up @@ -525,7 +516,7 @@ async def build_pre_charge_req(self) -> PreChargeReq:
pre_charge_req = PreChargeReq(
dc_ev_status=await ev_controller.get_dc_ev_status_dinspec(),
ev_target_voltage=dc_charge_params.dc_target_voltage,
ev_target_current=0,
ev_target_current=PVEVTargetCurrentDin(Value=0, Multiplier=0, unit=UnitSymbol.AMPERE),
)
return pre_charge_req

Expand Down Expand Up @@ -607,7 +598,7 @@ async def build_pre_charge_req(self) -> PreChargeReq:
pre_charge_req = PreChargeReq(
dc_ev_status=await ev_controller.get_dc_ev_status_dinspec(),
ev_target_voltage=dc_charge_params.dc_target_voltage,
ev_target_current=0,
ev_target_current=PVEVTargetCurrentDin(Value=0, Multiplier=0, unit=UnitSymbol.AMPERE),
)
return pre_charge_req

Expand Down
6 changes: 4 additions & 2 deletions iso15118/evcc/states/iso15118_2_states.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
EVSENotification,
SelectedService,
SelectedServiceList,
PVEVTargetCurrent,
)
from iso15118.shared.messages.din_spec.msgdef import V2GMessage as V2GMessageDINSPEC
from iso15118.shared.messages.enums import (
Expand All @@ -38,6 +39,7 @@
IsolationLevel,
Namespace,
Protocol,
UnitSymbol,
)
from iso15118.shared.messages.iso15118_2.body import (
AuthorizationReq,
Expand Down Expand Up @@ -1308,7 +1310,7 @@ async def build_pre_charge_message(self):
pre_charge_req = PreChargeReq(
dc_ev_status=await self.comm_session.ev_controller.get_dc_ev_status(),
ev_target_voltage=charge_params.dc_target_voltage,
ev_target_current=0,
ev_target_current=PVEVTargetCurrent(Value=0, Multiplier=0, unit=UnitSymbol.AMPERE),
)
return pre_charge_req

Expand Down Expand Up @@ -1385,7 +1387,7 @@ async def build_pre_charge_message(self):
pre_charge_req = PreChargeReq(
dc_ev_status=await self.comm_session.ev_controller.get_dc_ev_status(),
ev_target_voltage=charge_params.dc_target_voltage,
ev_target_current=0,
ev_target_current=PVEVTargetCurrent(Value=0, Multiplier=0, unit=UnitSymbol.AMPERE),
)
return pre_charge_req

Expand Down