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

Allow connection to rfxtrx using tcp (#28297)

Browse Source
This commit is contained in:
foxy82 2019-11-20 02:11:17 +00:00 committed by Charles Garwood
parent 6db4e975e3
commit 9fd6afc5fb
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
homeassistant/components/rfxtrx/__init__.py
View File

@ -12,6 +12,8 @@ from homeassistant.const import (
ATTR_STATE, ATTR_STATE,
CONF_DEVICE, CONF_DEVICE,
CONF_DEVICES, CONF_DEVICES,
CONF_HOST,
CONF_PORT,
EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_START,
EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_STOP,
POWER_WATT, POWER_WATT,
@ -80,17 +82,21 @@ RFX_DEVICES = {}
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
DATA_RFXOBJECT = "rfxobject" DATA_RFXOBJECT = "rfxobject"
CONFIG_SCHEMA = vol.Schema( BASE_SCHEMA = vol.Schema(
{ {
DOMAIN: vol.Schema(
{
vol.Required(CONF_DEVICE): cv.string,
vol.Optional(CONF_DEBUG, default=False): cv.boolean, vol.Optional(CONF_DEBUG, default=False): cv.boolean,
vol.Optional(CONF_DUMMY, default=False): cv.boolean, vol.Optional(CONF_DUMMY, default=False): cv.boolean,
} }
) )
},
extra=vol.ALLOW_EXTRA, DEVICE_SCHEMA = BASE_SCHEMA.extend({vol.Required(CONF_DEVICE): cv.string})
PORT_SCHEMA = BASE_SCHEMA.extend(
{vol.Required(CONF_PORT): cv.port, vol.Optional(CONF_HOST): cv.string}
)
CONFIG_SCHEMA = vol.Schema(
{DOMAIN: vol.Any(DEVICE_SCHEMA, PORT_SCHEMA)}, extra=vol.ALLOW_EXTRA
) )
@ -115,7 +121,9 @@ def setup(hass, config):
for subscriber in RECEIVED_EVT_SUBSCRIBERS: for subscriber in RECEIVED_EVT_SUBSCRIBERS:
subscriber(event) subscriber(event)
device = config[DOMAIN][ATTR_DEVICE] device = config[DOMAIN].get(ATTR_DEVICE)
host = config[DOMAIN].get(CONF_HOST)
port = config[DOMAIN].get(CONF_PORT)
debug = config[DOMAIN][ATTR_DEBUG] debug = config[DOMAIN][ATTR_DEBUG]
dummy_connection = config[DOMAIN][ATTR_DUMMY] dummy_connection = config[DOMAIN][ATTR_DUMMY]
@ -123,6 +131,14 @@ def setup(hass, config):
rfx_object = rfxtrxmod.Connect( rfx_object = rfxtrxmod.Connect(
device, None, debug=debug, transport_protocol=rfxtrxmod.DummyTransport2 device, None, debug=debug, transport_protocol=rfxtrxmod.DummyTransport2
) )
elif port is not None:
# If port is set then we create a TCP connection
rfx_object = rfxtrxmod.Connect(
(host, port),
None,
debug=debug,
transport_protocol=rfxtrxmod.PyNetworkTransport,
)
else: else:
rfx_object = rfxtrxmod.Connect(device, None, debug=debug) rfx_object = rfxtrxmod.Connect(device, None, debug=debug)

2
homeassistant/components/rfxtrx/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Rfxtrx", "name": "Rfxtrx",
"documentation": "https://www.home-assistant.io/integrations/rfxtrx", "documentation": "https://www.home-assistant.io/integrations/rfxtrx",
"requirements": [ "requirements": [
"pyRFXtrx==0.23" "pyRFXtrx==0.24"
], ],
"dependencies": [], "dependencies": [],
"codeowners": [ "codeowners": [

2
requirements_all.txt
View File

@ -1073,7 +1073,7 @@ pyHS100==0.3.5
pyMetno==0.4.6 pyMetno==0.4.6
# homeassistant.components.rfxtrx # homeassistant.components.rfxtrx
pyRFXtrx==0.23 pyRFXtrx==0.24
# homeassistant.components.switchmate # homeassistant.components.switchmate
# pySwitchmate==0.4.6 # pySwitchmate==0.4.6

2
requirements_test_all.txt
View File

@ -371,7 +371,7 @@ pyHS100==0.3.5
pyMetno==0.4.6 pyMetno==0.4.6
# homeassistant.components.rfxtrx # homeassistant.components.rfxtrx
pyRFXtrx==0.23 pyRFXtrx==0.24
# homeassistant.components.nextbus # homeassistant.components.nextbus
py_nextbusnext==0.1.4 py_nextbusnext==0.1.4