Skip to content

Commit

Permalink
flaked the code
Browse files Browse the repository at this point in the history
  • Loading branch information
tropxy committed Feb 7, 2025
1 parent 07946b5 commit d68d903
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 17 deletions.
8 changes: 0 additions & 8 deletions iso15118/secc/controller/evse_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@
from typing import Optional, Union

from iso15118.secc.controller.common import Limits, UnknownEnergyService
from iso15118.shared.messages.datatypes import DCEVSEChargeParameter
from iso15118.shared.messages.enums import (
ControlMode,
EnergyTransferModeEnum,
ServiceV20,
)
from iso15118.shared.messages.iso15118_2.datatypes import ACEVSEChargeParameter
from iso15118.shared.messages.iso15118_20.ac import (
ACChargeParameterDiscoveryRes,
ACChargeParameterDiscoveryResParams,
BPTACChargeParameterDiscoveryResParams,
)
from iso15118.shared.messages.iso15118_20.common_messages import ScheduleExchangeRes
from iso15118.shared.messages.iso15118_20.dc import (
BPTDCChargeParameterDiscoveryResParams,
Expand Down
8 changes: 4 additions & 4 deletions iso15118/secc/controller/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -919,14 +919,14 @@ async def get_evse_max_current_limit(
logger.debug(f"Active Session Limits: {session_limits.ac_limits}")
ac_limits = session_limits.ac_limits
if ac_limits.max_charge_power > 0:
logger.info(f"Applying a Charging limit")
logger.info("Applying a Charging limit")
total_power_limit: float = ac_limits.max_charge_power
if ac_limits.max_charge_power_l2:
total_power_limit += ac_limits.max_charge_power_l2
if ac_limits.max_charge_power_l3:
total_power_limit += ac_limits.max_charge_power_l3
elif ac_limits.max_discharge_power and ac_limits.max_discharge_power > 0:
logger.info(f"Applying a Discharging limit")
logger.info("Applying a Discharging limit")
total_power_limit = (-1) * ac_limits.max_discharge_power
if ac_limits.max_discharge_power_l2:
total_power_limit -= ac_limits.max_discharge_power_l2
Expand Down Expand Up @@ -957,10 +957,10 @@ async def get_evse_max_current_limit(
logger.debug(f"Active Session Limits: {session_limits.dc_limits}")
max_discharge_current = session_limits.dc_limits.max_discharge_current
if max_discharge_current and max_discharge_current > 0:
logger.info(f"Applying a Discharging limit")
logger.info("Applying a Discharging limit")
current_limit = (-1) * session_limits.dc_limits.max_discharge_current
else:
logger.info(f"Applying a Charging limit")
logger.info("Applying a Charging limit")
current_limit = session_limits.dc_limits.max_charge_current
logger.debug(f"Active EVSEMaxCurrentLimit: {current_limit}")
exponent, value = PhysicalValue.get_exponent_value_repr(current_limit)
Expand Down
5 changes: 0 additions & 5 deletions tests/shared/messages/test_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,6 @@ async def test_get_evse_present_and_nominal_voltage_are_0(
evse_controller_interface.evse_data_context.current_type = CurrentType.AC
evse_controller_interface.evse_data_context.present_voltage = 0
evse_controller_interface.evse_data_context.nominal_voltage = 0
expected_limit = PVEVSEMaxCurrent(
multiplier=0,
value=100,
unit=UnitSymbol.AMPERE,
)
with pytest.raises(ValueError):
await evse_controller_interface.get_evse_max_current_limit()

Expand Down

0 comments on commit d68d903

Please sign in to comment.