Skip to content

Commit

Permalink
Merge branch 'main' into power-control-block
Browse files Browse the repository at this point in the history
  • Loading branch information
@WillCodeForCats
WillCodeForCats committed Sep 10, 2023
2 parents c29efbb + ddf936b commit e7e8631
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 39 deletions.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ body:
required: true
- label: My configuration follows https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki/Configuration
required: true
- label: This issue is not about a template error (template errors should not be reported as an issue, read https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki/Template-Design-Notes)
required: true
- type: textarea
id: additional-context
attributes:
label: Additional Context
description: Add any other context about the problem here.
description: Add any other context about the problem here.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ After rebooting Home Assistant, this integration can be configured through the i
[WillCodeForCats/solaredge-modbus-multi/wiki](https://github.com/WillCodeForCats/solaredge-modbus-multi/wiki)

### Required Versions
* Home Assistant 2023.8.0 or newer
* Home Assistant 2023.9.1 or newer
* Python 3.11 or newer
* pymodbus 3.3.1 or newer
* pymodbus 3.5.1 or newer

## Specifications
[WillCodeForCats/solaredge-modbus-multi/tree/main/doc](https://github.com/WillCodeForCats/solaredge-modbus-multi/tree/main/doc)
Expand Down
40 changes: 20 additions & 20 deletions custom_components/solaredge_modbus_multi/hub.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ async def init_device(self) -> None:
)

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers, byteorder=Endian.Big
inverter_data.registers, byteorder=Endian.BIG
)

self.decoded_common = OrderedDict(
Expand Down Expand Up @@ -782,7 +782,7 @@ async def init_device(self) -> None:
)

decoder = BinaryPayloadDecoder.fromRegisters(
mmppt_common.registers, byteorder=Endian.Big
mmppt_common.registers, byteorder=Endian.BIG
)

self.decoded_mmppt = OrderedDict(
Expand Down Expand Up @@ -846,7 +846,7 @@ async def read_modbus_data(self) -> None:
)

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers, byteorder=Endian.Big
inverter_data.registers, byteorder=Endian.BIG
)

self.decoded_model = OrderedDict(
Expand Down Expand Up @@ -925,7 +925,7 @@ async def read_modbus_data(self) -> None:
)

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers, byteorder=Endian.Big
inverter_data.registers, byteorder=Endian.BIG
)

if self.decoded_mmppt["mmppt_Units"] in [2, 3]:
Expand Down Expand Up @@ -1011,8 +1011,8 @@ async def read_modbus_data(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)

