Update ordering (#21377)
This commit is contained in:
1 parent
2ada0ecfd9
commit
3732d75633
5 files changed
+119
-152
No files matched your search
@@ -4,27 +4,34 @@ import threading
|
||||
|
||||
import voluptuous as vol
|
||||
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.const import (
|
||||
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP,
|
||||
CONF_HOST, CONF_METHOD, CONF_NAME, CONF_PORT, CONF_TYPE, CONF_TIMEOUT,
|
||||
ATTR_STATE)
|
||||
|
||||
DOMAIN = 'modbus'
|
||||
ATTR_STATE, CONF_HOST, CONF_METHOD, CONF_NAME, CONF_PORT, CONF_TIMEOUT,
|
||||
CONF_TYPE, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
|
||||
REQUIREMENTS = ['pymodbus==1.5.2']
|
||||
|
||||
CONF_HUB = 'hub'
|
||||
# Type of network
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_ADDRESS = 'address'
|
||||
ATTR_HUB = 'hub'
|
||||
ATTR_UNIT = 'unit'
|
||||
ATTR_VALUE = 'value'
|
||||
|
||||
CONF_BAUDRATE = 'baudrate'
|
||||
CONF_BYTESIZE = 'bytesize'
|
||||
CONF_STOPBITS = 'stopbits'
|
||||
CONF_HUB = 'hub'
|
||||
CONF_PARITY = 'parity'
|
||||
CONF_STOPBITS = 'stopbits'
|
||||
|
||||
DEFAULT_HUB = 'default'
|
||||
DOMAIN = 'modbus'
|
||||
|
||||
SERVICE_WRITE_COIL = 'write_coil'
|
||||
SERVICE_WRITE_REGISTER = 'write_register'
|
||||
|
||||
BASE_SCHEMA = vol.Schema({
|
||||
vol.Optional(CONF_NAME, default=DEFAULT_HUB): cv.string
|
||||
vol.Optional(CONF_NAME, default=DEFAULT_HUB): cv.string,
|
||||
})
|
||||
|
||||
SERIAL_SCHEMA = BASE_SCHEMA.extend({
|
||||
@@ -49,16 +56,6 @@ CONFIG_SCHEMA = vol.Schema({
|
||||
DOMAIN: vol.All(cv.ensure_list, [vol.Any(SERIAL_SCHEMA, ETHERNET_SCHEMA)])
|
||||
}, extra=vol.ALLOW_EXTRA,)
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
SERVICE_WRITE_REGISTER = 'write_register'
|
||||
SERVICE_WRITE_COIL = 'write_coil'
|
||||
|
||||
ATTR_ADDRESS = 'address'
|
||||
ATTR_HUB = 'hub'
|
||||
ATTR_UNIT = 'unit'
|
||||
ATTR_VALUE = 'value'
|
||||
|
||||
SERVICE_WRITE_REGISTER_SCHEMA = vol.Schema({
|
||||
vol.Optional(ATTR_HUB, default=DEFAULT_HUB): cv.string,
|
||||
vol.Required(ATTR_UNIT): cv.positive_int,
|
||||
@@ -109,14 +106,13 @@ def setup_client(client_config):
|
||||
|
||||
def setup(hass, config):
|
||||
"""Set up Modbus component."""
|
||||
# Modbus connection type
|
||||
hass.data[DOMAIN] = hub_collect = {}
|
||||
|
||||
for client_config in config[DOMAIN]:
|
||||
client = setup_client(client_config)
|
||||
name = client_config[CONF_NAME]
|
||||
hub_collect[name] = ModbusHub(client, name)
|
||||
_LOGGER.debug('Setting up hub: %s', client_config)
|
||||
_LOGGER.debug("Setting up hub: %s", client_config)
|
||||
|
||||
def stop_modbus(event):
|
||||
"""Stop Modbus service."""
|
||||
@@ -139,24 +135,20 @@ def setup(hass, config):
|
||||
schema=SERVICE_WRITE_COIL_SCHEMA)
|
||||
|
||||
def write_register(service):
|
||||
"""Write modbus registers."""
|
||||
"""Write Modbus registers."""
|
||||
unit = int(float(service.data.get(ATTR_UNIT)))
|
||||
address = int(float(service.data.get(ATTR_ADDRESS)))
|
||||
value = service.data.get(ATTR_VALUE)
|
||||
client_name = service.data.get(ATTR_HUB)
|
||||
if isinstance(value, list):
|
||||
hub_collect[client_name].write_registers(
|
||||
unit,
|
||||
address,
|
||||
[int(float(i)) for i in value])
|
||||
unit, address, [int(float(i)) for i in value])
|
||||
else:
|
||||
hub_collect[client_name].write_register(
|
||||
unit,
|
||||
address,
|
||||
int(float(value)))
|
||||
unit, address, int(float(value)))
|
||||
|
||||
def write_coil(service):
|
||||
"""Write modbus coil."""
|
||||
"""Write Modbus coil."""
|
||||
unit = service.data.get(ATTR_UNIT)
|
||||
address = service.data.get(ATTR_ADDRESS)
|
||||
state = service.data.get(ATTR_STATE)
|
||||
@@ -172,7 +164,7 @@ class ModbusHub:
|
||||
"""Thread safe wrapper class for pymodbus."""
|
||||
|
||||
def __init__(self, modbus_client, name):
|
||||
"""Initialize the modbus hub."""
|
||||
"""Initialize the Modbus hub."""
|
||||
self._client = modbus_client
|
||||
self._lock = threading.Lock()
|
||||
self._name = name
|
||||
@@ -196,52 +188,36 @@ class ModbusHub:
|
||||
"""Read coils."""
|
||||
with self._lock:
|
||||
kwargs = {'unit': unit} if unit else {}
|
||||
return self._client.read_coils(
|
||||
address,
|
||||
count,
|
||||
**kwargs)
|
||||
return self._client.read_coils(address, count, **kwargs)
|
||||
|
||||
def read_input_registers(self, unit, address, count):
|
||||
"""Read input registers."""
|
||||
with self._lock:
|
||||
kwargs = {'unit': unit} if unit else {}
|
||||
return self._client.read_input_registers(
|
||||
address,
|
||||
count,
|
||||
**kwargs)
|
||||
address, count, **kwargs)
|
||||
|
||||
def read_holding_registers(self, unit, address, count):
|
||||
"""Read holding registers."""
|
||||
with self._lock:
|
||||
kwargs = {'unit': unit} if unit else {}
|
||||
return self._client.read_holding_registers(
|
||||
address,
|
||||
count,
|
||||
**kwargs)
|
||||
address, count, **kwargs)
|
||||
|
||||
def write_coil(self, unit, address, value):
|
||||
"""Write coil."""
|
||||
with self._lock:
|
||||
kwargs = {'unit': unit} if unit else {}
|
||||
self._client.write_coil(
|
||||
address,
|
||||
value,
|
||||
**kwargs)
|
||||
self._client.write_coil(address, value, **kwargs)
|
||||
|
||||
def write_register(self, unit, address, value):
|
||||
"""Write register."""
|
||||
with self._lock:
|
||||
kwargs = {'unit': unit} if unit else {}
|
||||
self._client.write_register(
|
||||
address,
|
||||
value,
|
||||
**kwargs)
|
||||
self._client.write_register(address, value, **kwargs)
|
||||
|
||||
def write_registers(self, unit, address, values):
|
||||
"""Write registers."""
|
||||
with self._lock:
|
||||
kwargs = {'unit': unit} if unit else {}
|
||||
self._client.write_registers(
|
||||
address,
|
||||
values,
|
||||
**kwargs)
|
||||
self._client.write_registers(address, values, **kwargs)
|
||||
Reference in new issue
Block a user