thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-06-13 08:03:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add ESP32 Ethernet Support (#301)

Browse Source 
* Fix

* Build flags

* Fix
This commit is contained in:
Otto Winter
2019-01-05 20:47:33 +01:00
committed by GitHub
parent 3f4bba57f4
commit e72ef9e061
6 changed files with 98 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphomeyaml/config.py
+2 -3
View File
@@ -79,7 +79,6 @@ def _path_begins_with_(path, other): # type: (ConfigPath, ConfigPath) -> bool
def _path_begins_with(path, other): # type: (ConfigPath, ConfigPath) -> bool
ret = _path_begins_with_(path, other)
# print('_path_begins_with({}, {}) -> {}'.format(path, other, ret))
return ret
@@ -262,7 +261,7 @@ def validate_config(config):
success = True
conflicts_with = getattr(component, 'CONFLICTS_WITH', [])
for conflict in conflicts_with:
if conflict not in config:
if conflict in config:
result.add_error(u"Component {} cannot be used together with component {}"
u"".format(domain, conflict), [domain])
success = False
@@ -317,7 +316,7 @@ def validate_config(config):
success = True
conflicts_with = getattr(platform, 'CONFLICTS_WITH', [])
for conflict in conflicts_with:
if conflict not in config:
if conflict in config:
result.add_error(u"Platform {} cannot be used together with component {}"
u"".format(p_domain, conflict), [domain, i])
success = False