From b7fc537cd5cb68447cbc031628b7488878b375bf Mon Sep 17 00:00:00 2001 From: jan iversen Date: Wed, 19 May 2021 11:39:53 +0200 Subject: [PATCH] Remove non pymodbus_call from modbus.py. (#50813) --- homeassistant/components/modbus/modbus.py | 40 ++++++----------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py index 1a8da35f6fe..943e4a81d54 100644 --- a/homeassistant/components/modbus/modbus.py +++ b/homeassistant/components/modbus/modbus.py @@ -92,12 +92,12 @@ async def async_modbus_setup( service.data[ATTR_HUB] if ATTR_HUB in service.data else DEFAULT_HUB ) if isinstance(value, list): - await hub_collect[client_name].async_write_registers( - unit, address, [int(float(i)) for i in value] + await hub_collect[client_name].async_pymodbus_call( + unit, address, [int(float(i)) for i in value], CALL_TYPE_WRITE_REGISTERS ) else: - await hub_collect[client_name].async_write_register( - unit, address, int(float(value)) + await hub_collect[client_name].async_pymodbus_call( + unit, address, int(float(value)), CALL_TYPE_WRITE_REGISTER ) hass.services.async_register( @@ -116,9 +116,13 @@ async def async_modbus_setup( service.data[ATTR_HUB] if ATTR_HUB in service.data else DEFAULT_HUB ) if isinstance(state, list): - await hub_collect[client_name].async_write_coils(unit, address, state) + await hub_collect[client_name].async_pymodbus_call( + unit, address, state, CALL_TYPE_WRITE_COILS + ) else: - await hub_collect[client_name].async_write_coil(unit, address, state) + await hub_collect[client_name].async_pymodbus_call( + unit, address, state, CALL_TYPE_WRITE_COIL + ) hass.services.async_register( DOMAIN, SERVICE_WRITE_COIL, async_write_coil, schema=service_write_coil_schema @@ -326,27 +330,3 @@ class ModbusHub: return await self.hass.async_add_executor_job( self._pymodbus_call, unit, address, value, use_call ) - - async def async_write_coil(self, unit, address, value) -> bool: - """Write coil.""" - return await self.async_pymodbus_call( - unit, address, value, CALL_TYPE_WRITE_COIL - ) - - async def async_write_coils(self, unit, address, values) -> bool: - """Write coil.""" - return await self.async_pymodbus_call( - unit, address, values, CALL_TYPE_WRITE_COILS - ) - - async def async_write_register(self, unit, address, value) -> bool: - """Write register.""" - return await self.async_pymodbus_call( - unit, address, value, CALL_TYPE_WRITE_REGISTER - ) - - async def async_write_registers(self, unit, address, values) -> bool: - """Write registers.""" - return await self.async_pymodbus_call( - unit, address, values, CALL_TYPE_WRITE_REGISTERS - )