self.decoded_model.update(
Expand Down Expand Up @@ -1051,8 +1051,8 @@ async def read_modbus_data(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)

self.decoded_model.update(
Expand Down Expand Up @@ -1091,8 +1091,8 @@ async def read_modbus_data(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)

self.decoded_model.update(
Expand Down Expand Up @@ -1129,8 +1129,8 @@ async def read_modbus_data(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)

self.decoded_model.update(
Expand Down Expand Up @@ -1181,8 +1181,8 @@ async def read_modbus_data(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
inverter_data.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)

self.decoded_storage_control = OrderedDict(
Expand Down Expand Up @@ -1299,7 +1299,7 @@ async def init_device(self) -> None:
raise ModbusReadError(meter_info)

decoder = BinaryPayloadDecoder.fromRegisters(
meter_info.registers, byteorder=Endian.Big
meter_info.registers, byteorder=Endian.BIG
)
self.decoded_common = OrderedDict(
[
Expand Down Expand Up @@ -1364,7 +1364,7 @@ async def read_modbus_data(self) -> None:
)

decoder = BinaryPayloadDecoder.fromRegisters(
meter_data.registers, byteorder=Endian.Big
meter_data.registers, byteorder=Endian.BIG
)

self.decoded_model = OrderedDict(
Expand Down Expand Up @@ -1524,8 +1524,8 @@ async def init_device(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
battery_info.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)
self.decoded_common = OrderedDict(
[
Expand Down Expand Up @@ -1620,8 +1620,8 @@ async def read_modbus_data(self) -> None:

decoder = BinaryPayloadDecoder.fromRegisters(
battery_data.registers,
byteorder=Endian.Big,
wordorder=Endian.Little,
byteorder=Endian.BIG,
wordorder=Endian.LITTLE,
)

self.decoded_model = OrderedDict(
Expand Down
4 changes: 2 additions & 2 deletions custom_components/solaredge_modbus_multi/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"iot_class": "local_polling",
"issue_tracker": "https://github.com/WillCodeForCats/solaredge-modbus-multi/issues",
"loggers": ["custom_components.solaredge_modbus_multi"],
"requirements": ["pymodbus>=3.3.1"],
"version": "2.4.4-pre.1"
"requirements": ["pymodbus==3.5.1"],
"version": "2.4.5"
}
18 changes: 9 additions & 9 deletions custom_components/solaredge_modbus_multi/number.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def native_value(self) -> float | None:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=57350, payload=builder.to_registers()
Expand Down Expand Up @@ -208,7 +208,7 @@ def native_value(self) -> float | None:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=57352, payload=builder.to_registers()
Expand Down Expand Up @@ -259,7 +259,7 @@ def native_value(self) -> int | None:

async def async_set_native_value(self, value: int) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_uint(int(value))
await self._platform.write_registers(
address=57355, payload=builder.to_registers()
Expand Down Expand Up @@ -310,7 +310,7 @@ def native_value(self) -> float | None:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=57358, payload=builder.to_registers()
Expand Down Expand Up @@ -361,7 +361,7 @@ def native_value(self) -> float | None:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=57360, payload=builder.to_registers()
Expand Down Expand Up @@ -415,7 +415,7 @@ def native_value(self) -> float | None:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=57346, payload=builder.to_registers()
Expand Down Expand Up @@ -472,7 +472,7 @@ def native_value(self) -> float | None:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=57362, payload=builder.to_registers()
Expand Down Expand Up @@ -525,7 +525,7 @@ def native_value(self) -> int:

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_16bit_uint(int(value))
await self._platform.write_registers(
address=61441, payload=builder.to_registers()
Expand Down Expand Up @@ -579,7 +579,7 @@ def native_value(self):

async def async_set_native_value(self, value: float) -> None:
_LOGGER.debug(f"set {self.unique_id} to {value}")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_float(float(value))
await self._platform.write_registers(
address=61442, payload=builder.to_registers()
Expand Down
4 changes: 2 additions & 2 deletions custom_components/solaredge_modbus_multi/switch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def is_on(self) -> bool | None:

async def async_turn_on(self, **kwargs: Any) -> None:
_LOGGER.debug(f"set {self.unique_id} to 0x1")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_int(0x1)
await self._platform.write_registers(
address=61762, payload=builder.to_registers()
Expand All @@ -223,7 +223,7 @@ async def async_turn_on(self, **kwargs: Any) -> None:

async def async_turn_off(self, **kwargs: Any) -> None:
_LOGGER.debug(f"set {self.unique_id} to 0x0")
builder = BinaryPayloadBuilder(byteorder=Endian.Big, wordorder=Endian.Little)
builder = BinaryPayloadBuilder(byteorder=Endian.BIG, wordorder=Endian.LITTLE)
builder.add_32bit_int(0x0)
await self._platform.write_registers(
address=61762, payload=builder.to_registers()
Expand Down
2 changes: 1 addition & 1 deletion hacs.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SolarEdge Modbus Multi",
"content_in_root": false,
"homeassistant": "2023.8.0",
"homeassistant": "2023.9.1",
"render_readme": false
}
2 changes: 1 addition & 1 deletion info.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ Read more on the wiki: [WillCodeForCats/solaredge-modbus-multi/wiki](https://git
* Supports status and error reporting sensors.
* User friendly configuration through Config Flow.

Requires Home Assistant 2023.8.0 and newer.
Requires Home Assistant 2023.9.1 and newer.
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pymodbus>=3.3.1
pymodbus==3.5.1

0 comments on commit e7e8631

Please sign in to comment.