Skip to content

Commit

Permalink
fix return types
Browse files Browse the repository at this point in the history
  • Loading branch information
@LavermanJJ
LavermanJJ committed Jun 20, 2022
1 parent b6ca181 commit 12d9bdc
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 27 deletions.
2 changes: 1 addition & 1 deletion cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


def run(host):
client = ModbusClient(host="172.16.1.17", port=PORT)
client = ModbusClient(host, port=PORT)
client.connect()

solarfocus = sf.SolarfocusAPI(client)
Expand Down
60 changes: 34 additions & 26 deletions pysolarfocus/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Python client lib for Solarfocus"""
__version__ = "1.1.1"
__version__ = "1.1.2"


from .const import (
Expand Down Expand Up @@ -45,27 +45,27 @@ def hc1_room_temp(self) -> float:
@property
def hc1_humidity(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_input_regs.get("HC_1_HUMIDITY")["value"]
return int(self._heating_circuit_input_regs.get("HC_1_HUMIDITY")["value"])

@property
def hc1_limit_thermostat(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_input_regs.get("HC_1_LIMIT_THERMOSTAT")["value"]
return int(self._heating_circuit_input_regs.get("HC_1_LIMIT_THERMOSTAT")["value"])

@property
def hc1_circulator_pump(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_input_regs.get("HC_1_CIRCULATOR_PUMP")["value"]
return int(self._heating_circuit_input_regs.get("HC_1_CIRCULATOR_PUMP")["value"])

@property
def hc1_mixer_valve(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_input_regs.get("HC_1_MIXER_VALVE")["value"]
return int(self._heating_circuit_input_regs.get("HC_1_MIXER_VALVE")["value"])

@property
def hc1_state(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_input_regs.get('HC_1_STATE')['value']
return int(self._heating_circuit_input_regs.get('HC_1_STATE')['value'])
#return HEATING_STATE.get(value, "UNKOWN")

@property
Expand All @@ -86,13 +86,13 @@ def bu1_pump(self) -> int:
@property
def bu1_state(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._buffer_input_regs.get("BU_1_STATE")["value"]
return int(self._buffer_input_regs.get("BU_1_STATE")["value"])
# return BUFFER_STATE.get(value, "UNKOWN")

@property
def bu1_mode(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._buffer_input_regs.get("BU_1_MODE")["value"]
return int(self._buffer_input_regs.get("BU_1_MODE")["value"])
# return BUFFER_MODE.get(value, "UNKOWN")

@property
Expand All @@ -103,13 +103,13 @@ def bo1_temp(self) -> float:
@property
def bo1_state(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._boiler_input_regs.get("BO_1_STATE")["value"]
return int(self._boiler_input_regs.get("BO_1_STATE")["value"])
# return BOILER_STATE.get(value, "UNKOWN")

@property
def bo1_mode(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._boiler_input_regs.get("BO_1_MODE")["value"]
return int(self._boiler_input_regs.get("BO_1_MODE")["value"])
# return BOILER_MODE.get(value, "UNKOWN")

@property
Expand All @@ -125,29 +125,29 @@ def hp_return_temp(self) -> float:
@property
def hp_flow_rate(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_input_regs.get("FLOW_RATE")["value"]
return int(self._heatpump_input_regs.get("FLOW_RATE")["value"])

@property
def hp_compressor_speed(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_input_regs.get("COMPRESSOR_SPEED")["value"]
return int(self._heatpump_input_regs.get("COMPRESSOR_SPEED")["value"])

@property
def hp_evu_lock_active(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_input_regs.get("EVU_LOCK_ACTIVE")["value"]
return int(self._heatpump_input_regs.get("EVU_LOCK_ACTIVE")["value"])
# return EVU_LOCK.get(value, "UNKNOWN")

@property
def hp_defrost_active(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_input_regs.get("DEFROST_ACTIVE")["value"]
return int(self._heatpump_input_regs.get("DEFROST_ACTIVE")["value"])
# return DEFROST.get(value, "UNKNOWN")

@property
def hp_boiler_charge(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_input_regs.get("BOILER_CHARGE")["value"]
return int(self._heatpump_input_regs.get("BOILER_CHARGE")["value"])
# return BOILER_CHARGE.get(value, "UNKNOWN")

@property
Expand Down Expand Up @@ -255,12 +255,12 @@ def hc1_target_temperatur(self) -> float:
@property
def hc1_cooling(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_holding_regs.get("COOLING")["value"]
return int(self._heating_circuit_holding_regs.get("COOLING")["value"])

@property
def hc1_mode_holding(self) -> float:
def hc1_mode_holding(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heating_circuit_holding_regs.get("MODE")["value"]
return int(self._heating_circuit_holding_regs.get("MODE")["value"])

@property
def hc1_target_room_temperatur(self) -> float:
Expand Down Expand Up @@ -291,27 +291,27 @@ def bo1_target_temperatur(self) -> float:
@property
def bo1_single_charge(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._boiler_holding_regs.get("SINGLE_CHARGE")["value"]
return int(self._boiler_holding_regs.get("SINGLE_CHARGE")["value"])

@property
def bo1_mode_holding(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._boiler_holding_regs.get("MODE")["value"]
return int(self._boiler_holding_regs.get("MODE")["value"])

@property
def bo1_ciruclation(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._boiler_holding_regs.get("CIRCULATION")["value"]
return int(self._boiler_holding_regs.get("CIRCULATION")["value"])

@property
def hp_evu_lock(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_holding_regs.get("EVU_LOCK")["value"]
return int(self._heatpump_holding_regs.get("EVU_LOCK")["value"])

@property
def hp_smart_grid(self) -> int:
"""Supply temperature of heating circuit 1"""
return self._heatpump_holding_regs.get("SMART_GRID")["value"]
return int(self._heatpump_holding_regs.get("SMART_GRID")["value"])

@property
def hp_outdoor_temperature_external(self) -> float:
Expand Down Expand Up @@ -550,11 +550,18 @@ def _update_holding(self, holding_reg) -> bool:
try:
for i in holding_reg:
_entry = holding_reg[i]
results = self._conn.read_holding_registers(
_value = self._conn.read_holding_registers(
address=_entry["addr"]
).registers
_entry["value"] = results[0] / _entry["multiplier"]
).registers[0]

# Datatype
if _entry["type"] is INT:
_value = self._unsigned_to_signed(_value, _entry["count"] * 2)

# Scale
_value *= _entry["multiplier"]

_entry["value"] = _value
except AttributeError:
# The unit does not reply reliably
ret = False
Expand Down Expand Up @@ -599,6 +606,7 @@ def _parse_registers(self, input_reg, result_reg):
# Store
input_reg[i]["value"] = _value


def _unsigned_to_signed(self, n, byte_count):
return int.from_bytes(
n.to_bytes(byte_count, "little", signed=False), "little", signed=True
Expand Down

0 comments on commit 12d9bdc

Please sign in to comment.