Modbus remove unnecessary get calls (#31966)
This commit is contained in:
1 parent
0dad2f8e41
commit
32cd58e03d
5 files changed
+66
-66
No files matched your search
@@ -32,8 +32,8 @@ CONF_STATE_ON = "state_on"
|
||||
CONF_VERIFY_REGISTER = "verify_register"
|
||||
CONF_VERIFY_STATE = "verify_state"
|
||||
|
||||
REGISTER_TYPE_HOLDING = "holding"
|
||||
REGISTER_TYPE_INPUT = "input"
|
||||
DEFAULT_REGISTER_TYPE_HOLDING = "holding"
|
||||
DEFAULT_REGISTER_TYPE_INPUT = "input"
|
||||
|
||||
REGISTERS_SCHEMA = vol.Schema(
|
||||
{
|
||||
@@ -42,8 +42,8 @@ REGISTERS_SCHEMA = vol.Schema(
|
||||
vol.Required(CONF_NAME): cv.string,
|
||||
vol.Required(CONF_REGISTER): cv.positive_int,
|
||||
vol.Optional(CONF_HUB, default=DEFAULT_HUB): cv.string,
|
||||
vol.Optional(CONF_REGISTER_TYPE, default=REGISTER_TYPE_HOLDING): vol.In(
|
||||
[REGISTER_TYPE_HOLDING, REGISTER_TYPE_INPUT]
|
||||
vol.Optional(CONF_REGISTER_TYPE, default=DEFAULT_REGISTER_TYPE_HOLDING): vol.In(
|
||||
[DEFAULT_REGISTER_TYPE_HOLDING, DEFAULT_REGISTER_TYPE_INPUT]
|
||||
),
|
||||
vol.Optional(CONF_SLAVE): cv.positive_int,
|
||||
vol.Optional(CONF_STATE_OFF): cv.positive_int,
|
||||
@@ -77,30 +77,30 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
|
||||
"""Read configuration and create Modbus devices."""
|
||||
switches = []
|
||||
if CONF_COILS in config:
|
||||
for coil in config.get(CONF_COILS):
|
||||
hub_name = coil.get(CONF_HUB)
|
||||
for coil in config[CONF_COILS]:
|
||||
hub_name = coil[CONF_HUB]
|
||||
hub = hass.data[MODBUS_DOMAIN][hub_name]
|
||||
switches.append(
|
||||
ModbusCoilSwitch(
|
||||
hub, coil.get(CONF_NAME), coil.get(CONF_SLAVE), coil.get(CONF_COIL)
|
||||
hub, coil[CONF_NAME], coil[CONF_SLAVE], coil[CONF_COIL]
|
||||
)
|
||||
)
|
||||
if CONF_REGISTERS in config:
|
||||
for register in config.get(CONF_REGISTERS):
|
||||
hub_name = register.get(CONF_HUB)
|
||||
for register in config[CONF_REGISTERS]:
|
||||
hub_name = register[CONF_HUB]
|
||||
hub = hass.data[MODBUS_DOMAIN][hub_name]
|
||||
|
||||
switches.append(
|
||||
ModbusRegisterSwitch(
|
||||
hub,
|
||||
register.get(CONF_NAME),
|
||||
register[CONF_NAME],
|
||||
register.get(CONF_SLAVE),
|
||||
register.get(CONF_REGISTER),
|
||||
register.get(CONF_COMMAND_ON),
|
||||
register.get(CONF_COMMAND_OFF),
|
||||
register.get(CONF_VERIFY_STATE),
|
||||
register[CONF_REGISTER],
|
||||
register[CONF_COMMAND_ON],
|
||||
register[CONF_COMMAND_OFF],
|
||||
register[CONF_VERIFY_STATE],
|
||||
register.get(CONF_VERIFY_REGISTER),
|
||||
register.get(CONF_REGISTER_TYPE),
|
||||
register[CONF_REGISTER_TYPE],
|
||||
register.get(CONF_STATE_ON),
|
||||
register.get(CONF_STATE_OFF),
|
||||
)
|
||||
@@ -242,7 +242,7 @@ class ModbusRegisterSwitch(ModbusCoilSwitch):
|
||||
"""Set switch on."""
|
||||
|
||||
# Only holding register is writable
|
||||
if self._register_type == REGISTER_TYPE_HOLDING:
|
||||
if self._register_type == DEFAULT_REGISTER_TYPE_HOLDING:
|
||||
self._write_register(self._command_on)
|
||||
if not self._verify_state:
|
||||
self._is_on = True
|
||||
@@ -251,7 +251,7 @@ class ModbusRegisterSwitch(ModbusCoilSwitch):
|
||||
"""Set switch off."""
|
||||
|
||||
# Only holding register is writable
|
||||
if self._register_type == REGISTER_TYPE_HOLDING:
|
||||
if self._register_type == DEFAULT_REGISTER_TYPE_HOLDING:
|
||||
self._write_register(self._command_off)
|
||||
if not self._verify_state:
|
||||
self._is_on = False
|
||||
@@ -282,7 +282,7 @@ class ModbusRegisterSwitch(ModbusCoilSwitch):
|
||||
|
||||
def _read_register(self) -> Optional[int]:
|
||||
try:
|
||||
if self._register_type == REGISTER_TYPE_INPUT:
|
||||
if self._register_type == DEFAULT_REGISTER_TYPE_INPUT:
|
||||
result = self._hub.read_input_registers(self._slave, self._register, 1)
|
||||
else:
|
||||
result = self._hub.read_holding_registers(
|
||||
|
||||
Reference in new issue
Block a user