Skip to content

Fix Solis #1990

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

Merged
LKuemmel merged 4 commits into from
Nov 7, 2024
Merged

Fix Solis #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f479935
Solis: fix modbus address for SOC
the2masters Nov 1, 2024
9d7c9f1
Solis: read all registers as input registers
the2masters Nov 1, 2024
d10355f
Solis: Fix for unreachable local variables
the2masters Nov 1, 2024
82dffab
Review
LKuemmel Nov 7, 2024
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
10 changes: 5 additions & 5 deletions packages/modules/devices/solis/solis/bat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ def __init__(self, component_config: SolisBatSetup) -> None:
def update(self, client: ModbusTcpClient_) -> None:
unit = self.component_config.configuration.modbus_id

power = client.read_holding_registers(33149, ModbusDataType.INT_32, unit=unit) * -1
soc = client.read_holding_registers(31038, ModbusDataType.UINT_16, unit=unit)
power = client.read_input_registers(33149, ModbusDataType.INT_32, unit=unit) * -1
soc = client.read_input_registers(33139, ModbusDataType.UINT_16, unit=unit)
# Geladen in kWh
imported = client.read_holding_registers(33161, ModbusDataType.UINT_32, unit=unit) * 1000
# Entladen in kWh * 0,1
exported = client.read_holding_registers(33165, ModbusDataType.UINT_32, unit=unit) * 100
imported = client.read_input_registers(33161, ModbusDataType.UINT_32, unit=unit) * 1000
# Entladen in kWh
exported = client.read_input_registers(33165, ModbusDataType.UINT_32, unit=unit) * 1000

bat_state = BatState(
power=power,
Expand Down
15 changes: 8 additions & 7 deletions packages/modules/devices/solis/solis/counter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ def __init__(self, component_config: SolisCounterSetup,

def update(self, client: ModbusTcpClient_):
unit = self.component_config.configuration.modbus_id

register_offset = 30000
if self.version == SolisVersion.inverter:
register_offset = -1
elif self.version == SolisVersion.hybrid:
register_offset = 30000
power = client.read_holding_registers(3263 + register_offset, ModbusDataType.INT_32, unit=unit)
powers = client.read_holding_registers(3257 + register_offset, [ModbusDataType.INT_32]*3, unit=unit)
frequency = client.read_holding_registers(3282 + register_offset, ModbusDataType.UINT_16, unit=unit) / 100
imported = client.read_holding_registers(3283 + register_offset, ModbusDataType.UINT_32, unit=unit) * 10
exported = client.read_holding_registers(3285 + register_offset, ModbusDataType.UINT_32, unit=unit) * 10

power = client.read_input_registers(3263 + register_offset, ModbusDataType.INT_32, unit=unit)
powers = client.read_input_registers(3257 + register_offset, [ModbusDataType.INT_32]*3, unit=unit)
frequency = client.read_input_registers(3282 + register_offset, ModbusDataType.UINT_16, unit=unit) / 100
imported = client.read_input_registers(3283 + register_offset, ModbusDataType.UINT_32, unit=unit) * 10
exported = client.read_input_registers(3285 + register_offset, ModbusDataType.UINT_32, unit=unit) * 10

counter_state = CounterState(
imported=imported,
Expand Down
10 changes: 4 additions & 6 deletions packages/modules/devices/solis/solis/inverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ def update(self, client: ModbusTcpClient_) -> None:
unit = self.component_config.configuration.modbus_id

if self.version == SolisVersion.inverter:
power = client.read_holding_registers(3004, ModbusDataType.UINT_32, unit=unit) * -1
# Unit 1kWh
exported = client.read_holding_registers(3008, ModbusDataType.UINT_32, unit=unit) * 1000
power = client.read_input_registers(3004, ModbusDataType.UINT_32, unit=unit) * -1
exported = client.read_input_registers(3008, ModbusDataType.UINT_32, unit=unit) * 1000
elif self.version == SolisVersion.hybrid:
power = client.read_holding_registers(33057, ModbusDataType.UINT_32, unit=unit) * -1
# Unit 1kWh
exported = client.read_holding_registers(33029, ModbusDataType.UINT_32, unit=unit) * 1000
power = client.read_input_registers(33057, ModbusDataType.UINT_32, unit=unit) * -1
exported = client.read_input_registers(33029, ModbusDataType.UINT_32, unit=unit) * 1000

inverter_state = InverterState(
power=power,
Expand Down