Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/modules/common/sdm.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def get_power(self) -> Tuple[List[float], float]:
power = sum(powers)
return powers, power

def get_voltages(self) -> Tuple[List[float], float]:
def get_voltages(self) -> List[float]:
# client handler
time.sleep(0.1)
return self.client.read_input_registers(0x00, [ModbusDataType.FLOAT_32]*3, unit=self.id)
Expand Down
21 changes: 14 additions & 7 deletions packages/modules/internal_chargepoint_handler/clients.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@

BUS_SOURCES = ("/dev/ttyUSB0", "/dev/ttyUSB1", "/dev/ttyACM0", "/dev/serial0")

METERS = Union[mpm3pm.Mpm3pm, sdm.Sdm630_72, b23.B23]
meter_config = NamedTuple("meter_config", [('type', METERS), ('modbus_id', int)])
MeterClient = Union[mpm3pm.Mpm3pm, sdm.Sdm630_72, b23.B23]
MeterType = Union[type[mpm3pm.Mpm3pm], type[sdm.Sdm630_72], type[b23.B23]]
meter_config = NamedTuple("meter_config", [('type', MeterType), ('modbus_id', int)])
CP0_METERS = [meter_config(mpm3pm.Mpm3pm, modbus_id=5),
meter_config(sdm.Sdm630_72, modbus_id=105),
meter_config(b23.B23, modbus_id=201)]
Expand Down Expand Up @@ -64,18 +65,24 @@ def _evse_factory(self, client: Union[ModbusSerialClient_, ModbusTcpClient_], ev
@staticmethod
def find_meter_client(meters: List[meter_config],
client: Union[ModbusSerialClient_, ModbusTcpClient_],
fault_state: FaultState) -> METERS:
fault_state: FaultState) -> Optional[MeterClient]:
for meter_type, modbus_id in meters:
try:
with client:
meter_client = meter_type(modbus_id, client, fault_state)
if meter_client.get_voltages()[0] > 200:
meter_client: MeterClient = meter_type(modbus_id, client, fault_state)
voltages = meter_client.get_voltages()
if voltages[0] > 200:
with ModifyLoglevelContext(log, logging.DEBUG):
log.debug("Verbauter Zähler: "+str(meter_type)+" mit Modbus-ID: "+str(modbus_id))
return meter_client
else:
with ModifyLoglevelContext(log, logging.DEBUG):
log.debug(f"Zähler {meter_type} mit Modbus-ID:{modbus_id} antwortet, "
f"aber Spannung ist nicht plausibel: {voltages}.")
except Exception:
log.debug(client)
log.debug(f"Zähler {meter_type} mit Modbus-ID:{modbus_id} antwortet nicht.")
with ModifyLoglevelContext(log, logging.DEBUG):
log.debug(client)
log.debug(f"Zähler {meter_type} mit Modbus-ID:{modbus_id} antwortet nicht.")
else:
return None

Expand Down
Loading