Skip to content

Commit b7a16f9

Browse files
Merge pull request #823 from WillCodeForCats/code-quality
Update some error and debug messages
2 parents b9d5a21 + be8454d commit b7a16f9

File tree

1 file changed

+7
-6
lines changed
  • custom_components/solaredge_modbus_multi

1 file changed

+7
-6
lines changed

custom_components/solaredge_modbus_multi/hub.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -531,30 +531,31 @@ async def modbus_read_holding_registers(self, unit, address, rcount):
531531

532532
if type(result) is ExceptionResponse:
533533
if result.exception_code == ModbusExceptions.IllegalAddress:
534-
_LOGGER.debug(f"Unit {unit} Read IllegalAddress: {result}")
534+
_LOGGER.debug(f"I{unit} Read IllegalAddress: {result}")
535535
raise ModbusIllegalAddress(result)
536536

537537
if result.exception_code == ModbusExceptions.IllegalFunction:
538-
_LOGGER.debug(f"Unit {unit} Read IllegalFunction: {result}")
538+
_LOGGER.debug(f"I{unit} Read IllegalFunction: {result}")
539539
raise ModbusIllegalFunction(result)
540540

541541
if result.exception_code == ModbusExceptions.IllegalValue:
542-
_LOGGER.debug(f"Unit {unit} Read IllegalValue: {result}")
542+
_LOGGER.debug(f"I{unit} Read IllegalValue: {result}")
543543
raise ModbusIllegalValue(result)
544544

545545
raise ModbusReadError(result)
546546

547547
_LOGGER.debug(
548-
f"Registers received requested : {len(result.registers)} {self._rr_count}"
548+
f"I{self._rr_unit}: Registers received requested : "
549+
f"{len(result.registers)} {self._rr_count}"
549550
)
550551

551552
if len(result.registers) != rcount:
552553
_LOGGER.error(
553-
"Registers received != requested : "
554+
"I{self._rr_unit}: Registers received != requested : "
554555
f"{len(result.registers)} != {self._rr_count}"
555556
)
556557
raise ModbusReadError(
557-
f"Registers received != requested on inverter ID {self._rr_count}"
558+
f"I{self._rr_unit}: Registers received != requested from inverter."
558559
)
559560

560561
return result

0 commit comments

Comments
 (0)