home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-14 10:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

MySensors: Rename Ethernet to TCP

Browse Source
This commit is contained in:
functionpointer
2021-01-23 13:58:43 +01:00
parent 79524b607f
commit 5bc2039890
3 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/mysensors/config_flow.py
View File

@@ -24,9 +24,9 @@ from .const import (
CONF_BAUD_RATE, CONF_BAUD_RATE,
CONF_GATEWAY_TYPE, CONF_GATEWAY_TYPE,
CONF_GATEWAY_TYPE_ALL, CONF_GATEWAY_TYPE_ALL,
CONF_GATEWAY_TYPE_ETHERNET,
CONF_GATEWAY_TYPE_MQTT, CONF_GATEWAY_TYPE_MQTT,
CONF_GATEWAY_TYPE_SERIAL, CONF_GATEWAY_TYPE_SERIAL,
CONF_GATEWAY_TYPE_TCP,
CONF_GATEWAY_TYPE_TYPE, CONF_GATEWAY_TYPE_TYPE,
CONF_PERSISTENCE_FILE, CONF_PERSISTENCE_FILE,
CONF_TCP_PORT, CONF_TCP_PORT,
@@ -128,7 +128,7 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
is_serial_port, user_input[CONF_DEVICE] is_serial_port, user_input[CONF_DEVICE]
) )
except vol.Invalid: except vol.Invalid:
user_input[CONF_GATEWAY_TYPE] = CONF_GATEWAY_TYPE_ETHERNET user_input[CONF_GATEWAY_TYPE] = CONF_GATEWAY_TYPE_TCP
else: else:
user_input[CONF_GATEWAY_TYPE] = CONF_GATEWAY_TYPE_SERIAL user_input[CONF_GATEWAY_TYPE] = CONF_GATEWAY_TYPE_SERIAL
@@ -140,16 +140,13 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
schema[vol.Required(CONF_GATEWAY_TYPE)] = vol.In(CONF_GATEWAY_TYPE_ALL) schema[vol.Required(CONF_GATEWAY_TYPE)] = vol.In(CONF_GATEWAY_TYPE_ALL)
schema = vol.Schema(schema) schema = vol.Schema(schema)
if ( if user_input is not None and CONF_GATEWAY_TYPE in user_input:
user_input is not None
and user_input.get(CONF_GATEWAY_TYPE) in CONF_GATEWAY_TYPE_ALL
):
gw_type = user_input[CONF_GATEWAY_TYPE] gw_type = user_input[CONF_GATEWAY_TYPE]
input_pass = user_input if CONF_DEVICE in user_input else None input_pass = user_input if CONF_DEVICE in user_input else None
if gw_type == CONF_GATEWAY_TYPE_MQTT: if gw_type == CONF_GATEWAY_TYPE_MQTT:
return await self.async_step_gw_mqtt(input_pass) return await self.async_step_gw_mqtt(input_pass)
elif gw_type == CONF_GATEWAY_TYPE_ETHERNET: elif gw_type == CONF_GATEWAY_TYPE_TCP:
return await self.async_step_gw_ethernet(input_pass) return await self.async_step_gw_tcp(input_pass)
elif gw_type == CONF_GATEWAY_TYPE_SERIAL: elif gw_type == CONF_GATEWAY_TYPE_SERIAL:
return await self.async_step_gw_serial(input_pass) return await self.async_step_gw_serial(input_pass)
@@ -178,8 +175,8 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
step_id="gw_serial", data_schema=schema, errors=errors step_id="gw_serial", data_schema=schema, errors=errors
) )
async def async_step_gw_ethernet(self, user_input: Optional[Dict[str, str]] = None): async def async_step_gw_tcp(self, user_input: Optional[Dict[str, str]] = None):
"""Create a config entry for an ethernet gateway.""" """Create a config entry for a tcp gateway."""
errors = {} errors = {}
if user_input is not None: if user_input is not None:
try: try:
@@ -193,9 +190,7 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
errors[CONF_TCP_PORT] = "port_out_of_range" errors[CONF_TCP_PORT] = "port_out_of_range"
errors.update( errors.update(
await self.validate_common( await self.validate_common(CONF_GATEWAY_TYPE_TCP, user_input, errors)
CONF_GATEWAY_TYPE_ETHERNET, user_input, errors
)
) )
if not errors: if not errors:
return self.async_create_entry( return self.async_create_entry(
@@ -208,9 +203,7 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
schema[vol.Optional(CONF_TCP_PORT, default=DEFAULT_TCP_PORT)] = vol.Coerce(int) schema[vol.Optional(CONF_TCP_PORT, default=DEFAULT_TCP_PORT)] = vol.Coerce(int)
schema = vol.Schema(schema) schema = vol.Schema(schema)
return self.async_show_form( return self.async_show_form(step_id="gw_tcp", data_schema=schema, errors=errors)
step_id="gw_ethernet", data_schema=schema, errors=errors
)
async def async_step_gw_mqtt(self, user_input: Optional[Dict[str, str]] = None): async def async_step_gw_mqtt(self, user_input: Optional[Dict[str, str]] = None):
"""Create a config entry for a mqtt gateway.""" """Create a config entry for a mqtt gateway."""
@@ -263,7 +256,7 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
if gw_type != CONF_GATEWAY_TYPE_MQTT: if gw_type != CONF_GATEWAY_TYPE_MQTT:
verification_func = ( verification_func = (
is_socket_address is_socket_address
if gw_type == CONF_GATEWAY_TYPE_ETHERNET if gw_type == CONF_GATEWAY_TYPE_TCP
else is_serial_port else is_serial_port
) )
try: try:
@@ -273,7 +266,7 @@ class MySensorsConfigFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
except vol.Invalid: except vol.Invalid:
errors[CONF_DEVICE] = ( errors[CONF_DEVICE] = (
"invalid_ip" "invalid_ip"
if gw_type == CONF_GATEWAY_TYPE_ETHERNET if gw_type == CONF_GATEWAY_TYPE_TCP
else "invalid_serial" else "invalid_serial"
) )

12
homeassistant/components/mysensors/const.py
View File

@@ -16,16 +16,14 @@ CONF_TOPIC_IN_PREFIX: str = "topic_in_prefix"
CONF_TOPIC_OUT_PREFIX: str = "topic_out_prefix" CONF_TOPIC_OUT_PREFIX: str = "topic_out_prefix"
CONF_VERSION: str = "version" CONF_VERSION: str = "version"
CONF_GATEWAY_TYPE: str = "gateway_type" CONF_GATEWAY_TYPE: str = "gateway_type"
CONF_GATEWAY_TYPE_TYPE = Literal[ CONF_GATEWAY_TYPE_TYPE = Literal["Serial", "TCP", "MQTT"]
"gateway_type_serial", "gateway_type_ethernet", "gateway_type_mqtt" CONF_GATEWAY_TYPE_SERIAL: CONF_GATEWAY_TYPE_TYPE = "Serial"
] CONF_GATEWAY_TYPE_TCP: CONF_GATEWAY_TYPE_TYPE = "TCP"
CONF_GATEWAY_TYPE_SERIAL: CONF_GATEWAY_TYPE_TYPE = "gateway_type_serial" CONF_GATEWAY_TYPE_MQTT: CONF_GATEWAY_TYPE_TYPE = "MQTT"
CONF_GATEWAY_TYPE_ETHERNET: CONF_GATEWAY_TYPE_TYPE = "gateway_type_ethernet"
CONF_GATEWAY_TYPE_MQTT: CONF_GATEWAY_TYPE_TYPE = "gateway_type_mqtt"
CONF_GATEWAY_TYPE_ALL: List[str] = [ CONF_GATEWAY_TYPE_ALL: List[str] = [
CONF_GATEWAY_TYPE_MQTT, CONF_GATEWAY_TYPE_MQTT,
CONF_GATEWAY_TYPE_SERIAL, CONF_GATEWAY_TYPE_SERIAL,
CONF_GATEWAY_TYPE_ETHERNET, CONF_GATEWAY_TYPE_TCP,
] ]

2
homeassistant/components/mysensors/translations/en.json
View File

@@ -26,7 +26,7 @@
}, },
"description": "Choose connection method to the gateway" "description": "Choose connection method to the gateway"
}, },
"gw_ethernet": { "gw_tcp": {
"description": "Ethernet gateway setup", "description": "Ethernet gateway setup",
"data": { "data": {
"device": "IP address of the gateway", "device": "IP address of the gateway",