jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-28 07:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move imports to top for modbus (#29515)

Browse Source 
* Move imports to top for modbus

* Include imports for TCP and UDP ModbusClients
This commit is contained in:
springstan 2019-12-06 06:10:29 +01:00 committed by Franck Nijhof
parent 8def0326dd
commit fcf18aca34
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/modbus/__init__.py
View File

@ -2,6 +2,8 @@
import logging
import threading
from pymodbus.client.sync import ModbusSerialClient, ModbusTcpClient, ModbusUdpClient
from pymodbus.transaction import ModbusRtuFramer
import voluptuous as vol
from homeassistant.const import (
@ -91,9 +93,7 @@ def setup_client(client_config):
client_type = client_config[CONF_TYPE]
if client_type == "serial":
from pymodbus.client.sync import ModbusSerialClient as ModbusClient
return ModbusClient(
return ModbusSerialClient(
method=client_config[CONF_METHOD],
port=client_config[CONF_PORT],
baudrate=client_config[CONF_BAUDRATE],
@ -103,27 +103,20 @@ def setup_client(client_config):
timeout=client_config[CONF_TIMEOUT],
)
if client_type == "rtuovertcp":
from pymodbus.client.sync import ModbusTcpClient as ModbusClient
from pymodbus.transaction import ModbusRtuFramer
return ModbusClient(
return ModbusTcpClient(
host=client_config[CONF_HOST],
port=client_config[CONF_PORT],
framer=ModbusRtuFramer,
timeout=client_config[CONF_TIMEOUT],
)
if client_type == "tcp":
from pymodbus.client.sync import ModbusTcpClient as ModbusClient
return ModbusClient(
return ModbusTcpClient(
host=client_config[CONF_HOST],
port=client_config[CONF_PORT],
timeout=client_config[CONF_TIMEOUT],
)
if client_type == "udp":
from pymodbus.client.sync import ModbusUdpClient as ModbusClient
return ModbusClient(
return ModbusUdpClient(
host=client_config[CONF_HOST],
port=client_config[CONF_PORT],
timeout=client_config[CONF_TIMEOUT],

2
homeassistant/components/modbus/climate.py
View File

@ -6,8 +6,8 @@ import voluptuous as vol
from homeassistant.components.climate import PLATFORM_SCHEMA, ClimateDevice
from homeassistant.components.climate.const import (
SUPPORT_TARGET_TEMPERATURE,
HVAC_MODE_AUTO,
SUPPORT_TARGET_TEMPERATURE,
)
from homeassistant.const import (
ATTR_TEMPERATURE,

2
homeassistant/components/modbus/sensor.py
View File

@ -1,8 +1,8 @@
"""Support for Modbus Register sensors."""
import logging
import struct
from typing import Any, Union
import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA