sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

Rename extra_libraries to libraries

Browse Source
This commit is contained in:
Otto Winter
2018-11-26 13:25:26 +01:00
parent 1d9f4bfe24
commit 34bd837ff1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphomeyaml/const.py
View File

@@ -377,7 +377,7 @@ CONF_OUTPUTS = 'outputs'
CONF_SWITCHES = 'switches' CONF_SWITCHES = 'switches'
CONF_TEXT_SENSORS = 'text_sensors' CONF_TEXT_SENSORS = 'text_sensors'
CONF_INCLUDES = 'includes' CONF_INCLUDES = 'includes'
CONF_EXTRA_LIBRARIES = 'extra_libraries' CONF_LIBRARIES = 'libraries'
ALLOWED_NAME_CHARS = u'abcdefghijklmnopqrstuvwxyz0123456789_' ALLOWED_NAME_CHARS = u'abcdefghijklmnopqrstuvwxyz0123456789_'
ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git#feature/stage' ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git#feature/stage'

8
esphomeyaml/core_config.py
View File

@@ -11,7 +11,7 @@ from esphomeyaml.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266
CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, CONF_LOCAL, CONF_NAME, CONF_ON_BOOT, \ CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, CONF_LOCAL, CONF_NAME, CONF_ON_BOOT, \
CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, CONF_PRIORITY, CONF_REPOSITORY, CONF_TAG, \ CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, CONF_PRIORITY, CONF_REPOSITORY, CONF_TAG, \
CONF_TRIGGER_ID, CONF_USE_CUSTOM_CODE, ESPHOMELIB_VERSION, ESP_PLATFORM_ESP32, \ CONF_TRIGGER_ID, CONF_USE_CUSTOM_CODE, ESPHOMELIB_VERSION, ESP_PLATFORM_ESP32, \
ESP_PLATFORM_ESP8266, CONF_EXTRA_LIBRARIES, CONF_INCLUDES ESP_PLATFORM_ESP8266, CONF_LIBRARIES, CONF_INCLUDES
from esphomeyaml.core import CORE, EsphomeyamlError from esphomeyaml.core import CORE, EsphomeyamlError
from esphomeyaml.cpp_generator import Pvariable, RawExpression, add from esphomeyaml.cpp_generator import Pvariable, RawExpression, add
from esphomeyaml.cpp_types import App, NoArg, const_char_ptr, esphomelib_ns from esphomeyaml.cpp_types import App, NoArg, const_char_ptr, esphomelib_ns
@@ -176,7 +176,7 @@ CONFIG_SCHEMA = vol.Schema({
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(LoopTrigger), cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(LoopTrigger),
}), }),
vol.Optional(CONF_INCLUDES): vol.All(cv.ensure_list, [cv.file_]), vol.Optional(CONF_INCLUDES): vol.All(cv.ensure_list, [cv.file_]),
vol.Optional(CONF_EXTRA_LIBRARIES): vol.All(cv.ensure_list, [cv.string_strict]), vol.Optional(CONF_LIBRARIES): vol.All(cv.ensure_list, [cv.string_strict]),
vol.Optional('library_uri'): cv.invalid("The library_uri option has been removed in 1.8.0 and " vol.Optional('library_uri'): cv.invalid("The library_uri option has been removed in 1.8.0 and "
"was moved into the esphomelib_version option."), "was moved into the esphomelib_version option."),
@@ -227,7 +227,7 @@ def to_code(config):
def lib_deps(config): def lib_deps(config):
return set(config.get(CONF_EXTRA_LIBRARIES, [])) return set(config.get(CONF_LIBRARIES, []))
def includes(config): def includes(config):
@@ -235,5 +235,5 @@ def includes(config):
for include in config.get(CONF_INCLUDES, []): for include in config.get(CONF_INCLUDES, []):
path = CORE.relative_path(include) path = CORE.relative_path(include)
res = os.path.relpath(path, CORE.relative_build_path('src', 'main.cpp')) res = os.path.relpath(path, CORE.relative_build_path('src', 'main.cpp'))
ret.append(res) ret.append(u'#include "{}"'.format(res))
return ret return ret