Upstream
/
esphome
mirror of https://github.com/esphome/esphome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix rebase misstake

This commit is contained in:
Jimmy Hedman 2024-03-29 20:59:43 +01:00
parent bf10947789
commit a60344dd10
No known key found for this signature in database
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
esphome/components/network/__init__.py
View File

@ -64,25 +64,6 @@ async def to_code(config):
cg.add_define("USE_NETWORK_IPV6", config[CONF_ENABLE_IPV6])
cg.add_define(
"USE_NETWORK_MIN_IPV6_ADDR_COUNT", config[CONF_MIN_IPV6_ADDR_COUNT]
hosts = []
if CONF_HOSTS in config:
hosts = [
(host[CONF_NAME], IPAddress(host[CONF_IP_ADDRESS]))
for host in config[CONF_HOSTS]
]
if CONF_HOSTSFILE in config:
hosts_contents = helpers.read_file(
CORE.relative_config_path(config[CONF_HOSTSFILE])
)
hosts.extend(parse_hosts_file(hosts_contents))
map_ = cg.std_ns.class_("multimap").template(cg.std_string, IPAddress)
cg.new_Pvariable(config[CONF_NETWORK_ID], map_(hosts))
cg.add_define("ENABLE_IPV6", config[CONF_ENABLE_IPV6])
if CORE.using_esp_idf:
add_idf_sdkconfig_option("CONFIG_LWIP_IPV6", config[CONF_ENABLE_IPV6])
add_idf_sdkconfig_option(
"CONFIG_LWIP_IPV6_AUTOCONFIG", config[CONF_ENABLE_IPV6]
)
if CORE.using_esp_idf:
add_idf_sdkconfig_option("CONFIG_LWIP_IPV6", config[CONF_ENABLE_IPV6])
@ -97,3 +78,17 @@ async def to_code(config):
cg.add_build_flag("-DPIO_FRAMEWORK_ARDUINO_ENABLE_IPV6")
if CORE.is_esp8266:
cg.add_build_flag("-DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_LOW_MEMORY")
hosts = []
if CONF_HOSTS in config:
hosts = [
(host[CONF_NAME], IPAddress(host[CONF_IP_ADDRESS]))
for host in config[CONF_HOSTS]
]
if CONF_HOSTSFILE in config:
hosts_contents = helpers.read_file(
CORE.relative_config_path(config[CONF_HOSTSFILE])
)
hosts.extend(parse_hosts_file(hosts_contents))
map_ = cg.std_ns.class_("multimap").template(cg.std_string, IPAddress)
cg.new_Pvariable(config[CONF_NETWORK_ID], map_(hosts))