onkelbeh/esphome_kamstrup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename esphomeyaml to esphome (#426)

Browse Source 
* Rename

* Update

* Add migration

* Fix

* Fix dashboard

* Change test

* Fixes

* Code cleanup

* Fix import order

* Update

* Automate docker builds

* Shellcheck
This commit is contained in:
Otto Winter 2019-02-13 16:54:02 +01:00 committed by GitHub
parent 1b8d242505
commit 3d9301a0f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
234 changed files with 1869 additions and 2000 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.github/ISSUE_TEMPLATE/bug_report.md vendored
View File

@ -1,49 +0,0 @@
---
name: Bug report
about: Create a report to help esphomelib improve
---
<!-- Thanks for reporting a bug for this project. READ THIS FIRST:
- Please make sure to submit issues in the right GitHub repository, if unsure just post it here:
- esphomeyaml [here] - This is mostly for reporting bugs when compiling and when you get a long stack trace while compiling or if a configuration fails to validate.
- esphomelib [https://github.com/OttoWinter/esphomelib] - Report bugs there if the ESP is crashing or a feature is not working as expected.
- esphomedocs [https://github.com/OttoWinter/esphomedocs] - Report bugs there if the documentation is wrong/outdated.
- Provide as many details as possible. Paste logs, configuration sample and code into the backticks (```).
DO NOT DELETE ANY TEXT from this template! Otherwise the issue may be closed without a comment.
-->
**Operating environment (Hass.io/Docker/pip/etc.):**
<!--
Please provide details about your environment.
-->
**ESP (ESP32/ESP8266/Board/Sonoff):**
<!--
Please provide details about which ESP you're using.
-->
**Affected component:**
<!--
Please add the link to the documentation at https://esphomelib.com/esphomeyaml/index.html of the component in question.
-->
**Description of problem:**
**Problem-relevant YAML-configuration entries:**
```yaml
PASTE YAML FILE HERE
```
**Traceback (if applicable):**
<!--
Please copy the traceback here if compilation is failing. If possible, also connect to the ESP and copy its logs into the backticks.
-->
```
```
**Additional information:**

21
.github/ISSUE_TEMPLATE/feature_request.md vendored
View File

@ -1,21 +0,0 @@
---
name: Feature request
about: Suggest an idea for this project
---
<!-- READ THIS FIRST:
- This is for feature requests only, if you want to have a certain new sensor/module supported, please use the "new integration" template.
- Please be as descriptive as possible, especially use-cases that can otherwise not be solved boost the problem's priority.
DO NOT DELETE ANY TEXT from this template! Otherwise the issue may be closed without a comment.
-->
**Is your feature request related to a problem/use-case? Please describe.**
<!-- A clear and concise description of what the problem is. -->
**Describe the solution you'd like:**
<!-- A description of what you want to happen. -->
**Additional context:**
<!-- Add any other context about the feature request here. -->

13
.github/ISSUE_TEMPLATE/new-integration.md vendored
View File

@ -1,13 +0,0 @@
---
name: New integration
about: Suggest a new integration for esphomelib
---
DO NOT POST NEW INTEGRATION REQUESTS HERE!
Please post all new integration requests in the esphomelib repository:
https://github.com/OttoWinter/esphomelib/issues
Thank you!

4
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -3,8 +3,8 @@
**Related issue (if applicable):** fixes <link to issue> **Related issue (if applicable):** fixes <link to issue>
**Pull request in [esphomedocs](https://github.com/OttoWinter/esphomedocs) with documentation (if applicable):** OttoWinter/esphomedocs#<esphomedocs PR number goes here> **Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here>
**Pull request in [esphomelib](https://github.com/OttoWinter/esphomelib) with C++ framework changes (if applicable):** OttoWinter/esphomelib#<esphomelib PR number goes here> **Pull request in [esphome-core](https://github.com/esphome/esphome-core) with C++ framework changes (if applicable):** esphome/esphome-core#<esphome-core PR number goes here>
## Checklist: ## Checklist:
- [ ] The code change is tested and works locally. - [ ] The code change is tested and works locally.

2
.gitignore vendored
View File

@ -105,4 +105,4 @@ venv.bak/
config/ config/
tests/build/ tests/build/
tests/.esphomeyaml/ tests/.esphome/

241
.gitlab-ci.yml
View File

@ -15,7 +15,7 @@ stages:
- pip install -e . - pip install -e .
tags: tags:
- python2.7 - python2.7
- esphomeyaml-lint - esphome-lint
.test: &test .test: &test
stage: test stage: test
@ -23,7 +23,7 @@ stages:
- pip install -e . - pip install -e .
tags: tags:
- python2.7 - python2.7
- esphomeyaml-test - esphome-test
variables: variables:
TZ: UTC TZ: UTC
@ -39,253 +39,34 @@ stages:
flake8: flake8:
<<: *lint <<: *lint
script: script:
- flake8 esphomeyaml - flake8 esphome
pylint: pylint:
<<: *lint <<: *lint
script: script:
- pylint esphomeyaml - pylint esphome
test1: test1:
<<: *test <<: *test
script: script:
- esphomeyaml tests/test1.yaml compile - esphome tests/test1.yaml compile
test2: test2:
<<: *test <<: *test
script: script:
- esphomeyaml tests/test2.yaml compile - esphome tests/test2.yaml compile
.build-hassio: &build-hassio test3:
<<: *docker-builder <<: *test
stage: build
script: script:
- docker run --rm --privileged hassioaddons/qemu-user-static:latest - esphome tests/test3.yaml compile
- BUILD_FROM=hassioaddons/ubuntu-base-${ADDON_ARCH}:2.2.1
- ADDON_VERSION="${CI_COMMIT_TAG#v}"
- ADDON_VERSION="${ADDON_VERSION:-${CI_COMMIT_SHA:0:7}}"
- echo "Build from ${BUILD_FROM}"
- echo "Add-on version ${ADDON_VERSION}"
- echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:dev"
- echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
- |
docker build \
--build-arg "BUILD_FROM=${BUILD_FROM}" \
--build-arg "BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ")" \
--build-arg "BUILD_ARCH=${ADDON_ARCH}" \
--build-arg "BUILD_REF=${CI_COMMIT_SHA}" \
--build-arg "BUILD_VERSION=${ADDON_VERSION}" \
--tag "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:dev" \
--tag "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
--file "docker/Dockerfile.hassio" \
.
- |
if [ "${DO_PUSH:-true}" = true ]; then
echo "Pushing to CI registry"
docker push ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}
docker push ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:dev
fi
# Generic deploy template
.deploy-release: &deploy-release
<<: *docker-builder
stage: deploy
script:
- version="${CI_COMMIT_TAG#v}"
- echo "Publishing release version ${version}"
- docker pull "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
- docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
- echo "Tag ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- echo "Tag ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
- docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
- echo "Tag ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
- |
docker tag \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}" \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
- docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
- echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- |
docker tag \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}" \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
only:
- /^v\d+\.\d+\.\d+$/
except:
- /^(?!master).+@/
.deploy-beta: &deploy-beta
<<: *docker-builder
stage: deploy
script:
- version="${CI_COMMIT_TAG#v}"
- echo "Publishing beta version ${version}"
- docker pull "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
- docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
- echo "Tag ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- echo "Tag ${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- |
docker tag \
"${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
- echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- |
docker tag \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}" \
"ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
- docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
only:
- /^v\d+\.\d+\.\d+b\d+$/
except:
- /^(?!rc).+@/
# Build jobs # Build jobs
build:normal: build:normal:
<<: *docker-builder <<: *docker-builder
stage: build stage: build
script: script:
- docker build -t "${CI_REGISTRY}/ottowinter/esphomeyaml:dev" . - docker build -t "${CI_REGISTRY}/esphome/esphome:dev" .
.build-hassio-edge: &build-hassio-edge
<<: *build-hassio
except:
- /^v\d+\.\d+\.\d+$/
- /^v\d+\.\d+\.\d+b\d+$/
.build-hassio-release: &build-hassio-release
<<: *build-hassio
only:
- /^v\d+\.\d+\.\d+$/
- /^v\d+\.\d+\.\d+b\d+$/
build:hassio-armhf-edge:
<<: *build-hassio-edge
variables:
ADDON_ARCH: armhf
DO_PUSH: "false"
build:hassio-armhf:
<<: *build-hassio-release
variables:
ADDON_ARCH: armhf
#build:hassio-aarch64-edge:
# <<: *build-hassio-edge
# variables:
# ADDON_ARCH: aarch64
# DO_PUSH: "false"
#build:hassio-aarch64:
# <<: *build-hassio-release
# variables:
# ADDON_ARCH: aarch64
build:hassio-i386-edge:
<<: *build-hassio-edge
variables:
ADDON_ARCH: i386
DO_PUSH: "false"
build:hassio-i386:
<<: *build-hassio-release
variables:
ADDON_ARCH: i386
build:hassio-amd64-edge:
<<: *build-hassio-edge
variables:
ADDON_ARCH: amd64
DO_PUSH: "false"
build:hassio-amd64:
<<: *build-hassio-release
variables:
ADDON_ARCH: amd64
# Deploy jobs
deploy-release:armhf:
<<: *deploy-release
variables:
ADDON_ARCH: armhf
deploy-beta:armhf:
<<: *deploy-beta
variables:
ADDON_ARCH: armhf
#deploy-release:aarch64:
# <<: *deploy-release
# variables:
# ADDON_ARCH: aarch64
#deploy-beta:aarch64:
# <<: *deploy-beta
# variables:
# ADDON_ARCH: aarch64
deploy-release:i386:
<<: *deploy-release
variables:
ADDON_ARCH: i386
deploy-beta:i386:
<<: *deploy-beta
variables:
ADDON_ARCH: i386
deploy-release:amd64:
<<: *deploy-release
variables:
ADDON_ARCH: amd64
deploy-beta:amd64:
<<: *deploy-beta
variables:
ADDON_ARCH: amd64
.deploy-pypi: &deploy-pypi .deploy-pypi: &deploy-pypi
stage: deploy stage: deploy
@ -297,7 +78,7 @@ deploy-beta:amd64:
- twine upload dist/* - twine upload dist/*
tags: tags:
- python2.7 - python2.7
- esphomeyaml-test - esphome-test
deploy-release:pypi: deploy-release:pypi:
<<: *deploy-pypi <<: *deploy-pypi

18
.travis.yml
View File

@ -8,24 +8,24 @@ matrix:
env: TARGET=Lint2.7 env: TARGET=Lint2.7
install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow
script: script:
- flake8 esphomeyaml - flake8 esphome
- pylint esphomeyaml - pylint esphome
- python: "3.5.3" - python: "3.5.3"
env: TARGET=Lint3.5 env: TARGET=Lint3.5
install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 pillow install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 pillow
script: script:
- flake8 esphomeyaml - flake8 esphome
- pylint esphomeyaml - pylint esphome
- python: "2.7" - python: "2.7"
env: TARGET=Test2.7 env: TARGET=Test2.7
install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow
script: script:
- esphomeyaml tests/test1.yaml compile - esphome tests/test1.yaml compile
- esphomeyaml tests/test2.yaml compile - esphome tests/test2.yaml compile
- esphomeyaml tests/test3.yaml compile - esphome tests/test3.yaml compile
#- python: "3.5.3" #- python: "3.5.3"
# env: TARGET=Test3.5 # env: TARGET=Test3.5
# install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 pillow # install: pip install -U https://github.com/platformio/platformio-core/archive/develop.zip && pip install -e . && pip install flake8==3.6.0 pylint==2.2.2 pillow
# script: # script:
# - esphomeyaml tests/test1.yaml compile # - esphome tests/test1.yaml compile
# - esphomeyaml tests/test2.yaml compile # - esphome tests/test2.yaml compile

10
CONTRIBUTING.md
View File

@ -1,16 +1,16 @@
# Contributing to esphomeyaml # Contributing to ESPHome
esphomeyaml is a part of esphomelib and is responsible for reading in YAML configuration files, This python project is responsible for reading in YAML configuration files,
converting them to C++ code. This code is then converted to a platformio project and compiled converting them to C++ code. This code is then converted to a platformio project and compiled
with [esphomelib](https://github.com/OttoWinter/esphomelib), the C++ framework behind the project. with [esphome-core](https://github.com/esphome/esphome-core), the C++ framework behind the project.
For a detailed guide, please see https://esphomelib.com/esphomeyaml/guides/contributing.html#contributing-to-esphomeyaml For a detailed guide, please see https://esphome.io/guides/contributing.html#contributing-to-esphomeyaml
Things to note when contributing: Things to note when contributing:
- Please test your changes :) - Please test your changes :)
- If a new feature is added or an existing user-facing feature is changed, you should also - If a new feature is added or an existing user-facing feature is changed, you should also
update the [docs](https://github.com/OttoWinter/esphomedocs). See [contributing to esphomedocs](https://esphomelib.com/esphomeyaml/guides/contributing.html#contributing-to-esphomedocs) update the [docs](https://github.com/esphome/esphome-docs). See [contributing to esphome-docs](https://esphome.io/guides/contributing.html#contributing-to-esphomedocs)
for more information. for more information.
- Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files - Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files
which checks if your new feature compiles correctly. which checks if your new feature compiles correctly.

28
Dockerfile
View File

@ -1,28 +0,0 @@
ARG BUILD_FROM=python:2.7
FROM ${BUILD_FROM}
MAINTAINER Otto Winter <contact@otto-winter.com>
RUN apt-get update && apt-get install -y \
git \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* && \
pip install --no-cache-dir --no-binary :all: platformio && \
platformio settings set enable_telemetry No && \
platformio settings set check_libraries_interval 1000000 && \
platformio settings set check_platformio_interval 1000000 && \
platformio settings set check_platforms_interval 1000000
ENV ESPHOMEYAML_OTA_HOST_PORT=6123
EXPOSE 6123
VOLUME /config
WORKDIR /usr/src/app
COPY docker/platformio.ini /pio/platformio.ini
RUN platformio run -d /pio; rm -rf /pio
COPY . .
RUN pip install --no-cache-dir --no-binary :all: -e . && \
pip install --no-cache-dir pillow
WORKDIR /config
ENTRYPOINT ["esphomeyaml"]
CMD ["/config", "dashboard"]

32
MANIFEST.in
View File

@ -1,17 +1,17 @@
include README.md include README.md
include esphomeyaml/dashboard/templates/index.html include esphome/dashboard/templates/index.html
include esphomeyaml/dashboard/templates/login.html include esphome/dashboard/templates/login.html
include esphomeyaml/dashboard/static/ace.js include esphome/dashboard/static/ace.js
include esphomeyaml/dashboard/static/esphomeyaml.css include esphome/dashboard/static/esphome.css
include esphomeyaml/dashboard/static/esphomeyaml.js include esphome/dashboard/static/esphome.js
include esphomeyaml/dashboard/static/favicon.ico include esphome/dashboard/static/favicon.ico
include esphomeyaml/dashboard/static/jquery.min.js include esphome/dashboard/static/jquery.min.js
include esphomeyaml/dashboard/static/jquery.validate.min.js include esphome/dashboard/static/jquery.validate.min.js
include esphomeyaml/dashboard/static/jquery-ui.min.js include esphome/dashboard/static/jquery-ui.min.js
include esphomeyaml/dashboard/static/materialize.min.css include esphome/dashboard/static/materialize.min.css
include esphomeyaml/dashboard/static/materialize.min.js include esphome/dashboard/static/materialize.min.js
include esphomeyaml/dashboard/static/materialize-stepper.min.css include esphome/dashboard/static/materialize-stepper.min.css
include esphomeyaml/dashboard/static/materialize-stepper.min.js include esphome/dashboard/static/materialize-stepper.min.js
include esphomeyaml/dashboard/static/mode-yaml.js include esphome/dashboard/static/mode-yaml.js
include esphomeyaml/dashboard/static/theme-dreamweaver.js include esphome/dashboard/static/theme-dreamweaver.js
include esphomeyaml/dashboard/static/ext-searchbox.js include esphome/dashboard/static/ext-searchbox.js

39
README.md
View File

@ -1,38 +1,3 @@
# esphomeyaml for [esphomelib](https://github.com/OttoWinter/esphomelib) # ESPHome
### Getting Started Guide: https://esphomelib.com/esphomeyaml/guides/getting_started_command_line.html # TODO
### Available Components: https://esphomelib.com/esphomeyaml/index.html
esphomeyaml is the solution for your ESP8266/ESP32 projects with Home Assistant. It allows you to create **custom firmwares** for your microcontrollers with no programming experience required. All you need to know is the YAML configuration format which is also used by [Home Assistant](https://www.home-assistant.io).
esphomeyaml will:
* Read your configuration file and warn you about potential errors (like using the invalid pins.)
* Create a custom C++ sketch file for you using esphomeyaml's powerful C++ generation engine.
* Compile the sketch file for you using [platformio](http://platformio.org/).
* Upload the binary to your ESP via Over the Air updates.
* Automatically start remote logs via MQTT.
And all of that with a single command 🎉:
```bash
esphomeyaml configuration.yaml run
```
## Features
* **No programming experience required:** just edit YAML configuration
files like you're used to with Home Assistant.
* **Flexible:** Use [esphomelib](https://github.com/OttoWinter/esphomelib)'s powerful core to create custom sensors/outputs.
* **Fast and efficient:** Written in C++ and keeps memory consumption to a minimum.
* **Made for [Home Assistant](https://www.home-assistant.io):** Almost all [Home Assistant](https://www.home-assistant.io) features are supported out of the box. Including RGB lights and many more.
* **Easy reproducible configuration:** No need to go through a long setup process for every single node. Just copy a configuration file and run a single command.
* **Smart Over The Air Updates:** esphomeyaml has OTA updates deeply integrated into the system. It even automatically enters a recovery mode if a boot loop is detected.
* **Powerful logging engine:** View colorful logs and debug issues remotely.
* **Open Source**
* For me: Makes documenting esphomelib's features a lot easier.
## Special Thanks
Special Thanks to the Home Assistant project. Lots of the code base of esphomeyaml is based off of Home Assistant, for example the loading and config validation code.

11
docker/Dockerfile Normal file
View File

@ -0,0 +1,11 @@
ARG BUILD_FROM=esphome/esphome-base-amd64:1.0.0
FROM ${BUILD_FROM}
COPY . .
RUN \
pip install --no-cache-dir --no-binary :all: -e . && \
pip install --no-cache-dir pillow
WORKDIR /config
ENTRYPOINT ["esphome"]
CMD ["/config", "dashboard"]

30
docker/Dockerfile.builder
View File

@ -1,30 +0,0 @@
FROM multiarch/ubuntu-core:amd64-xenial
# setup locals
RUN apt-get update && apt-get install -y \
jq \
git \
python3-setuptools \
&& rm -rf /var/lib/apt/lists/* \
ENV LANG C.UTF-8
# Install docker
# https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/
RUN apt-get update && apt-get install -y \
apt-transport-https \
ca-certificates \
curl \
software-properties-common \
&& rm -rf /var/lib/apt/lists/* \
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
&& add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
&& apt-get update && apt-get install -y docker-ce \
&& rm -rf /var/lib/apt/lists/*
# setup arm binary support
RUN apt-get update && apt-get install -y \
qemu-user-static \
binfmt-support \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /data

76
docker/Dockerfile.hassio
View File

@ -1,73 +1,29 @@
ARG BUILD_FROM=hassioaddons/ubuntu-base:2.2.1 ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.0.0
# hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Copy root filesystem
COPY esphomeyaml-edge/rootfs /
COPY setup.py setup.cfg MANIFEST.in /opt/esphomeyaml/
COPY esphomeyaml /opt/esphomeyaml/esphomeyaml
RUN \ RUN \
# Temporarily move nginx.conf (otherwise dpkg fails) apt-get update \
mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.bkp \
# Install add-on dependencies
&& apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
# Python for esphomeyaml
python \
python-pip \
python-setuptools \
# Python Pillow for display component
python-pil \ python-pil \
# Git for esphomelib downloads && rm -rf \
git \
# NGINX proxy
nginx \
\
&& mv /etc/nginx/nginx.conf.bkp /etc/nginx/nginx.conf \
\
&& pip2 install --no-cache-dir --no-binary :all: -e /opt/esphomeyaml \
\
# Change some platformio settings
&& platformio settings set enable_telemetry No \
&& platformio settings set check_libraries_interval 1000000 \
&& platformio settings set check_platformio_interval 1000000 \
&& platformio settings set check_platforms_interval 1000000 \
\
# Build an empty platformio project to force platformio to install all fw build dependencies
# The return-code will be non-zero since there's nothing to build.
&& (platformio run -d /opt/pio; echo "Done") \
\
# Cleanup
&& rm -fr \
/tmp/* \ /tmp/* \
/var/{cache,log}/* \ /var/{cache,log}/* \
/var/lib/apt/lists/* \ /var/lib/apt/lists/*
/opt/pio/
# Build arugments # Copy root filesystem
ARG BUILD_ARCH=amd64 COPY docker/rootfs/ /
ARG BUILD_DATE COPY setup.py setup.cfg MANIFEST.in /opt/esphome/
ARG BUILD_REF COPY esphome /opt/esphome/esphome
ARG BUILD_VERSION
RUN \
pip2 install --no-cache-dir --no-binary :all: -e /opt/esphome
# Build arguments
ARG BUILD_VERSION=dev
# Labels # Labels
LABEL \ LABEL \
io.hass.name="esphomeyaml" \ io.hass.name="ESPHome" \
io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \ io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
io.hass.arch="${BUILD_ARCH}" \
io.hass.type="addon" \ io.hass.type="addon" \
io.hass.version=${BUILD_VERSION} \ io.hass.version=${BUILD_VERSION}
maintainer="Otto Winter <contact@otto-winter.com>" \
org.label-schema.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
org.label-schema.build-date=${BUILD_DATE} \
org.label-schema.name="esphomeyaml" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://esphomelib.com" \
org.label-schema.usage="https://github.com/OttoWinter/esphomeyaml/tree/dev/esphomeyaml/README.md" \
org.label-schema.vcs-ref=${BUILD_REF} \
org.label-schema.vcs-url="https://github.com/OttoWinter/esphomeyaml" \
org.label-schema.vendor="esphomelib"

25
docker/hooks/build Executable file
View File

@ -0,0 +1,25 @@
#!/usr/bin/env bash
# the Docker repository tag being built.
declare CACHE_TAG
echo "CACHE_TAG: ${CACHE_TAG}"
# the name and tag of the Docker repository being built. (This variable is a combination of DOCKER_REPO:CACHE_TAG.)
declare IMAGE_NAME
echo "IMAGE_NAME: ${IMAGE_NAME}"
# the architecture to build
declare BUILD_ARCH
echo "BUILD_ARCH: ${BUILD_ARCH}"
# whether this is a hassio build
declare IS_HASSIO
echo "IS_HASSIO: ${IS_HASSIO}"
if [[ ${IS_HASSIO} = "YES" ]]; then
docker build \
--build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.0.0" \
--build-arg "BUILD_VERSION=${CACHE_TAG}" \
-t "${IMAGE_NAME}" -f docker/Dockerfile.hassio .
else
docker build \
--build-arg "BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.0.0" \
-t "${IMAGE_NAME}" -f docker/Dockerfile .
fi

18
docker/hooks/pre_build Executable file
View File

@ -0,0 +1,18 @@
#!/usr/bin/env bash
# the architecture to build
declare BUILD_ARCH
echo "BUILD_ARCH: ${BUILD_ARCH}"
if [[ ${BUILD_ARCH} = "amd64" ]]; then
echo "No qemu required..."
exit 0
fi
if [[ ${BUILD_ARCH} = "i386" ]]; then
echo "No qemu required..."
exit 0
fi
echo "Installing qemu..."
docker run --rm --privileged multiarch/qemu-user-static:register --reset

35
docker/rootfs/etc/cont-init.d/10-requirements.sh Executable file
View File

@ -0,0 +1,35 @@
#!/usr/bin/with-contenv bash
# ==============================================================================
# Community Hass.io Add-ons: ESPHome
# This files check if all user configuration requirements are met
# ==============================================================================
# shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh
# Check SSL requirements, if enabled
if hass.config.true 'ssl'; then
if ! hass.config.has_value 'certfile'; then
hass.die 'SSL is enabled, but no certfile was specified.'
fi
if ! hass.config.has_value 'keyfile'; then
hass.die 'SSL is enabled, but no keyfile was specified'
fi
if ! hass.file_exists "/ssl/$(hass.config.get 'certfile')"; then
if ! hass.file_exists "/ssl/$(hass.config.get 'keyfile')"; then
# Both files are missing, let's print a friendlier error message
text="You enabled encrypted connections using the \"ssl\": true option.
However, the SSL files \"$(hass.config.get 'certfile')\" and \"$(hass.config.get 'keyfile')\"
were not found. If you're using Hass.io on your local network and don't want
to encrypt connections to the ESPHome dashboard, you can manually disable
SSL by setting \"ssl\" to false."
hass.die "${text}"
fi
hass.die 'The configured certfile is not found'
fi
if ! hass.file_exists "/ssl/$(hass.config.get 'keyfile')"; then
hass.die 'The configured keyfile is not found'
fi
fi

28
docker/rootfs/etc/cont-init.d/20-nginx.sh Executable file
View File

@ -0,0 +1,28 @@
#!/usr/bin/with-contenv bash
# ==============================================================================
# Community Hass.io Add-ons: ESPHome
# Configures NGINX for use with ESPHome
# ==============================================================================
# shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh
declare certfile
declare keyfile
declare port
mkdir -p /var/log/nginx
# Enable SSL
if hass.config.true 'ssl'; then
rm /etc/nginx/nginx.conf
mv /etc/nginx/nginx-ssl.conf /etc/nginx/nginx.conf
certfile=$(hass.config.get 'certfile')
keyfile=$(hass.config.get 'keyfile')
sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/nginx.conf
sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/nginx.conf
fi
port=$(hass.config.get 'port')
sed -i "s/%%port%%/${port}/g" /etc/nginx/nginx.conf

12
esphomeyaml-edge/rootfs/etc/cont-init.d/30-esphomeyaml.sh → docker/rootfs/etc/cont-init.d/30-esphome.sh
View File

@ -1,14 +1,14 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: esphomeyaml # Community Hass.io Add-ons: ESPHome
# This files installs the user esphomeyaml version if specified # This files installs the user ESPHome version if specified
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh source /usr/lib/hassio-addons/base.sh
declare esphomeyaml_version declare esphome_version
if hass.config.has_value 'esphomeyaml_version'; then if hass.config.has_value 'esphome_version'; then
esphomeyaml_version=$(hass.config.get 'esphomeyaml_version') esphome_version=$(hass.config.get 'esphome_version')
pip2 install --no-cache-dir --no-binary :all: "https://github.com/OttoWinter/esphomeyaml/archive/${esphomeyaml_version}.zip" pip2 install --no-cache-dir --no-binary :all: "https://github.com/esphome/esphome/archive/${esphome_version}.zip"
fi fi

13
docker/rootfs/etc/cont-init.d/40-migrate.sh Normal file
View File

@ -0,0 +1,13 @@
#!/usr/bin/with-contenv bash
# ==============================================================================
# Community Hass.io Add-ons: ESPHome
# This files migrates the esphome config directory from the old path
# ==============================================================================
# shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh
if [[ ! -d /config/esphome && -d /config/esphomeyaml ]]; then
echo "Moving config directory from /config/esphomeyaml to /config/esphome"
mv /config/esphomeyaml /config/esphome
mv /config/esphome/.esphomeyaml /config/esphome/.esphome
fi

62
docker/rootfs/etc/nginx/nginx-ssl.conf Executable file
View File

@ -0,0 +1,62 @@
worker_processes 1;
pid /var/run/nginx.pid;
error_log stderr;
events {
worker_connections 1024;
}
http {
access_log stdout;
include mime.types;
default_type application/octet-stream;
sendfile on;
keepalive_timeout 65;
upstream esphome {
ip_hash;
server unix:/var/run/esphome.sock;
}
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
server {
server_name hassio.local;
listen %%port%% default_server ssl;
root /dev/null;
ssl_certificate /ssl/%%certfile%%;
ssl_certificate_key /ssl/%%keyfile%%;
ssl_protocols TLSv1.2;
ssl_prefer_server_ciphers on;
ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
ssl_ecdh_curve secp384r1;
ssl_session_timeout 10m;
ssl_session_cache shared:SSL:10m;
ssl_session_tickets off;
ssl_stapling on;
ssl_stapling_verify on;
# Redirect http requests to https on the same port.
# https://rageagainstshell.com/2016/11/redirect-http-to-https-on-the-same-port-in-nginx/
error_page 497 https://$http_host$request_uri;
location / {
proxy_redirect off;
proxy_pass http://esphome;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Authorization "";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_set_header X-NginX-Proxy true;
}
}
}

46
docker/rootfs/etc/nginx/nginx.conf Executable file
View File

@ -0,0 +1,46 @@
worker_processes 1;
pid /var/run/nginx.pid;
error_log stderr;
events {
worker_connections 1024;
}
http {
access_log stdout;
include mime.types;
default_type application/octet-stream;
sendfile on;
keepalive_timeout 65;
upstream esphome {
ip_hash;
server unix:/var/run/esphome.sock;
}
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
server {
server_name hassio.local;
listen %%port%% default_server;
root /dev/null;
location / {
proxy_redirect off;
proxy_pass http://esphome;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Authorization "";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $http_host;
proxy_set_header X-NginX-Proxy true;
}
}
}

4
esphomeyaml-edge/rootfs/etc/services.d/esphomeyaml/finish → docker/rootfs/etc/services.d/esphome/finish
View File

@ -1,7 +1,7 @@
#!/usr/bin/execlineb -S0 #!/usr/bin/execlineb -S0
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: esphomeyaml # Community Hass.io Add-ons: ESPHome
# Take down the S6 supervision tree when esphomeyaml fails # Take down the S6 supervision tree when ESPHome fails
# ============================================================================== # ==============================================================================
if -n { s6-test $# -ne 0 } if -n { s6-test $# -ne 0 }
if -n { s6-test ${1} -eq 256 } if -n { s6-test ${1} -eq 256 }

8
esphomeyaml-edge/rootfs/etc/services.d/esphomeyaml/run → docker/rootfs/etc/services.d/esphome/run
View File

@ -1,7 +1,7 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# ============================================================================== # ==============================================================================
# Community Hass.io Add-ons: esphomeyaml # Community Hass.io Add-ons: ESPHome
# Runs the esphomeyaml dashboard # Runs the ESPHome dashboard
# ============================================================================== # ==============================================================================
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh source /usr/lib/hassio-addons/base.sh
@ -10,5 +10,5 @@ if hass.config.true 'leave_front_door_open'; then
export DISABLE_HA_AUTHENTICATION=true export DISABLE_HA_AUTHENTICATION=true
fi fi
hass.log.info "Starting esphomeyaml dashboard..." hass.log.info "Starting ESPHome dashboard..."
exec esphomeyaml /config/esphomeyaml dashboard --socket /var/run/esphomeyaml.sock --hassio exec esphome /config/esphome dashboard --socket /var/run/esphome.sock --hassio

9
docker/rootfs/etc/services.d/nginx/finish Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/execlineb -S0
# ==============================================================================
# Community Hass.io Add-ons: ESPHome
# Take down the S6 supervision tree when NGINX fails
# ==============================================================================
if -n { s6-test $# -ne 0 }
if -n { s6-test ${1} -eq 256 }
s6-svscanctl -t /var/run/s6/services

10
docker/rootfs/etc/services.d/nginx/run Executable file
View File

@ -0,0 +1,10 @@
#!/usr/bin/with-contenv bash
# ==============================================================================
# Community Hass.io Add-ons: ESPHome
# Runs the NGINX proxy
# ==============================================================================
# shellcheck disable=SC1091
source /usr/lib/hassio-addons/base.sh
hass.log.info "Starting NGINX..."
exec nginx -g "daemon off;"

0
esphomeyaml/__init__.py → esphome/__init__.py
View File

66
esphomeyaml/__main__.py → esphome/__main__.py
View File

@ -8,22 +8,22 @@ import os
import random import random
import sys import sys
from esphomeyaml import const, core_config, mqtt, platformio_api, wizard, writer, yaml_util from esphome import const, core_config, mqtt, platformio_api, wizard, writer, yaml_util
from esphomeyaml.api.client import run_logs from esphome.api.client import run_logs
from esphomeyaml.config import get_component, iter_components, read_config, strip_default_ids from esphome.config import get_component, iter_components, read_config, strip_default_ids
from esphomeyaml.const import CONF_BAUD_RATE, CONF_ESPHOMEYAML, CONF_LOGGER, CONF_USE_CUSTOM_CODE, \ from esphome.const import CONF_BAUD_RATE, CONF_BROKER, CONF_ESPHOME, CONF_LOGGER, \
CONF_BROKER CONF_USE_CUSTOM_CODE
from esphomeyaml.core import CORE, EsphomeyamlError from esphome.core import CORE, EsphomeError
from esphomeyaml.cpp_generator import Expression, RawStatement, add, statement from esphome.cpp_generator import Expression, RawStatement, add, statement
from esphomeyaml.helpers import color, indent from esphome.helpers import color, indent
from esphomeyaml.py_compat import safe_input, text_type, IS_PY2 from esphome.py_compat import IS_PY2, safe_input, text_type
from esphomeyaml.storage_json import StorageJSON, esphomeyaml_storage_path, \ from esphome.storage_json import StorageJSON, esphome_storage_path, \
start_update_check_thread, storage_path start_update_check_thread, storage_path
from esphomeyaml.util import run_external_command, run_external_process, safe_print from esphome.util import run_external_command, run_external_process, safe_print
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
PRE_INITIALIZE = ['esphomeyaml', 'logger', 'wifi', 'ethernet', 'ota', 'mqtt', 'web_server', 'api', PRE_INITIALIZE = ['esphome', 'logger', 'wifi', 'ethernet', 'ota', 'mqtt', 'web_server', 'api',
'i2c'] 'i2c']
@ -127,9 +127,9 @@ def run_miniterm(config, port):
def write_cpp(config): def write_cpp(config):
_LOGGER.info("Generating C++ source...") _LOGGER.info("Generating C++ source...")
CORE.add_job(core_config.to_code, config[CONF_ESPHOMEYAML], domain='esphomeyaml') CORE.add_job(core_config.to_code, config[CONF_ESPHOME], domain='esphome')
for domain in PRE_INITIALIZE: for domain in PRE_INITIALIZE:
if domain == CONF_ESPHOMEYAML or domain not in config: if domain == CONF_ESPHOME or domain not in config:
continue continue
CORE.add_job(get_component(domain).to_code, config[domain], domain=domain) CORE.add_job(get_component(domain).to_code, config[domain], domain=domain)
@ -143,7 +143,7 @@ def write_cpp(config):
add(RawStatement('')) add(RawStatement(''))
all_code = [] all_code = []
for exp in CORE.expressions: for exp in CORE.expressions:
if not config[CONF_ESPHOMEYAML][CONF_USE_CUSTOM_CODE]: if not config[CONF_ESPHOME][CONF_USE_CUSTOM_CODE]:
if isinstance(exp, Expression) and not exp.required: if isinstance(exp, Expression) and not exp.required:
continue continue
all_code.append(text_type(statement(exp))) all_code.append(text_type(statement(exp)))
@ -157,9 +157,9 @@ def write_cpp(config):
def compile_program(args, config): def compile_program(args, config):
_LOGGER.info("Compiling app...") _LOGGER.info("Compiling app...")
update_check = not os.getenv('ESPHOMEYAML_NO_UPDATE_CHECK', '') update_check = not os.getenv('ESPHOME_NO_UPDATE_CHECK', '')
if update_check: if update_check:
thread = start_update_check_thread(esphomeyaml_storage_path(CORE.config_dir)) thread = start_update_check_thread(esphome_storage_path(CORE.config_dir))
rc = platformio_api.run_compile(config, args.verbose) rc = platformio_api.run_compile(config, args.verbose)
if update_check: if update_check:
thread.join() thread.join()
@ -186,13 +186,13 @@ def upload_program(config, args, host):
return upload_using_esptool(config, host) return upload_using_esptool(config, host)
return platformio_api.run_upload(config, args.verbose, host) return platformio_api.run_upload(config, args.verbose, host)
from esphomeyaml.components import ota from esphome.components import ota
from esphomeyaml import espota2 from esphome import espota2
if args.host_port is not None: if args.host_port is not None:
host_port = args.host_port host_port = args.host_port
else: else:
host_port = int(os.getenv('ESPHOMEYAML_OTA_HOST_PORT', random.randint(10000, 60000))) host_port = int(os.getenv('ESPHOME_OTA_HOST_PORT', random.randint(10000, 60000)))
verbose = args.verbose verbose = args.verbose
remote_port = ota.get_port(config) remote_port = ota.get_port(config)
@ -215,7 +215,7 @@ def upload_program(config, args, host):
def show_logs(config, args, port): def show_logs(config, args, port):
if 'logger' not in config: if 'logger' not in config:
raise EsphomeyamlError("Logger is not configured!") raise EsphomeError("Logger is not configured!")
if get_port_type(port) == 'SERIAL': if get_port_type(port) == 'SERIAL':
run_miniterm(config, port) run_miniterm(config, port)
return 0 return 0
@ -345,7 +345,7 @@ def command_clean(args, config):
def command_hass_config(args, config): def command_hass_config(args, config):
from esphomeyaml.components import mqtt as mqtt_component from esphome.components import mqtt as mqtt_component
_LOGGER.info("This is what you should put in your Home Assistant YAML configuration.") _LOGGER.info("This is what you should put in your Home Assistant YAML configuration.")
_LOGGER.info("Please note this is only necessary if you're not using MQTT discovery.") _LOGGER.info("Please note this is only necessary if you're not using MQTT discovery.")
@ -367,7 +367,7 @@ def command_hass_config(args, config):
def command_dashboard(args): def command_dashboard(args):
from esphomeyaml.dashboard import dashboard from esphome.dashboard import dashboard
return dashboard.start_web_server(args) return dashboard.start_web_server(args)
@ -392,8 +392,8 @@ POST_CONFIG_ACTIONS = {
def parse_args(argv): def parse_args(argv):
parser = argparse.ArgumentParser(prog='esphomeyaml') parser = argparse.ArgumentParser(prog='esphome')
parser.add_argument('-v', '--verbose', help="Enable verbose esphomeyaml logs.", parser.add_argument('-v', '--verbose', help="Enable verbose esphome logs.",
action='store_true') action='store_true')
parser.add_argument('--dashboard', help="Internal flag to set if the command is run from the " parser.add_argument('--dashboard', help="Internal flag to set if the command is run from the "
"dashboard.", action='store_true') "dashboard.", action='store_true')
@ -444,11 +444,11 @@ def parse_args(argv):
parser_clean.add_argument('--client-id', help='Manually set the client id.') parser_clean.add_argument('--client-id', help='Manually set the client id.')
subparsers.add_parser('wizard', help="A helpful setup wizard that will guide " subparsers.add_parser('wizard', help="A helpful setup wizard that will guide "
"you through setting up esphomeyaml.") "you through setting up esphome.")
subparsers.add_parser('mqtt-fingerprint', help="Get the SSL fingerprint from a MQTT broker.") subparsers.add_parser('mqtt-fingerprint', help="Get the SSL fingerprint from a MQTT broker.")
subparsers.add_parser('version', help="Print the esphomeyaml version and exit.") subparsers.add_parser('version', help="Print the esphome version and exit.")
subparsers.add_parser('clean', help="Delete all temporary build files.") subparsers.add_parser('clean', help="Delete all temporary build files.")
@ -461,7 +461,7 @@ def parse_args(argv):
dashboard.add_argument("--open-ui", help="Open the dashboard UI in a browser.", dashboard.add_argument("--open-ui", help="Open the dashboard UI in a browser.",
action='store_true') action='store_true')
dashboard.add_argument("--hassio", dashboard.add_argument("--hassio",
help="Internal flag used to tell esphomeyaml is started as a Hass.io " help="Internal flag used to tell esphome is started as a Hass.io "
"add-on.", "add-on.",
action="store_true") action="store_true")
dashboard.add_argument("--socket", dashboard.add_argument("--socket",
@ -474,7 +474,7 @@ def parse_args(argv):
return parser.parse_args(argv[1:]) return parser.parse_args(argv[1:])
def run_esphomeyaml(argv): def run_esphome(argv):
args = parse_args(argv) args = parse_args(argv)
CORE.dashboard = args.dashboard CORE.dashboard = args.dashboard
@ -482,7 +482,7 @@ def run_esphomeyaml(argv):
if args.command in PRE_CONFIG_ACTIONS: if args.command in PRE_CONFIG_ACTIONS:
try: try:
return PRE_CONFIG_ACTIONS[args.command](args) return PRE_CONFIG_ACTIONS[args.command](args)
except EsphomeyamlError as e: except EsphomeError as e:
_LOGGER.error(e) _LOGGER.error(e)
return 1 return 1
@ -496,7 +496,7 @@ def run_esphomeyaml(argv):
if args.command in POST_CONFIG_ACTIONS: if args.command in POST_CONFIG_ACTIONS:
try: try:
return POST_CONFIG_ACTIONS[args.command](args, config) return POST_CONFIG_ACTIONS[args.command](args, config)
except EsphomeyamlError as e: except EsphomeError as e:
_LOGGER.error(e) _LOGGER.error(e)
return 1 return 1
safe_print(u"Unknown command {}".format(args.command)) safe_print(u"Unknown command {}".format(args.command))
@ -505,8 +505,8 @@ def run_esphomeyaml(argv):
def main(): def main():
try: try:
return run_esphomeyaml(sys.argv) return run_esphome(sys.argv)
except EsphomeyamlError as e: except EsphomeError as e:
_LOGGER.error(e) _LOGGER.error(e)
return 1 return 1
except KeyboardInterrupt: except KeyboardInterrupt:

0
esphomeyaml/api/__init__.py → esphome/api/__init__.py
View File

2
esphomeyaml/api/api.proto → esphome/api/api.proto
View File

@ -92,7 +92,7 @@ message DeviceInfoResponse {
// A string describing the date of compilation, this is generated by the compiler // A string describing the date of compilation, this is generated by the compiler
// and therefore may not be in the same format all the time. // and therefore may not be in the same format all the time.
// If the user isn't using esphomeyaml, this will also not be set. // If the user isn't using esphome, this will also not be set.
string compilation_time = 5; string compilation_time = 5;
// The model of the board. For example NodeMCU // The model of the board. For example NodeMCU

0
esphomeyaml/api/api_pb2.py → esphome/api/api_pb2.py
View File

24
esphomeyaml/api/client.py → esphome/api/client.py
View File

@ -9,18 +9,18 @@ import time
from typing import Optional # noqa from typing import Optional # noqa
from google.protobuf import message # noqa from google.protobuf import message # noqa
from esphomeyaml import const from esphome import const
import esphomeyaml.api.api_pb2 as pb import esphome.api.api_pb2 as pb
from esphomeyaml.const import CONF_PASSWORD, CONF_PORT from esphome.const import CONF_PASSWORD, CONF_PORT
from esphomeyaml.core import EsphomeyamlError from esphome.core import EsphomeError
from esphomeyaml.helpers import resolve_ip_address, indent, color from esphome.helpers import resolve_ip_address, indent, color
from esphomeyaml.py_compat import text_type, IS_PY2, byte_to_bytes, char_to_byte, format_bytes from esphome.py_compat import text_type, IS_PY2, byte_to_bytes, char_to_byte, format_bytes
from esphomeyaml.util import safe_print from esphome.util import safe_print
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
class APIConnectionError(EsphomeyamlError): class APIConnectionError(EsphomeError):
pass pass
@ -179,11 +179,11 @@ class APIClient(threading.Thread):
try: try:
ip = resolve_ip_address(self._address) ip = resolve_ip_address(self._address)
except EsphomeyamlError as err: except EsphomeError as err:
_LOGGER.warning("Error resolving IP address of %s. Is it connected to WiFi?", _LOGGER.warning("Error resolving IP address of %s. Is it connected to WiFi?",
self._address) self._address)
_LOGGER.warning("(If this error persists, please set a static IP address: " _LOGGER.warning("(If this error persists, please set a static IP address: "
"https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips)") "https://esphome.io/components/wifi.html#manual-ips)")
raise APIConnectionError(err) raise APIConnectionError(err)
_LOGGER.info("Connecting to %s:%s (%s)", self._address, self._port, ip) _LOGGER.info("Connecting to %s:%s (%s)", self._address, self._port, ip)
@ -200,7 +200,7 @@ class APIClient(threading.Thread):
self._socket_open_event.set() self._socket_open_event.set()
hello = pb.HelloRequest() hello = pb.HelloRequest()
hello.client_info = 'esphomeyaml v{}'.format(const.__version__) hello.client_info = 'ESPHome v{}'.format(const.__version__)
try: try:
resp = self._send_message_await_response(hello, pb.HelloResponse) resp = self._send_message_await_response(hello, pb.HelloResponse)
except APIConnectionError as err: except APIConnectionError as err:
@ -423,7 +423,7 @@ def run_logs(config, address):
conf = config['api'] conf = config['api']
port = conf[CONF_PORT] port = conf[CONF_PORT]
password = conf[CONF_PASSWORD] password = conf[CONF_PASSWORD]
_LOGGER.info("Starting log output from %s using esphomelib API", address) _LOGGER.info("Starting log output from %s using esphome API", address)
cli = APIClient(address, port, password) cli = APIClient(address, port, password)
stopping = False stopping = False

36
esphomeyaml/automation.py → esphome/automation.py
View File

@ -2,16 +2,16 @@ import copy
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ABOVE, CONF_ACTION_ID, CONF_AND, CONF_AUTOMATION_ID, \ from esphome.const import CONF_ABOVE, CONF_ACTION_ID, CONF_AND, CONF_AUTOMATION_ID, \
CONF_BELOW, CONF_CONDITION, CONF_CONDITION_ID, CONF_DELAY, CONF_ELSE, CONF_ID, CONF_IF, \ CONF_BELOW, CONF_CONDITION, CONF_CONDITION_ID, CONF_DELAY, CONF_ELSE, CONF_ID, CONF_IF, \
CONF_LAMBDA, CONF_OR, CONF_RANGE, CONF_THEN, CONF_TRIGGER_ID, CONF_WHILE CONF_LAMBDA, CONF_OR, CONF_RANGE, CONF_THEN, CONF_TRIGGER_ID, CONF_WHILE
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, TemplateArguments, add, get_variable, \ from esphome.cpp_generator import Pvariable, TemplateArguments, add, get_variable, \
process_lambda, templatable process_lambda, templatable
from esphomeyaml.cpp_types import Action, App, Component, PollingComponent, Trigger, bool_, \ from esphome.cpp_types import Action, App, Component, PollingComponent, Trigger, bool_, \
esphomelib_ns, float_, uint32, void esphome_ns, float_, uint32, void
from esphomeyaml.util import ServiceRegistry from esphome.util import ServiceRegistry
def maybe_simple_id(*validators): def maybe_simple_id(*validators):
@ -98,18 +98,18 @@ ACTION_REGISTRY = ServiceRegistry()
CONDITION_REGISTRY = ServiceRegistry() CONDITION_REGISTRY = ServiceRegistry()
# pylint: disable=invalid-name # pylint: disable=invalid-name
DelayAction = esphomelib_ns.class_('DelayAction', Action, Component) DelayAction = esphome_ns.class_('DelayAction', Action, Component)
LambdaAction = esphomelib_ns.class_('LambdaAction', Action) LambdaAction = esphome_ns.class_('LambdaAction', Action)
IfAction = esphomelib_ns.class_('IfAction', Action) IfAction = esphome_ns.class_('IfAction', Action)
WhileAction = esphomelib_ns.class_('WhileAction', Action) WhileAction = esphome_ns.class_('WhileAction', Action)
UpdateComponentAction = esphomelib_ns.class_('UpdateComponentAction', Action) UpdateComponentAction = esphome_ns.class_('UpdateComponentAction', Action)
Automation = esphomelib_ns.class_('Automation') Automation = esphome_ns.class_('Automation')
Condition = esphomelib_ns.class_('Condition') Condition = esphome_ns.class_('Condition')
AndCondition = esphomelib_ns.class_('AndCondition', Condition) AndCondition = esphome_ns.class_('AndCondition', Condition)
OrCondition = esphomelib_ns.class_('OrCondition', Condition) OrCondition = esphome_ns.class_('OrCondition', Condition)
RangeCondition = esphomelib_ns.class_('RangeCondition', Condition) RangeCondition = esphome_ns.class_('RangeCondition', Condition)
LambdaCondition = esphomelib_ns.class_('LambdaCondition', Condition) LambdaCondition = esphome_ns.class_('LambdaCondition', Condition)
def validate_automation(extra_schema=None, extra_validators=None, single=False): def validate_automation(extra_schema=None, extra_validators=None, single=False):

0
esphomeyaml/components/__init__.py → esphome/components/__init__.py
View File

12
esphomeyaml/components/ads1115.py → esphome/components/ads1115.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID from esphome.const import CONF_ADDRESS, CONF_ID
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']
MULTI_CONF = True MULTI_CONF = True

12
esphomeyaml/components/apds9960.py → esphome/components/apds9960.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_UPDATE_INTERVAL from esphome.const import CONF_ADDRESS, CONF_ID, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']
MULTI_CONF = True MULTI_CONF = True

18
esphomeyaml/components/api.py → esphome/components/api.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DATA, CONF_DATA_TEMPLATE, CONF_ID, CONF_PASSWORD, CONF_PORT, \ from esphome.const import CONF_DATA, CONF_DATA_TEMPLATE, CONF_ID, CONF_PASSWORD, CONF_PORT, \
CONF_SERVICE, CONF_VARIABLES, CONF_REBOOT_TIMEOUT CONF_REBOOT_TIMEOUT, CONF_SERVICE, CONF_VARIABLES
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import Action, App, Component, StoringController, esphomelib_ns from esphome.cpp_types import Action, App, Component, StoringController, esphome_ns
api_ns = esphomelib_ns.namespace('api') api_ns = esphome_ns.namespace('api')
APIServer = api_ns.class_('APIServer', Component, StoringController) APIServer = api_ns.class_('APIServer', Component, StoringController)
HomeAssistantServiceCallAction = api_ns.class_('HomeAssistantServiceCallAction', Action) HomeAssistantServiceCallAction = api_ns.class_('HomeAssistantServiceCallAction', Action)
KeyValuePair = api_ns.class_('KeyValuePair') KeyValuePair = api_ns.class_('KeyValuePair')

26
esphomeyaml/components/binary_sensor/__init__.py → esphome/components/binary_sensor/__init__.py
View File

@ -1,21 +1,19 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation, core from esphome import automation, core
from esphomeyaml.automation import CONDITION_REGISTRY, Condition, maybe_simple_id from esphome.automation import CONDITION_REGISTRY, Condition, maybe_simple_id
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DELAYED_OFF, CONF_DELAYED_ON, CONF_DEVICE_CLASS, CONF_FILTERS, \ from esphome.const import CONF_DELAYED_OFF, CONF_DELAYED_ON, CONF_DEVICE_CLASS, CONF_FILTERS, \
CONF_HEARTBEAT, CONF_ID, CONF_INTERNAL, CONF_INVALID_COOLDOWN, CONF_INVERT, CONF_INVERTED, \ CONF_HEARTBEAT, CONF_ID, CONF_INTERNAL, CONF_INVALID_COOLDOWN, CONF_INVERT, CONF_INVERTED, \
CONF_LAMBDA, CONF_MAX_LENGTH, CONF_MIN_LENGTH, CONF_MQTT_ID, CONF_ON_CLICK, \ CONF_LAMBDA, CONF_MAX_LENGTH, CONF_MIN_LENGTH, CONF_MQTT_ID, CONF_ON_CLICK, \
CONF_ON_DOUBLE_CLICK, CONF_ON_MULTI_CLICK, CONF_ON_PRESS, CONF_ON_RELEASE, CONF_ON_STATE, \ CONF_ON_DOUBLE_CLICK, CONF_ON_MULTI_CLICK, CONF_ON_PRESS, CONF_ON_RELEASE, CONF_ON_STATE, \
CONF_STATE, CONF_TIMING, CONF_TRIGGER_ID CONF_STATE, CONF_TIMING, CONF_TRIGGER_ID
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, StructInitializer, add, get_variable, \ from esphome.cpp_generator import Pvariable, StructInitializer, add, get_variable, process_lambda
process_lambda from esphome.cpp_types import App, Component, Nameable, NoArg, Trigger, bool_, esphome_ns, optional
from esphomeyaml.cpp_types import App, Component, Nameable, NoArg, Trigger, bool_, esphomelib_ns, \ from esphome.py_compat import string_types
optional
from esphomeyaml.py_compat import string_types
DEVICE_CLASSES = [ DEVICE_CLASSES = [
'', 'battery', 'cold', 'connectivity', 'door', 'garage_door', 'gas', '', 'battery', 'cold', 'connectivity', 'door', 'garage_door', 'gas',
@ -28,7 +26,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
binary_sensor_ns = esphomelib_ns.namespace('binary_sensor') binary_sensor_ns = esphome_ns.namespace('binary_sensor')
BinarySensor = binary_sensor_ns.class_('BinarySensor', Nameable) BinarySensor = binary_sensor_ns.class_('BinarySensor', Nameable)
BinarySensorPtr = BinarySensor.operator('ptr') BinarySensorPtr = BinarySensor.operator('ptr')
MQTTBinarySensorComponent = binary_sensor_ns.class_('MQTTBinarySensorComponent', mqtt.MQTTComponent) MQTTBinarySensorComponent = binary_sensor_ns.class_('MQTTBinarySensorComponent', mqtt.MQTTComponent)
@ -191,7 +189,7 @@ BINARY_SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({
vol.Optional(CONF_INVERTED): cv.invalid( vol.Optional(CONF_INVERTED): cv.invalid(
"The inverted binary_sensor property has been replaced by the " "The inverted binary_sensor property has been replaced by the "
"new 'invert' binary sensor filter. Please see " "new 'invert' binary sensor filter. Please see "
"https://esphomelib.com/esphomeyaml/components/binary_sensor/index.html." "https://esphome.io/components/binary_sensor/index.html."
), ),
}) })

10
esphomeyaml/components/binary_sensor/apds9960.py → esphome/components/binary_sensor/apds9960.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor, sensor from esphome.components import binary_sensor, sensor
from esphomeyaml.components.apds9960 import APDS9960, CONF_APDS9960_ID from esphome.components.apds9960 import APDS9960, CONF_APDS9960_ID
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DIRECTION, CONF_NAME from esphome.const import CONF_DIRECTION, CONF_NAME
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
DEPENDENCIES = ['apds9960'] DEPENDENCIES = ['apds9960']
APDS9960GestureDirectionBinarySensor = sensor.sensor_ns.class_( APDS9960GestureDirectionBinarySensor = sensor.sensor_ns.class_(

10
esphomeyaml/components/binary_sensor/custom.py → esphome/components/binary_sensor/custom.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BINARY_SENSORS, CONF_ID, CONF_LAMBDA, CONF_NAME from esphome.const import CONF_BINARY_SENSORS, CONF_ID, CONF_LAMBDA, CONF_NAME
from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add from esphome.cpp_generator import Pvariable, add, process_lambda, variable
from esphomeyaml.cpp_types import std_vector from esphome.cpp_types import std_vector
CustomBinarySensorConstructor = binary_sensor.binary_sensor_ns.class_( CustomBinarySensorConstructor = binary_sensor.binary_sensor_ns.class_(
'CustomBinarySensorConstructor') 'CustomBinarySensorConstructor')

14
esphomeyaml/components/binary_sensor/esp32_ble_tracker.py → esphome/components/binary_sensor/esp32_ble_tracker.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
from esphomeyaml.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \ from esphome.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \
make_address_array make_address_array
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_MAC_ADDRESS, CONF_NAME from esphome.const import CONF_MAC_ADDRESS, CONF_NAME
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
from esphomeyaml.cpp_types import esphomelib_ns from esphome.cpp_types import esphome_ns
DEPENDENCIES = ['esp32_ble_tracker'] DEPENDENCIES = ['esp32_ble_tracker']
ESP32BLEPresenceDevice = esphomelib_ns.class_('ESP32BLEPresenceDevice', binary_sensor.BinarySensor) ESP32BLEPresenceDevice = esphome_ns.class_('ESP32BLEPresenceDevice', binary_sensor.BinarySensor)
PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
cv.GenerateID(): cv.declare_variable_id(ESP32BLEPresenceDevice), cv.GenerateID(): cv.declare_variable_id(ESP32BLEPresenceDevice),

14
esphomeyaml/components/binary_sensor/esp32_touch.py → esphome/components/binary_sensor/esp32_touch.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome.components import binary_sensor
from esphomeyaml.components import binary_sensor from esphome.components.esp32_touch import ESP32TouchComponent
from esphomeyaml.components.esp32_touch import ESP32TouchComponent import esphome.config_validation as cv
from esphomeyaml.const import CONF_NAME, CONF_PIN, CONF_THRESHOLD, ESP_PLATFORM_ESP32 from esphome.const import CONF_NAME, CONF_PIN, CONF_THRESHOLD, ESP_PLATFORM_ESP32
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
from esphomeyaml.cpp_types import global_ns from esphome.cpp_types import global_ns
from esphomeyaml.pins import validate_gpio_pin from esphome.pins import validate_gpio_pin
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]

14
esphomeyaml/components/binary_sensor/gpio.py → esphome/components/binary_sensor/gpio.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_PIN from esphome.const import CONF_ID, CONF_NAME, CONF_PIN
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
GPIOBinarySensorComponent = binary_sensor.binary_sensor_ns.class_('GPIOBinarySensorComponent', GPIOBinarySensorComponent = binary_sensor.binary_sensor_ns.class_('GPIOBinarySensorComponent',
binary_sensor.BinarySensor, binary_sensor.BinarySensor,

10
esphomeyaml/components/binary_sensor/homeassistant.py → esphome/components/binary_sensor/homeassistant.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME from esphome.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DEPENDENCIES = ['api'] DEPENDENCIES = ['api']

10
esphomeyaml/components/binary_sensor/nextion.py → esphome/components/binary_sensor/nextion.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor, display from esphome.components import binary_sensor, display
from esphomeyaml.components.display.nextion import Nextion from esphome.components.display.nextion import Nextion
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_COMPONENT_ID, CONF_NAME, CONF_PAGE_ID from esphome.const import CONF_COMPONENT_ID, CONF_NAME, CONF_PAGE_ID
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
DEPENDENCIES = ['display'] DEPENDENCIES = ['display']

12
esphomeyaml/components/binary_sensor/pn532.py → esphome/components/binary_sensor/pn532.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
from esphomeyaml.components.pn532 import PN532Component from esphome.components.pn532 import PN532Component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_NAME, CONF_UID from esphome.const import CONF_NAME, CONF_UID
from esphomeyaml.core import HexInt from esphome.core import HexInt
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
DEPENDENCIES = ['pn532'] DEPENDENCIES = ['pn532']

8
esphomeyaml/components/binary_sensor/rdm6300.py → esphome/components/binary_sensor/rdm6300.py
View File

@ -1,9 +1,9 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome.components import binary_sensor, rdm6300
from esphomeyaml.components import binary_sensor, rdm6300 import esphome.config_validation as cv
from esphomeyaml.const import CONF_NAME, CONF_UID from esphome.const import CONF_NAME, CONF_UID
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
DEPENDENCIES = ['rdm6300'] DEPENDENCIES = ['rdm6300']

20
esphomeyaml/components/binary_sensor/remote_receiver.py → esphome/components/binary_sensor/remote_receiver.py
View File

@ -1,18 +1,18 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
from esphomeyaml.components.remote_receiver import RemoteReceiverComponent, remote_ns from esphome.components.remote_receiver import RemoteReceiverComponent, remote_ns
from esphomeyaml.components.remote_transmitter import RC_SWITCH_RAW_SCHEMA, \ from esphome.components.remote_transmitter import RC_SWITCH_RAW_SCHEMA, \
RC_SWITCH_TYPE_A_SCHEMA, RC_SWITCH_TYPE_B_SCHEMA, RC_SWITCH_TYPE_C_SCHEMA, \ RC_SWITCH_TYPE_A_SCHEMA, RC_SWITCH_TYPE_B_SCHEMA, RC_SWITCH_TYPE_C_SCHEMA, \
RC_SWITCH_TYPE_D_SCHEMA, binary_code, build_rc_switch_protocol RC_SWITCH_TYPE_D_SCHEMA, binary_code, build_rc_switch_protocol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_CHANNEL, CONF_CODE, CONF_COMMAND, CONF_DATA, \ from esphome.const import CONF_ADDRESS, CONF_CHANNEL, CONF_CODE, CONF_COMMAND, CONF_DATA, \
CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_JVC, CONF_LG, CONF_NAME, CONF_NBITS, CONF_NEC, \ CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_ID, CONF_JVC, CONF_LG, CONF_NAME, CONF_NBITS, \
CONF_PANASONIC, CONF_PROTOCOL, CONF_RAW, CONF_RC_SWITCH_RAW, CONF_RC_SWITCH_TYPE_A, \ CONF_NEC, CONF_PANASONIC, CONF_PROTOCOL, CONF_RAW, CONF_RC_SWITCH_RAW, CONF_RC_SWITCH_TYPE_A, \
CONF_RC_SWITCH_TYPE_B, CONF_RC_SWITCH_TYPE_C, CONF_RC_SWITCH_TYPE_D, CONF_SAMSUNG, CONF_SONY, \ CONF_RC_SWITCH_TYPE_B, CONF_RC_SWITCH_TYPE_C, CONF_RC_SWITCH_TYPE_D, CONF_SAMSUNG, CONF_SONY, \
CONF_STATE, CONF_ID CONF_STATE
from esphomeyaml.cpp_generator import Pvariable, get_variable, progmem_array from esphome.cpp_generator import Pvariable, get_variable, progmem_array
from esphomeyaml.cpp_types import int32 from esphome.cpp_types import int32
DEPENDENCIES = ['remote_receiver'] DEPENDENCIES = ['remote_receiver']

12
esphomeyaml/components/binary_sensor/status.py → esphome/components/binary_sensor/status.py
View File

@ -1,9 +1,9 @@
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME from esphome.const import CONF_ID, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
StatusBinarySensor = binary_sensor.binary_sensor_ns.class_('StatusBinarySensor', StatusBinarySensor = binary_sensor.binary_sensor_ns.class_('StatusBinarySensor',
binary_sensor.BinarySensor, binary_sensor.BinarySensor,

14
esphomeyaml/components/binary_sensor/template.py → esphome/components/binary_sensor/template.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import Action, App, Component, bool_, optional from esphome.cpp_types import Action, App, Component, bool_, optional
TemplateBinarySensor = binary_sensor.binary_sensor_ns.class_('TemplateBinarySensor', TemplateBinarySensor = binary_sensor.binary_sensor_ns.class_('TemplateBinarySensor',
binary_sensor.BinarySensor, binary_sensor.BinarySensor,

18
esphomeyaml/components/cover/__init__.py → esphome/components/cover/__init__.py
View File

@ -1,19 +1,19 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY, maybe_simple_id from esphome.automation import ACTION_REGISTRY, maybe_simple_id
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_INTERNAL, CONF_MQTT_ID from esphome.const import CONF_ID, CONF_INTERNAL, CONF_MQTT_ID
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable from esphome.cpp_generator import Pvariable, add, get_variable
from esphomeyaml.cpp_types import Action, Nameable, esphomelib_ns from esphome.cpp_types import Action, Nameable, esphome_ns
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
cover_ns = esphomelib_ns.namespace('cover') cover_ns = esphome_ns.namespace('cover')
Cover = cover_ns.class_('Cover', Nameable) Cover = cover_ns.class_('Cover', Nameable)
MQTTCoverComponent = cover_ns.class_('MQTTCoverComponent', mqtt.MQTTComponent) MQTTCoverComponent = cover_ns.class_('MQTTCoverComponent', mqtt.MQTTComponent)

20
esphomeyaml/components/cover/template.py → esphome/components/cover/template.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
from esphomeyaml.components import cover from esphome.components import cover
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ASSUMED_STATE, CONF_CLOSE_ACTION, CONF_ID, CONF_LAMBDA, \ from esphome.const import CONF_ASSUMED_STATE, CONF_CLOSE_ACTION, CONF_ID, CONF_LAMBDA, CONF_NAME, \
CONF_NAME, CONF_OPEN_ACTION, CONF_OPTIMISTIC, CONF_STATE, CONF_STOP_ACTION CONF_OPEN_ACTION, CONF_OPTIMISTIC, CONF_STATE, CONF_STOP_ACTION
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import Action, App, NoArg, optional from esphome.cpp_types import Action, App, NoArg, optional
from esphomeyaml.py_compat import string_types from esphome.py_compat import string_types
TemplateCover = cover.cover_ns.class_('TemplateCover', cover.Cover) TemplateCover = cover.cover_ns.class_('TemplateCover', cover.Cover)
CoverPublishAction = cover.cover_ns.class_('CoverPublishAction', Action) CoverPublishAction = cover.cover_ns.class_('CoverPublishAction', Action)

12
esphomeyaml/components/custom_component.py → esphome/components/custom_component.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_COMPONENTS from esphome.const import CONF_COMPONENTS, CONF_ID, CONF_LAMBDA
from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable from esphome.cpp_generator import Pvariable, process_lambda, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import Component, ComponentPtr, esphomelib_ns, std_vector from esphome.cpp_types import Component, ComponentPtr, esphome_ns, std_vector
CustomComponentConstructor = esphomelib_ns.class_('CustomComponentConstructor') CustomComponentConstructor = esphome_ns.class_('CustomComponentConstructor')
MULTI_CONF = True MULTI_CONF = True
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({

14
esphomeyaml/components/dallas.py → esphome/components/dallas.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_PIN, CONF_UPDATE_INTERVAL from esphome.const import CONF_ID, CONF_PIN, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DallasComponent = sensor.sensor_ns.class_('DallasComponent', PollingComponent) DallasComponent = sensor.sensor_ns.class_('DallasComponent', PollingComponent)
MULTI_CONF = True MULTI_CONF = True

4
esphomeyaml/components/debug.py → esphome/components/debug.py
View File

@ -1,7 +1,7 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.cpp_generator import add from esphome.cpp_generator import add
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DEPENDENCIES = ['logger'] DEPENDENCIES = ['logger']

22
esphomeyaml/components/deep_sleep.py → esphome/components/deep_sleep.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import config_validation as cv, pins from esphome import config_validation as cv, pins
from esphomeyaml.automation import ACTION_REGISTRY, maybe_simple_id from esphome.automation import ACTION_REGISTRY, maybe_simple_id
from esphomeyaml.const import CONF_ID, CONF_MODE, CONF_NUMBER, CONF_PINS, CONF_RUN_CYCLES, \ from esphome.const import CONF_ID, CONF_MODE, CONF_NUMBER, CONF_PINS, CONF_RUN_CYCLES, \
CONF_RUN_DURATION, CONF_SLEEP_DURATION, CONF_WAKEUP_PIN CONF_RUN_DURATION, CONF_SLEEP_DURATION, CONF_WAKEUP_PIN
from esphomeyaml.cpp_generator import Pvariable, StructInitializer, add, get_variable from esphome.cpp_generator import Pvariable, StructInitializer, add, get_variable
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import Action, App, Component, esphomelib_ns, global_ns from esphome.cpp_types import Action, App, Component, esphome_ns, global_ns
def validate_pin_number(value): def validate_pin_number(value):
@ -17,11 +17,11 @@ def validate_pin_number(value):
return value return value
DeepSleepComponent = esphomelib_ns.class_('DeepSleepComponent', Component) DeepSleepComponent = esphome_ns.class_('DeepSleepComponent', Component)
EnterDeepSleepAction = esphomelib_ns.class_('EnterDeepSleepAction', Action) EnterDeepSleepAction = esphome_ns.class_('EnterDeepSleepAction', Action)
PreventDeepSleepAction = esphomelib_ns.class_('PreventDeepSleepAction', Action) PreventDeepSleepAction = esphome_ns.class_('PreventDeepSleepAction', Action)
WakeupPinMode = esphomelib_ns.enum('WakeupPinMode') WakeupPinMode = esphome_ns.enum('WakeupPinMode')
WAKEUP_PIN_MODES = { WAKEUP_PIN_MODES = {
'IGNORE': WakeupPinMode.WAKEUP_PIN_MODE_IGNORE, 'IGNORE': WakeupPinMode.WAKEUP_PIN_MODE_IGNORE,
'KEEP_AWAKE': WakeupPinMode.WAKEUP_PIN_MODE_KEEP_AWAKE, 'KEEP_AWAKE': WakeupPinMode.WAKEUP_PIN_MODE_KEEP_AWAKE,
@ -29,7 +29,7 @@ WAKEUP_PIN_MODES = {
} }
esp_sleep_ext1_wakeup_mode_t = global_ns.enum('esp_sleep_ext1_wakeup_mode_t') esp_sleep_ext1_wakeup_mode_t = global_ns.enum('esp_sleep_ext1_wakeup_mode_t')
Ext1Wakeup = esphomelib_ns.struct('Ext1Wakeup') Ext1Wakeup = esphome_ns.struct('Ext1Wakeup')
EXT1_WAKEUP_MODES = { EXT1_WAKEUP_MODES = {
'ALL_LOW': esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ALL_LOW, 'ALL_LOW': esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ALL_LOW,
'ANY_HIGH': esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ANY_HIGH, 'ANY_HIGH': esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ANY_HIGH,

12
esphomeyaml/components/display/__init__.py → esphome/components/display/__init__.py
View File

@ -1,17 +1,17 @@
# coding=utf-8 # coding=utf-8
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_LAMBDA, CONF_ROTATION, CONF_UPDATE_INTERVAL from esphome.const import CONF_LAMBDA, CONF_ROTATION, CONF_UPDATE_INTERVAL
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import add from esphome.cpp_generator import add
from esphomeyaml.cpp_types import esphomelib_ns from esphome.cpp_types import esphome_ns
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
display_ns = esphomelib_ns.namespace('display') display_ns = esphome_ns.namespace('display')
DisplayBuffer = display_ns.class_('DisplayBuffer') DisplayBuffer = display_ns.class_('DisplayBuffer')
DisplayBufferRef = DisplayBuffer.operator('ref') DisplayBufferRef = DisplayBuffer.operator('ref')

14
esphomeyaml/components/display/lcd_gpio.py → esphome/components/display/lcd_gpio.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import display from esphome.components import display
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DATA_PINS, CONF_DIMENSIONS, CONF_ENABLE_PIN, CONF_ID, \ from esphome.const import CONF_DATA_PINS, CONF_DIMENSIONS, CONF_ENABLE_PIN, CONF_ID, \
CONF_LAMBDA, CONF_RS_PIN, CONF_RW_PIN CONF_LAMBDA, CONF_RS_PIN, CONF_RW_PIN
from esphomeyaml.cpp_generator import Pvariable, add, process_lambda from esphome.cpp_generator import Pvariable, add, process_lambda
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, PollingComponent, void from esphome.cpp_types import App, PollingComponent, void
LCDDisplay = display.display_ns.class_('LCDDisplay', PollingComponent) LCDDisplay = display.display_ns.class_('LCDDisplay', PollingComponent)
LCDDisplayRef = LCDDisplay.operator('ref') LCDDisplayRef = LCDDisplay.operator('ref')

14
esphomeyaml/components/display/lcd_pcf8574.py → esphome/components/display/lcd_pcf8574.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import display, i2c from esphome.components import display, i2c
from esphomeyaml.components.display.lcd_gpio import LCDDisplay, LCDDisplayRef, \ from esphome.components.display.lcd_gpio import LCDDisplay, LCDDisplayRef, \
validate_lcd_dimensions validate_lcd_dimensions
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_DIMENSIONS, CONF_ID, CONF_LAMBDA from esphome.const import CONF_ADDRESS, CONF_DIMENSIONS, CONF_ID, CONF_LAMBDA
from esphomeyaml.cpp_generator import Pvariable, add, process_lambda from esphome.cpp_generator import Pvariable, add, process_lambda
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, void from esphome.cpp_types import App, void
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

16
esphomeyaml/components/display/max7219.py → esphome/components/display/max7219.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import display, spi from esphome.components import display, spi
from esphomeyaml.components.spi import SPIComponent from esphome.components.spi import SPIComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CS_PIN, CONF_ID, CONF_INTENSITY, CONF_LAMBDA, CONF_NUM_CHIPS, \ from esphome.const import CONF_CS_PIN, CONF_ID, CONF_INTENSITY, CONF_LAMBDA, CONF_NUM_CHIPS, \
CONF_SPI_ID CONF_SPI_ID
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, PollingComponent, void from esphome.cpp_types import App, PollingComponent, void
DEPENDENCIES = ['spi'] DEPENDENCIES = ['spi']

14
esphomeyaml/components/display/nextion.py → esphome/components/display/nextion.py
View File

@ -1,10 +1,10 @@
from esphomeyaml.components import display, uart from esphome.components import display, uart
from esphomeyaml.components.uart import UARTComponent from esphome.components.uart import UARTComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_UART_ID from esphome.const import CONF_ID, CONF_LAMBDA, CONF_UART_ID
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent, void from esphome.cpp_types import App, PollingComponent, void
DEPENDENCIES = ['uart'] DEPENDENCIES = ['uart']

16
esphomeyaml/components/display/ssd1306_i2c.py → esphome/components/display/ssd1306_i2c.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import display from esphome.components import display
from esphomeyaml.components.display import ssd1306_spi from esphome.components.display import ssd1306_spi
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_EXTERNAL_VCC, CONF_ID, CONF_LAMBDA, CONF_MODEL, \ from esphome.const import CONF_ADDRESS, CONF_EXTERNAL_VCC, CONF_ID, CONF_LAMBDA, CONF_MODEL, \
CONF_RESET_PIN CONF_RESET_PIN
from esphomeyaml.cpp_generator import Pvariable, add, process_lambda from esphome.cpp_generator import Pvariable, add, process_lambda
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, void from esphome.cpp_types import App, void
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

16
esphomeyaml/components/display/ssd1306_spi.py → esphome/components/display/ssd1306_spi.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import display, spi from esphome.components import display, spi
from esphomeyaml.components.spi import SPIComponent from esphome.components.spi import SPIComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CS_PIN, CONF_DC_PIN, CONF_EXTERNAL_VCC, CONF_ID, CONF_LAMBDA, \ from esphome.const import CONF_CS_PIN, CONF_DC_PIN, CONF_EXTERNAL_VCC, CONF_ID, CONF_LAMBDA, \
CONF_MODEL, CONF_RESET_PIN, CONF_SPI_ID CONF_MODEL, CONF_RESET_PIN, CONF_SPI_ID
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, PollingComponent, void from esphome.cpp_types import App, PollingComponent, void
DEPENDENCIES = ['spi'] DEPENDENCIES = ['spi']

17
esphomeyaml/components/display/waveshare_epaper.py → esphome/components/display/waveshare_epaper.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome import pins
from esphomeyaml import pins from esphome.components import display, spi
from esphomeyaml.components import display, spi from esphome.components.spi import SPIComponent
from esphomeyaml.components.spi import SPIComponent import esphome.config_validation as cv
from esphomeyaml.const import CONF_BUSY_PIN, CONF_CS_PIN, CONF_DC_PIN, CONF_FULL_UPDATE_EVERY, \ from esphome.const import CONF_BUSY_PIN, CONF_CS_PIN, CONF_DC_PIN, CONF_FULL_UPDATE_EVERY, \
CONF_ID, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN, CONF_SPI_ID CONF_ID, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN, CONF_SPI_ID
from esphomeyaml.cpp_generator import get_variable, Pvariable, process_lambda, add from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, gpio_input_pin_expression, \ from esphome.cpp_helpers import gpio_input_pin_expression, gpio_output_pin_expression, \
setup_component setup_component
from esphomeyaml.cpp_types import PollingComponent, App, void from esphome.cpp_types import App, PollingComponent, void
DEPENDENCIES = ['spi'] DEPENDENCIES = ['spi']
@ -17,7 +17,6 @@ WaveshareEPaperTypeA = display.display_ns.WaveshareEPaperTypeA
WaveshareEPaper = display.display_ns.class_('WaveshareEPaper', WaveshareEPaper = display.display_ns.class_('WaveshareEPaper',
PollingComponent, spi.SPIDevice, display.DisplayBuffer) PollingComponent, spi.SPIDevice, display.DisplayBuffer)
WaveshareEPaperTypeAModel = display.display_ns.enum('WaveshareEPaperTypeAModel') WaveshareEPaperTypeAModel = display.display_ns.enum('WaveshareEPaperTypeAModel')
WaveshareEPaperTypeBModel = display.display_ns.enum('WaveshareEPaperTypeBModel') WaveshareEPaperTypeBModel = display.display_ns.enum('WaveshareEPaperTypeBModel')

12
esphomeyaml/components/esp32_ble_beacon.py → esphome/components/esp32_ble_beacon.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import config_validation as cv from esphome import config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_SCAN_INTERVAL, CONF_TYPE, CONF_UUID, ESP_PLATFORM_ESP32 from esphome.const import CONF_ID, CONF_SCAN_INTERVAL, CONF_TYPE, CONF_UUID, ESP_PLATFORM_ESP32
from esphomeyaml.cpp_generator import Pvariable, RawExpression, add from esphome.cpp_generator import Pvariable, RawExpression, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
ESP32BLEBeacon = esphomelib_ns.class_('ESP32BLEBeacon', Component) ESP32BLEBeacon = esphome_ns.class_('ESP32BLEBeacon', Component)
CONF_MAJOR = 'major' CONF_MAJOR = 'major'
CONF_MINOR = 'minor' CONF_MINOR = 'minor'

20
esphomeyaml/components/esp32_ble_tracker.py → esphome/components/esp32_ble_tracker.py
View File

@ -1,19 +1,19 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import config_validation as cv from esphome import config_validation as cv
from esphomeyaml.components import sensor from esphome.components import sensor
from esphomeyaml.const import CONF_ID, CONF_SCAN_INTERVAL, ESP_PLATFORM_ESP32 from esphome.const import CONF_ID, CONF_SCAN_INTERVAL, ESP_PLATFORM_ESP32
from esphomeyaml.core import HexInt from esphome.core import HexInt
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
CONF_ESP32_BLE_ID = 'esp32_ble_id' CONF_ESP32_BLE_ID = 'esp32_ble_id'
ESP32BLETracker = esphomelib_ns.class_('ESP32BLETracker', Component) ESP32BLETracker = esphome_ns.class_('ESP32BLETracker', Component)
XiaomiSensor = esphomelib_ns.class_('XiaomiSensor', sensor.Sensor) XiaomiSensor = esphome_ns.class_('XiaomiSensor', sensor.Sensor)
XiaomiDevice = esphomelib_ns.class_('XiaomiDevice') XiaomiDevice = esphome_ns.class_('XiaomiDevice')
XIAOMI_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({ XIAOMI_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({
cv.GenerateID(): cv.declare_variable_id(XiaomiSensor) cv.GenerateID(): cv.declare_variable_id(XiaomiSensor)
}) })

14
esphomeyaml/components/esp32_touch.py → esphome/components/esp32_touch.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import config_validation as cv from esphome import config_validation as cv
from esphomeyaml.components import binary_sensor from esphome.components import binary_sensor
from esphomeyaml.const import CONF_HIGH_VOLTAGE_REFERENCE, CONF_ID, CONF_IIR_FILTER, \ from esphome.const import CONF_HIGH_VOLTAGE_REFERENCE, CONF_ID, CONF_IIR_FILTER, \
CONF_LOW_VOLTAGE_REFERENCE, CONF_MEASUREMENT_DURATION, CONF_SETUP_MODE, CONF_SLEEP_DURATION, \ CONF_LOW_VOLTAGE_REFERENCE, CONF_MEASUREMENT_DURATION, CONF_SETUP_MODE, CONF_SLEEP_DURATION, \
CONF_VOLTAGE_ATTENUATION, ESP_PLATFORM_ESP32 CONF_VOLTAGE_ATTENUATION, ESP_PLATFORM_ESP32
from esphomeyaml.core import TimePeriod from esphome.core import TimePeriod
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component, global_ns from esphome.cpp_types import App, Component, global_ns
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]

22
esphomeyaml/components/ethernet.py → esphome/components/ethernet.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import wifi from esphome.components import wifi
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DOMAIN, CONF_ID, CONF_MANUAL_IP, CONF_TYPE, ESP_PLATFORM_ESP32, \ from esphome.const import CONF_DOMAIN, CONF_ID, CONF_MANUAL_IP, CONF_STATIC_IP, CONF_TYPE, \
CONF_USE_ADDRESS, CONF_STATIC_IP CONF_USE_ADDRESS, ESP_PLATFORM_ESP32
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression from esphome.cpp_helpers import gpio_output_pin_expression
from esphomeyaml.cpp_types import App, Component, esphomelib_ns, global_ns from esphome.cpp_types import App, Component, esphome_ns, global_ns
CONFLICTS_WITH = ['wifi'] CONFLICTS_WITH = ['wifi']
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
@ -19,7 +19,7 @@ CONF_MDIO_PIN = 'mdio_pin'
CONF_CLK_MODE = 'clk_mode' CONF_CLK_MODE = 'clk_mode'
CONF_POWER_PIN = 'power_pin' CONF_POWER_PIN = 'power_pin'
EthernetType = esphomelib_ns.enum('EthernetType') EthernetType = esphome_ns.enum('EthernetType')
ETHERNET_TYPES = { ETHERNET_TYPES = {
'LAN8720': EthernetType.ETHERNET_TYPE_LAN8720, 'LAN8720': EthernetType.ETHERNET_TYPE_LAN8720,
'TLK110': EthernetType.ETHERNET_TYPE_TLK110, 'TLK110': EthernetType.ETHERNET_TYPE_TLK110,
@ -33,7 +33,7 @@ CLK_MODES = {
'GPIO17_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO17_OUT, 'GPIO17_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO17_OUT,
} }
EthernetComponent = esphomelib_ns.class_('EthernetComponent', Component) EthernetComponent = esphome_ns.class_('EthernetComponent', Component)
def validate(config): def validate(config):

20
esphomeyaml/components/fan/__init__.py → esphome/components/fan/__init__.py
View File

@ -1,22 +1,22 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY, maybe_simple_id from esphome.automation import ACTION_REGISTRY, maybe_simple_id
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_INTERNAL, CONF_MQTT_ID, CONF_NAME, CONF_OSCILLATING, \ from esphome.const import CONF_ID, CONF_INTERNAL, CONF_MQTT_ID, CONF_NAME, CONF_OSCILLATING, \
CONF_OSCILLATION_COMMAND_TOPIC, CONF_OSCILLATION_OUTPUT, CONF_OSCILLATION_STATE_TOPIC, \ CONF_OSCILLATION_COMMAND_TOPIC, CONF_OSCILLATION_OUTPUT, CONF_OSCILLATION_STATE_TOPIC, \
CONF_SPEED, CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_STATE_TOPIC CONF_SPEED, CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_STATE_TOPIC
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, templatable from esphome.cpp_generator import Pvariable, add, get_variable, templatable
from esphomeyaml.cpp_types import Action, Application, Component, Nameable, bool_, esphomelib_ns from esphome.cpp_types import Action, Application, Component, Nameable, bool_, esphome_ns
from esphomeyaml.py_compat import string_types from esphome.py_compat import string_types
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
fan_ns = esphomelib_ns.namespace('fan') fan_ns = esphome_ns.namespace('fan')
FanState = fan_ns.class_('FanState', Nameable, Component) FanState = fan_ns.class_('FanState', Nameable, Component)
MQTTFanComponent = fan_ns.class_('MQTTFanComponent', mqtt.MQTTComponent) MQTTFanComponent = fan_ns.class_('MQTTFanComponent', mqtt.MQTTComponent)
MakeFan = Application.struct('MakeFan') MakeFan = Application.struct('MakeFan')

12
esphomeyaml/components/fan/binary.py → esphome/components/fan/binary.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome.components import fan, output
from esphomeyaml.components import fan, output import esphome.config_validation as cv
from esphomeyaml.const import CONF_MAKE_ID, CONF_NAME, CONF_OSCILLATION_OUTPUT, CONF_OUTPUT from esphome.const import CONF_MAKE_ID, CONF_NAME, CONF_OSCILLATION_OUTPUT, CONF_OUTPUT
from esphomeyaml.cpp_generator import get_variable, variable, add from esphome.cpp_generator import add, get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(fan.FAN_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(fan.FAN_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(fan.MakeFan), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(fan.MakeFan),

10
esphomeyaml/components/fan/speed.py → esphome/components/fan/speed.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome.components import fan, mqtt, output
from esphomeyaml.components import fan, mqtt, output import esphome.config_validation as cv
from esphomeyaml.const import CONF_HIGH, CONF_LOW, CONF_MAKE_ID, CONF_MEDIUM, CONF_NAME, \ from esphome.const import CONF_HIGH, CONF_LOW, CONF_MAKE_ID, CONF_MEDIUM, CONF_NAME, \
CONF_OSCILLATION_OUTPUT, CONF_OUTPUT, CONF_SPEED, CONF_SPEED_COMMAND_TOPIC, \ CONF_OSCILLATION_OUTPUT, CONF_OUTPUT, CONF_SPEED, CONF_SPEED_COMMAND_TOPIC, \
CONF_SPEED_STATE_TOPIC CONF_SPEED_STATE_TOPIC
from esphomeyaml.cpp_generator import get_variable, variable, add from esphome.cpp_generator import add, get_variable, variable
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(fan.FAN_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(fan.FAN_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(fan.MakeFan), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(fan.MakeFan),

18
esphomeyaml/components/font.py → esphome/components/font.py
View File

@ -1,14 +1,14 @@
# coding=utf-8 # coding=utf-8
import voluptuous as vol import voluptuous as vol
from esphomeyaml import core from esphome import core
from esphomeyaml.components import display from esphome.components import display
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_FILE, CONF_GLYPHS, CONF_ID, CONF_SIZE from esphome.const import CONF_FILE, CONF_GLYPHS, CONF_ID, CONF_SIZE
from esphomeyaml.core import CORE, HexInt from esphome.core import CORE, HexInt
from esphomeyaml.cpp_generator import Pvariable, progmem_array, safe_exp from esphome.cpp_generator import Pvariable, progmem_array, safe_exp
from esphomeyaml.cpp_types import App, uint8 from esphome.cpp_types import App, uint8
from esphomeyaml.py_compat import sort_by_cmp from esphome.py_compat import sort_by_cmp
DEPENDENCIES = ['display'] DEPENDENCIES = ['display']
MULTI_CONF = True MULTI_CONF = True
@ -87,7 +87,7 @@ def to_code(config):
try: try:
font = ImageFont.truetype(path, config[CONF_SIZE]) font = ImageFont.truetype(path, config[CONF_SIZE])
except Exception as e: except Exception as e:
raise core.EsphomeyamlError(u"Could not load truetype file {}: {}".format(path, e)) raise core.EsphomeError(u"Could not load truetype file {}: {}".format(path, e))
ascent, descent = font.getmetrics() ascent, descent = font.getmetrics()

12
esphomeyaml/components/globals.py → esphome/components/globals.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import config_validation as cv from esphome import config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_INITIAL_VALUE, CONF_RESTORE_VALUE, CONF_TYPE from esphome.const import CONF_ID, CONF_INITIAL_VALUE, CONF_RESTORE_VALUE, CONF_TYPE
from esphomeyaml.cpp_generator import Pvariable, RawExpression, TemplateArguments, add from esphome.cpp_generator import Pvariable, RawExpression, TemplateArguments, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
GlobalVariableComponent = esphomelib_ns.class_('GlobalVariableComponent', Component) GlobalVariableComponent = esphome_ns.class_('GlobalVariableComponent', Component)
MULTI_CONF = True MULTI_CONF = True

14
esphomeyaml/components/i2c.py → esphome/components/i2c.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_FREQUENCY, CONF_ID, CONF_RECEIVE_TIMEOUT, CONF_SCAN, CONF_SCL, \ from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_RECEIVE_TIMEOUT, CONF_SCAN, CONF_SCL, \
CONF_SDA CONF_SDA
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
I2CComponent = esphomelib_ns.class_('I2CComponent', Component) I2CComponent = esphome_ns.class_('I2CComponent', Component)
I2CDevice = pins.I2CDevice I2CDevice = pins.I2CDevice
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({

16
esphomeyaml/components/image.py → esphome/components/image.py
View File

@ -3,13 +3,13 @@ import logging
import voluptuous as vol import voluptuous as vol
from esphomeyaml import core from esphome import core
from esphomeyaml.components import display, font from esphome.components import display, font
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_FILE, CONF_ID, CONF_RESIZE from esphome.const import CONF_FILE, CONF_ID, CONF_RESIZE
from esphomeyaml.core import CORE, HexInt from esphome.core import CORE, HexInt
from esphomeyaml.cpp_generator import Pvariable, progmem_array, safe_exp from esphome.cpp_generator import Pvariable, progmem_array, safe_exp
from esphomeyaml.cpp_types import App, uint8 from esphome.cpp_types import App, uint8
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -37,7 +37,7 @@ def to_code(config):
try: try:
image = Image.open(path) image = Image.open(path)
except Exception as e: except Exception as e:
raise core.EsphomeyamlError(u"Could not load image file {}: {}".format(path, e)) raise core.EsphomeError(u"Could not load image file {}: {}".format(path, e))
if CONF_RESIZE in config: if CONF_RESIZE in config:
image.thumbnail(config[CONF_RESIZE]) image.thumbnail(config[CONF_RESIZE])

14
esphomeyaml/components/interval.py → esphome/components/interval.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_INTERVAL from esphome.const import CONF_ID, CONF_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, NoArg, PollingComponent, Trigger, esphomelib_ns from esphome.cpp_types import App, NoArg, PollingComponent, Trigger, esphome_ns
IntervalTrigger = esphomelib_ns.class_('IntervalTrigger', Trigger.template(NoArg), PollingComponent) IntervalTrigger = esphome_ns.class_('IntervalTrigger', Trigger.template(NoArg), PollingComponent)
CONFIG_SCHEMA = automation.validate_automation(vol.Schema({ CONFIG_SCHEMA = automation.validate_automation(vol.Schema({
cv.GenerateID(): cv.declare_variable_id(IntervalTrigger), cv.GenerateID(): cv.declare_variable_id(IntervalTrigger),

20
esphomeyaml/components/light/__init__.py → esphome/components/light/__init__.py
View File

@ -1,18 +1,18 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY, maybe_simple_id from esphome.automation import ACTION_REGISTRY, maybe_simple_id
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ALPHA, CONF_BLUE, CONF_BRIGHTNESS, CONF_COLORS, \ from esphome.const import CONF_ALPHA, CONF_BLUE, CONF_BRIGHTNESS, CONF_COLORS, \
CONF_COLOR_TEMPERATURE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_DURATION, CONF_EFFECT, \ CONF_COLOR_TEMPERATURE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_DURATION, CONF_EFFECT, \
CONF_EFFECTS, CONF_EFFECT_ID, CONF_FLASH_LENGTH, CONF_GAMMA_CORRECT, CONF_GREEN, CONF_ID, \ CONF_EFFECTS, CONF_EFFECT_ID, CONF_FLASH_LENGTH, CONF_GAMMA_CORRECT, CONF_GREEN, CONF_ID, \
CONF_INTERNAL, CONF_LAMBDA, CONF_MQTT_ID, CONF_NAME, CONF_NUM_LEDS, CONF_RANDOM, CONF_RED, \ CONF_INTERNAL, CONF_LAMBDA, CONF_MQTT_ID, CONF_NAME, CONF_NUM_LEDS, CONF_RANDOM, CONF_RED, \
CONF_SPEED, CONF_STATE, CONF_TRANSITION_LENGTH, CONF_UPDATE_INTERVAL, CONF_WHITE, CONF_WIDTH CONF_SPEED, CONF_STATE, CONF_TRANSITION_LENGTH, CONF_UPDATE_INTERVAL, CONF_WHITE, CONF_WIDTH
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, StructInitializer, add, get_variable, \ from esphome.cpp_generator import Pvariable, StructInitializer, add, get_variable, process_lambda, \
process_lambda, templatable templatable
from esphomeyaml.cpp_types import Action, Application, Component, Nameable, esphomelib_ns, float_, \ from esphome.cpp_types import Action, Application, Component, Nameable, esphome_ns, float_, \
std_string, uint32, void std_string, uint32, void
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
@ -20,7 +20,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
# Base # Base
light_ns = esphomelib_ns.namespace('light') light_ns = esphome_ns.namespace('light')
LightState = light_ns.class_('LightState', Nameable, Component) LightState = light_ns.class_('LightState', Nameable, Component)
MakeLight = Application.struct('MakeLight') MakeLight = Application.struct('MakeLight')
LightOutput = light_ns.class_('LightOutput') LightOutput = light_ns.class_('LightOutput')

12
esphomeyaml/components/light/binary.py → esphome/components/light/binary.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import light, output from esphome.components import light, output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_EFFECTS, CONF_MAKE_ID, CONF_NAME, CONF_OUTPUT from esphome.const import CONF_EFFECTS, CONF_MAKE_ID, CONF_NAME, CONF_OUTPUT
from esphomeyaml.cpp_generator import get_variable, variable from esphome.cpp_generator import get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),

14
esphomeyaml/components/light/cwww.py → esphome/components/light/cwww.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome.components import light, output
from esphomeyaml.components import light, output from esphome.components.light.rgbww import validate_cold_white_colder, \
from esphomeyaml.components.light.rgbww import validate_cold_white_colder, \
validate_color_temperature validate_color_temperature
from esphomeyaml.const import CONF_COLD_WHITE, CONF_COLD_WHITE_COLOR_TEMPERATURE, \ import esphome.config_validation as cv
from esphome.const import CONF_COLD_WHITE, CONF_COLD_WHITE_COLOR_TEMPERATURE, \
CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, \ CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, \
CONF_NAME, CONF_WARM_WHITE, CONF_WARM_WHITE_COLOR_TEMPERATURE CONF_NAME, CONF_WARM_WHITE, CONF_WARM_WHITE_COLOR_TEMPERATURE
from esphomeyaml.cpp_generator import get_variable, variable from esphome.cpp_generator import get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),

16
esphomeyaml/components/light/fastled_clockless.py → esphome/components/light/fastled_clockless.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import light from esphome.components import light
from esphomeyaml.components.power_supply import PowerSupplyComponent from esphome.components.power_supply import PowerSupplyComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CHIPSET, CONF_COLOR_CORRECT, CONF_DEFAULT_TRANSITION_LENGTH, \ from esphome.const import CONF_CHIPSET, CONF_COLOR_CORRECT, CONF_DEFAULT_TRANSITION_LENGTH, \
CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, CONF_MAX_REFRESH_RATE, CONF_NAME, \ CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, CONF_MAX_REFRESH_RATE, CONF_NAME, \
CONF_NUM_LEDS, CONF_PIN, CONF_POWER_SUPPLY, CONF_RGB_ORDER CONF_NUM_LEDS, CONF_PIN, CONF_POWER_SUPPLY, CONF_RGB_ORDER
from esphomeyaml.cpp_generator import RawExpression, TemplateArguments, add, get_variable, variable from esphome.cpp_generator import RawExpression, TemplateArguments, add, get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Application from esphome.cpp_types import App, Application
TYPES = [ TYPES = [
'NEOPIXEL', 'NEOPIXEL',

16
esphomeyaml/components/light/fastled_spi.py → esphome/components/light/fastled_spi.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import light from esphome.components import light
from esphomeyaml.components.power_supply import PowerSupplyComponent from esphome.components.power_supply import PowerSupplyComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CHIPSET, CONF_CLOCK_PIN, CONF_COLOR_CORRECT, CONF_DATA_PIN, \ from esphome.const import CONF_CHIPSET, CONF_CLOCK_PIN, CONF_COLOR_CORRECT, CONF_DATA_PIN, \
CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, \ CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, \
CONF_MAX_REFRESH_RATE, CONF_NAME, CONF_NUM_LEDS, CONF_POWER_SUPPLY, CONF_RGB_ORDER CONF_MAX_REFRESH_RATE, CONF_NAME, CONF_NUM_LEDS, CONF_POWER_SUPPLY, CONF_RGB_ORDER
from esphomeyaml.cpp_generator import RawExpression, TemplateArguments, add, get_variable, variable from esphome.cpp_generator import RawExpression, TemplateArguments, add, get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Application from esphome.cpp_types import App, Application
CHIPSETS = [ CHIPSETS = [
'LPD8806', 'LPD8806',

12
esphomeyaml/components/light/monochromatic.py → esphome/components/light/monochromatic.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import light, output from esphome.components import light, output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, \ from esphome.const import CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, \
CONF_MAKE_ID, CONF_NAME, CONF_OUTPUT CONF_MAKE_ID, CONF_NAME, CONF_OUTPUT
from esphomeyaml.cpp_generator import get_variable, variable from esphome.cpp_generator import get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),

20
esphomeyaml/components/light/neopixelbus.py → esphome/components/light/neopixelbus.py
View File

@ -1,17 +1,17 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import light from esphome.components import light
from esphomeyaml.components.light import AddressableLight from esphome.components.light import AddressableLight
from esphomeyaml.components.power_supply import PowerSupplyComponent from esphome.components.power_supply import PowerSupplyComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CLOCK_PIN, CONF_COLOR_CORRECT, CONF_DATA_PIN, \ from esphome.const import CONF_CLOCK_PIN, CONF_COLOR_CORRECT, CONF_DATA_PIN, \
CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, CONF_METHOD, \ CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_MAKE_ID, CONF_METHOD, \
CONF_NAME, CONF_NUM_LEDS, CONF_PIN, CONF_POWER_SUPPLY, CONF_TYPE, CONF_VARIANT CONF_NAME, CONF_NUM_LEDS, CONF_PIN, CONF_POWER_SUPPLY, CONF_TYPE, CONF_VARIANT
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import TemplateArguments, add, get_variable, variable from esphome.cpp_generator import TemplateArguments, add, get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Application, Component, global_ns from esphome.cpp_types import App, Application, Component, global_ns
NeoPixelBusLightOutputBase = light.light_ns.class_('NeoPixelBusLightOutputBase', Component, NeoPixelBusLightOutputBase = light.light_ns.class_('NeoPixelBusLightOutputBase', Component,
AddressableLight) AddressableLight)

12
esphomeyaml/components/light/rgb.py → esphome/components/light/rgb.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import light, output from esphome.components import light, output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BLUE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, \ from esphome.const import CONF_BLUE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, \
CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, CONF_NAME, CONF_RED CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, CONF_NAME, CONF_RED
from esphomeyaml.cpp_generator import get_variable, variable from esphome.cpp_generator import get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),

12
esphomeyaml/components/light/rgbw.py → esphome/components/light/rgbw.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import light, output from esphome.components import light, output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BLUE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, \ from esphome.const import CONF_BLUE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, \
CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, CONF_NAME, CONF_RED, CONF_WHITE CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, CONF_NAME, CONF_RED, CONF_WHITE
from esphomeyaml.cpp_generator import get_variable, variable from esphome.cpp_generator import get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight), cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),

12
esphomeyaml/components/light/rgbww.py → esphome/components/light/rgbww.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import light, output from esphome.components import light, output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BLUE, CONF_COLD_WHITE, CONF_COLD_WHITE_COLOR_TEMPERATURE, \ from esphome.const import CONF_BLUE, CONF_COLD_WHITE, CONF_COLD_WHITE_COLOR_TEMPERATURE, \
CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, \ CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, \
CONF_NAME, CONF_RED, CONF_WARM_WHITE, CONF_WARM_WHITE_COLOR_TEMPERATURE CONF_NAME, CONF_RED, CONF_WARM_WHITE, CONF_WARM_WHITE_COLOR_TEMPERATURE
from esphomeyaml.cpp_generator import get_variable, variable from esphome.cpp_generator import get_variable, variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
def validate_color_temperature(value): def validate_color_temperature(value):

38
esphomeyaml/components/logger.py → esphome/components/logger.py
View File

@ -2,23 +2,23 @@ import re
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY, LambdaAction from esphome.automation import ACTION_REGISTRY, LambdaAction
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_ID, CONF_LEVEL, \ from esphome.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_HARDWARE_UART, CONF_ID, \
CONF_LOGS, CONF_TAG, CONF_TX_BUFFER_SIZE, CONF_HARDWARE_UART CONF_LEVEL, CONF_LOGS, CONF_TAG, CONF_TX_BUFFER_SIZE
from esphomeyaml.core import EsphomeyamlError, Lambda, CORE from esphome.core import CORE, EsphomeError, Lambda
from esphomeyaml.cpp_generator import Pvariable, RawExpression, add, process_lambda, statement from esphome.cpp_generator import Pvariable, RawExpression, add, process_lambda, statement
from esphomeyaml.cpp_types import App, Component, esphomelib_ns, global_ns, void from esphome.cpp_types import App, Component, esphome_ns, global_ns, void
from esphomeyaml.py_compat import text_type from esphome.py_compat import text_type
LOG_LEVELS = { LOG_LEVELS = {
'NONE': global_ns.ESPHOMELIB_LOG_LEVEL_NONE, 'NONE': global_ns.ESPHOME_LOG_LEVEL_NONE,
'ERROR': global_ns.ESPHOMELIB_LOG_LEVEL_ERROR, 'ERROR': global_ns.ESPHOME_LOG_LEVEL_ERROR,
'WARN': global_ns.ESPHOMELIB_LOG_LEVEL_WARN, 'WARN': global_ns.ESPHOME_LOG_LEVEL_WARN,
'INFO': global_ns.ESPHOMELIB_LOG_LEVEL_INFO, 'INFO': global_ns.ESPHOME_LOG_LEVEL_INFO,
'DEBUG': global_ns.ESPHOMELIB_LOG_LEVEL_DEBUG, 'DEBUG': global_ns.ESPHOME_LOG_LEVEL_DEBUG,
'VERBOSE': global_ns.ESPHOMELIB_LOG_LEVEL_VERBOSE, 'VERBOSE': global_ns.ESPHOME_LOG_LEVEL_VERBOSE,
'VERY_VERBOSE': global_ns.ESPHOMELIB_LOG_LEVEL_VERY_VERBOSE, 'VERY_VERBOSE': global_ns.ESPHOME_LOG_LEVEL_VERY_VERBOSE,
} }
LOG_LEVEL_TO_ESP_LOG = { LOG_LEVEL_TO_ESP_LOG = {
@ -66,12 +66,12 @@ def validate_local_no_higher_than_global(value):
global_level = value.get(CONF_LEVEL, 'DEBUG') global_level = value.get(CONF_LEVEL, 'DEBUG')
for tag, level in value.get(CONF_LOGS, {}).items(): for tag, level in value.get(CONF_LOGS, {}).items():
if LOG_LEVEL_SEVERITY.index(level) > LOG_LEVEL_SEVERITY.index(global_level): if LOG_LEVEL_SEVERITY.index(level) > LOG_LEVEL_SEVERITY.index(global_level):
raise EsphomeyamlError(u"The local log level {} for {} must be less severe than the " raise EsphomeError(u"The local log level {} for {} must be less severe than the "
u"global log level {}.".format(level, tag, global_level)) u"global log level {}.".format(level, tag, global_level))
return value return value
LogComponent = esphomelib_ns.class_('LogComponent', Component) LogComponent = esphome_ns.class_('LogComponent', Component)
CONFIG_SCHEMA = vol.All(vol.Schema({ CONFIG_SCHEMA = vol.All(vol.Schema({
cv.GenerateID(): cv.declare_variable_id(LogComponent), cv.GenerateID(): cv.declare_variable_id(LogComponent),
@ -99,7 +99,7 @@ def to_code(config):
def required_build_flags(config): def required_build_flags(config):
flags = [] flags = []
if CONF_LEVEL in config: if CONF_LEVEL in config:
flags.append(u'-DESPHOMELIB_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]]))) flags.append(u'-DESPHOME_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]])))
this_severity = LOG_LEVEL_SEVERITY.index(config[CONF_LEVEL]) this_severity = LOG_LEVEL_SEVERITY.index(config[CONF_LEVEL])
verbose_severity = LOG_LEVEL_SEVERITY.index('VERBOSE') verbose_severity = LOG_LEVEL_SEVERITY.index('VERBOSE')
is_at_least_verbose = this_severity >= verbose_severity is_at_least_verbose = this_severity >= verbose_severity

30
esphomeyaml/components/mqtt.py → esphome/components/mqtt.py
View File

@ -3,22 +3,22 @@ import re
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
from esphomeyaml.components import logger from esphome.components import logger
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_AVAILABILITY, CONF_BIRTH_MESSAGE, CONF_BROKER, CONF_CLIENT_ID, \ from esphome.const import CONF_AVAILABILITY, CONF_BIRTH_MESSAGE, CONF_BROKER, CONF_CLIENT_ID, \
CONF_COMMAND_TOPIC, CONF_DISCOVERY, CONF_DISCOVERY_PREFIX, CONF_DISCOVERY_RETAIN, \ CONF_COMMAND_TOPIC, CONF_DISCOVERY, CONF_DISCOVERY_PREFIX, CONF_DISCOVERY_RETAIN, \
CONF_ESPHOMEYAML, CONF_ID, CONF_INTERNAL, CONF_KEEPALIVE, CONF_LEVEL, CONF_LOG_TOPIC, \ CONF_ESPHOME, CONF_ID, CONF_INTERNAL, CONF_KEEPALIVE, CONF_LEVEL, CONF_LOG_TOPIC, \
CONF_MQTT, CONF_NAME, CONF_ON_JSON_MESSAGE, CONF_ON_MESSAGE, CONF_PASSWORD, CONF_PAYLOAD, \ CONF_MQTT, CONF_NAME, CONF_ON_JSON_MESSAGE, CONF_ON_MESSAGE, CONF_PASSWORD, CONF_PAYLOAD, \
CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_PORT, CONF_QOS, CONF_REBOOT_TIMEOUT, \ CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_PORT, CONF_QOS, CONF_REBOOT_TIMEOUT, \
CONF_RETAIN, CONF_SHUTDOWN_MESSAGE, CONF_SSL_FINGERPRINTS, CONF_STATE_TOPIC, CONF_TOPIC, \ CONF_RETAIN, CONF_SHUTDOWN_MESSAGE, CONF_SSL_FINGERPRINTS, CONF_STATE_TOPIC, CONF_TOPIC, \
CONF_TOPIC_PREFIX, CONF_TRIGGER_ID, CONF_USERNAME, CONF_WILL_MESSAGE CONF_TOPIC_PREFIX, CONF_TRIGGER_ID, CONF_USERNAME, CONF_WILL_MESSAGE
from esphomeyaml.core import EsphomeyamlError from esphome.core import EsphomeError
from esphomeyaml.cpp_generator import Pvariable, RawExpression, StructInitializer, \ from esphome.cpp_generator import Pvariable, RawExpression, StructInitializer, TemplateArguments, \
TemplateArguments, add, process_lambda, templatable, get_variable add, get_variable, process_lambda, templatable
from esphomeyaml.cpp_types import Action, App, Component, JsonObjectConstRef, JsonObjectRef, \ from esphome.cpp_types import Action, App, Component, JsonObjectConstRef, JsonObjectRef, \
Trigger, bool_, esphomelib_ns, optional, std_string, uint8, void Trigger, bool_, esphome_ns, optional, std_string, uint8, void
def validate_message_just_topic(value): def validate_message_just_topic(value):
@ -38,7 +38,7 @@ MQTT_MESSAGE_SCHEMA = vol.Any(None, MQTT_MESSAGE_BASE.extend({
vol.Required(CONF_PAYLOAD): cv.mqtt_payload, vol.Required(CONF_PAYLOAD): cv.mqtt_payload,
})) }))
mqtt_ns = esphomelib_ns.namespace('mqtt') mqtt_ns = esphome_ns.namespace('mqtt')
MQTTMessage = mqtt_ns.struct('MQTTMessage') MQTTMessage = mqtt_ns.struct('MQTTMessage')
MQTTClientComponent = mqtt_ns.class_('MQTTClientComponent', Component) MQTTClientComponent = mqtt_ns.class_('MQTTClientComponent', Component)
MQTTPublishAction = mqtt_ns.class_('MQTTPublishAction', Action) MQTTPublishAction = mqtt_ns.class_('MQTTPublishAction', Action)
@ -299,10 +299,10 @@ def build_hass_config(data, component_type, config, include_state=True, include_
class GenerateHassConfigData(object): class GenerateHassConfigData(object):
def __init__(self, config): def __init__(self, config):
if 'mqtt' not in config: if 'mqtt' not in config:
raise EsphomeyamlError("Cannot generate Home Assistant MQTT config if MQTT is not " raise EsphomeError("Cannot generate Home Assistant MQTT config if MQTT is not "
"used!") "used!")
mqtt = config[CONF_MQTT] mqtt = config[CONF_MQTT]
self.topic_prefix = mqtt.get(CONF_TOPIC_PREFIX, config[CONF_ESPHOMEYAML][CONF_NAME]) self.topic_prefix = mqtt.get(CONF_TOPIC_PREFIX, config[CONF_ESPHOME][CONF_NAME])
birth_message = mqtt.get(CONF_BIRTH_MESSAGE) birth_message = mqtt.get(CONF_BIRTH_MESSAGE)
if CONF_BIRTH_MESSAGE not in mqtt: if CONF_BIRTH_MESSAGE not in mqtt:
birth_message = { birth_message = {

16
esphomeyaml/components/my9231.py → esphome/components/my9231.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import output from esphome.components import output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import (CONF_BIT_DEPTH, CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID, from esphome.const import (CONF_BIT_DEPTH, CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID,
CONF_NUM_CHANNELS, CONF_NUM_CHIPS, CONF_UPDATE_ON_BOOT) CONF_NUM_CHANNELS, CONF_NUM_CHIPS, CONF_UPDATE_ON_BOOT)
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
MY9231OutputComponent = output.output_ns.class_('MY9231OutputComponent', Component) MY9231OutputComponent = output.output_ns.class_('MY9231OutputComponent', Component)
MULTI_CONF = True MULTI_CONF = True

12
esphomeyaml/components/ota.py → esphome/components/ota.py
View File

@ -2,15 +2,15 @@ import logging
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_OTA, CONF_PASSWORD, CONF_PORT, CONF_SAFE_MODE from esphome.const import CONF_ID, CONF_OTA, CONF_PASSWORD, CONF_PORT, CONF_SAFE_MODE
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
OTAComponent = esphomelib_ns.class_('OTAComponent', Component) OTAComponent = esphome_ns.class_('OTAComponent', Component)
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
cv.GenerateID(): cv.declare_variable_id(OTAComponent), cv.GenerateID(): cv.declare_variable_id(OTAComponent),

17
esphomeyaml/components/output/__init__.py → esphome/components/output/__init__.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import maybe_simple_id, ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY, maybe_simple_id
import esphomeyaml.config_validation as cv from esphome.components.power_supply import PowerSupplyComponent
from esphomeyaml.components.power_supply import PowerSupplyComponent import esphome.config_validation as cv
from esphomeyaml.const import CONF_INVERTED, CONF_MAX_POWER, CONF_POWER_SUPPLY, CONF_ID, CONF_LEVEL from esphome.const import CONF_ID, CONF_INVERTED, CONF_LEVEL, CONF_MAX_POWER, CONF_POWER_SUPPLY
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import add, get_variable, Pvariable, templatable from esphome.cpp_generator import Pvariable, add, get_variable, templatable
from esphomeyaml.cpp_types import esphomelib_ns, Action, float_ from esphome.cpp_types import Action, esphome_ns, float_
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
@ -25,7 +25,7 @@ FLOAT_OUTPUT_SCHEMA = BINARY_OUTPUT_SCHEMA.extend({
FLOAT_OUTPUT_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(FLOAT_OUTPUT_SCHEMA.schema) FLOAT_OUTPUT_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(FLOAT_OUTPUT_SCHEMA.schema)
output_ns = esphomelib_ns.namespace('output') output_ns = esphome_ns.namespace('output')
BinaryOutput = output_ns.class_('BinaryOutput') BinaryOutput = output_ns.class_('BinaryOutput')
BinaryOutputPtr = BinaryOutput.operator('ptr') BinaryOutputPtr = BinaryOutput.operator('ptr')
FloatOutput = output_ns.class_('FloatOutput', BinaryOutput) FloatOutput = output_ns.class_('FloatOutput', BinaryOutput)
@ -60,7 +60,6 @@ def register_output(var, config):
BUILD_FLAGS = '-DUSE_OUTPUT' BUILD_FLAGS = '-DUSE_OUTPUT'
CONF_OUTPUT_TURN_ON = 'output.turn_on' CONF_OUTPUT_TURN_ON = 'output.turn_on'
OUTPUT_TURN_ON_ACTION = maybe_simple_id({ OUTPUT_TURN_ON_ACTION = maybe_simple_id({
vol.Required(CONF_ID): cv.use_variable_id(BinaryOutput), vol.Required(CONF_ID): cv.use_variable_id(BinaryOutput),

10
esphomeyaml/components/output/custom.py → esphome/components/output/custom.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import output from esphome.components import output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE from esphome.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE
from esphomeyaml.cpp_generator import process_lambda, variable from esphome.cpp_generator import process_lambda, variable
from esphomeyaml.cpp_types import std_vector from esphome.cpp_types import std_vector
CustomBinaryOutputConstructor = output.output_ns.class_('CustomBinaryOutputConstructor') CustomBinaryOutputConstructor = output.output_ns.class_('CustomBinaryOutputConstructor')
CustomFloatOutputConstructor = output.output_ns.class_('CustomFloatOutputConstructor') CustomFloatOutputConstructor = output.output_ns.class_('CustomFloatOutputConstructor')

14
esphomeyaml/components/output/esp8266_pwm.py → esphome/components/output/esp8266_pwm.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import output from esphome.components import output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_FREQUENCY, CONF_ID, CONF_NUMBER, CONF_PIN, ESP_PLATFORM_ESP8266 from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_NUMBER, CONF_PIN, ESP_PLATFORM_ESP8266
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
ESP_PLATFORMS = [ESP_PLATFORM_ESP8266] ESP_PLATFORMS = [ESP_PLATFORM_ESP8266]

14
esphomeyaml/components/output/gpio.py → esphome/components/output/gpio.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import output from esphome.components import output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_PIN from esphome.const import CONF_ID, CONF_PIN
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
GPIOBinaryOutputComponent = output.output_ns.class_('GPIOBinaryOutputComponent', GPIOBinaryOutputComponent = output.output_ns.class_('GPIOBinaryOutputComponent',
output.BinaryOutput, Component) output.BinaryOutput, Component)

14
esphomeyaml/components/output/ledc.py → esphome/components/output/ledc.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import output from esphome.components import output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import APB_CLOCK_FREQ, CONF_BIT_DEPTH, CONF_CHANNEL, CONF_FREQUENCY, \ from esphome.const import APB_CLOCK_FREQ, CONF_BIT_DEPTH, CONF_CHANNEL, CONF_FREQUENCY, \
CONF_ID, CONF_PIN, ESP_PLATFORM_ESP32 CONF_ID, CONF_PIN, ESP_PLATFORM_ESP32
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]

12
esphomeyaml/components/output/my9231.py → esphome/components/output/my9231.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import output from esphome.components import output
from esphomeyaml.components.my9231 import MY9231OutputComponent from esphome.components.my9231 import MY9231OutputComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CHANNEL, CONF_ID, CONF_MY9231_ID, CONF_POWER_SUPPLY from esphome.const import CONF_CHANNEL, CONF_ID, CONF_MY9231_ID, CONF_POWER_SUPPLY
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
DEPENDENCIES = ['my9231'] DEPENDENCIES = ['my9231']

10
esphomeyaml/components/output/pca9685.py → esphome/components/output/pca9685.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import output from esphome.components import output
from esphomeyaml.components.pca9685 import PCA9685OutputComponent from esphome.components.pca9685 import PCA9685OutputComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CHANNEL, CONF_ID, CONF_PCA9685_ID, CONF_POWER_SUPPLY from esphome.const import CONF_CHANNEL, CONF_ID, CONF_PCA9685_ID, CONF_POWER_SUPPLY
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
DEPENDENCIES = ['pca9685'] DEPENDENCIES = ['pca9685']

12
esphomeyaml/components/pca9685.py → esphome/components/pca9685.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, output from esphome.components import i2c, output
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_FREQUENCY, CONF_ID from esphome.const import CONF_ADDRESS, CONF_FREQUENCY, CONF_ID
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']
MULTI_CONF = True MULTI_CONF = True

12
esphomeyaml/components/pcf8574.py → esphome/components/pcf8574.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_PCF8575 from esphome.const import CONF_ADDRESS, CONF_ID, CONF_PCF8575
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, GPIOInputPin, GPIOOutputPin, io_ns from esphome.cpp_types import App, GPIOInputPin, GPIOOutputPin, io_ns
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']
MULTI_CONF = True MULTI_CONF = True

16
esphomeyaml/components/pn532.py → esphome/components/pn532.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation, pins from esphome import automation, pins
from esphomeyaml.components import binary_sensor, spi from esphome.components import binary_sensor, spi
from esphomeyaml.components.spi import SPIComponent from esphome.components.spi import SPIComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CS_PIN, CONF_ID, CONF_ON_TAG, CONF_SPI_ID, CONF_TRIGGER_ID, \ from esphome.const import CONF_CS_PIN, CONF_ID, CONF_ON_TAG, CONF_SPI_ID, CONF_TRIGGER_ID, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, PollingComponent, Trigger, std_string from esphome.cpp_types import App, PollingComponent, Trigger, std_string
DEPENDENCIES = ['spi'] DEPENDENCIES = ['spi']
MULTI_CONF = True MULTI_CONF = True

14
esphomeyaml/components/power_supply.py → esphome/components/power_supply.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ENABLE_TIME, CONF_ID, CONF_KEEP_ON_TIME, CONF_PIN from esphome.const import CONF_ENABLE_TIME, CONF_ID, CONF_KEEP_ON_TIME, CONF_PIN
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
PowerSupplyComponent = esphomelib_ns.class_('PowerSupplyComponent', Component) PowerSupplyComponent = esphome_ns.class_('PowerSupplyComponent', Component)
MULTI_CONF = True MULTI_CONF = True

12
esphomeyaml/components/rdm6300.py → esphome/components/rdm6300.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import binary_sensor, uart from esphome.components import binary_sensor, uart
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_UART_ID from esphome.const import CONF_ID, CONF_UART_ID
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['uart'] DEPENDENCIES = ['uart']

16
esphomeyaml/components/remote_receiver.py → esphome/components/remote_receiver.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BUFFER_SIZE, CONF_DUMP, CONF_FILTER, CONF_ID, CONF_IDLE, \ from esphome.const import CONF_BUFFER_SIZE, CONF_DUMP, CONF_FILTER, CONF_ID, CONF_IDLE, \
CONF_PIN, CONF_TOLERANCE CONF_PIN, CONF_TOLERANCE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
from esphomeyaml.py_compat import string_types from esphome.py_compat import string_types
remote_ns = esphomelib_ns.namespace('remote') remote_ns = esphome_ns.namespace('remote')
MULTI_CONF = True MULTI_CONF = True
RemoteControlComponentBase = remote_ns.class_('RemoteControlComponentBase') RemoteControlComponentBase = remote_ns.class_('RemoteControlComponentBase')

18
esphomeyaml/components/remote_transmitter.py → esphome/components/remote_transmitter.py
View File

@ -1,16 +1,16 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components.remote_receiver import RemoteControlComponentBase, remote_ns from esphome.components.remote_receiver import RemoteControlComponentBase, remote_ns
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_CARRIER_DUTY_PERCENT, CONF_CHANNEL, CONF_CODE, \ from esphome.const import CONF_ADDRESS, CONF_CARRIER_DUTY_PERCENT, CONF_CHANNEL, CONF_CODE, \
CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_ID, CONF_INVERTED, CONF_ONE, CONF_PIN, \ CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_ID, CONF_INVERTED, CONF_ONE, CONF_PIN, \
CONF_PROTOCOL, CONF_PULSE_LENGTH, CONF_STATE, CONF_SYNC, CONF_ZERO CONF_PROTOCOL, CONF_PULSE_LENGTH, CONF_STATE, CONF_SYNC, CONF_ZERO
from esphomeyaml.core import HexInt from esphome.core import HexInt
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
from esphomeyaml.py_compat import text_type from esphome.py_compat import text_type
RemoteTransmitterComponent = remote_ns.class_('RemoteTransmitterComponent', RemoteTransmitterComponent = remote_ns.class_('RemoteTransmitterComponent',
RemoteControlComponentBase, Component) RemoteControlComponentBase, Component)

18
esphomeyaml/components/script.py → esphome/components/script.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.automation import ACTION_REGISTRY, maybe_simple_id from esphome.automation import ACTION_REGISTRY, maybe_simple_id
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID from esphome.const import CONF_ID
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_types import Action, NoArg, Trigger, esphomelib_ns from esphome.cpp_types import Action, NoArg, Trigger, esphome_ns
Script = esphomelib_ns.class_('Script', Trigger.template(NoArg)) Script = esphome_ns.class_('Script', Trigger.template(NoArg))
ScriptExecuteAction = esphomelib_ns.class_('ScriptExecuteAction', Action) ScriptExecuteAction = esphome_ns.class_('ScriptExecuteAction', Action)
ScriptStopAction = esphomelib_ns.class_('ScriptStopAction', Action) ScriptStopAction = esphome_ns.class_('ScriptStopAction', Action)
CONFIG_SCHEMA = automation.validate_automation({ CONFIG_SCHEMA = automation.validate_automation({
vol.Required(CONF_ID): cv.declare_variable_id(Script), vol.Required(CONF_ID): cv.declare_variable_id(Script),

22
esphomeyaml/components/sensor/__init__.py → esphome/components/sensor/__init__.py
View File

@ -1,21 +1,21 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.automation import CONDITION_REGISTRY from esphome.automation import CONDITION_REGISTRY
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ABOVE, CONF_ACCURACY_DECIMALS, CONF_ALPHA, CONF_BELOW, \ from esphome.const import CONF_ABOVE, CONF_ACCURACY_DECIMALS, CONF_ALPHA, CONF_BELOW, \
CONF_DEBOUNCE, CONF_DELTA, CONF_EXPIRE_AFTER, CONF_EXPONENTIAL_MOVING_AVERAGE, CONF_FILTERS, \ CONF_DEBOUNCE, CONF_DELTA, CONF_EXPIRE_AFTER, CONF_EXPONENTIAL_MOVING_AVERAGE, CONF_FILTERS, \
CONF_FILTER_NAN, CONF_FILTER_OUT, CONF_HEARTBEAT, CONF_ICON, CONF_ID, CONF_INTERNAL, \ CONF_FILTER_NAN, CONF_FILTER_OUT, CONF_HEARTBEAT, CONF_ICON, CONF_ID, CONF_INTERNAL, \
CONF_LAMBDA, CONF_MQTT_ID, CONF_MULTIPLY, CONF_OFFSET, CONF_ON_RAW_VALUE, CONF_ON_VALUE, \ CONF_LAMBDA, CONF_MQTT_ID, CONF_MULTIPLY, CONF_OFFSET, CONF_ON_RAW_VALUE, CONF_ON_VALUE, \
CONF_ON_VALUE_RANGE, CONF_OR, CONF_SEND_EVERY, CONF_SEND_FIRST_AT, \ CONF_ON_VALUE_RANGE, CONF_OR, CONF_SEND_EVERY, CONF_SEND_FIRST_AT, \
CONF_SLIDING_WINDOW_MOVING_AVERAGE, CONF_THROTTLE, CONF_TRIGGER_ID, CONF_UNIQUE, \ CONF_SLIDING_WINDOW_MOVING_AVERAGE, CONF_THROTTLE, CONF_TRIGGER_ID, CONF_UNIQUE, \
CONF_UNIT_OF_MEASUREMENT, CONF_WINDOW_SIZE CONF_UNIT_OF_MEASUREMENT, CONF_WINDOW_SIZE
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
from esphomeyaml.cpp_types import App, Component, Nameable, PollingComponent, Trigger, \ from esphome.cpp_types import App, Component, Nameable, PollingComponent, Trigger, \
esphomelib_ns, float_, optional esphome_ns, float_, optional
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
@ -63,7 +63,7 @@ FILTERS_SCHEMA = cv.ensure_list({
}, cv.has_exactly_one_key(*FILTER_KEYS)) }, cv.has_exactly_one_key(*FILTER_KEYS))
# Base # Base
sensor_ns = esphomelib_ns.namespace('sensor') sensor_ns = esphome_ns.namespace('sensor')
Sensor = sensor_ns.class_('Sensor', Nameable) Sensor = sensor_ns.class_('Sensor', Nameable)
SensorPtr = Sensor.operator('ptr') SensorPtr = Sensor.operator('ptr')
MQTTSensorComponent = sensor_ns.class_('MQTTSensorComponent', mqtt.MQTTComponent) MQTTSensorComponent = sensor_ns.class_('MQTTSensorComponent', mqtt.MQTTComponent)

14
esphomeyaml/components/sensor/adc.py → esphome/components/sensor/adc.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ATTENUATION, CONF_ID, CONF_NAME, CONF_PIN, CONF_UPDATE_INTERVAL from esphome.const import CONF_ATTENUATION, CONF_ID, CONF_NAME, CONF_PIN, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, global_ns from esphome.cpp_types import App, global_ns
ATTENUATION_MODES = { ATTENUATION_MODES = {
'0db': global_ns.ADC_0db, '0db': global_ns.ADC_0db,

12
esphomeyaml/components/sensor/ads1115.py → esphome/components/sensor/ads1115.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
from esphomeyaml.components.ads1115 import ADS1115Component from esphome.components.ads1115 import ADS1115Component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADS1115_ID, CONF_GAIN, CONF_MULTIPLEXER, CONF_NAME, \ from esphome.const import CONF_ADS1115_ID, CONF_GAIN, CONF_MULTIPLEXER, CONF_NAME, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
from esphomeyaml.py_compat import string_types from esphome.py_compat import string_types
DEPENDENCIES = ['ads1115'] DEPENDENCIES = ['ads1115']

10
esphomeyaml/components/sensor/apds9960.py → esphome/components/sensor/apds9960.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
from esphomeyaml.components.apds9960 import APDS9960, CONF_APDS9960_ID from esphome.components.apds9960 import APDS9960, CONF_APDS9960_ID
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_NAME, CONF_TYPE from esphome.const import CONF_NAME, CONF_TYPE
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
DEPENDENCIES = ['apds9960'] DEPENDENCIES = ['apds9960']

12
esphomeyaml/components/sensor/bh1750.py → esphome/components/sensor/bh1750.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_RESOLUTION, \ from esphome.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_RESOLUTION, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/ble_rssi.py → esphome/components/sensor/ble_rssi.py
View File

@ -1,16 +1,16 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
from esphomeyaml.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \ from esphome.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \
make_address_array make_address_array
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_MAC_ADDRESS, CONF_NAME from esphome.const import CONF_MAC_ADDRESS, CONF_NAME
from esphomeyaml.cpp_generator import get_variable from esphome.cpp_generator import get_variable
from esphomeyaml.cpp_types import esphomelib_ns from esphome.cpp_types import esphome_ns
DEPENDENCIES = ['esp32_ble_tracker'] DEPENDENCIES = ['esp32_ble_tracker']
ESP32BLERSSISensor = esphomelib_ns.class_('ESP32BLERSSISensor', sensor.Sensor) ESP32BLERSSISensor = esphome_ns.class_('ESP32BLERSSISensor', sensor.Sensor)
PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
cv.GenerateID(): cv.declare_variable_id(ESP32BLERSSISensor), cv.GenerateID(): cv.declare_variable_id(ESP32BLERSSISensor),

12
esphomeyaml/components/sensor/bme280.py → esphome/components/sensor/bme280.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_HUMIDITY, CONF_ID, CONF_IIR_FILTER, CONF_NAME, \ from esphome.const import CONF_ADDRESS, CONF_HUMIDITY, CONF_ID, CONF_IIR_FILTER, CONF_NAME, \
CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/bme680.py → esphome/components/sensor/bme680.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import core from esphome import core
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_DURATION, CONF_GAS_RESISTANCE, CONF_HEATER, \ from esphome.const import CONF_ADDRESS, CONF_DURATION, CONF_GAS_RESISTANCE, CONF_HEATER, \
CONF_HUMIDITY, CONF_ID, CONF_IIR_FILTER, CONF_NAME, CONF_OVERSAMPLING, CONF_PRESSURE, \ CONF_HUMIDITY, CONF_ID, CONF_IIR_FILTER, CONF_NAME, CONF_OVERSAMPLING, CONF_PRESSURE, \
CONF_TEMPERATURE, CONF_UPDATE_INTERVAL CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

12
esphomeyaml/components/sensor/bmp085.py → esphome/components/sensor/bmp085.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_PRESSURE, CONF_TEMPERATURE, \ from esphome.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_PRESSURE, CONF_TEMPERATURE, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import HexIntLiteral, Pvariable, add from esphome.cpp_generator import HexIntLiteral, Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

12
esphomeyaml/components/sensor/bmp280.py → esphome/components/sensor/bmp280.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_IIR_FILTER, CONF_NAME, \ from esphome.const import CONF_ADDRESS, CONF_ID, CONF_IIR_FILTER, CONF_NAME, \
CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/cse7766.py → esphome/components/sensor/cse7766.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor, uart from esphome.components import sensor, uart
from esphomeyaml.components.uart import UARTComponent from esphome.components.uart import UARTComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CURRENT, CONF_ID, CONF_NAME, CONF_POWER, CONF_UART_ID, \ from esphome.const import CONF_CURRENT, CONF_ID, CONF_NAME, CONF_POWER, CONF_UART_ID, \
CONF_UPDATE_INTERVAL, CONF_VOLTAGE CONF_UPDATE_INTERVAL, CONF_VOLTAGE
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['uart'] DEPENDENCIES = ['uart']

10
esphomeyaml/components/sensor/custom.py → esphome/components/sensor/custom.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_SENSORS, CONF_NAME from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_SENSORS
from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add from esphome.cpp_generator import Pvariable, add, process_lambda, variable
from esphomeyaml.cpp_types import std_vector from esphome.cpp_types import std_vector
CustomSensorConstructor = sensor.sensor_ns.class_('CustomSensorConstructor') CustomSensorConstructor = sensor.sensor_ns.class_('CustomSensorConstructor')

10
esphomeyaml/components/sensor/dallas.py → esphome/components/sensor/dallas.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
from esphomeyaml.components.dallas import DallasComponent from esphome.components.dallas import DallasComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_DALLAS_ID, CONF_INDEX, CONF_NAME, \ from esphome.const import CONF_ADDRESS, CONF_DALLAS_ID, CONF_INDEX, CONF_NAME, \
CONF_RESOLUTION CONF_RESOLUTION
from esphomeyaml.cpp_generator import HexIntLiteral, get_variable from esphome.cpp_generator import HexIntLiteral, get_variable
DallasTemperatureSensor = sensor.sensor_ns.class_('DallasTemperatureSensor', DallasTemperatureSensor = sensor.sensor_ns.class_('DallasTemperatureSensor',
sensor.EmptyPollingParentSensor) sensor.EmptyPollingParentSensor)

14
esphomeyaml/components/sensor/dht.py → esphome/components/sensor/dht.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_HUMIDITY, CONF_ID, CONF_MODEL, CONF_NAME, \ from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_MODEL, CONF_NAME, \
CONF_PIN, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL CONF_PIN, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
from esphomeyaml.pins import gpio_input_pullup_pin_schema from esphome.pins import gpio_input_pullup_pin_schema
DHTModel = sensor.sensor_ns.enum('DHTModel') DHTModel = sensor.sensor_ns.enum('DHTModel')
DHT_MODELS = { DHT_MODELS = {

12
esphomeyaml/components/sensor/dht12.py → esphome/components/sensor/dht12.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \ from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/duty_cycle.py → esphome/components/sensor/duty_cycle.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_PIN, CONF_UPDATE_INTERVAL from esphome.const import CONF_ID, CONF_NAME, CONF_PIN, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DutyCycleSensor = sensor.sensor_ns.class_('DutyCycleSensor', sensor.PollingSensorComponent) DutyCycleSensor = sensor.sensor_ns.class_('DutyCycleSensor', sensor.PollingSensorComponent)

12
esphomeyaml/components/sensor/esp32_hall.py → esphome/components/sensor/esp32_hall.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL, ESP_PLATFORM_ESP32 from esphome.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL, ESP_PLATFORM_ESP32
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Application from esphome.cpp_types import App, Application
ESP_PLATFORMS = [ESP_PLATFORM_ESP32] ESP_PLATFORMS = [ESP_PLATFORM_ESP32]

12
esphomeyaml/components/sensor/hdc1080.py → esphome/components/sensor/hdc1080.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \ from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/hlw8012.py → esphome/components/sensor/hlw8012.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CF1_PIN, CONF_CF_PIN, CONF_CHANGE_MODE_EVERY, CONF_CURRENT, \ from esphome.const import CONF_CF1_PIN, CONF_CF_PIN, CONF_CHANGE_MODE_EVERY, CONF_CURRENT, \
CONF_CURRENT_RESISTOR, CONF_ID, CONF_NAME, CONF_POWER, CONF_SEL_PIN, CONF_UPDATE_INTERVAL, \ CONF_CURRENT_RESISTOR, CONF_ID, CONF_NAME, CONF_POWER, CONF_SEL_PIN, CONF_UPDATE_INTERVAL, \
CONF_VOLTAGE, CONF_VOLTAGE_DIVIDER CONF_VOLTAGE, CONF_VOLTAGE_DIVIDER
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import PollingComponent, App from esphome.cpp_types import App, PollingComponent
HLW8012Component = sensor.sensor_ns.class_('HLW8012Component', PollingComponent) HLW8012Component = sensor.sensor_ns.class_('HLW8012Component', PollingComponent)
HLW8012VoltageSensor = sensor.sensor_ns.class_('HLW8012VoltageSensor', sensor.EmptySensor) HLW8012VoltageSensor = sensor.sensor_ns.class_('HLW8012VoltageSensor', sensor.EmptySensor)

13
esphomeyaml/components/sensor/hmc5883l.py → esphome/components/sensor/hmc5883l.py
View File

@ -1,12 +1,12 @@
# coding=utf-8 # coding=utf-8
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv from esphome.components import i2c, sensor
from esphomeyaml.components import sensor, i2c import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL, CONF_RANGE from esphome.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_RANGE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import PollingComponent, App from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']
@ -21,7 +21,6 @@ HMC5883LFieldStrengthSensor = sensor.sensor_ns.class_('HMC5883LFieldStrengthSens
HMC5883LHeadingSensor = sensor.sensor_ns.class_('HMC5883LHeadingSensor', HMC5883LHeadingSensor = sensor.sensor_ns.class_('HMC5883LHeadingSensor',
sensor.EmptyPollingParentSensor) sensor.EmptyPollingParentSensor)
HMC5883LRange = sensor.sensor_ns.enum('HMC5883LRange') HMC5883LRange = sensor.sensor_ns.enum('HMC5883LRange')
HMC5883L_RANGES = { HMC5883L_RANGES = {
88: HMC5883LRange.HMC5883L_RANGE_88_UT, 88: HMC5883LRange.HMC5883L_RANGE_88_UT,

10
esphomeyaml/components/sensor/homeassistant.py → esphome/components/sensor/homeassistant.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME from esphome.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DEPENDENCIES = ['api'] DEPENDENCIES = ['api']

12
esphomeyaml/components/sensor/htu21d.py → esphome/components/sensor/htu21d.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \ from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Application, PollingComponent from esphome.cpp_types import App, Application, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/hx711.py → esphome/components/sensor/hx711.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CLK_PIN, CONF_GAIN, CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL from esphome.const import CONF_CLK_PIN, CONF_GAIN, CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Application from esphome.cpp_types import App, Application
MakeHX711Sensor = Application.struct('MakeHX711Sensor') MakeHX711Sensor = Application.struct('MakeHX711Sensor')
HX711Sensor = sensor.sensor_ns.class_('HX711Sensor', sensor.PollingSensorComponent) HX711Sensor = sensor.sensor_ns.class_('HX711Sensor', sensor.PollingSensorComponent)

12
esphomeyaml/components/sensor/ina219.py → esphome/components/sensor/ina219.py
View File

@ -1,14 +1,14 @@
# coding=utf-8 # coding=utf-8
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_BUS_VOLTAGE, CONF_CURRENT, CONF_ID, \ from esphome.const import CONF_ADDRESS, CONF_BUS_VOLTAGE, CONF_CURRENT, CONF_ID, \
CONF_MAX_CURRENT, CONF_MAX_VOLTAGE, CONF_NAME, CONF_POWER, CONF_SHUNT_RESISTANCE, \ CONF_MAX_CURRENT, CONF_MAX_VOLTAGE, CONF_NAME, CONF_POWER, CONF_SHUNT_RESISTANCE, \
CONF_SHUNT_VOLTAGE, CONF_UPDATE_INTERVAL CONF_SHUNT_VOLTAGE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

12
esphomeyaml/components/sensor/ina3221.py → esphome/components/sensor/ina3221.py
View File

@ -1,13 +1,13 @@
# coding=utf-8 # coding=utf-8
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_BUS_VOLTAGE, CONF_CURRENT, CONF_ID, CONF_NAME, \ from esphome.const import CONF_ADDRESS, CONF_BUS_VOLTAGE, CONF_CURRENT, CONF_ID, CONF_NAME, \
CONF_POWER, CONF_SHUNT_RESISTANCE, CONF_SHUNT_VOLTAGE, CONF_UPDATE_INTERVAL CONF_POWER, CONF_SHUNT_RESISTANCE, CONF_SHUNT_VOLTAGE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

16
esphomeyaml/components/sensor/max31855.py → esphome/components/sensor/max31855.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor, spi from esphome.components import sensor, spi
from esphomeyaml.components.spi import SPIComponent from esphome.components.spi import SPIComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CS_PIN, CONF_ID, CONF_NAME, CONF_SPI_ID, CONF_UPDATE_INTERVAL from esphome.const import CONF_CS_PIN, CONF_ID, CONF_NAME, CONF_SPI_ID, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
MAX31855Sensor = sensor.sensor_ns.class_('MAX31855Sensor', sensor.PollingSensorComponent, MAX31855Sensor = sensor.sensor_ns.class_('MAX31855Sensor', sensor.PollingSensorComponent,
spi.SPIDevice) spi.SPIDevice)

16
esphomeyaml/components/sensor/max6675.py → esphome/components/sensor/max6675.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor, spi from esphome.components import sensor, spi
from esphomeyaml.components.spi import SPIComponent from esphome.components.spi import SPIComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CS_PIN, CONF_ID, CONF_NAME, CONF_SPI_ID, \ from esphome.const import CONF_CS_PIN, CONF_ID, CONF_NAME, CONF_SPI_ID, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
MAX6675Sensor = sensor.sensor_ns.class_('MAX6675Sensor', sensor.PollingSensorComponent, MAX6675Sensor = sensor.sensor_ns.class_('MAX6675Sensor', sensor.PollingSensorComponent,
spi.SPIDevice) spi.SPIDevice)

14
esphomeyaml/components/sensor/mhz19.py → esphome/components/sensor/mhz19.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor, uart from esphome.components import sensor, uart
from esphomeyaml.components.uart import UARTComponent from esphome.components.uart import UARTComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CO2, CONF_ID, CONF_NAME, CONF_TEMPERATURE, CONF_UART_ID, \ from esphome.const import CONF_CO2, CONF_ID, CONF_NAME, CONF_TEMPERATURE, CONF_UART_ID, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['uart'] DEPENDENCIES = ['uart']

12
esphomeyaml/components/sensor/mpu6050.py → esphome/components/sensor/mpu6050.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \ from esphome.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

12
esphomeyaml/components/sensor/mqtt_subscribe.py → esphome/components/sensor/mqtt_subscribe.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_QOS, CONF_TOPIC from esphome.const import CONF_ID, CONF_NAME, CONF_QOS, CONF_TOPIC
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['mqtt'] DEPENDENCIES = ['mqtt']

12
esphomeyaml/components/sensor/ms5611.py → esphome/components/sensor/ms5611.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_PRESSURE, \ from esphome.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_PRESSURE, \
CONF_TEMPERATURE, CONF_UPDATE_INTERVAL CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/pmsx003.py → esphome/components/sensor/pmsx003.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor, uart from esphome.components import sensor, uart
from esphomeyaml.components.uart import UARTComponent from esphome.components.uart import UARTComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_FORMALDEHYDE, CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_PM_10_0, \ from esphome.const import CONF_FORMALDEHYDE, CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_PM_10_0, \
CONF_PM_1_0, CONF_PM_2_5, CONF_TEMPERATURE, CONF_TYPE, CONF_UART_ID CONF_PM_1_0, CONF_PM_2_5, CONF_TEMPERATURE, CONF_TYPE, CONF_UART_ID
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['uart'] DEPENDENCIES = ['uart']

16
esphomeyaml/components/sensor/pulse_counter.py → esphome/components/sensor/pulse_counter.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_COUNT_MODE, CONF_FALLING_EDGE, CONF_ID, CONF_INTERNAL_FILTER, \ from esphome.const import CONF_COUNT_MODE, CONF_FALLING_EDGE, CONF_ID, CONF_INTERNAL_FILTER, \
CONF_NAME, CONF_PIN, CONF_RISING_EDGE, CONF_UPDATE_INTERVAL CONF_NAME, CONF_PIN, CONF_RISING_EDGE, CONF_UPDATE_INTERVAL
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
PulseCounterCountMode = sensor.sensor_ns.enum('PulseCounterCountMode') PulseCounterCountMode = sensor.sensor_ns.enum('PulseCounterCountMode')
COUNT_MODES = { COUNT_MODES = {

14
esphomeyaml/components/sensor/rotary_encoder.py → esphome/components/sensor/rotary_encoder.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_RESOLUTION from esphome.const import CONF_ID, CONF_NAME, CONF_RESOLUTION
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, setup_component from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
RotaryEncoderResolution = sensor.sensor_ns.enum('RotaryEncoderResolution') RotaryEncoderResolution = sensor.sensor_ns.enum('RotaryEncoderResolution')
RESOLUTIONS = { RESOLUTIONS = {

12
esphomeyaml/components/sensor/sht3xd.py → esphome/components/sensor/sht3xd.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_HUMIDITY, CONF_ID, CONF_NAME, \ from esphome.const import CONF_ADDRESS, CONF_HUMIDITY, CONF_ID, CONF_NAME, \
CONF_TEMPERATURE, CONF_UPDATE_INTERVAL CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

12
esphomeyaml/components/sensor/tcs34725.py → esphome/components/sensor/tcs34725.py
View File

@ -1,13 +1,13 @@
# coding=utf-8 # coding=utf-8
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_COLOR_TEMPERATURE, CONF_GAIN, CONF_ID, \ from esphome.const import CONF_ADDRESS, CONF_COLOR_TEMPERATURE, CONF_GAIN, CONF_ID, \
CONF_ILLUMINANCE, CONF_INTEGRATION_TIME, CONF_NAME, CONF_UPDATE_INTERVAL CONF_ILLUMINANCE, CONF_INTEGRATION_TIME, CONF_NAME, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent from esphome.cpp_types import App, PollingComponent
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/template.py → esphome/components/sensor/template.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE, CONF_UPDATE_INTERVAL from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import Action, App, float_, optional from esphome.cpp_types import Action, App, float_, optional
TemplateSensor = sensor.sensor_ns.class_('TemplateSensor', sensor.PollingSensorComponent) TemplateSensor = sensor.sensor_ns.class_('TemplateSensor', sensor.PollingSensorComponent)
SensorPublishAction = sensor.sensor_ns.class_('SensorPublishAction', Action) SensorPublishAction = sensor.sensor_ns.class_('SensorPublishAction', Action)

12
esphomeyaml/components/sensor/total_daily_energy.py → esphome/components/sensor/total_daily_energy.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor, time from esphome.components import sensor, time
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_TIME_ID from esphome.const import CONF_ID, CONF_NAME, CONF_TIME_ID
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['time'] DEPENDENCIES = ['time']

12
esphomeyaml/components/sensor/tsl2561.py → esphome/components/sensor/tsl2561.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import i2c, sensor from esphome.components import i2c, sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_GAIN, CONF_ID, CONF_INTEGRATION_TIME, CONF_NAME, \ from esphome.const import CONF_ADDRESS, CONF_GAIN, CONF_ID, CONF_INTEGRATION_TIME, CONF_NAME, \
CONF_UPDATE_INTERVAL CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DEPENDENCIES = ['i2c'] DEPENDENCIES = ['i2c']

14
esphomeyaml/components/sensor/ultrasonic.py → esphome/components/sensor/ultrasonic.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ECHO_PIN, CONF_ID, CONF_NAME, CONF_TIMEOUT_METER, \ from esphome.const import CONF_ECHO_PIN, CONF_ID, CONF_NAME, CONF_TIMEOUT_METER, \
CONF_TIMEOUT_TIME, CONF_TRIGGER_PIN, CONF_UPDATE_INTERVAL CONF_TIMEOUT_TIME, CONF_TRIGGER_PIN, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, gpio_output_pin_expression, \ from esphome.cpp_helpers import gpio_input_pin_expression, gpio_output_pin_expression, \
setup_component setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
UltrasonicSensorComponent = sensor.sensor_ns.class_('UltrasonicSensorComponent', UltrasonicSensorComponent = sensor.sensor_ns.class_('UltrasonicSensorComponent',
sensor.PollingSensorComponent) sensor.PollingSensorComponent)

12
esphomeyaml/components/sensor/uptime.py → esphome/components/sensor/uptime.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL from esphome.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
UptimeSensor = sensor.sensor_ns.class_('UptimeSensor', sensor.PollingSensorComponent) UptimeSensor = sensor.sensor_ns.class_('UptimeSensor', sensor.PollingSensorComponent)

12
esphomeyaml/components/sensor/wifi_signal.py → esphome/components/sensor/wifi_signal.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import sensor from esphome.components import sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL from esphome.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
WiFiSignalSensor = sensor.sensor_ns.class_('WiFiSignalSensor', sensor.PollingSensorComponent) WiFiSignalSensor = sensor.sensor_ns.class_('WiFiSignalSensor', sensor.PollingSensorComponent)

10
esphomeyaml/components/sensor/xiaomi_miflora.py → esphome/components/sensor/xiaomi_miflora.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import esp32_ble_tracker, sensor from esphome.components import esp32_ble_tracker, sensor
from esphomeyaml.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \ from esphome.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \
make_address_array make_address_array
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BATTERY_LEVEL, CONF_CONDUCTIVITY, CONF_ID, CONF_ILLUMINANCE, \ from esphome.const import CONF_BATTERY_LEVEL, CONF_CONDUCTIVITY, CONF_ID, CONF_ILLUMINANCE, \
CONF_MAC_ADDRESS, CONF_MOISTURE, CONF_NAME, CONF_TEMPERATURE CONF_MAC_ADDRESS, CONF_MOISTURE, CONF_NAME, CONF_TEMPERATURE
from esphomeyaml.cpp_generator import get_variable, Pvariable from esphome.cpp_generator import Pvariable, get_variable
DEPENDENCIES = ['esp32_ble_tracker'] DEPENDENCIES = ['esp32_ble_tracker']

10
esphomeyaml/components/sensor/xiaomi_mijia.py → esphome/components/sensor/xiaomi_mijia.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import esp32_ble_tracker, sensor from esphome.components import esp32_ble_tracker, sensor
from esphomeyaml.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \ from esphome.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \
make_address_array make_address_array
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_MAKE_ID, \ from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_MAKE_ID, \
CONF_NAME, CONF_TEMPERATURE CONF_NAME, CONF_TEMPERATURE
from esphomeyaml.cpp_generator import get_variable, Pvariable from esphome.cpp_generator import Pvariable, get_variable
DEPENDENCIES = ['esp32_ble_tracker'] DEPENDENCIES = ['esp32_ble_tracker']

16
esphomeyaml/components/spi.py → esphome/components/spi.py
View File

@ -1,15 +1,15 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CLK_PIN, CONF_ID, CONF_MISO_PIN, CONF_MOSI_PIN from esphome.const import CONF_CLK_PIN, CONF_ID, CONF_MISO_PIN, CONF_MOSI_PIN
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_input_pin_expression, gpio_output_pin_expression, \ from esphome.cpp_helpers import gpio_input_pin_expression, gpio_output_pin_expression, \
setup_component setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
SPIComponent = esphomelib_ns.class_('SPIComponent', Component) SPIComponent = esphome_ns.class_('SPIComponent', Component)
SPIDevice = esphomelib_ns.class_('SPIDevice') SPIDevice = esphome_ns.class_('SPIDevice')
MULTI_CONF = True MULTI_CONF = True
CONFIG_SCHEMA = vol.All(vol.Schema({ CONFIG_SCHEMA = vol.All(vol.Schema({

12
esphomeyaml/components/status_led.py → esphome/components/status_led.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import config_validation as cv, pins from esphome import config_validation as cv, pins
from esphomeyaml.const import CONF_ID, CONF_PIN from esphome.const import CONF_ID, CONF_PIN
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
StatusLEDComponent = esphomelib_ns.class_('StatusLEDComponent', Component) StatusLEDComponent = esphome_ns.class_('StatusLEDComponent', Component)
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
cv.GenerateID(): cv.declare_variable_id(StatusLEDComponent), cv.GenerateID(): cv.declare_variable_id(StatusLEDComponent),

14
esphomeyaml/components/stepper/__init__.py → esphome/components/stepper/__init__.py
View File

@ -1,19 +1,19 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ACCELERATION, CONF_DECELERATION, CONF_ID, CONF_MAX_SPEED, \ from esphome.const import CONF_ACCELERATION, CONF_DECELERATION, CONF_ID, CONF_MAX_SPEED, \
CONF_POSITION, CONF_TARGET CONF_POSITION, CONF_TARGET
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, templatable from esphome.cpp_generator import Pvariable, add, get_variable, templatable
from esphomeyaml.cpp_types import Action, esphomelib_ns, int32 from esphome.cpp_types import Action, esphome_ns, int32
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
# pylint: disable=invalid-name # pylint: disable=invalid-name
stepper_ns = esphomelib_ns.namespace('stepper') stepper_ns = esphome_ns.namespace('stepper')
Stepper = stepper_ns.class_('Stepper') Stepper = stepper_ns.class_('Stepper')
SetTargetAction = stepper_ns.class_('SetTargetAction', Action) SetTargetAction = stepper_ns.class_('SetTargetAction', Action)

14
esphomeyaml/components/stepper/a4988.py → esphome/components/stepper/a4988.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import stepper from esphome.components import stepper
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DIR_PIN, CONF_ID, CONF_SLEEP_PIN, CONF_STEP_PIN from esphome.const import CONF_DIR_PIN, CONF_ID, CONF_SLEEP_PIN, CONF_STEP_PIN
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import Component, App from esphome.cpp_types import App, Component
A4988 = stepper.stepper_ns.class_('A4988', stepper.Stepper, Component) A4988 = stepper.stepper_ns.class_('A4988', stepper.Stepper, Component)

14
esphomeyaml/components/stepper/uln2003.py → esphome/components/stepper/uln2003.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import stepper from esphome.components import stepper
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_PIN_A, CONF_PIN_B, CONF_PIN_C, CONF_PIN_D, \ from esphome.const import CONF_ID, CONF_PIN_A, CONF_PIN_B, CONF_PIN_C, CONF_PIN_D, \
CONF_SLEEP_WHEN_DONE, CONF_STEP_MODE CONF_SLEEP_WHEN_DONE, CONF_STEP_MODE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
ULN2003StepMode = stepper.stepper_ns.enum('ULN2003StepMode') ULN2003StepMode = stepper.stepper_ns.enum('ULN2003StepMode')

12
esphomeyaml/components/substitutions.py → esphome/components/substitutions.py
View File

@ -3,9 +3,9 @@ import re
import voluptuous as vol import voluptuous as vol
from esphomeyaml import core from esphome import core
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.core import EsphomeyamlError from esphome.core import EsphomeError
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -110,8 +110,8 @@ def do_substitution_pass(config):
substitutions = config[CONF_SUBSTITUTIONS] substitutions = config[CONF_SUBSTITUTIONS]
if not isinstance(substitutions, dict): if not isinstance(substitutions, dict):
raise EsphomeyamlError(u"Substitutions must be a key to value mapping, got {}" raise EsphomeError(u"Substitutions must be a key to value mapping, got {}"
u"".format(type(substitutions))) u"".format(type(substitutions)))
key = '' key = ''
try: try:
@ -127,7 +127,7 @@ def do_substitution_pass(config):
except vol.Invalid as err: except vol.Invalid as err:
err.path.append(key) err.path.append(key)
raise EsphomeyamlError(u"Error while parsing substitutions: {}".format(err)) raise EsphomeError(u"Error while parsing substitutions: {}".format(err))
config[CONF_SUBSTITUTIONS] = substitutions config[CONF_SUBSTITUTIONS] = substitutions
_substitute_item(substitutions, config, []) _substitute_item(substitutions, config, [])

23
esphomeyaml/components/switch/__init__.py → esphome/components/switch/__init__.py
View File

@ -1,21 +1,21 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.automation import maybe_simple_id, ACTION_REGISTRY, CONDITION_REGISTRY, Condition from esphome.automation import ACTION_REGISTRY, CONDITION_REGISTRY, Condition, maybe_simple_id
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ICON, CONF_ID, CONF_INVERTED, CONF_MQTT_ID, CONF_INTERNAL, \ from esphome.const import CONF_ICON, CONF_ID, CONF_INTERNAL, CONF_INVERTED, CONF_MQTT_ID, \
CONF_OPTIMISTIC, CONF_ON_TURN_ON, CONF_ON_TURN_OFF, CONF_TRIGGER_ID CONF_ON_TURN_OFF, CONF_ON_TURN_ON, CONF_OPTIMISTIC, CONF_TRIGGER_ID
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import add, Pvariable, get_variable from esphome.cpp_generator import Pvariable, add, get_variable
from esphomeyaml.cpp_types import esphomelib_ns, Nameable, Action, App, Trigger, NoArg from esphome.cpp_types import Action, App, Nameable, NoArg, Trigger, esphome_ns
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
switch_ns = esphomelib_ns.namespace('switch_') switch_ns = esphome_ns.namespace('switch_')
Switch = switch_ns.class_('Switch', Nameable) Switch = switch_ns.class_('Switch', Nameable)
SwitchPtr = Switch.operator('ptr') SwitchPtr = Switch.operator('ptr')
MQTTSwitchComponent = switch_ns.class_('MQTTSwitchComponent', mqtt.MQTTComponent) MQTTSwitchComponent = switch_ns.class_('MQTTSwitchComponent', mqtt.MQTTComponent)
@ -76,7 +76,6 @@ def register_switch(var, config):
BUILD_FLAGS = '-DUSE_SWITCH' BUILD_FLAGS = '-DUSE_SWITCH'
CONF_SWITCH_TOGGLE = 'switch.toggle' CONF_SWITCH_TOGGLE = 'switch.toggle'
SWITCH_TOGGLE_ACTION_SCHEMA = maybe_simple_id({ SWITCH_TOGGLE_ACTION_SCHEMA = maybe_simple_id({
vol.Required(CONF_ID): cv.use_variable_id(Switch), vol.Required(CONF_ID): cv.use_variable_id(Switch),

10
esphomeyaml/components/switch/custom.py → esphome/components/switch/custom.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import switch from esphome.components import switch
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_SWITCHES, CONF_NAME from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_SWITCHES
from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add from esphome.cpp_generator import Pvariable, add, process_lambda, variable
from esphomeyaml.cpp_types import std_vector from esphome.cpp_types import std_vector
CustomSwitchConstructor = switch.switch_ns.class_('CustomSwitchConstructor') CustomSwitchConstructor = switch.switch_ns.class_('CustomSwitchConstructor')

14
esphomeyaml/components/switch/gpio.py → esphome/components/switch/gpio.py
View File

@ -1,12 +1,12 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
from esphomeyaml.components import switch from esphome.components import switch
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_PIN, CONF_RESTORE_MODE, CONF_INTERLOCK from esphome.const import CONF_ID, CONF_INTERLOCK, CONF_NAME, CONF_PIN, CONF_RESTORE_MODE
from esphomeyaml.cpp_generator import Pvariable, add, get_variable from esphome.cpp_generator import Pvariable, add, get_variable
from esphomeyaml.cpp_helpers import gpio_output_pin_expression, setup_component from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
GPIOSwitch = switch.switch_ns.class_('GPIOSwitch', switch.Switch, Component) GPIOSwitch = switch.switch_ns.class_('GPIOSwitch', switch.Switch, Component)
GPIOSwitchRestoreMode = switch.switch_ns.enum('GPIOSwitchRestoreMode') GPIOSwitchRestoreMode = switch.switch_ns.enum('GPIOSwitchRestoreMode')

12
esphomeyaml/components/switch/output.py → esphome/components/switch/output.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import output, switch from esphome.components import output, switch
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_OUTPUT from esphome.const import CONF_ID, CONF_NAME, CONF_OUTPUT
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
OutputSwitch = switch.switch_ns.class_('OutputSwitch', switch.Switch, Component) OutputSwitch = switch.switch_ns.class_('OutputSwitch', switch.Switch, Component)

17
esphomeyaml/components/switch/remote_transmitter.py → esphome/components/switch/remote_transmitter.py
View File

@ -1,19 +1,20 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import switch from esphome.components import switch
from esphomeyaml.components.remote_transmitter import RC_SWITCH_RAW_SCHEMA, \ from esphome.components.remote_transmitter import RC_SWITCH_RAW_SCHEMA, \
RC_SWITCH_TYPE_A_SCHEMA, RC_SWITCH_TYPE_B_SCHEMA, RC_SWITCH_TYPE_C_SCHEMA, \ RC_SWITCH_TYPE_A_SCHEMA, RC_SWITCH_TYPE_B_SCHEMA, RC_SWITCH_TYPE_C_SCHEMA, \
RC_SWITCH_TYPE_D_SCHEMA, RemoteTransmitterComponent, binary_code, build_rc_switch_protocol, \ RC_SWITCH_TYPE_D_SCHEMA, RemoteTransmitterComponent, binary_code, build_rc_switch_protocol, \
remote_ns remote_ns
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ADDRESS, CONF_CARRIER_FREQUENCY, CONF_CHANNEL, CONF_CODE, \ from esphome.const import CONF_ADDRESS, CONF_CARRIER_FREQUENCY, CONF_CHANNEL, CONF_CODE, \
CONF_COMMAND, CONF_DATA, CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_INVERTED, CONF_JVC, \ CONF_COMMAND, CONF_DATA, CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_ID, CONF_INVERTED, \
CONF_JVC, \
CONF_LG, CONF_NAME, CONF_NBITS, CONF_NEC, CONF_PANASONIC, CONF_PROTOCOL, CONF_RAW, \ CONF_LG, CONF_NAME, CONF_NBITS, CONF_NEC, CONF_PANASONIC, CONF_PROTOCOL, CONF_RAW, \
CONF_RC_SWITCH_RAW, CONF_RC_SWITCH_TYPE_A, CONF_RC_SWITCH_TYPE_B, CONF_RC_SWITCH_TYPE_C, \ CONF_RC_SWITCH_RAW, CONF_RC_SWITCH_TYPE_A, CONF_RC_SWITCH_TYPE_B, CONF_RC_SWITCH_TYPE_C, \
CONF_RC_SWITCH_TYPE_D, CONF_REPEAT, CONF_SAMSUNG, CONF_SONY, CONF_STATE, CONF_TIMES, \ CONF_RC_SWITCH_TYPE_D, CONF_REPEAT, CONF_SAMSUNG, CONF_SONY, CONF_STATE, CONF_TIMES, \
CONF_WAIT_TIME, CONF_ID CONF_WAIT_TIME
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, progmem_array from esphome.cpp_generator import Pvariable, add, get_variable, progmem_array
from esphomeyaml.cpp_types import int32 from esphome.cpp_types import int32
DEPENDENCIES = ['remote_transmitter'] DEPENDENCIES = ['remote_transmitter']

10
esphomeyaml/components/switch/restart.py → esphome/components/switch/restart.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import switch from esphome.components import switch
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_INVERTED, CONF_NAME from esphome.const import CONF_ID, CONF_INVERTED, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
RestartSwitch = switch.switch_ns.class_('RestartSwitch', switch.Switch) RestartSwitch = switch.switch_ns.class_('RestartSwitch', switch.Switch)

10
esphomeyaml/components/switch/shutdown.py → esphome/components/switch/shutdown.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import switch from esphome.components import switch
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_INVERTED, CONF_NAME from esphome.const import CONF_ID, CONF_INVERTED, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
ShutdownSwitch = switch.switch_ns.class_('ShutdownSwitch', switch.Switch) ShutdownSwitch = switch.switch_ns.class_('ShutdownSwitch', switch.Switch)

19
esphomeyaml/components/switch/template.py → esphome/components/switch/template.py
View File

@ -1,15 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.automation import ACTION_REGISTRY from esphome.automation import ACTION_REGISTRY
from esphomeyaml.components import switch from esphome.components import switch
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_OPTIMISTIC, \ from esphome.const import CONF_ASSUMED_STATE, CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_OPTIMISTIC, \
CONF_RESTORE_STATE, \ CONF_RESTORE_STATE, CONF_STATE, CONF_TURN_OFF_ACTION, CONF_TURN_ON_ACTION
CONF_STATE, CONF_TURN_OFF_ACTION, CONF_TURN_ON_ACTION, CONF_ASSUMED_STATE from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
from esphomeyaml.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_types import Action, App, Component, NoArg, bool_, optional
from esphomeyaml.cpp_types import Action, App, Component, NoArg, bool_, optional
TemplateSwitch = switch.switch_ns.class_('TemplateSwitch', switch.Switch, Component) TemplateSwitch = switch.switch_ns.class_('TemplateSwitch', switch.Switch, Component)
SwitchPublishAction = switch.switch_ns.class_('SwitchPublishAction', Action) SwitchPublishAction = switch.switch_ns.class_('SwitchPublishAction', Action)

16
esphomeyaml/components/switch/uart.py → esphome/components/switch/uart.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import switch, uart from esphome.components import switch, uart
from esphomeyaml.components.uart import UARTComponent from esphome.components.uart import UARTComponent
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_DATA, CONF_ID, CONF_INVERTED, CONF_NAME, CONF_UART_ID from esphome.const import CONF_DATA, CONF_ID, CONF_INVERTED, CONF_NAME, CONF_UART_ID
from esphomeyaml.core import HexInt from esphome.core import HexInt
from esphomeyaml.cpp_generator import Pvariable, get_variable from esphome.cpp_generator import Pvariable, get_variable
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
from esphomeyaml.py_compat import text_type from esphome.py_compat import text_type
DEPENDENCIES = ['uart'] DEPENDENCIES = ['uart']

18
esphomeyaml/components/text_sensor/__init__.py → esphome/components/text_sensor/__init__.py
View File

@ -1,21 +1,21 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
from esphomeyaml.components import mqtt from esphome.components import mqtt
from esphomeyaml.components.mqtt import setup_mqtt_component from esphome.components.mqtt import setup_mqtt_component
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ICON, CONF_ID, CONF_INTERNAL, CONF_MQTT_ID, CONF_ON_VALUE, \ from esphome.const import CONF_ICON, CONF_ID, CONF_INTERNAL, CONF_MQTT_ID, CONF_ON_VALUE, \
CONF_TRIGGER_ID CONF_TRIGGER_ID
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_types import esphomelib_ns, Nameable, Trigger, std_string, App from esphome.cpp_types import App, Nameable, Trigger, esphome_ns, std_string
PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
# pylint: disable=invalid-name # pylint: disable=invalid-name
text_sensor_ns = esphomelib_ns.namespace('text_sensor') text_sensor_ns = esphome_ns.namespace('text_sensor')
TextSensor = text_sensor_ns.class_('TextSensor', Nameable) TextSensor = text_sensor_ns.class_('TextSensor', Nameable)
TextSensorPtr = TextSensor.operator('ptr') TextSensorPtr = TextSensor.operator('ptr')
MQTTTextSensor = text_sensor_ns.class_('MQTTTextSensor', mqtt.MQTTComponent) MQTTTextSensor = text_sensor_ns.class_('MQTTTextSensor', mqtt.MQTTComponent)

10
esphomeyaml/components/text_sensor/custom.py → esphome/components/text_sensor/custom.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import text_sensor from esphome.components import text_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_TEXT_SENSORS, CONF_NAME from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_TEXT_SENSORS
from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add from esphome.cpp_generator import Pvariable, add, process_lambda, variable
from esphomeyaml.cpp_types import std_vector from esphome.cpp_types import std_vector
CustomTextSensorConstructor = text_sensor.text_sensor_ns.class_('CustomTextSensorConstructor') CustomTextSensorConstructor = text_sensor.text_sensor_ns.class_('CustomTextSensorConstructor')

10
esphomeyaml/components/text_sensor/homeassistant.py → esphome/components/text_sensor/homeassistant.py
View File

@ -1,10 +1,10 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import text_sensor from esphome.components import text_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME from esphome.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['api'] DEPENDENCIES = ['api']

12
esphomeyaml/components/text_sensor/mqtt_subscribe.py → esphome/components/text_sensor/mqtt_subscribe.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import text_sensor from esphome.components import text_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME, CONF_QOS, CONF_TOPIC from esphome.const import CONF_ID, CONF_NAME, CONF_QOS, CONF_TOPIC
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
DEPENDENCIES = ['mqtt'] DEPENDENCIES = ['mqtt']

12
esphomeyaml/components/text_sensor/template.py → esphome/components/text_sensor/template.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import text_sensor from esphome.components import text_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_UPDATE_INTERVAL from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_UPDATE_INTERVAL
from esphomeyaml.cpp_generator import Pvariable, add, process_lambda from esphome.cpp_generator import Pvariable, add, process_lambda
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, PollingComponent, optional, std_string from esphome.cpp_types import App, PollingComponent, optional, std_string
TemplateTextSensor = text_sensor.text_sensor_ns.class_('TemplateTextSensor', TemplateTextSensor = text_sensor.text_sensor_ns.class_('TemplateTextSensor',
text_sensor.TextSensor, PollingComponent) text_sensor.TextSensor, PollingComponent)

12
esphomeyaml/components/text_sensor/version.py → esphome/components/text_sensor/version.py
View File

@ -1,9 +1,9 @@
from esphomeyaml.components import text_sensor from esphome.components import text_sensor
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_NAME from esphome.const import CONF_ID, CONF_NAME
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component from esphome.cpp_types import App, Component
VersionTextSensor = text_sensor.text_sensor_ns.class_('VersionTextSensor', VersionTextSensor = text_sensor.text_sensor_ns.class_('VersionTextSensor',
text_sensor.TextSensor, Component) text_sensor.TextSensor, Component)

18
esphomeyaml/components/time/__init__.py → esphome/components/time/__init__.py
View File

@ -4,14 +4,14 @@ import math
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation from esphome import automation
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CRON, CONF_DAYS_OF_MONTH, CONF_DAYS_OF_WEEK, CONF_HOURS, \ from esphome.const import CONF_CRON, CONF_DAYS_OF_MONTH, CONF_DAYS_OF_WEEK, CONF_HOURS, \
CONF_MINUTES, CONF_MONTHS, CONF_ON_TIME, CONF_SECONDS, CONF_TIMEZONE, CONF_TRIGGER_ID CONF_MINUTES, CONF_MONTHS, CONF_ON_TIME, CONF_SECONDS, CONF_TIMEZONE, CONF_TRIGGER_ID
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_types import App, Component, NoArg, Trigger, esphomelib_ns from esphome.cpp_types import App, Component, NoArg, Trigger, esphome_ns
from esphomeyaml.py_compat import string_types from esphome.py_compat import string_types
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -19,10 +19,10 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
}) })
time_ns = esphomelib_ns.namespace('time') time_ns = esphome_ns.namespace('time')
RealTimeClockComponent = time_ns.class_('RealTimeClockComponent', Component) RealTimeClockComponent = time_ns.class_('RealTimeClockComponent', Component)
CronTrigger = time_ns.class_('CronTrigger', Trigger.template(NoArg), Component) CronTrigger = time_ns.class_('CronTrigger', Trigger.template(NoArg), Component)
EsphomelibTime = time_ns.struct('EsphomelibTime') ESPTime = time_ns.struct('ESPTime')
def _tz_timedelta(td): def _tz_timedelta(td):

13
esphomeyaml/components/time/homeassistant.py → esphome/components/time/homeassistant.py
View File

@ -1,10 +1,9 @@
from esphomeyaml.components import time as time_ from esphome.components import time as time_
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID from esphome.const import CONF_ID
from esphomeyaml.cpp_generator import Pvariable from esphome.cpp_generator import Pvariable
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
DEPENDENCIES = ['api'] DEPENDENCIES = ['api']

12
esphomeyaml/components/time/sntp.py → esphome/components/time/sntp.py
View File

@ -1,11 +1,11 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml.components import time as time_ from esphome.components import time as time_
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_SERVERS from esphome.const import CONF_ID, CONF_SERVERS
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App from esphome.cpp_types import App
SNTPComponent = time_.time_ns.class_('SNTPComponent', time_.RealTimeClockComponent) SNTPComponent = time_.time_ns.class_('SNTPComponent', time_.RealTimeClockComponent)

16
esphomeyaml/components/uart.py → esphome/components/uart.py
View File

@ -1,14 +1,14 @@
import voluptuous as vol import voluptuous as vol
from esphomeyaml import pins from esphome import pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_BAUD_RATE, CONF_ID, CONF_RX_PIN, CONF_TX_PIN from esphome.const import CONF_BAUD_RATE, CONF_ID, CONF_RX_PIN, CONF_TX_PIN
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import App, Component, esphomelib_ns from esphome.cpp_types import App, Component, esphome_ns
UARTComponent = esphomelib_ns.class_('UARTComponent', Component) UARTComponent = esphome_ns.class_('UARTComponent', Component)
UARTDevice = esphomelib_ns.class_('UARTDevice') UARTDevice = esphome_ns.class_('UARTDevice')
MULTI_CONF = True MULTI_CONF = True
CONFIG_SCHEMA = vol.All(vol.Schema({ CONFIG_SCHEMA = vol.All(vol.Schema({

14
esphomeyaml/components/web_server.py → esphome/components/web_server.py
View File

@ -1,13 +1,13 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_CSS_URL, CONF_ID, CONF_JS_URL, CONF_PORT from esphome.const import CONF_CSS_URL, CONF_ID, CONF_JS_URL, CONF_PORT
from esphomeyaml.core import CORE from esphome.core import CORE
from esphomeyaml.cpp_generator import Pvariable, add from esphome.cpp_generator import Pvariable, add
from esphomeyaml.cpp_helpers import setup_component from esphome.cpp_helpers import setup_component
from esphomeyaml.cpp_types import esphomelib_ns, StoringController, Component, App from esphome.cpp_types import App, Component, StoringController, esphome_ns
WebServer = esphomelib_ns.class_('WebServer', Component, StoringController) WebServer = esphome_ns.class_('WebServer', Component, StoringController)
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({
cv.GenerateID(): cv.declare_variable_id(WebServer), cv.GenerateID(): cv.declare_variable_id(WebServer),

18
esphomeyaml/components/wifi.py → esphome/components/wifi.py
View File

@ -1,20 +1,20 @@
import voluptuous as vol import voluptuous as vol
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import CONF_AP, CONF_BSSID, CONF_CHANNEL, CONF_DNS1, CONF_DNS2, \ from esphome.const import CONF_AP, CONF_BSSID, CONF_CHANNEL, CONF_DNS1, CONF_DNS2, \
CONF_DOMAIN, CONF_FAST_CONNECT, CONF_GATEWAY, CONF_ID, CONF_MANUAL_IP, CONF_NETWORKS, \ CONF_DOMAIN, CONF_FAST_CONNECT, CONF_GATEWAY, CONF_ID, CONF_MANUAL_IP, CONF_NETWORKS, \
CONF_PASSWORD, CONF_POWER_SAVE_MODE, CONF_REBOOT_TIMEOUT, CONF_SSID, CONF_STATIC_IP, \ CONF_PASSWORD, CONF_POWER_SAVE_MODE, CONF_REBOOT_TIMEOUT, CONF_SSID, CONF_STATIC_IP, \
CONF_SUBNET, CONF_USE_ADDRESS CONF_SUBNET, CONF_USE_ADDRESS
from esphomeyaml.core import CORE, HexInt from esphome.core import CORE, HexInt
from esphomeyaml.cpp_generator import Pvariable, StructInitializer, add, variable from esphome.cpp_generator import Pvariable, StructInitializer, add, variable
from esphomeyaml.cpp_types import App, Component, esphomelib_ns, global_ns from esphome.cpp_types import App, Component, esphome_ns, global_ns
IPAddress = global_ns.class_('IPAddress') IPAddress = global_ns.class_('IPAddress')
ManualIP = esphomelib_ns.struct('ManualIP') ManualIP = esphome_ns.struct('ManualIP')
WiFiComponent = esphomelib_ns.class_('WiFiComponent', Component) WiFiComponent = esphome_ns.class_('WiFiComponent', Component)
WiFiAP = esphomelib_ns.struct('WiFiAP') WiFiAP = esphome_ns.struct('WiFiAP')
WiFiPowerSaveMode = esphomelib_ns.enum('WiFiPowerSaveMode') WiFiPowerSaveMode = esphome_ns.enum('WiFiPowerSaveMode')
WIFI_POWER_SAVE_MODES = { WIFI_POWER_SAVE_MODES = {
'NONE': WiFiPowerSaveMode.WIFI_POWER_SAVE_NONE, 'NONE': WiFiPowerSaveMode.WIFI_POWER_SAVE_NONE,
'LIGHT': WiFiPowerSaveMode.WIFI_POWER_SAVE_LIGHT, 'LIGHT': WiFiPowerSaveMode.WIFI_POWER_SAVE_LIGHT,

40
esphomeyaml/config.py → esphome/config.py
View File

@ -8,17 +8,17 @@ import re
import voluptuous as vol import voluptuous as vol
from esphomeyaml import core, core_config, yaml_util from esphome import core, core_config, yaml_util
from esphomeyaml.components import substitutions from esphome.components import substitutions
from esphomeyaml.const import CONF_ESPHOMEYAML, CONF_PLATFORM, ESP_PLATFORMS from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS
from esphomeyaml.core import CORE, EsphomeyamlError from esphome.core import CORE, EsphomeError
from esphomeyaml.helpers import color, indent from esphome.helpers import color, indent
from esphomeyaml.py_compat import text_type from esphome.py_compat import text_type
from esphomeyaml.util import safe_print from esphome.util import safe_print
# pylint: disable=unused-import, wrong-import-order # pylint: disable=unused-import, wrong-import-order
from typing import List, Optional, Tuple, Union # noqa from typing import List, Optional, Tuple, Union # noqa
from esphomeyaml.core import ConfigType # noqa from esphome.core import ConfigType # noqa
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -29,7 +29,7 @@ def get_component(domain):
if domain in _COMPONENT_CACHE: if domain in _COMPONENT_CACHE:
return _COMPONENT_CACHE[domain] return _COMPONENT_CACHE[domain]
path = 'esphomeyaml.components.{}'.format(domain) path = 'esphome.components.{}'.format(domain)
try: try:
module = importlib.import_module(path) module = importlib.import_module(path)
except (ImportError, ValueError) as err: except (ImportError, ValueError) as err:
@ -52,8 +52,8 @@ def is_platform_component(component):
def iter_components(config): def iter_components(config):
for domain, conf in config.items(): for domain, conf in config.items():
if domain == CONF_ESPHOMEYAML: if domain == CONF_ESPHOME:
yield CONF_ESPHOMEYAML, core_config, conf yield CONF_ESPHOME, core_config, conf
continue continue
component = get_component(domain) component = get_component(domain)
if getattr(component, 'MULTI_CONF', False): if getattr(component, 'MULTI_CONF', False):
@ -164,7 +164,7 @@ def iter_ids(config, path=None):
def do_id_pass(result): # type: (Config) -> None def do_id_pass(result): # type: (Config) -> None
from esphomeyaml.cpp_generator import MockObjClass from esphome.cpp_generator import MockObjClass
declare_ids = [] # type: List[Tuple[core.ID, ConfigPath]] declare_ids = [] # type: List[Tuple[core.ID, ConfigPath]]
searching_ids = [] # type: List[Tuple[core.ID, ConfigPath]] searching_ids = [] # type: List[Tuple[core.ID, ConfigPath]]
@ -226,12 +226,12 @@ def validate_config(config):
skip_paths = list() # type: List[ConfigPath] skip_paths = list() # type: List[ConfigPath]
# Step 1: Load everything # Step 1: Load everything
result.add_domain([CONF_ESPHOMEYAML], CONF_ESPHOMEYAML) result.add_domain([CONF_ESPHOME], CONF_ESPHOME)
result[CONF_ESPHOMEYAML] = config[CONF_ESPHOMEYAML] result[CONF_ESPHOME] = config[CONF_ESPHOME]
for domain, conf in config.items(): for domain, conf in config.items():
domain = str(domain) domain = str(domain)
if domain == CONF_ESPHOMEYAML or domain.startswith(u'.'): if domain == CONF_ESPHOME or domain.startswith(u'.'):
skip_paths.append([domain]) skip_paths.append([domain])
continue continue
result.add_domain([domain], domain) result.add_domain([domain], domain)
@ -333,9 +333,9 @@ def validate_config(config):
# Step 2: Validate configuration # Step 2: Validate configuration
try: try:
result[CONF_ESPHOMEYAML] = core_config.CONFIG_SCHEMA(result[CONF_ESPHOMEYAML]) result[CONF_ESPHOME] = core_config.CONFIG_SCHEMA(result[CONF_ESPHOME])
except vol.Invalid as ex: except vol.Invalid as ex:
_comp_error(ex, [CONF_ESPHOMEYAML]) _comp_error(ex, [CONF_ESPHOME])
for domain, conf in result.items(): for domain, conf in result.items():
domain = str(domain) domain = str(domain)
@ -438,14 +438,14 @@ def load_config():
try: try:
config = yaml_util.load_yaml(CORE.config_path) config = yaml_util.load_yaml(CORE.config_path)
except OSError: except OSError:
raise EsphomeyamlError(u"Invalid YAML at {}".format(CORE.config_path)) raise EsphomeError(u"Invalid YAML at {}".format(CORE.config_path))
CORE.raw_config = config CORE.raw_config = config
config = substitutions.do_substitution_pass(config) config = substitutions.do_substitution_pass(config)
core_config.preload_core_config(config) core_config.preload_core_config(config)
try: try:
result = validate_config(config) result = validate_config(config)
except EsphomeyamlError: except EsphomeError:
raise raise
except Exception: except Exception:
_LOGGER.error(u"Unexpected exception while reading configuration:") _LOGGER.error(u"Unexpected exception while reading configuration:")
@ -584,7 +584,7 @@ def read_config(verbose):
_LOGGER.info("Reading configuration...") _LOGGER.info("Reading configuration...")
try: try:
res = load_config() res = load_config()
except EsphomeyamlError as err: except EsphomeError as err:
_LOGGER.error(u"Error while reading config: %s", err) _LOGGER.error(u"Error while reading config: %s", err)
return None return None
if res.errors: if res.errors:

9
esphomeyaml/config_validation.py → esphome/config_validation.py
View File

@ -9,14 +9,14 @@ import uuid as uuid_
import voluptuous as vol import voluptuous as vol
from esphomeyaml import core from esphome import core
from esphomeyaml.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY, CONF_ID, \ from esphome.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY, CONF_ID, \
CONF_INTERNAL, CONF_NAME, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_PLATFORM, \ CONF_INTERNAL, CONF_NAME, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_PLATFORM, \
CONF_RETAIN, CONF_SETUP_PRIORITY, CONF_STATE_TOPIC, CONF_TOPIC, ESP_PLATFORM_ESP32, \ CONF_RETAIN, CONF_SETUP_PRIORITY, CONF_STATE_TOPIC, CONF_TOPIC, ESP_PLATFORM_ESP32, \
ESP_PLATFORM_ESP8266 ESP_PLATFORM_ESP8266
from esphomeyaml.core import CORE, HexInt, IPAddress, Lambda, TimePeriod, TimePeriodMicroseconds, \ from esphome.core import CORE, HexInt, IPAddress, Lambda, TimePeriod, TimePeriodMicroseconds, \
TimePeriodMilliseconds, TimePeriodSeconds TimePeriodMilliseconds, TimePeriodSeconds
from esphomeyaml.py_compat import text_type, string_types, integer_types from esphome.py_compat import integer_types, string_types, text_type
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -578,6 +578,7 @@ def requires_component(comp):
if comp not in CORE.raw_config: if comp not in CORE.raw_config:
raise vol.Invalid("This option requires component {}".format(comp)) raise vol.Invalid("This option requires component {}".format(comp))
return value return value
return validator return validator

8
esphomeyaml/const.py → esphome/const.py
View File

@ -1,11 +1,11 @@
"""Constants used by esphomeyaml.""" """Constants used by esphome."""
MAJOR_VERSION = 1 MAJOR_VERSION = 1
MINOR_VERSION = 10 MINOR_VERSION = 10
PATCH_VERSION = '0-dev' PATCH_VERSION = '0-dev'
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
ESPHOMELIB_VERSION = 'dev' ESPHOME_CORE_VERSION = 'dev'
ESP_PLATFORM_ESP32 = 'ESP32' ESP_PLATFORM_ESP32 = 'ESP32'
ESP_PLATFORM_ESP8266 = 'ESP8266' ESP_PLATFORM_ESP8266 = 'ESP8266'
@ -13,11 +13,11 @@ ESP_PLATFORMS = [ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266]
APB_CLOCK_FREQ = 80000000 APB_CLOCK_FREQ = 80000000
CONF_ESPHOMEYAML = 'esphomeyaml' CONF_ESPHOME = 'esphome'
CONF_NAME = 'name' CONF_NAME = 'name'
CONF_PLATFORM = 'platform' CONF_PLATFORM = 'platform'
CONF_BOARD = 'board' CONF_BOARD = 'board'
CONF_ESPHOMELIB_VERSION = 'esphomelib_version' CONF_ESPHOME_CORE_VERSION = 'esphome_core_version'
CONF_USE_CUSTOM_CODE = 'use_custom_code' CONF_USE_CUSTOM_CODE = 'use_custom_code'
CONF_ARDUINO_VERSION = 'arduino_version' CONF_ARDUINO_VERSION = 'arduino_version'
CONF_LOCAL = 'local' CONF_LOCAL = 'local'

42
esphomeyaml/core.py → esphome/core.py
View File

@ -6,20 +6,20 @@ import math
import os import os
import re import re
from esphomeyaml.const import CONF_ARDUINO_VERSION, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, \
CONF_LOCAL, CONF_WIFI, ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266, CONF_USE_ADDRESS
from esphomeyaml.helpers import ensure_unique_string
# pylint: disable=unused-import, wrong-import-order # pylint: disable=unused-import, wrong-import-order
from typing import Any, Dict, List # noqa from typing import Any, Dict, List # noqa
from esphomeyaml.py_compat import integer_types, IS_PY2 from esphome.const import CONF_ARDUINO_VERSION, CONF_ESPHOME, CONF_ESPHOME_CORE_VERSION, \
CONF_LOCAL, \
CONF_USE_ADDRESS, CONF_WIFI, ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266
from esphome.helpers import ensure_unique_string
from esphome.py_compat import IS_PY2, integer_types
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
class EsphomeyamlError(Exception): class EsphomeError(Exception):
"""General esphomeyaml exception occurred.""" """General ESPHome exception occurred."""
if IS_PY2: if IS_PY2:
@ -55,7 +55,7 @@ class MACAddress(object):
return ':'.join('{:02X}'.format(part) for part in self.parts) return ':'.join('{:02X}'.format(part) for part in self.parts)
def as_hex(self): def as_hex(self):
from esphomeyaml.cpp_generator import RawExpression from esphome.cpp_generator import RawExpression
num = ''.join('{:02X}'.format(part) for part in self.parts) num = ''.join('{:02X}'.format(part) for part in self.parts)
return RawExpression('0x{}ULL'.format(num)) return RawExpression('0x{}ULL'.format(num))
@ -261,7 +261,7 @@ class ID(object):
self.type = type self.type = type
def resolve(self, registered_ids): def resolve(self, registered_ids):
from esphomeyaml.config_validation import RESERVED_IDS from esphome.config_validation import RESERVED_IDS
if self.id is None: if self.id is None:
base = str(self.type).replace('::', '_').lower() base = str(self.type).replace('::', '_').lower()
@ -289,7 +289,7 @@ class ID(object):
# pylint: disable=too-many-instance-attributes # pylint: disable=too-many-instance-attributes
class EsphomeyamlCore(object): class EsphomeCore(object):
def __init__(self): def __init__(self):
# True if command is run from dashboard # True if command is run from dashboard
self.dashboard = False self.dashboard = False
@ -322,19 +322,19 @@ class EsphomeyamlCore(object):
if 'ethernet' in self.config: if 'ethernet' in self.config:
return self.config['ethernet'][CONF_USE_ADDRESS] return self.config['ethernet'][CONF_USE_ADDRESS]
return None raise EsphomeError("No network configured")
@property @property
def esphomelib_version(self): # type: () -> Dict[str, str] def esphome_core_version(self): # type: () -> Dict[str, str]
return self.config[CONF_ESPHOMEYAML][CONF_ESPHOMELIB_VERSION] return self.config[CONF_ESPHOME][CONF_ESPHOME_CORE_VERSION]
@property @property
def is_local_esphomelib_copy(self): def is_local_esphome_core_copy(self):
return CONF_LOCAL in self.esphomelib_version return CONF_LOCAL in self.esphome_core_version
@property @property
def arduino_version(self): # type: () -> str def arduino_version(self): # type: () -> str
return self.config[CONF_ESPHOMEYAML][CONF_ARDUINO_VERSION] return self.config[CONF_ESPHOME][CONF_ARDUINO_VERSION]
@property @property
def config_dir(self): def config_dir(self):
@ -388,7 +388,7 @@ class EsphomeyamlCore(object):
while self.pending_tasks: while self.pending_tasks:
i += 1 i += 1
if i > 1000000: if i > 1000000:
raise EsphomeyamlError("Circular dependency detected!") raise EsphomeError("Circular dependency detected!")
task, domain = self.pending_tasks.popleft() task, domain = self.pending_tasks.popleft()
_LOGGER.debug("Executing task for domain=%s", domain) _LOGGER.debug("Executing task for domain=%s", domain)
@ -399,7 +399,7 @@ class EsphomeyamlCore(object):
_LOGGER.debug(" -> %s finished", domain) _LOGGER.debug(" -> %s finished", domain)
def add(self, expression, require=True): def add(self, expression, require=True):
from esphomeyaml.cpp_generator import Expression from esphome.cpp_generator import Expression
if require and isinstance(expression, Expression): if require and isinstance(expression, Expression):
expression.require() expression.require()
@ -427,7 +427,7 @@ class EsphomeyamlCore(object):
def register_variable(self, id, obj): def register_variable(self, id, obj):
if id in self.variables: if id in self.variables:
raise EsphomeyamlError("ID {} is already registered".format(id)) raise EsphomeError("ID {} is already registered".format(id))
_LOGGER.debug("Registered variable %s of type %s", id.id, id.type) _LOGGER.debug("Registered variable %s of type %s", id.id, id.type)
self.variables[id] = obj self.variables[id] = obj
@ -435,7 +435,7 @@ class EsphomeyamlCore(object):
return id in self.variables return id in self.variables
CORE = EsphomeyamlCore() CORE = EsphomeCore()
ConfigType = Dict[str, Any] ConfigType = Dict[str, Any]
CoreType = EsphomeyamlCore CoreType = EsphomeCore

81
esphomeyaml/core_config.py → esphome/core_config.py
View File

@ -4,28 +4,30 @@ import re
import voluptuous as vol import voluptuous as vol
from esphomeyaml import automation, pins from esphome import automation, pins
import esphomeyaml.config_validation as cv import esphome.config_validation as cv
from esphomeyaml.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266_DEV, \ from esphome.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266_DEV, \
CONF_ARDUINO_VERSION, CONF_BOARD, CONF_BOARD_FLASH_MODE, CONF_BRANCH, CONF_BUILD_PATH, \ CONF_ARDUINO_VERSION, CONF_BOARD, CONF_BOARD_FLASH_MODE, CONF_BRANCH, CONF_BUILD_PATH, \
CONF_COMMIT, CONF_ESPHOMELIB_VERSION, CONF_ESPHOMEYAML, CONF_LOCAL, CONF_NAME, CONF_ON_BOOT, \ CONF_COMMIT, CONF_ESPHOME, CONF_ESPHOME_CORE_VERSION, CONF_INCLUDES, CONF_LIBRARIES, \
CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, CONF_PRIORITY, CONF_REPOSITORY, CONF_TAG, \ CONF_LOCAL, \
CONF_TRIGGER_ID, CONF_USE_CUSTOM_CODE, ESPHOMELIB_VERSION, ESP_PLATFORM_ESP32, \ CONF_NAME, CONF_ON_BOOT, CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, \
ESP_PLATFORM_ESP8266, CONF_LIBRARIES, CONF_INCLUDES, CONF_PLATFORMIO_OPTIONS CONF_PLATFORMIO_OPTIONS, \
from esphomeyaml.core import CORE, EsphomeyamlError CONF_PRIORITY, CONF_REPOSITORY, CONF_TAG, CONF_TRIGGER_ID, CONF_USE_CUSTOM_CODE, \
from esphomeyaml.cpp_generator import Pvariable, RawExpression, add ESPHOME_CORE_VERSION, ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266
from esphomeyaml.cpp_types import App, NoArg, const_char_ptr, esphomelib_ns from esphome.core import CORE, EsphomeError
from esphomeyaml.py_compat import text_type from esphome.cpp_generator import Pvariable, RawExpression, add
from esphome.cpp_types import App, NoArg, const_char_ptr, esphome_ns
from esphome.py_compat import text_type
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
LIBRARY_URI_REPO = u'https://github.com/OttoWinter/esphomelib.git' LIBRARY_URI_REPO = u'https://github.com/esphome/esphome-core.git'
GITHUB_ARCHIVE_ZIP = u'https://github.com/OttoWinter/esphomelib/archive/{}.zip' GITHUB_ARCHIVE_ZIP = u'https://github.com/esphome/esphome-core/archive/{}.zip'
BUILD_FLASH_MODES = ['qio', 'qout', 'dio', 'dout'] BUILD_FLASH_MODES = ['qio', 'qout', 'dio', 'dout']
StartupTrigger = esphomelib_ns.StartupTrigger StartupTrigger = esphome_ns.StartupTrigger
ShutdownTrigger = esphomelib_ns.ShutdownTrigger ShutdownTrigger = esphome_ns.ShutdownTrigger
LoopTrigger = esphomelib_ns.LoopTrigger LoopTrigger = esphome_ns.LoopTrigger
VERSION_REGEX = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+(?:[ab]\d+)?$') VERSION_REGEX = re.compile(r'^[0-9]+\.[0-9]+\.[0-9]+(?:[ab]\d+)?$')
@ -44,14 +46,14 @@ def validate_board(value):
return value return value
def validate_simple_esphomelib_version(value): def validate_simple_esphome_core_version(value):
value = cv.string_strict(value) value = cv.string_strict(value)
if value.upper() == 'LATEST': if value.upper() == 'LATEST':
if ESPHOMELIB_VERSION == 'dev': if ESPHOME_CORE_VERSION == 'dev':
return validate_simple_esphomelib_version('dev') return validate_simple_esphome_core_version('dev')
return { return {
CONF_REPOSITORY: LIBRARY_URI_REPO, CONF_REPOSITORY: LIBRARY_URI_REPO,
CONF_TAG: 'v' + ESPHOMELIB_VERSION, CONF_TAG: 'v' + ESPHOME_CORE_VERSION,
} }
if value.upper() == 'DEV': if value.upper() == 'DEV':
return { return {
@ -63,16 +65,16 @@ def validate_simple_esphomelib_version(value):
CONF_REPOSITORY: LIBRARY_URI_REPO, CONF_REPOSITORY: LIBRARY_URI_REPO,
CONF_TAG: 'v' + value, CONF_TAG: 'v' + value,
} }
raise vol.Invalid("Only simple esphomelib versions!") raise vol.Invalid("Only simple esphome core versions!")
def validate_local_esphomelib_version(value): def validate_local_esphome_core_version(value):
value = cv.directory(value) value = cv.directory(value)
path = CORE.relative_path(value) path = CORE.relative_path(value)
library_json = os.path.join(path, 'library.json') library_json = os.path.join(path, 'library.json')
if not os.path.exists(library_json): if not os.path.exists(library_json):
raise vol.Invalid(u"Could not find '{}' file. '{}' does not seem to point to an " raise vol.Invalid(u"Could not find '{}' file. '{}' does not seem to point to an "
u"esphomelib copy.".format(library_json, value)) u"esphome-core copy.".format(library_json, value))
return value return value
@ -83,10 +85,10 @@ def validate_commit(value):
return value return value
ESPHOMELIB_VERSION_SCHEMA = vol.Any( ESPHOME_CORE_VERSION_SCHEMA = vol.Any(
validate_simple_esphomelib_version, validate_simple_esphome_core_version,
vol.Schema({ vol.Schema({
vol.Required(CONF_LOCAL): validate_local_esphomelib_version, vol.Required(CONF_LOCAL): validate_local_esphome_core_version,
}), }),
vol.All( vol.All(
vol.Schema({ vol.Schema({
@ -160,7 +162,7 @@ CONFIG_SCHEMA = vol.Schema({
vol.Required(CONF_PLATFORM): cv.one_of('ESP8266', 'ESPRESSIF8266', 'ESP32', 'ESPRESSIF32', vol.Required(CONF_PLATFORM): cv.one_of('ESP8266', 'ESPRESSIF8266', 'ESP32', 'ESPRESSIF32',
upper=True), upper=True),
vol.Required(CONF_BOARD): validate_board, vol.Required(CONF_BOARD): validate_board,
vol.Optional(CONF_ESPHOMELIB_VERSION, default='latest'): ESPHOMELIB_VERSION_SCHEMA, vol.Optional(CONF_ESPHOME_CORE_VERSION, default='latest'): ESPHOME_CORE_VERSION_SCHEMA,
vol.Optional(CONF_ARDUINO_VERSION, default='recommended'): validate_arduino_version, vol.Optional(CONF_ARDUINO_VERSION, default='recommended'): validate_arduino_version,
vol.Optional(CONF_USE_CUSTOM_CODE, default=False): cv.boolean, vol.Optional(CONF_USE_CUSTOM_CODE, default=False): cv.boolean,
vol.Optional(CONF_BUILD_PATH, default=default_build_path): cv.string, vol.Optional(CONF_BUILD_PATH, default=default_build_path): cv.string,
@ -182,23 +184,26 @@ CONFIG_SCHEMA = vol.Schema({
vol.Optional(CONF_INCLUDES): cv.ensure_list(cv.file_), vol.Optional(CONF_INCLUDES): cv.ensure_list(cv.file_),
vol.Optional(CONF_LIBRARIES): cv.ensure_list(cv.string_strict), vol.Optional(CONF_LIBRARIES): 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('esphomelib_version'): cv.invalid("The esphomelib_version has been renamed to "
"was moved into the esphomelib_version option."), "esphome_core_version in 1.11.0"),
vol.Optional('use_build_flags'): cv.invalid("The use_build_flags option has been replaced by "
"use_custom_code option in 1.8.0."),
}) })
def preload_core_config(config): def preload_core_config(config):
if CONF_ESPHOMEYAML not in config: if CONF_ESPHOME not in config:
raise EsphomeyamlError(u"No esphomeyaml section in config") if 'esphomeyaml' in config:
core_conf = config[CONF_ESPHOMEYAML] raise EsphomeError(u"The top-level 'esphomeyaml' section has been renamed to "
u"'esphome' in 1.11.0.\n"
u"Please replace the esphomeyaml: line in your config with"
u"esphome:")
raise EsphomeError(u"No esphome section in config")
core_conf = config[CONF_ESPHOME]
if CONF_PLATFORM not in core_conf: if CONF_PLATFORM not in core_conf:
raise EsphomeyamlError("esphomeyaml.platform not specified.") raise EsphomeError("esphome.platform not specified.")
if CONF_BOARD not in core_conf: if CONF_BOARD not in core_conf:
raise EsphomeyamlError("esphomeyaml.board not specified.") raise EsphomeError("esphome.board not specified.")
if CONF_NAME not in core_conf: if CONF_NAME not in core_conf:
raise EsphomeyamlError("esphomeyaml.name not specified.") raise EsphomeError("esphome.name not specified.")
try: try:
CORE.esp_platform = validate_platform(core_conf[CONF_PLATFORM]) CORE.esp_platform = validate_platform(core_conf[CONF_PLATFORM])
@ -207,7 +212,7 @@ def preload_core_config(config):
CORE.build_path = CORE.relative_path( CORE.build_path = CORE.relative_path(
cv.string(core_conf.get(CONF_BUILD_PATH, default_build_path()))) cv.string(core_conf.get(CONF_BUILD_PATH, default_build_path())))
except vol.Invalid as e: except vol.Invalid as e:
raise EsphomeyamlError(text_type(e)) raise EsphomeError(text_type(e))
def to_code(config): def to_code(config):

10
esphomeyaml/cpp_generator.py → esphome/cpp_generator.py
View File

@ -1,13 +1,13 @@
from collections import OrderedDict from collections import OrderedDict
from esphomeyaml.core import CORE, HexInt, Lambda, TimePeriod, TimePeriodMicroseconds, \ from esphome.core import CORE, HexInt, Lambda, TimePeriod, TimePeriodMicroseconds, \
TimePeriodMilliseconds, TimePeriodSeconds TimePeriodMilliseconds, TimePeriodSeconds
from esphomeyaml.helpers import cpp_string_escape, indent_all_but_first_and_last from esphome.helpers import cpp_string_escape, indent_all_but_first_and_last
# pylint: disable=unused-import, wrong-import-order # pylint: disable=unused-import, wrong-import-order
from typing import Any, Generator, List, Optional, Tuple, Union # noqa from typing import Any, Generator, List, Optional, Tuple, Union # noqa
from esphomeyaml.core import ID # noqa from esphome.core import ID # noqa
from esphomeyaml.py_compat import text_type, string_types, integer_types from esphome.py_compat import text_type, string_types, integer_types
class Expression(object): class Expression(object):
@ -397,7 +397,7 @@ def process_lambda(value, # type: Lambda
return_type=None # type: Optional[Expression] return_type=None # type: Optional[Expression]
): ):
# type: (...) -> Generator[LambdaExpression] # type: (...) -> Generator[LambdaExpression]
from esphomeyaml.components.globals import GlobalVariableComponent from esphome.components.globals import GlobalVariableComponent
if value is None: if value is None:
yield yield

12
esphomeyaml/cpp_helpers.py → esphome/cpp_helpers.py
View File

@ -1,8 +1,8 @@
from esphomeyaml.const import CONF_INVERTED, CONF_MODE, CONF_NUMBER, CONF_PCF8574, \ from esphome.const import CONF_INVERTED, CONF_MODE, CONF_NUMBER, CONF_PCF8574, \
CONF_SETUP_PRIORITY CONF_SETUP_PRIORITY
from esphomeyaml.core import CORE, EsphomeyamlError from esphome.core import CORE, EsphomeError
from esphomeyaml.cpp_generator import IntLiteral, RawExpression from esphome.cpp_generator import IntLiteral, RawExpression
from esphomeyaml.cpp_types import GPIOInputPin, GPIOOutputPin from esphome.cpp_types import GPIOInputPin, GPIOOutputPin
def generic_gpio_pin_expression_(conf, mock_obj, default_mode): def generic_gpio_pin_expression_(conf, mock_obj, default_mode):
@ -11,7 +11,7 @@ def generic_gpio_pin_expression_(conf, mock_obj, default_mode):
number = conf[CONF_NUMBER] number = conf[CONF_NUMBER]
inverted = conf.get(CONF_INVERTED) inverted = conf.get(CONF_INVERTED)
if CONF_PCF8574 in conf: if CONF_PCF8574 in conf:
from esphomeyaml.components import pcf8574 from esphome.components import pcf8574
for hub in CORE.get_variable(conf[CONF_PCF8574]): for hub in CORE.get_variable(conf[CONF_PCF8574]):
yield None yield None
@ -24,7 +24,7 @@ def generic_gpio_pin_expression_(conf, mock_obj, default_mode):
yield hub.make_output_pin(number, inverted) yield hub.make_output_pin(number, inverted)
return return
raise EsphomeyamlError(u"Unknown default mode {}".format(default_mode)) raise EsphomeError(u"Unknown default mode {}".format(default_mode))
if len(conf) == 1: if len(conf) == 1:
yield IntLiteral(number) yield IntLiteral(number)
return return

37
esphome/cpp_types.py Normal file
View File

@ -0,0 +1,37 @@
from esphome.cpp_generator import MockObj
global_ns = MockObj('', '')
void = global_ns.namespace('void')
float_ = global_ns.namespace('float')
bool_ = global_ns.namespace('bool')
std_ns = global_ns.namespace('std')
std_string = std_ns.class_('string')
std_vector = std_ns.class_('vector')
uint8 = global_ns.namespace('uint8_t')
uint16 = global_ns.namespace('uint16_t')
uint32 = global_ns.namespace('uint32_t')
int32 = global_ns.namespace('int32_t')
const_char_ptr = global_ns.namespace('const char *')
NAN = global_ns.namespace('NAN')
esphome_ns = global_ns # using namespace esphome;
NoArg = esphome_ns.class_('NoArg')
App = esphome_ns.App
io_ns = esphome_ns.namespace('io')
Nameable = esphome_ns.class_('Nameable')
Trigger = esphome_ns.class_('Trigger')
Action = esphome_ns.class_('Action')
Component = esphome_ns.class_('Component')
ComponentPtr = Component.operator('ptr')
PollingComponent = esphome_ns.class_('PollingComponent', Component)
Application = esphome_ns.class_('Application')
optional = esphome_ns.class_('optional')
arduino_json_ns = global_ns.namespace('ArduinoJson')
JsonObject = arduino_json_ns.class_('JsonObject')
JsonObjectRef = JsonObject.operator('ref')
JsonObjectConstRef = JsonObjectRef.operator('const')
Controller = esphome_ns.class_('Controller')
StoringController = esphome_ns.class_('StoringController', Controller)
GPIOPin = esphome_ns.class_('GPIOPin')
GPIOOutputPin = esphome_ns.class_('GPIOOutputPin', GPIOPin)
GPIOInputPin = esphome_ns.class_('GPIOInputPin', GPIOPin)

0
esphomeyaml/dashboard/__init__.py → esphome/dashboard/__init__.py
View File

86
esphomeyaml/dashboard/dashboard.py → esphome/dashboard/dashboard.py
View File

@ -11,28 +11,28 @@ import threading
import tornado import tornado
import tornado.concurrent import tornado.concurrent
import tornado.httpserver
import tornado.netutil
import tornado.gen import tornado.gen
import tornado.httpserver
import tornado.ioloop import tornado.ioloop
import tornado.iostream import tornado.iostream
from tornado.log import access_log from tornado.log import access_log
import tornado.netutil
import tornado.process import tornado.process
import tornado.web import tornado.web
import tornado.websocket import tornado.websocket
from esphomeyaml import const from esphome import const
from esphomeyaml.__main__ import get_serial_ports from esphome.__main__ import get_serial_ports
from esphomeyaml.helpers import mkdir_p from esphome.helpers import mkdir_p
from esphomeyaml.py_compat import IS_PY2 from esphome.py_compat import IS_PY2
from esphomeyaml.storage_json import EsphomeyamlStorageJSON, StorageJSON, \ from esphome.storage_json import EsphomeStorageJSON, StorageJSON, \
esphomeyaml_storage_path, ext_storage_path esphome_storage_path, ext_storage_path
from esphomeyaml.util import shlex_quote from esphome.util import shlex_quote
# pylint: disable=unused-import, wrong-import-order # pylint: disable=unused-import, wrong-import-order
from typing import Optional # noqa from typing import Optional # noqa
from esphomeyaml.zeroconf import Zeroconf, DashboardStatus from esphome.zeroconf import DashboardStatus, Zeroconf
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
CONFIG_DIR = '' CONFIG_DIR = ''
@ -59,9 +59,9 @@ class BaseHandler(tornado.web.RequestHandler):
# pylint: disable=abstract-method, arguments-differ # pylint: disable=abstract-method, arguments-differ
class EsphomeyamlCommandWebSocket(tornado.websocket.WebSocketHandler): class EsphomeCommandWebSocket(tornado.websocket.WebSocketHandler):
def __init__(self, application, request, **kwargs): def __init__(self, application, request, **kwargs):
super(EsphomeyamlCommandWebSocket, self).__init__(application, request, **kwargs) super(EsphomeCommandWebSocket, self).__init__(application, request, **kwargs)
self.proc = None self.proc = None
self.closed = False self.closed = False
@ -113,53 +113,53 @@ class EsphomeyamlCommandWebSocket(tornado.websocket.WebSocketHandler):
raise NotImplementedError raise NotImplementedError
class EsphomeyamlLogsHandler(EsphomeyamlCommandWebSocket): class EsphomeLogsHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = CONFIG_DIR + '/' + js['configuration'] config_file = CONFIG_DIR + '/' + js['configuration']
return ["esphomeyaml", "--dashboard", config_file, "logs", '--serial-port', js["port"]] return ["esphome", "--dashboard", config_file, "logs", '--serial-port', js["port"]]
class EsphomeyamlRunHandler(EsphomeyamlCommandWebSocket): class EsphomeRunHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = os.path.join(CONFIG_DIR, js['configuration']) config_file = os.path.join(CONFIG_DIR, js['configuration'])
return ["esphomeyaml", "--dashboard", config_file, "run", '--upload-port', js["port"]] return ["esphome", "--dashboard", config_file, "run", '--upload-port', js["port"]]
class EsphomeyamlCompileHandler(EsphomeyamlCommandWebSocket): class EsphomeCompileHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = os.path.join(CONFIG_DIR, js['configuration']) config_file = os.path.join(CONFIG_DIR, js['configuration'])
return ["esphomeyaml", "--dashboard", config_file, "compile"] return ["esphome", "--dashboard", config_file, "compile"]
class EsphomeyamlValidateHandler(EsphomeyamlCommandWebSocket): class EsphomeValidateHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = os.path.join(CONFIG_DIR, js['configuration']) config_file = os.path.join(CONFIG_DIR, js['configuration'])
return ["esphomeyaml", "--dashboard", config_file, "config"] return ["esphome", "--dashboard", config_file, "config"]
class EsphomeyamlCleanMqttHandler(EsphomeyamlCommandWebSocket): class EsphomeCleanMqttHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = os.path.join(CONFIG_DIR, js['configuration']) config_file = os.path.join(CONFIG_DIR, js['configuration'])
return ["esphomeyaml", "--dashboard", config_file, "clean-mqtt"] return ["esphome", "--dashboard", config_file, "clean-mqtt"]
class EsphomeyamlCleanHandler(EsphomeyamlCommandWebSocket): class EsphomeCleanHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = os.path.join(CONFIG_DIR, js['configuration']) config_file = os.path.join(CONFIG_DIR, js['configuration'])
return ["esphomeyaml", "--dashboard", config_file, "clean"] return ["esphome", "--dashboard", config_file, "clean"]
class EsphomeyamlHassConfigHandler(EsphomeyamlCommandWebSocket): class EsphomeHassConfigHandler(EsphomeCommandWebSocket):
def build_command(self, message): def build_command(self, message):
js = json.loads(message) js = json.loads(message)
config_file = os.path.join(CONFIG_DIR, js['configuration']) config_file = os.path.join(CONFIG_DIR, js['configuration'])
return ["esphomeyaml", "--dashboard", config_file, "hass-config"] return ["esphome", "--dashboard", config_file, "hass-config"]
class SerialPortRequestHandler(BaseHandler): class SerialPortRequestHandler(BaseHandler):
@ -184,7 +184,7 @@ class SerialPortRequestHandler(BaseHandler):
class WizardRequestHandler(BaseHandler): class WizardRequestHandler(BaseHandler):
def post(self): def post(self):
from esphomeyaml import wizard from esphome import wizard
if not self.is_authenticated(): if not self.is_authenticated():
self.redirect('/login') self.redirect('/login')
@ -291,7 +291,7 @@ class DashboardEntry(object):
def update_old(self): def update_old(self):
if self.storage is None: if self.storage is None:
return '' return ''
return self.storage.esphomeyaml_version or '' return self.storage.esphome_version or ''
@property @property
def update_new(self): def update_new(self):
@ -307,8 +307,8 @@ class MainRequestHandler(BaseHandler):
begin = bool(self.get_argument('begin', False)) begin = bool(self.get_argument('begin', False))
entries = _list_dashboard_entries() entries = _list_dashboard_entries()
version = const.__version__ version = const.__version__
docs_link = 'https://beta.esphomelib.com/esphomeyaml/' if 'b' in version else \ docs_link = 'https://beta.esphome.io/' if 'b' in version else \
'https://esphomelib.com/esphomeyaml/' 'https://esphome.io/'
self.render("templates/index.html", entries=entries, self.render("templates/index.html", entries=entries,
version=version, begin=begin, docs_link=docs_link, version=version, begin=begin, docs_link=docs_link,
@ -396,8 +396,8 @@ class LoginHandler(BaseHandler):
def render_hassio_login(self, error=None): def render_hassio_login(self, error=None):
version = const.__version__ version = const.__version__
docs_link = 'https://beta.esphomelib.com/esphomeyaml/' if 'b' in version else \ docs_link = 'https://beta.esphome.io/' if 'b' in version else \
'https://esphomelib.com/esphomeyaml/' 'https://esphome.io/'
self.render("templates/login.html", version=version, docs_link=docs_link, error=error, self.render("templates/login.html", version=version, docs_link=docs_link, error=error,
get_static_file_url=get_static_file_url) get_static_file_url=get_static_file_url)
@ -490,13 +490,13 @@ def make_app(debug=False):
app = tornado.web.Application([ app = tornado.web.Application([
(r"/", MainRequestHandler), (r"/", MainRequestHandler),
(r"/login", LoginHandler), (r"/login", LoginHandler),
(r"/logs", EsphomeyamlLogsHandler), (r"/logs", EsphomeLogsHandler),
(r"/run", EsphomeyamlRunHandler), (r"/run", EsphomeRunHandler),
(r"/compile", EsphomeyamlCompileHandler), (r"/compile", EsphomeCompileHandler),
(r"/validate", EsphomeyamlValidateHandler), (r"/validate", EsphomeValidateHandler),
(r"/clean-mqtt", EsphomeyamlCleanMqttHandler), (r"/clean-mqtt", EsphomeCleanMqttHandler),
(r"/clean", EsphomeyamlCleanHandler), (r"/clean", EsphomeCleanHandler),
(r"/hass-config", EsphomeyamlHassConfigHandler), (r"/hass-config", EsphomeHassConfigHandler),
(r"/edit", EditRequestHandler), (r"/edit", EditRequestHandler),
(r"/download.bin", DownloadBinaryRequestHandler), (r"/download.bin", DownloadBinaryRequestHandler),
(r"/serial-ports", SerialPortRequestHandler), (r"/serial-ports", SerialPortRequestHandler),
@ -521,7 +521,7 @@ def start_web_server(args):
CONFIG_DIR = args.configuration CONFIG_DIR = args.configuration
mkdir_p(CONFIG_DIR) mkdir_p(CONFIG_DIR)
mkdir_p(os.path.join(CONFIG_DIR, ".esphomeyaml")) mkdir_p(os.path.join(CONFIG_DIR, ".esphome"))
ON_HASSIO = args.hassio ON_HASSIO = args.hassio
if ON_HASSIO: if ON_HASSIO:
@ -538,10 +538,10 @@ def start_web_server(args):
PASSWORD_DIGEST = hmac.new(args.password.encode()).digest() PASSWORD_DIGEST = hmac.new(args.password.encode()).digest()
if USING_HASSIO_AUTH or USING_PASSWORD: if USING_HASSIO_AUTH or USING_PASSWORD:
path = esphomeyaml_storage_path(CONFIG_DIR) path = esphome_storage_path(CONFIG_DIR)
storage = EsphomeyamlStorageJSON.load(path) storage = EsphomeStorageJSON.load(path)
if storage is None: if storage is None:
storage = EsphomeyamlStorageJSON.get_default() storage = EsphomeStorageJSON.get_default()
storage.save(path) storage.save(path)
COOKIE_SECRET = storage.cookie_secret COOKIE_SECRET = storage.cookie_secret

0
esphomeyaml/dashboard/static/ace.js → esphome/dashboard/static/ace.js
View File

0
esphomeyaml/dashboard/static/esphomeyaml.css → esphome/dashboard/static/esphome.css
View File

0
esphomeyaml/dashboard/static/esphomeyaml.js → esphome/dashboard/static/esphome.js
View File

0
esphomeyaml/dashboard/static/ext-searchbox.js → esphome/dashboard/static/ext-searchbox.js
View File

0
esphomeyaml/dashboard/static/favicon.ico → esphome/dashboard/static/favicon.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
esphomeyaml/dashboard/static/jquery-ui.min.js → esphome/dashboard/static/jquery-ui.min.js vendored
View File

0
esphomeyaml/dashboard/static/jquery.min.js → esphome/dashboard/static/jquery.min.js vendored
View File

0
esphomeyaml/dashboard/static/jquery.validate.min.js → esphome/dashboard/static/jquery.validate.min.js vendored
View File

0
esphomeyaml/dashboard/static/materialize-stepper.min.css → esphome/dashboard/static/materialize-stepper.min.css vendored
View File

0
esphomeyaml/dashboard/static/materialize-stepper.min.js → esphome/dashboard/static/materialize-stepper.min.js vendored
View File

0
esphomeyaml/dashboard/static/materialize.min.css → esphome/dashboard/static/materialize.min.css vendored
View File

0
esphomeyaml/dashboard/static/materialize.min.js → esphome/dashboard/static/materialize.min.js vendored
View File

0
esphomeyaml/dashboard/static/mode-yaml.js → esphome/dashboard/static/mode-yaml.js
View File

0
esphomeyaml/dashboard/static/theme-dreamweaver.js → esphome/dashboard/static/theme-dreamweaver.js
View File

Some files were not shown because too many files have changed in this diff Show More