Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-21 11:37:27 +01:00
Code Issues Projects Releases Wiki Activity

Support setting manual_ip under networks option (#2839)

Browse Source
This commit is contained in:
Oxan van Leeuwen 2021-12-01 20:55:27 +01:00 committed by GitHub
parent 11330af05f
commit f58828cb82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
esphome/components/wifi/__init__.py
View File

@ -221,10 +221,22 @@ def _validate(config):
raise cv.Invalid("Fast connect can only be used with one network!")
if CONF_USE_ADDRESS not in config:
use_address = CORE.name + config[CONF_DOMAIN]
if CONF_MANUAL_IP in config:
use_address = str(config[CONF_MANUAL_IP][CONF_STATIC_IP])
else:
use_address = CORE.name + config[CONF_DOMAIN]
elif CONF_NETWORKS in config:
ips = set(
str(net[CONF_MANUAL_IP][CONF_STATIC_IP])
for net in config[CONF_NETWORKS]
if CONF_MANUAL_IP in net
)
if len(ips) > 1:
raise cv.Invalid(
"Must specify use_address when using multiple static IP addresses."
)
if len(ips) == 1:
use_address = next(iter(ips))
config[CONF_USE_ADDRESS] = use_address
return config
@ -334,7 +346,8 @@ async def to_code(config):
cg.add(var.set_use_address(config[CONF_USE_ADDRESS]))
for network in config.get(CONF_NETWORKS, []):
cg.add(var.add_sta(wifi_network(network, config.get(CONF_MANUAL_IP))))
ip_config = network.get(CONF_MANUAL_IP, config.get(CONF_MANUAL_IP))
cg.add(var.add_sta(wifi_network(network, ip_config)))
if CONF_AP in config:
conf = config[CONF_AP]

4
tests/test5.yaml
View File

@ -16,6 +16,10 @@ wifi:
networks:
- ssid: 'MySSID'
password: 'password1'
manual_ip:
static_ip: 192.168.1.23
gateway: 192.168.1.1
subnet: 255.255.255.0
api: