Fix deploy script

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Create a report to help us 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!
+-->
+
+**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
+
+```
+
+**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:**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,22 @@
+---
+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.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+<!-- 
+A clear and concise description of what the problem is. 
+-->
+Ex. I'm always frustrated when [...]
+
+**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.

.github/ISSUE_TEMPLATE/new-integration.md

@@ -0,0 +1,20 @@
+---
+name: New integration
+about: Suggest a new integration for esphomelib
+
+---
+
+<!-- READ THIS FIRST:
+ - This is for new integrations (such as new sensors/modules) only, for new features within the environment please use the "feature request" template.
+ - Do not delete anything from this template and fill out the form as precisely as possible.
+-->
+
+**What new integration would you wish to have?**
+<!-- A name/description of the new integration/board. -->
+
+**If possible, provide a link to an existing library for the integration:**
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Additional context**

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,12 +3,18 @@
 
 **Related issue (if applicable):** fixes <link to issue>
 
-**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 [esphome-core](https://github.com/esphome/esphome-core) with C++ framework changes (if applicable):** esphome/esphome-core#<esphome-core PR number goes here>
+**Pull request in [esphomedocs](https://github.com/OttoWinter/esphomedocs) with documentation (if applicable):** OttoWinter/esphomedocs#<esphomedocs 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>
+
+## Example entry for YAML configuration (if applicable):
+```yaml
+
+```
 
 ## Checklist:
   - [ ] The code change is tested and works locally.
   - [ ] Tests have been added to verify that the new code works (under `tests/` folder).
+  - [ ] Check this box if you have read, understand, comply, and agree with the [Code of Conduct](https://github.com/OttoWinter/esphomeyaml/blob/master/CODE_OF_CONDUCT.md).
 
 If user exposed functionality or configuration variables are added/changed:
   - [ ] Documentation added/updated in [esphomedocs](https://github.com/OttoWinter/esphomedocs).

.github/issue-close-app.yml

@@ -1,7 +0,0 @@
-comment: >-
-  https://github.com/esphome/esphome/issues/430
-issueConfigs:
-- content:
-  - "OTHERWISE THE ISSUE WILL BE CLOSED AUTOMATICALLY"
-
-caseInsensitive: false

.gitignore

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

.gitlab-ci.yml

@@ -2,126 +2,212 @@
 # Based on https://gitlab.com/hassio-addons/addon-node-red/blob/master/.gitlab-ci.yml
 variables:
   DOCKER_DRIVER: overlay2
-  DOCKER_HOST: tcp://docker:2375/
 
 stages:
   - lint
   - test
+  - build
   - deploy
 
 .lint: &lint
-  image: esphome/esphome-base-amd64
   stage: lint
-  before_script:
-    - pip install -e .
-    - pip install flake8==3.6.0 pylint==1.9.4 pillow
   tags:
-    - docker
+    - python2.7
+    - esphomeyaml-lint
 
 .test: &test
-  image: esphome/esphome-base-amd64
   stage: test
   before_script:
     - pip install -e .
   tags:
-    - docker
+    - python2.7
+    - esphomeyaml-test
   variables:
     TZ: UTC
+  cache:
+    paths:
+      - tests/build
 
-.docker-base: &docker-base
-  image: esphome/esphome-base-builder
+.docker-builder: &docker-builder
   before_script:
     - docker info
-    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
-  script:
-    - docker run --rm --privileged hassioaddons/qemu-user-static:latest
-    - TAG="${CI_COMMIT_TAG#v}"
-    - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}"
-    - echo "Tag ${TAG}"
-
-    - |
-      if [[ "${IS_HASSIO}" == "YES" ]]; then
-        BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.3.0
-        BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH}
-        DOCKERFILE=docker/Dockerfile.hassio
-      else
-        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.3.0
-        if [[ "${BUILD_ARCH}" == "amd64" ]]; then
-          BUILD_TO=esphome/esphome
-        else
-          BUILD_TO=esphome/esphome-${BUILD_ARCH}
-        fi
-        DOCKERFILE=docker/Dockerfile
-      fi
-
-    - |
-      docker build \
-        --build-arg "BUILD_FROM=${BUILD_FROM}" \
-        --build-arg "BUILD_VERSION=${TAG}" \
-        --tag "${BUILD_TO}:${TAG}" \
-        --file "${DOCKERFILE}" \
-        .
-    - |
-      if [[ "${RELEASE}" = "YES" ]]; then
-        echo "Pushing to ${BUILD_TO}:${TAG}"
-        docker push "${BUILD_TO}:${TAG}"
-      fi
-    - |
-      if [[ "${LATEST}" = "YES" ]]; then
-        echo "Pushing to :latest"
-        docker tag ${BUILD_TO}:${TAG} ${BUILD_TO}:latest
-        docker push ${BUILD_TO}:latest
-      fi
-    - |
-      if [[ "${BETA}" = "YES" ]]; then
-        echo "Pushing to :beta"
-        docker tag \
-          ${BUILD_TO}:${TAG} \
-          ${BUILD_TO}:beta
-        docker push ${BUILD_TO}:beta
-      fi
-    - |
-      if [[ "${DEV}" = "YES" ]]; then
-        echo "Pushing to :dev"
-        docker tag \
-          ${BUILD_TO}:${TAG} \
-          ${BUILD_TO}:dev
-        docker push ${BUILD_TO}:dev
-      fi
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
   services:
     - docker:dind
   tags:
-    - docker
-  stage: deploy
+    - hassio-builder
 
 flake8:
   <<: *lint
   script:
-    - flake8 esphome
+    - flake8 esphomeyaml
 
 pylint:
   <<: *lint
   script:
-    - pylint esphome
+    - pylint esphomeyaml
 
 test1:
   <<: *test
   script:
-    - esphome tests/test1.yaml compile
+    - esphomeyaml tests/test1.yaml compile
 
 test2:
   <<: *test
   script:
-    - esphome tests/test2.yaml compile
+    - esphomeyaml tests/test2.yaml compile
 
-test3:
-  <<: *test
+.build-hassio: &build-hassio
+  <<: *docker-builder
+  stage: build
   script:
-    - esphome tests/test3.yaml compile
+    - |
+      hassio-builder.sh \
+           -t . \
+           -i ottowinter/esphomeyaml-hassio-${ADDON_ARCH} \
+           -d "$CI_REGISTRY" \
+           --${ADDON_ARCH}
+    - |
+      docker tag \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:dev" \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:dev"
+  retry: 2
+
+# Generic deploy template
+.deploy-release: &deploy-release
+  <<: *docker-builder
+  stage: deploy
+  script:
+    - version=${CI_COMMIT_TAG:1}
+    - echo "Publishing release version ${version}"
+    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+    - docker pull "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - |
+      docker tag \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+  only:
+  - /^v\d+\.\d+\.\d+$/
+  except:
+  - /^(?!master).+@/
+
+.deploy-beta: &deploy-beta
+  <<: *docker-builder
+  stage: deploy
+  script:
+    - version=${CI_COMMIT_TAG:1}
+    - echo "Publishing beta version ${version}"
+    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+    - docker pull "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - |
+      docker tag \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:beta"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+  only:
+  - /^v\d+\.\d+\.\d+b\d+$/
+  except:
+  - /^(?!rc).+@/
+
+# Build jobs
+build:normal:
+  <<: *docker-builder
+  stage: build
+  script:
+    - docker build -t "${CI_REGISTRY}/ottowinter/esphomeyaml:dev" .
+    - |
+      docker tag \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml:dev" \
+        "${CI_REGISTRY}/ottowinter/esphomeyaml:${CI_COMMIT_SHA}"
+    - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml:${CI_COMMIT_SHA}"
+    - docker push "${CI_REGISTRY}/ottowinter/esphomeyaml:dev"
+
+build:armhf:
+  <<: *build-hassio
+  variables:
+    ADDON_ARCH: armhf
+
+#build:aarch64:
+#   <<: *build
+#   variables:
+#     ADDON_ARCH: aarch64
+
+build:i386:
+  <<: *build-hassio
+  variables:
+    ADDON_ARCH: i386
+
+build:amd64:
+  <<: *build-hassio
+  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
   stage: deploy
-  image: python:2.7
   before_script:
   - pip install -e .
   - pip install twine
@@ -129,7 +215,8 @@ test3:
   - python setup.py sdist
   - twine upload dist/*
   tags:
-  - docker
+  - python2.7
+  - esphomeyaml-test
 
 deploy-release:pypi:
   <<: *deploy-pypi
@@ -144,204 +231,3 @@ deploy-beta:pypi:
     - /^v\d+\.\d+\.\d+b\d+$/
   except:
     - /^(?!rc).+@/
-
-.latest: &latest
-  <<: *docker-base
-  only:
-  - /^v([0-9\.]+)$/
-  except:
-  - branches
-
-.latest-vars: &latest-vars
-  RELEASE: YES
-  LATEST: YES
-  # Also push to beta tag
-  BETA: YES
-
-.beta: &beta
-  <<: *docker-base
-  only:
-  - /^v([0-9\.]+b\d+)$/
-  except:
-  - branches
-
-.beta-vars: &beta-vars
-  RELEASE: YES
-  BETA: YES
-
-.dev: &dev
-  <<: *docker-base
-  only:
-  - dev
-
-.dev-vars: &dev-vars
-  DEV: YES
-
-#aarch64-beta-docker:
-#  <<: *beta
-#  variables:
-#    BETA: "YES"
-#    BUILD_ARCH: aarch64
-#    IS_HASSIO: "NO"
-#    RELEASE: "YES"
-#aarch64-beta-hassio:
-#  <<: *beta
-#  variables:
-#    BETA: "YES"
-#    BUILD_ARCH: aarch64
-#    IS_HASSIO: "YES"
-#    RELEASE: "YES"
-#aarch64-dev-docker:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: aarch64
-#    DEV: "YES"
-#    IS_HASSIO: "NO"
-#aarch64-dev-hassio:
-#  <<: *dev
-#  variables:
-#    BUILD_ARCH: aarch64
-#    DEV: "YES"
-#    IS_HASSIO: "YES"
-#aarch64-latest-docker:
-#  <<: *latest
-#  variables:
-#    BETA: "YES"
-#    BUILD_ARCH: aarch64
-#    IS_HASSIO: "NO"
-#    LATEST: "YES"
-#    RELEASE: "YES"
-#aarch64-latest-hassio:
-#  <<: *latest
-#  variables:
-#    BETA: "YES"
-#    BUILD_ARCH: aarch64
-#    IS_HASSIO: "YES"
-#    LATEST: "YES"
-#    RELEASE: "YES"
-amd64-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-amd64-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-amd64-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: amd64
-    DEV: "YES"
-    IS_HASSIO: "NO"
-amd64-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: amd64
-    DEV: "YES"
-    IS_HASSIO: "YES"
-amd64-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-amd64-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"
-armhf-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armhf
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-armhf-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armhf
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-armhf-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: armhf
-    DEV: "YES"
-    IS_HASSIO: "NO"
-armhf-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: armhf
-    DEV: "YES"
-    IS_HASSIO: "YES"
-armhf-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armhf
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-armhf-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armhf
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"
-i386-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-i386-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-i386-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: i386
-    DEV: "YES"
-    IS_HASSIO: "NO"
-i386-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: i386
-    DEV: "YES"
-    IS_HASSIO: "YES"
-i386-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-i386-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"

.travis.yml

@@ -1,38 +1,20 @@
 sudo: false
 language: python
-
-cache:
-  directories:
-    - "~/.platformio"
-    - "$TRAVIS_BUILD_DIR/tests/build/test1/.piolibdeps"
-    - "$TRAVIS_BUILD_DIR/tests/build/test2/.piolibdeps"
-    - "$TRAVIS_BUILD_DIR/tests/build/test3/.piolibdeps"
-
-matrix:
-  fast_finish: true
+python:
+  - "2.7"
+jobs:
   include:
-    - python: "2.7"
-      env: TARGET=Lint2.7
-      install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow
+    - name: "Lint"
+      install:
+        - pip install -r requirements.txt
+        - pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow
       script:
-        - flake8 esphome
-        - pylint esphome
-    - python: "3.5.3"
-      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.3.0 pillow
+        - flake8 esphomeyaml
+        - pylint esphomeyaml
+    - name: "Test"
+      install:
+        - pip install -e .
+        - pip install tzlocal pillow
       script:
-        - flake8 esphome
-        - pylint esphome
-    - python: "2.7"
-      env: TARGET=Test2.7
-      install: pip install -e . && pip install flake8==3.6.0 pylint==1.9.4 pillow
-      script:
-        - esphome tests/test1.yaml compile
-        - esphome tests/test2.yaml compile
-        - esphome tests/test3.yaml compile
-    #- python: "3.5.3"
-    #  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.3.0 pillow
-    #  script:
-    #    - esphome tests/test1.yaml compile
-    #    - esphome tests/test2.yaml compile
+        - esphomeyaml tests/test1.yaml compile
+        - esphomeyaml tests/test2.yaml compile

CONTRIBUTING.md

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

Dockerfile

@@ -0,0 +1,26 @@
+FROM python:2.7
+MAINTAINER Otto Winter <contact@otto-winter.com>
+
+RUN apt-get update && apt-get install -y \
+        python-pil \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV ESPHOMEYAML_OTA_HOST_PORT=6123
+EXPOSE 6123
+VOLUME /config
+WORKDIR /usr/src/app
+
+RUN pip install --no-cache-dir --no-binary :all: platformio && \
+    platformio settings set enable_telemetry No
+
+COPY docker/platformio.ini /usr/src/app/
+RUN platformio settings set enable_telemetry No && \
+    platformio run -e espressif32 -e espressif8266; exit 0
+
+COPY . .
+RUN pip install --no-cache-dir -e . && \
+    pip install --no-cache-dir tzlocal pillow
+
+WORKDIR /config
+ENTRYPOINT ["esphomeyaml"]
+CMD ["/config", "dashboard"]

MANIFEST.in

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

README.md

@@ -1,9 +1,38 @@
-# ESPHome [![Build Status](https://travis-ci.org/esphome/esphome.svg?branch=master)](https://travis-ci.org/esphome/esphome) [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
+# esphomeyaml for [esphomelib](https://github.com/OttoWinter/esphomelib)
 
-[![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)
+### Getting Started Guide: https://esphomelib.com/esphomeyaml/guides/getting_started_command_line.html
 
-**Documentation:** https://esphome.io/
+### Available Components: https://esphomelib.com/esphomeyaml/index.html
 
-For issues, please go to [the issue tracker](https://github.com/esphome/issues/issues).
+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).
 
-For feature requests, please see [feature requests](https://github.com/esphome/feature-requests/issues).
+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.

docker/Dockerfile

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

docker/Dockerfile.aarch64

@@ -0,0 +1,21 @@
+# Dockerfile for aarch64 version of HassIO add-on
+FROM arm64v8/ubuntu:bionic
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        python \
+        python-pip \
+        python-setuptools \
+        python-pil \
+        git \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*rm -rf /var/lib/apt/lists/* /tmp/* && \
+    pip install --no-cache-dir --no-binary :all: platformio && \
+    platformio settings set enable_telemetry No
+
+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 --no-binary :all: tzlocal
+
+CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"]

docker/Dockerfile.amd64

@@ -0,0 +1,21 @@
+# Dockerfile for amd64 version of HassIO add-on
+FROM ubuntu:bionic
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        python \
+        python-pip \
+        python-setuptools \
+        python-pil \
+        git \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*rm -rf /var/lib/apt/lists/* /tmp/* && \
+    pip install --no-cache-dir --no-binary :all: platformio && \
+    platformio settings set enable_telemetry No
+
+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 --no-binary :all: tzlocal
+
+CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"]

docker/Dockerfile.armhf

@@ -0,0 +1,31 @@
+# Dockerfile for armhf version of HassIO add-on
+FROM homeassistant/armhf-base:latest
+
+RUN apk add --no-cache \
+        python2 \
+        python2-dev \
+        py2-pip \
+        git \
+        gcc \
+        openssh \
+        libc6-compat \
+        jpeg-dev \
+        zlib-dev \
+        freetype-dev \
+        lcms2-dev \
+        openjpeg-dev \
+        tiff-dev \
+        libc-dev \
+        linux-headers \
+    && \
+    pip install --no-cache-dir --no-binary :all: platformio && \
+    platformio settings set enable_telemetry No
+
+COPY docker/platformio-esp8266.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 tzlocal
+
+CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"]

docker/Dockerfile.builder

@@ -0,0 +1,32 @@
+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/*
+
+COPY docker/hassio-builder.sh /usr/bin/
+
+WORKDIR /data

docker/Dockerfile.hassio

@@ -1,20 +0,0 @@
-ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.3.0
-FROM ${BUILD_FROM}
-
-# Copy root filesystem
-COPY docker/rootfs/ /
-COPY setup.py setup.cfg MANIFEST.in /opt/esphome/
-COPY esphome /opt/esphome/esphome
-
-RUN \
-    pip2 install --no-cache-dir --no-binary :all: -e /opt/esphome
-
-# Build arguments
-ARG BUILD_VERSION=dev
-
-# Labels
-LABEL \
-    io.hass.name="ESPHome" \
-    io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
-    io.hass.type="addon" \
-    io.hass.version=${BUILD_VERSION}

docker/Dockerfile.i386

@@ -0,0 +1,21 @@
+# Dockerfile for i386 version of HassIO add-on
+FROM i386/ubuntu:bionic
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        python \
+        python-pip \
+        python-setuptools \
+        python-pil \
+        git \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*rm -rf /var/lib/apt/lists/* /tmp/* && \
+    pip install --no-cache-dir --no-binary :all: platformio && \
+    platformio settings set enable_telemetry No
+
+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 --no-binary :all: tzlocal
+
+CMD ["esphomeyaml", "/config/esphomeyaml", "dashboard"]

docker/Dockerfile.lint

@@ -3,4 +3,4 @@ FROM python:2.7
 COPY requirements.txt /requirements.txt
 
 RUN pip install -r /requirements.txt && \
-    pip install flake8==3.6.0 pylint==1.9.4 pillow
+    pip install flake8==3.5.0 pylint==1.9.3 tzlocal pillow

docker/Dockerfile.test

@@ -8,14 +8,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         git \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/*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
+    platformio settings set enable_telemetry No
 
 COPY docker/platformio.ini /pio/platformio.ini
 RUN platformio run -d /pio; rm -rf /pio
 
 COPY requirements.txt /requirements.txt
 
-RUN pip install --no-cache-dir -r /requirements.txt
+RUN pip install --no-cache-dir -r /requirements.txt && \
+    pip install --no-cache-dir tzlocal pillow

docker/hassio-builder.sh

@@ -0,0 +1,318 @@
+#!/usr/bin/env bash
+# Based on Home Assistant's docker builder
+######################
+# Hass.io Build-env
+######################
+set -e
+
+echo -- "$@"
+
+#### Variable ####
+
+DOCKER_TIMEOUT=20
+DOCKER_PID=-1
+DOCKER_HUB=""
+DOCKER_CACHE="true"
+DOCKER_LOCAL="false"
+TARGET=""
+IMAGE=""
+BUILD_LIST=()
+BUILD_TASKS=()
+
+#### Misc functions ####
+
+function print_help() {
+    cat << EOF
+Hass.io build-env for ecosystem:
+docker run --rm homeassistant/{arch}-builder:latest [options]
+
+Options:
+  -h, --help
+        Display this help and exit.
+
+  Repository / Data
+    -t, --target <PATH_TO_BUILD>
+        Set local folder or path inside repository for build.
+
+  Version/Image handling
+    -i, --image <IMAGE_NAME>
+        Overwrite image name of build / support {arch}
+
+  Architecture
+    --armhf
+        Build for arm.
+    --amd64
+        Build for intel/amd 64bit.
+    --aarch64
+        Build for arm 64bit.
+    --i386
+        Build for intel/amd 32bit.
+    --all
+        Build all architecture.
+
+  Build handling
+    --no-cache
+       Disable cache for the build (from latest).
+    -d, --docker-hub <DOCKER_REPOSITORY>
+       Set or overwrite the docker repository.
+
+    Use the host docker socket if mapped into container:
+       /var/run/docker.sock
+
+EOF
+
+    exit 1
+}
+
+#### Docker functions ####
+
+function start_docker() {
+    local starttime
+    local endtime
+
+    if [ -S "/var/run/docker.sock" ]; then
+        echo "[INFO] Use host docker setup with '/var/run/docker.sock'"
+        DOCKER_LOCAL="true"
+        return 0
+    fi
+
+    echo "[INFO] Starting docker."
+    dockerd 2> /dev/null &
+    DOCKER_PID=$!
+
+    echo "[INFO] Waiting for docker to initialize..."
+    starttime="$(date +%s)"
+    endtime="$(date +%s)"
+    until docker info >/dev/null 2>&1; do
+        if [ $((endtime - starttime)) -le ${DOCKER_TIMEOUT} ]; then
+            sleep 1
+            endtime=$(date +%s)
+        else
+            echo "[ERROR] Timeout while waiting for docker to come up"
+            exit 1
+        fi
+    done
+    echo "[INFO] Docker was initialized"
+}
+
+
+function stop_docker() {
+    local starttime
+    local endtime
+
+    if [ "$DOCKER_LOCAL" == "true" ]; then
+        return 0
+    fi
+
+    echo "[INFO] Stopping in container docker..."
+    if [ "$DOCKER_PID" -gt 0 ] && kill -0 "$DOCKER_PID" 2> /dev/null; then
+        starttime="$(date +%s)"
+        endtime="$(date +%s)"
+
+        # Now wait for it to die
+        kill "$DOCKER_PID"
+        while kill -0 "$DOCKER_PID" 2> /dev/null; do
+            if [ $((endtime - starttime)) -le ${DOCKER_TIMEOUT} ]; then
+                sleep 1
+                endtime=$(date +%s)
+            else
+                echo "[ERROR] Timeout while waiting for container docker to die"
+                exit 1
+            fi
+        done
+    else
+        echo "[WARN] Your host might have been left with unreleased resources"
+    fi
+}
+
+function run_build() {
+    local build_dir=$1
+    local repository=$2
+    local image=$3
+    local version=$4
+    local build_arch=$5
+    local docker_cli=("${!6}")
+
+    local push_images=()
+
+    # Overwrites
+    if [ ! -z "$DOCKER_HUB" ]; then repository="$DOCKER_HUB"; fi
+    if [ ! -z "$IMAGE" ]; then image="$IMAGE"; fi
+
+    # Init Cache
+    if [ "$DOCKER_CACHE" == "true" ]; then
+        echo "[INFO] Init cache for $repository/$image:$version"
+        if docker pull "$repository/$image:latest" > /dev/null 2>&1; then
+            docker_cli+=("--cache-from" "$repository/$image:latest")
+        else
+            docker_cli+=("--no-cache")
+            echo "[WARN] No cache image found. Cache is disabled for build"
+        fi
+    else
+        docker_cli+=("--no-cache")
+    fi
+
+    # Build image
+    echo "[INFO] Run build for $repository/$image:$version"
+    docker build --pull -t "$repository/$image:$version" \
+        --label "io.hass.version=$version" \
+        --label "io.hass.arch=$build_arch" \
+        -f "$TARGET/docker/Dockerfile.$build_arch" \
+        "${docker_cli[@]}" \
+        "$build_dir"
+
+    echo "[INFO] Finish build for $repository/$image:$version"
+    docker tag "$repository/$image:$version" "$repository/$image:dev"
+}
+
+
+#### HassIO functions ####
+
+function build_addon() {
+    local build_arch=$1
+
+    local docker_cli=()
+    local image=""
+    local repository=""
+    local raw_image=""
+    local name=""
+    local description=""
+    local url=""
+    local args=""
+
+    # Read addon config.json
+    name="$(jq --raw-output '.name // empty' "$TARGET/esphomeyaml/config.json" | sed "s/'//g")"
+    description="$(jq --raw-output '.description // empty' "$TARGET/esphomeyaml/config.json" | sed "s/'//g")"
+    url="$(jq --raw-output '.url // empty' "$TARGET/esphomeyaml/config.json")"
+    version="$(jq --raw-output '.version' "$TARGET/esphomeyaml/config.json")"
+    raw_image="$(jq --raw-output '.image // empty' "$TARGET/esphomeyaml/config.json")"
+
+    # Read data from image
+    if [ ! -z "$raw_image" ]; then
+        repository="$(echo "$raw_image" | cut -f 1 -d '/')"
+        image="$(echo "$raw_image" | cut -f 2 -d '/')"
+    fi
+
+    # Set additional labels
+    docker_cli+=("--label" "io.hass.name=$name")
+    docker_cli+=("--label" "io.hass.description=$description")
+    docker_cli+=("--label" "io.hass.type=addon")
+
+    if [ ! -z "$url" ]; then
+        docker_cli+=("--label" "io.hass.url=$url")
+    fi
+
+    # Start build
+    run_build "$TARGET" "$repository" "$image" "$version" \
+        "$build_arch" docker_cli[@]
+}
+
+#### initialized cross-build ####
+
+function init_crosscompile() {
+    echo "[INFO] Setup crosscompiling feature"
+    (
+        mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+        update-binfmts --enable qemu-arm
+        update-binfmts --enable qemu-aarch64
+    ) > /dev/null 2>&1 || echo "[WARN] Can't enable crosscompiling feature"
+}
+
+
+function clean_crosscompile() {
+    echo "[INFO] Clean crosscompiling feature"
+    if [ -f /proc/sys/fs/binfmt_misc ]; then
+        umount /proc/sys/fs/binfmt_misc || true
+    fi
+
+    (
+        update-binfmts --disable qemu-arm
+        update-binfmts --disable qemu-aarch64
+    ) > /dev/null 2>&1 || echo "[WARN] No crosscompiling feature found for cleanup"
+}
+
+#### Error handling ####
+
+function error_handling() {
+    stop_docker
+    clean_crosscompile
+
+    exit 1
+}
+trap 'error_handling' SIGINT SIGTERM
+
+#### Parse arguments ####
+
+while [[ $# -gt 0 ]]; do
+    key=$1
+    case ${key} in
+        -h|--help)
+            print_help
+            ;;
+        -t|--target)
+            TARGET=$2
+            shift
+            ;;
+        -i|--image)
+            IMAGE=$2
+            shift
+            ;;
+        --no-cache)
+            DOCKER_CACHE="false"
+            ;;
+        -d|--docker-hub)
+            DOCKER_HUB=$2
+            shift
+            ;;
+        --armhf)
+            BUILD_LIST+=("armhf")
+            ;;
+        --amd64)
+            BUILD_LIST+=("amd64")
+            ;;
+        --i386)
+            BUILD_LIST+=("i386")
+            ;;
+        --aarch64)
+            BUILD_LIST+=("aarch64")
+            ;;
+        --all)
+            BUILD_LIST=("armhf" "amd64" "i386" "aarch64")
+            ;;
+
+        *)
+            echo "[WARN] $0 : Argument '$1' unknown will be Ignoring"
+            ;;
+    esac
+    shift
+done
+
+# Check if an architecture is available
+if [ "${#BUILD_LIST[@]}" -eq 0 ]; then
+    echo "[ERROR] You need select an architecture for build!"
+    exit 1
+fi
+
+
+#### Main ####
+
+mkdir -p /data
+
+# Setup docker env
+init_crosscompile
+start_docker
+
+# Select arch build
+for arch in "${BUILD_LIST[@]}"; do
+    (build_addon "$arch") &
+    BUILD_TASKS+=($!)
+done
+
+# Wait until all build jobs are done
+wait "${BUILD_TASKS[@]}"
+
+# Cleanup docker env
+clean_crosscompile
+stop_docker
+
+exit 0

docker/hooks/build

@@ -1,26 +0,0 @@
-#!/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}"
-echo "PWD: $PWD"
-
-if [[ ${IS_HASSIO} = "YES" ]]; then
-    docker build \
-      --build-arg "BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:1.3.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.3.0" \
-      -t "${IMAGE_NAME}" -f ../docker/Dockerfile ..
-fi

docker/hooks/pre_build

@@ -1,18 +0,0 @@
-#!/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

docker/platformio-esp8266.ini

@@ -0,0 +1,7 @@
+; This file allows the docker build file to install the required platformio
+; platforms
+
+[env:espressif8266]
+platform = espressif8266
+board = nodemcuv2
+framework = arduino

docker/platformio.ini

@@ -2,11 +2,11 @@
 ; platforms
 
 [env:espressif8266]
-platform = espressif8266@1.8.0
+platform = espressif8266
 board = nodemcuv2
 framework = arduino
 
 [env:espressif32]
-platform = espressif32@1.5.0
+platform = espressif32
 board = nodemcu-32s
 framework = arduino

docker/rootfs/etc/cont-init.d/10-requirements.sh

@@ -1,35 +0,0 @@
-#!/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

docker/rootfs/etc/cont-init.d/20-nginx.sh

@@ -1,28 +0,0 @@
-#!/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

docker/rootfs/etc/cont-init.d/30-esphome.sh

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

docker/rootfs/etc/cont-init.d/40-migrate.sh

@@ -1,13 +0,0 @@
-#!/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

docker/rootfs/etc/nginx/nginx-ssl.conf

@@ -1,62 +0,0 @@
-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;
-        }
-    }
-}

docker/rootfs/etc/nginx/nginx.conf

@@ -1,46 +0,0 @@
-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;
-        }
-    }
-}

docker/rootfs/etc/services.d/esphome/finish

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

docker/rootfs/etc/services.d/esphome/run

@@ -1,28 +0,0 @@
-#!/usr/bin/with-contenv bash
-# ==============================================================================
-# Community Hass.io Add-ons: ESPHome
-# Runs the ESPHome dashboard
-# ==============================================================================
-# shellcheck disable=SC1091
-source /usr/lib/hassio-addons/base.sh
-
-export ESPHOME_IS_HASSIO=true
-
-if hass.config.true 'leave_front_door_open'; then
-    export DISABLE_HA_AUTHENTICATION=true
-fi
-
-if hass.config.true 'streamer_mode'; then
-    export ESPHOME_STREAMER_MODE=true
-fi
-
-if hass.config.true 'status_use_ping'; then
-    export ESPHOME_DASHBOARD_USE_PING=true
-fi
-
-if hass.config.has_value 'relative_url'; then
-    export ESPHOME_DASHBOARD_RELATIVE_URL=$(hass.config.get 'relative_url')
-fi
-
-hass.log.info "Starting ESPHome dashboard..."
-exec esphome /config/esphome dashboard --socket /var/run/esphome.sock --hassio

docker/rootfs/etc/services.d/nginx/finish

@@ -1,9 +0,0 @@
-#!/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

docker/rootfs/etc/services.d/nginx/run

@@ -1,10 +0,0 @@
-#!/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;"

esphome/api/api.proto

@@ -1,330 +0,0 @@
-syntax = "proto3";
-
-// The Home Assistant protocol is structured as a simple
-// TCP socket with short binary messages encoded in the protocol buffers format
-// First, a message in this protocol has a specific format:
-//  * VarInt denoting the size of the message object. (type is not part of this)
-//  * VarInt denoting the type of message.
-//  * The message object encoded as a ProtoBuf message
-
-// The connection is established in 4 steps:
-//  * First, the client connects to the server and sends a "Hello Request" identifying itself
-//  * The server responds with a "Hello Response" and selects the protocol version
-//  * After receiving this message, the client attempts to authenticate itself using
-//    the password and a "Connect Request"
-//  * The server responds with a "Connect Response" and notifies of invalid password.
-// If anything in this initial process fails, the connection must immediately closed
-// by both sides and _no_ disconnection message is to be sent.
-
-// Message sent at the beginning of each connection
-// Can only be sent by the client and only at the beginning of the connection
-message HelloRequest {
-  // Description of client (like User Agent)
-  // For example "Home Assistant"
-  // Not strictly necessary to send but nice for debugging
-  // purposes.
-  string client_info = 1;
-}
-
-// Confirmation of successful connection request.
-// Can only be sent by the server and only at the beginning of the connection
-message HelloResponse {
-  // The version of the API to use. The _client_ (for example Home Assistant) needs to check
-  // for compatibility and if necessary adopt to an older API.
-  // Major is for breaking changes in the base protocol - a mismatch will lead to immediate disconnect_client_
-  // Minor is for breaking changes in individual messages - a mismatch will lead to a warning message
-  uint32 api_version_major = 1;
-  uint32 api_version_minor = 2;
-
-  // A string identifying the server (ESP); like client info this may be empty
-  // and only exists for debugging/logging purposes.
-  // For example "ESPHome v1.10.0 on ESP8266"
-  string server_info = 3;
-}
-
-// Message sent at the beginning of each connection to authenticate the client
-// Can only be sent by the client and only at the beginning of the connection
-message ConnectRequest {
-  // The password to log in with
-  string password = 1;
-}
-
-// Confirmation of successful connection. After this the connection is available for all traffic.
-// Can only be sent by the server and only at the beginning of the connection
-message ConnectResponse {
-  bool invalid_password = 1;
-}
-
-// Request to close the connection.
-// Can be sent by both the client and server
-message DisconnectRequest {
-  // Do not close the connection before the acknowledgement arrives
-}
-
-message DisconnectResponse {
-  // Empty - Both parties are required to close the connection after this
-  // message has been received.
-}
-
-message PingRequest {
-  // Empty
-}
-
-message PingResponse {
-  // Empty
-}
-
-message DeviceInfoRequest {
-  // Empty
-}
-
-message DeviceInfoResponse {
-  bool uses_password = 1;
-
-  // The name of the node, given by "App.set_name()"
-  string name = 2;
-
-  // The mac address of the device. For example "AC:BC:32:89:0E:A9"
-  string mac_address = 3;
-
-  // A string describing the ESPHome version. For example "1.10.0"
-  string esphome_core_version = 4;
-
-  // 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.
-  // If the user isn't using esphome, this will also not be set.
-  string compilation_time = 5;
-
-  // The model of the board. For example NodeMCU
-  string model = 6;
-
-  bool has_deep_sleep = 7;
-}
-
-message ListEntitiesRequest {
-  // Empty
-}
-
-message ListEntitiesBinarySensorResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string device_class = 5;
-  bool is_status_binary_sensor = 6;
-}
-message ListEntitiesCoverResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  bool is_optimistic = 5;
-}
-message ListEntitiesFanResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  bool supports_oscillation = 5;
-  bool supports_speed = 6;
-}
-message ListEntitiesLightResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  bool supports_brightness = 5;
-  bool supports_rgb = 6;
-  bool supports_white_value = 7;
-  bool supports_color_temperature = 8;
-  float min_mireds = 9;
-  float max_mireds = 10;
-  repeated string effects = 11;
-}
-message ListEntitiesSensorResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-  string unit_of_measurement = 6;
-  int32 accuracy_decimals = 7;
-}
-message ListEntitiesSwitchResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-  bool optimistic = 6;
-}
-message ListEntitiesTextSensorResponse {
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-}
-message ListEntitiesDoneResponse {
-  // Empty
-}
-
-message SubscribeStatesRequest {
-  // Empty
-}
-message BinarySensorStateResponse {
-  fixed32 key = 1;
-  bool state = 2;
-}
-message CoverStateResponse {
-  fixed32 key = 1;
-  enum CoverState {
-    OPEN = 0;
-    CLOSED = 1;
-  }
-  CoverState state = 2;
-}
-enum FanSpeed {
-  LOW = 0;
-  MEDIUM = 1;
-  HIGH = 2;
-}
-message FanStateResponse {
-  fixed32 key = 1;
-  bool state = 2;
-  bool oscillating = 3;
-  FanSpeed speed = 4;
-}
-message LightStateResponse {
-  fixed32 key = 1;
-  bool state = 2;
-  float brightness = 3;
-  float red = 4;
-  float green = 5;
-  float blue = 6;
-  float white = 7;
-  float color_temperature = 8;
-  string effect = 9;
-}
-message SensorStateResponse {
-  fixed32 key = 1;
-  float state = 2;
-}
-message SwitchStateResponse {
-  fixed32 key = 1;
-  bool state = 2;
-}
-message TextSensorStateResponse {
-  fixed32 key = 1;
-  string state = 2;
-}
-
-message CoverCommandRequest {
-  fixed32 key = 1;
-  enum CoverCommand {
-    OPEN = 0;
-    CLOSE = 1;
-    STOP = 2;
-  }
-  bool has_state = 2;
-  CoverCommand command = 3;
-}
-message FanCommandRequest {
-  fixed32 key = 1;
-  bool has_state = 2;
-  bool state = 3;
-  bool has_speed = 4;
-  FanSpeed speed = 5;
-  bool has_oscillating = 6;
-  bool oscillating = 7;
-}
-message LightCommandRequest {
-  fixed32 key = 1;
-  bool has_state = 2;
-  bool state = 3;
-  bool has_brightness = 4;
-  float brightness = 5;
-  bool has_rgb = 6;
-  float red = 7;
-  float green = 8;
-  float blue = 9;
-  bool has_white = 10;
-  float white = 11;
-  bool has_color_temperature = 12;
-  float color_temperature = 13;
-  bool has_transition_length = 14;
-  uint32 transition_length = 15;
-  bool has_flash_length = 16;
-  uint32 flash_length = 17;
-  bool has_effect = 18;
-  string effect = 19;
-}
-message SwitchCommandRequest {
-  fixed32 key = 1;
-  bool state = 2;
-}
-
-enum LogLevel {
-  NONE = 0;
-  ERROR = 1;
-  WARN = 2;
-  INFO = 3;
-  DEBUG = 4;
-  VERBOSE = 5;
-  VERY_VERBOSE = 6;
-}
-
-message SubscribeLogsRequest {
-  LogLevel level = 1;
-  bool dump_config = 2;
-}
-
-message SubscribeLogsResponse {
-  LogLevel level = 1;
-  string tag = 2;
-  string message = 3;
-  bool send_failed = 4;
-}
-
-message SubscribeServiceCallsRequest {
-
-}
-
-message ServiceCallResponse {
-  string service = 1;
-  map<string, string> data = 2;
-  map<string, string> data_template = 3;
-  map<string, string> variables = 4;
-}
-
-// 1. Client sends SubscribeHomeAssistantStatesRequest
-// 2. Server responds with zero or more SubscribeHomeAssistantStateResponse (async)
-// 3. Client sends HomeAssistantStateResponse for state changes.
-message SubscribeHomeAssistantStatesRequest {
-
-}
-
-message SubscribeHomeAssistantStateResponse {
-  string entity_id = 1;
-}
-
-message HomeAssistantStateResponse {
-  string entity_id = 1;
-  string state = 2;
-}
-
-message GetTimeRequest {
-
-}
-
-message GetTimeResponse {
-  fixed32 epoch_seconds = 1;
-}
-

esphome/api/client.py

@@ -1,495 +0,0 @@
-from datetime import datetime
-import functools
-import logging
-import socket
-import threading
-import time
-
-# pylint: disable=unused-import
-from typing import Optional  # noqa
-from google.protobuf import message  # noqa
-
-from esphome import const
-import esphome.api.api_pb2 as pb
-from esphome.const import CONF_PASSWORD, CONF_PORT
-from esphome.core import EsphomeError
-from esphome.helpers import resolve_ip_address, indent, color
-from esphome.py_compat import text_type, IS_PY2, byte_to_bytes, char_to_byte, format_bytes
-from esphome.util import safe_print
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class APIConnectionError(EsphomeError):
-    pass
-
-
-MESSAGE_TYPE_TO_PROTO = {
-    1: pb.HelloRequest,
-    2: pb.HelloResponse,
-    3: pb.ConnectRequest,
-    4: pb.ConnectResponse,
-    5: pb.DisconnectRequest,
-    6: pb.DisconnectResponse,
-    7: pb.PingRequest,
-    8: pb.PingResponse,
-    9: pb.DeviceInfoRequest,
-    10: pb.DeviceInfoResponse,
-    11: pb.ListEntitiesRequest,
-    12: pb.ListEntitiesBinarySensorResponse,
-    13: pb.ListEntitiesCoverResponse,
-    14: pb.ListEntitiesFanResponse,
-    15: pb.ListEntitiesLightResponse,
-    16: pb.ListEntitiesSensorResponse,
-    17: pb.ListEntitiesSwitchResponse,
-    18: pb.ListEntitiesTextSensorResponse,
-    19: pb.ListEntitiesDoneResponse,
-    20: pb.SubscribeStatesRequest,
-    21: pb.BinarySensorStateResponse,
-    22: pb.CoverStateResponse,
-    23: pb.FanStateResponse,
-    24: pb.LightStateResponse,
-    25: pb.SensorStateResponse,
-    26: pb.SwitchStateResponse,
-    27: pb.TextSensorStateResponse,
-    28: pb.SubscribeLogsRequest,
-    29: pb.SubscribeLogsResponse,
-    30: pb.CoverCommandRequest,
-    31: pb.FanCommandRequest,
-    32: pb.LightCommandRequest,
-    33: pb.SwitchCommandRequest,
-    34: pb.SubscribeServiceCallsRequest,
-    35: pb.ServiceCallResponse,
-    36: pb.GetTimeRequest,
-    37: pb.GetTimeResponse,
-}
-
-
-def _varuint_to_bytes(value):
-    if value <= 0x7F:
-        return byte_to_bytes(value)
-
-    ret = bytes()
-    while value:
-        temp = value & 0x7F
-        value >>= 7
-        if value:
-            ret += byte_to_bytes(temp | 0x80)
-        else:
-            ret += byte_to_bytes(temp)
-
-    return ret
-
-
-def _bytes_to_varuint(value):
-    result = 0
-    bitpos = 0
-    for c in value:
-        val = char_to_byte(c)
-        result |= (val & 0x7F) << bitpos
-        bitpos += 7
-        if (val & 0x80) == 0:
-            return result
-    return None
-
-
-# pylint: disable=too-many-instance-attributes,not-callable
-class APIClient(threading.Thread):
-    def __init__(self, address, port, password):
-        threading.Thread.__init__(self)
-        self._address = address  # type: str
-        self._port = port  # type: int
-        self._password = password  # type: Optional[str]
-        self._socket = None  # type: Optional[socket.socket]
-        self._socket_open_event = threading.Event()
-        self._socket_write_lock = threading.Lock()
-        self._connected = False
-        self._authenticated = False
-        self._message_handlers = []
-        self._keepalive = 5
-        self._ping_timer = None
-        self._refresh_ping()
-
-        self.on_disconnect = None
-        self.on_connect = None
-        self.on_login = None
-        self.auto_reconnect = False
-        self._running_event = threading.Event()
-        self._stop_event = threading.Event()
-
-    @property
-    def stopped(self):
-        return self._stop_event.is_set()
-
-    def _refresh_ping(self):
-        if self._ping_timer is not None:
-            self._ping_timer.cancel()
-            self._ping_timer = None
-
-        def func():
-            self._ping_timer = None
-
-            if self._connected:
-                try:
-                    self.ping()
-                except APIConnectionError:
-                    self._fatal_error()
-                else:
-                    self._refresh_ping()
-
-        self._ping_timer = threading.Timer(self._keepalive, func)
-        self._ping_timer.start()
-
-    def _cancel_ping(self):
-        if self._ping_timer is not None:
-            self._ping_timer.cancel()
-            self._ping_timer = None
-
-    def _close_socket(self):
-        self._cancel_ping()
-        if self._socket is not None:
-            self._socket.close()
-            self._socket = None
-        self._socket_open_event.clear()
-        self._connected = False
-        self._authenticated = False
-        self._message_handlers = []
-
-    def stop(self, force=False):
-        if self.stopped:
-            raise ValueError
-
-        if self._connected and not force:
-            try:
-                self.disconnect()
-            except APIConnectionError:
-                pass
-        self._close_socket()
-
-        self._stop_event.set()
-        if not force:
-            self.join()
-
-    def connect(self):
-        if not self._running_event.wait(0.1):
-            raise APIConnectionError("You need to call start() first!")
-
-        if self._connected:
-            raise APIConnectionError("Already connected!")
-
-        try:
-            ip = resolve_ip_address(self._address)
-        except EsphomeError as err:
-            _LOGGER.warning("Error resolving IP address of %s. Is it connected to WiFi?",
-                            self._address)
-            _LOGGER.warning("(If this error persists, please set a static IP address: "
-                            "https://esphome.io/components/wifi.html#manual-ips)")
-            raise APIConnectionError(err)
-
-        _LOGGER.info("Connecting to %s:%s (%s)", self._address, self._port, ip)
-        self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self._socket.settimeout(10.0)
-        self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-        try:
-            self._socket.connect((ip, self._port))
-        except socket.error as err:
-            self._fatal_error()
-            raise APIConnectionError("Error connecting to {}: {}".format(ip, err))
-        self._socket.settimeout(0.1)
-
-        self._socket_open_event.set()
-
-        hello = pb.HelloRequest()
-        hello.client_info = 'ESPHome v{}'.format(const.__version__)
-        try:
-            resp = self._send_message_await_response(hello, pb.HelloResponse)
-        except APIConnectionError as err:
-            self._fatal_error()
-            raise err
-        _LOGGER.debug("Successfully connected to %s ('%s' API=%s.%s)", self._address,
-                      resp.server_info, resp.api_version_major, resp.api_version_minor)
-        self._connected = True
-        if self.on_connect is not None:
-            self.on_connect()
-
-    def _check_connected(self):
-        if not self._connected:
-            self._fatal_error()
-            raise APIConnectionError("Must be connected!")
-
-    def login(self):
-        self._check_connected()
-        if self._authenticated:
-            raise APIConnectionError("Already logged in!")
-
-        connect = pb.ConnectRequest()
-        if self._password is not None:
-            connect.password = self._password
-        resp = self._send_message_await_response(connect, pb.ConnectResponse)
-        if resp.invalid_password:
-            raise APIConnectionError("Invalid password!")
-
-        self._authenticated = True
-        if self.on_login is not None:
-            self.on_login()
-
-    def _fatal_error(self):
-        was_connected = self._connected
-
-        self._close_socket()
-
-        if was_connected and self.on_disconnect is not None:
-            self.on_disconnect()
-
-    def _write(self, data):  # type: (bytes) -> None
-        if self._socket is None:
-            raise APIConnectionError("Socket closed")
-
-        _LOGGER.debug("Write: %s", format_bytes(data))
-        with self._socket_write_lock:
-            try:
-                self._socket.sendall(data)
-            except socket.error as err:
-                self._fatal_error()
-                raise APIConnectionError("Error while writing data: {}".format(err))
-
-    def _send_message(self, msg):
-        # type: (message.Message) -> None
-        for message_type, klass in MESSAGE_TYPE_TO_PROTO.items():
-            if isinstance(msg, klass):
-                break
-        else:
-            raise ValueError
-
-        encoded = msg.SerializeToString()
-        _LOGGER.debug("Sending %s:\n%s", type(msg), indent(text_type(msg)))
-        if IS_PY2:
-            req = chr(0x00)
-        else:
-            req = bytes([0])
-        req += _varuint_to_bytes(len(encoded))
-        req += _varuint_to_bytes(message_type)
-        req += encoded
-        self._write(req)
-        self._refresh_ping()
-
-    def _send_message_await_response_complex(self, send_msg, do_append, do_stop, timeout=1):
-        event = threading.Event()
-        responses = []
-
-        def on_message(resp):
-            if do_append(resp):
-                responses.append(resp)
-            if do_stop(resp):
-                event.set()
-
-        self._message_handlers.append(on_message)
-        self._send_message(send_msg)
-        ret = event.wait(timeout)
-        try:
-            self._message_handlers.remove(on_message)
-        except ValueError:
-            pass
-        if not ret:
-            raise APIConnectionError("Timeout while waiting for message response!")
-        return responses
-
-    def _send_message_await_response(self, send_msg, response_type, timeout=1):
-        def is_response(msg):
-            return isinstance(msg, response_type)
-
-        return self._send_message_await_response_complex(send_msg, is_response, is_response,
-                                                         timeout)[0]
-
-    def device_info(self):
-        self._check_connected()
-        return self._send_message_await_response(pb.DeviceInfoRequest(), pb.DeviceInfoResponse)
-
-    def ping(self):
-        self._check_connected()
-        return self._send_message_await_response(pb.PingRequest(), pb.PingResponse)
-
-    def disconnect(self):
-        self._check_connected()
-
-        try:
-            self._send_message_await_response(pb.DisconnectRequest(), pb.DisconnectResponse)
-        except APIConnectionError:
-            pass
-        self._close_socket()
-
-        if self.on_disconnect is not None:
-            self.on_disconnect()
-
-    def _check_authenticated(self):
-        if not self._authenticated:
-            raise APIConnectionError("Must login first!")
-
-    def subscribe_logs(self, on_log, log_level=None, dump_config=False):
-        self._check_authenticated()
-
-        def on_msg(msg):
-            if isinstance(msg, pb.SubscribeLogsResponse):
-                on_log(msg)
-
-        self._message_handlers.append(on_msg)
-        req = pb.SubscribeLogsRequest(dump_config=dump_config)
-        if log_level is not None:
-            req.level = log_level
-        self._send_message(req)
-
-    def _recv(self, amount):
-        ret = bytes()
-        if amount == 0:
-            return ret
-
-        while len(ret) < amount:
-            if self.stopped:
-                raise APIConnectionError("Stopped!")
-            if not self._socket_open_event.is_set():
-                raise APIConnectionError("No socket!")
-            try:
-                val = self._socket.recv(amount - len(ret))
-            except AttributeError:
-                raise APIConnectionError("Socket was closed")
-            except socket.timeout:
-                continue
-            except socket.error as err:
-                raise APIConnectionError("Error while receiving data: {}".format(err))
-            ret += val
-        return ret
-
-    def _recv_varint(self):
-        raw = bytes()
-        while not raw or char_to_byte(raw[-1]) & 0x80:
-            raw += self._recv(1)
-        return _bytes_to_varuint(raw)
-
-    def _run_once(self):
-        if not self._socket_open_event.wait(0.1):
-            return
-
-        # Preamble
-        if char_to_byte(self._recv(1)[0]) != 0x00:
-            raise APIConnectionError("Invalid preamble")
-
-        length = self._recv_varint()
-        msg_type = self._recv_varint()
-
-        raw_msg = self._recv(length)
-        if msg_type not in MESSAGE_TYPE_TO_PROTO:
-            _LOGGER.debug("Skipping message type %s", msg_type)
-            return
-
-        msg = MESSAGE_TYPE_TO_PROTO[msg_type]()
-        msg.ParseFromString(raw_msg)
-        _LOGGER.debug("Got message: %s:\n%s", type(msg), indent(str(msg)))
-        for msg_handler in self._message_handlers[:]:
-            msg_handler(msg)
-        self._handle_internal_messages(msg)
-        self._refresh_ping()
-
-    def run(self):
-        self._running_event.set()
-        while not self.stopped:
-            try:
-                self._run_once()
-            except APIConnectionError as err:
-                if self.stopped:
-                    break
-                if self._connected:
-                    _LOGGER.error("Error while reading incoming messages: %s", err)
-                    self._fatal_error()
-        self._running_event.clear()
-
-    def _handle_internal_messages(self, msg):
-        if isinstance(msg, pb.DisconnectRequest):
-            self._send_message(pb.DisconnectResponse())
-            if self._socket is not None:
-                self._socket.close()
-                self._socket = None
-            self._connected = False
-            if self.on_disconnect is not None:
-                self.on_disconnect()
-        elif isinstance(msg, pb.PingRequest):
-            self._send_message(pb.PingResponse())
-        elif isinstance(msg, pb.GetTimeRequest):
-            resp = pb.GetTimeResponse()
-            resp.epoch_seconds = int(time.time())
-            self._send_message(resp)
-
-
-def run_logs(config, address):
-    conf = config['api']
-    port = conf[CONF_PORT]
-    password = conf[CONF_PASSWORD]
-    _LOGGER.info("Starting log output from %s using esphome API", address)
-
-    cli = APIClient(address, port, password)
-    stopping = False
-    retry_timer = []
-
-    has_connects = []
-
-    def try_connect(tries=0, is_disconnect=True):
-        if stopping:
-            return
-
-        if is_disconnect:
-            _LOGGER.warning(u"Disconnected from API.")
-
-        while retry_timer:
-            retry_timer.pop(0).cancel()
-
-        error = None
-        try:
-            cli.connect()
-            cli.login()
-        except APIConnectionError as err:  # noqa
-            error = err
-
-        if error is None:
-            _LOGGER.info("Successfully connected to %s", address)
-            return
-
-        wait_time = min(2**tries, 300)
-        if not has_connects:
-            _LOGGER.warning(u"Initial connection failed. The ESP might not be connected "
-                            u"to WiFi yet (%s). Re-Trying in %s seconds",
-                            error, wait_time)
-        else:
-            _LOGGER.warning(u"Couldn't connect to API (%s). Trying to reconnect in %s seconds",
-                            error, wait_time)
-        timer = threading.Timer(wait_time, functools.partial(try_connect, tries + 1, is_disconnect))
-        timer.start()
-        retry_timer.append(timer)
-
-    def on_log(msg):
-        time_ = datetime.now().time().strftime(u'[%H:%M:%S]')
-        text = msg.message
-        if msg.send_failed:
-            text = color('white', '(Message skipped because it was too big to fit in '
-                                  'TCP buffer - This is only cosmetic)')
-        safe_print(time_ + text)
-
-    def on_login():
-        try:
-            cli.subscribe_logs(on_log, dump_config=not has_connects)
-            has_connects.append(True)
-        except APIConnectionError:
-            cli.disconnect()
-
-    cli.on_disconnect = try_connect
-    cli.on_login = on_login
-    cli.start()
-
-    try:
-        try_connect(is_disconnect=False)
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        stopping = True
-        cli.stop(True)
-        while retry_timer:
-            retry_timer.pop(0).cancel()
-    return 0

esphome/automation.py

@@ -1,384 +0,0 @@
-import copy
-
-import voluptuous as vol
-
-import esphome.config_validation as cv
-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_LAMBDA, \
-    CONF_OR, CONF_RANGE, CONF_THEN, CONF_TRIGGER_ID, CONF_WAIT_UNTIL, CONF_WHILE
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, TemplateArguments, add, get_variable, \
-    process_lambda, templatable
-from esphome.cpp_types import Action, App, Component, PollingComponent, Trigger, bool_, \
-    esphome_ns, float_, uint32, void
-from esphome.util import ServiceRegistry
-
-
-def maybe_simple_id(*validators):
-    validator = vol.All(*validators)
-
-    def validate(value):
-        if isinstance(value, dict):
-            return validator(value)
-        return validator({CONF_ID: value})
-
-    return validate
-
-
-def validate_recursive_condition(value):
-    is_list = isinstance(value, list)
-    value = cv.ensure_list()(value)[:]
-    for i, item in enumerate(value):
-        path = [i] if is_list else []
-        item = copy.deepcopy(item)
-        if not isinstance(item, dict):
-            raise vol.Invalid(u"Condition must consist of key-value mapping! Got {}".format(item),
-                              path)
-        key = next((x for x in item if x != CONF_CONDITION_ID), None)
-        if key is None:
-            raise vol.Invalid(u"Key missing from action! Got {}".format(item), path)
-        if key not in CONDITION_REGISTRY:
-            raise vol.Invalid(u"Unable to find condition with the name '{}', is the "
-                              u"component loaded?".format(key), path + [key])
-        item.setdefault(CONF_CONDITION_ID, None)
-        key2 = next((x for x in item if x not in (CONF_CONDITION_ID, key)), None)
-        if key2 is not None:
-            raise vol.Invalid(u"Cannot have two conditions in one item. Key '{}' overrides '{}'! "
-                              u"Did you forget to indent the block inside the condition?"
-                              u"".format(key, key2), path)
-        validator = CONDITION_REGISTRY[key][0]
-        try:
-            condition = validator(item[key] or {})
-        except vol.Invalid as err:
-            err.prepend(path)
-            raise err
-        value[i] = {
-            CONF_CONDITION_ID: cv.declare_variable_id(Condition)(item[CONF_CONDITION_ID]),
-            key: condition,
-        }
-    return value
-
-
-def validate_recursive_action(value):
-    is_list = isinstance(value, list)
-    if not is_list:
-        value = [value]
-    for i, item in enumerate(value):
-        path = [i] if is_list else []
-        item = copy.deepcopy(item)
-        if not isinstance(item, dict):
-            raise vol.Invalid(u"Action must consist of key-value mapping! Got {}".format(item),
-                              path)
-        key = next((x for x in item if x != CONF_ACTION_ID), None)
-        if key is None:
-            raise vol.Invalid(u"Key missing from action! Got {}".format(item), path)
-        if key not in ACTION_REGISTRY:
-            raise vol.Invalid(u"Unable to find action with the name '{}', is the component loaded?"
-                              u"".format(key), path + [key])
-        item.setdefault(CONF_ACTION_ID, None)
-        key2 = next((x for x in item if x not in (CONF_ACTION_ID, key)), None)
-        if key2 is not None:
-            raise vol.Invalid(u"Cannot have two actions in one item. Key '{}' overrides '{}'! "
-                              u"Did you forget to indent the block inside the action?"
-                              u"".format(key, key2), path)
-        validator = ACTION_REGISTRY[key][0]
-        try:
-            action = validator(item[key] or {})
-        except vol.Invalid as err:
-            err.prepend(path)
-            raise err
-        value[i] = {
-            CONF_ACTION_ID: cv.declare_variable_id(Action)(item[CONF_ACTION_ID]),
-            key: action,
-        }
-    return value
-
-
-ACTION_REGISTRY = ServiceRegistry()
-CONDITION_REGISTRY = ServiceRegistry()
-
-# pylint: disable=invalid-name
-DelayAction = esphome_ns.class_('DelayAction', Action, Component)
-LambdaAction = esphome_ns.class_('LambdaAction', Action)
-IfAction = esphome_ns.class_('IfAction', Action)
-WhileAction = esphome_ns.class_('WhileAction', Action)
-WaitUntilAction = esphome_ns.class_('WaitUntilAction', Action, Component)
-UpdateComponentAction = esphome_ns.class_('UpdateComponentAction', Action)
-Automation = esphome_ns.class_('Automation')
-
-Condition = esphome_ns.class_('Condition')
-AndCondition = esphome_ns.class_('AndCondition', Condition)
-OrCondition = esphome_ns.class_('OrCondition', Condition)
-RangeCondition = esphome_ns.class_('RangeCondition', Condition)
-LambdaCondition = esphome_ns.class_('LambdaCondition', Condition)
-
-
-def validate_automation(extra_schema=None, extra_validators=None, single=False):
-    if extra_schema is None:
-        extra_schema = {}
-    if isinstance(extra_schema, vol.Schema):
-        extra_schema = extra_schema.schema
-    schema = AUTOMATION_SCHEMA.extend(extra_schema)
-
-    def validator_(value):
-        if isinstance(value, list):
-            try:
-                # First try as a sequence of actions
-                return [schema({CONF_THEN: value})]
-            except vol.Invalid as err:
-                if err.path and err.path[0] == CONF_THEN:
-                    err.path.pop(0)
-
-                # Next try as a sequence of automations
-                try:
-                    return cv.Schema([schema])(value)
-                except vol.Invalid as err2:
-                    if 'Unable to find action' in str(err):
-                        raise err2
-                    raise vol.MultipleInvalid([err, err2])
-        elif isinstance(value, dict):
-            if CONF_THEN in value:
-                return [schema(value)]
-            return [schema({CONF_THEN: value})]
-        # This should only happen with invalid configs, but let's have a nice error message.
-        return [schema(value)]
-
-    def validator(value):
-        value = validator_(value)
-        if extra_validators is not None:
-            value = cv.Schema([extra_validators])(value)
-        if single:
-            if len(value) != 1:
-                raise vol.Invalid("Cannot have more than 1 automation for templates")
-            return value[0]
-        return value
-
-    return validator
-
-
-AUTOMATION_SCHEMA = cv.Schema({
-    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(Trigger),
-    cv.GenerateID(CONF_AUTOMATION_ID): cv.declare_variable_id(Automation),
-    vol.Required(CONF_THEN): validate_recursive_action,
-})
-
-AND_CONDITION_SCHEMA = validate_recursive_condition
-
-
-@CONDITION_REGISTRY.register(CONF_AND, AND_CONDITION_SCHEMA)
-def and_condition_to_code(config, condition_id, template_arg, args):
-    for conditions in build_conditions(config, template_arg, args):
-        yield
-    rhs = AndCondition.new(template_arg, conditions)
-    type = AndCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)
-
-
-OR_CONDITION_SCHEMA = validate_recursive_condition
-
-
-@CONDITION_REGISTRY.register(CONF_OR, OR_CONDITION_SCHEMA)
-def or_condition_to_code(config, condition_id, template_arg, args):
-    for conditions in build_conditions(config, template_arg, args):
-        yield
-    rhs = OrCondition.new(template_arg, conditions)
-    type = OrCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)
-
-
-RANGE_CONDITION_SCHEMA = vol.All(cv.Schema({
-    vol.Optional(CONF_ABOVE): cv.templatable(cv.float_),
-    vol.Optional(CONF_BELOW): cv.templatable(cv.float_),
-}), cv.has_at_least_one_key(CONF_ABOVE, CONF_BELOW))
-
-
-@CONDITION_REGISTRY.register(CONF_RANGE, RANGE_CONDITION_SCHEMA)
-def range_condition_to_code(config, condition_id, template_arg, args):
-    for conditions in build_conditions(config, template_arg, args):
-        yield
-    rhs = RangeCondition.new(template_arg, conditions)
-    type = RangeCondition.template(template_arg)
-    condition = Pvariable(condition_id, rhs, type=type)
-    if CONF_ABOVE in config:
-        for template_ in templatable(config[CONF_ABOVE], args, float_):
-            yield
-        condition.set_min(template_)
-    if CONF_BELOW in config:
-        for template_ in templatable(config[CONF_BELOW], args, float_):
-            yield
-        condition.set_max(template_)
-    yield condition
-
-
-DELAY_ACTION_SCHEMA = cv.templatable(cv.positive_time_period_milliseconds)
-
-
-@ACTION_REGISTRY.register(CONF_DELAY, DELAY_ACTION_SCHEMA)
-def delay_action_to_code(config, action_id, template_arg, args):
-    rhs = App.register_component(DelayAction.new(template_arg))
-    type = DelayAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    for template_ in templatable(config, args, uint32):
-        yield
-    add(action.set_delay(template_))
-    yield action
-
-
-IF_ACTION_SCHEMA = vol.All({
-    vol.Required(CONF_CONDITION): validate_recursive_condition,
-    vol.Optional(CONF_THEN): validate_recursive_action,
-    vol.Optional(CONF_ELSE): validate_recursive_action,
-}, cv.has_at_least_one_key(CONF_THEN, CONF_ELSE))
-
-
-@ACTION_REGISTRY.register(CONF_IF, IF_ACTION_SCHEMA)
-def if_action_to_code(config, action_id, template_arg, args):
-    for conditions in build_conditions(config[CONF_CONDITION], template_arg, args):
-        yield None
-    rhs = IfAction.new(template_arg, conditions)
-    type = IfAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    if CONF_THEN in config:
-        for actions in build_actions(config[CONF_THEN], template_arg, args):
-            yield None
-        add(action.add_then(actions))
-    if CONF_ELSE in config:
-        for actions in build_actions(config[CONF_ELSE], template_arg, args):
-            yield None
-        add(action.add_else(actions))
-    yield action
-
-
-WHILE_ACTION_SCHEMA = cv.Schema({
-    vol.Required(CONF_CONDITION): validate_recursive_condition,
-    vol.Required(CONF_THEN): validate_recursive_action,
-})
-
-
-@ACTION_REGISTRY.register(CONF_WHILE, WHILE_ACTION_SCHEMA)
-def while_action_to_code(config, action_id, template_arg, args):
-    for conditions in build_conditions(config[CONF_CONDITION], template_arg, args):
-        yield None
-    rhs = WhileAction.new(template_arg, conditions)
-    type = WhileAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    for actions in build_actions(config[CONF_THEN], template_arg, args):
-        yield None
-    add(action.add_then(actions))
-    yield action
-
-
-def validate_wait_until(value):
-    schema = cv.Schema({
-        vol.Required(CONF_CONDITION): validate_recursive_condition
-    })
-    if isinstance(value, dict) and CONF_CONDITION in value:
-        return schema(value)
-    return validate_wait_until({CONF_CONDITION: value})
-
-
-WAIT_UNTIL_ACTION_SCHEMA = validate_wait_until
-
-
-@ACTION_REGISTRY.register(CONF_WAIT_UNTIL, WAIT_UNTIL_ACTION_SCHEMA)
-def wait_until_action_to_code(config, action_id, template_arg, args):
-    for conditions in build_conditions(config[CONF_CONDITION], template_arg, args):
-        yield None
-    rhs = WaitUntilAction.new(template_arg, conditions)
-    type = WaitUntilAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    add(App.register_component(action))
-    yield action
-
-
-LAMBDA_ACTION_SCHEMA = cv.lambda_
-
-
-@ACTION_REGISTRY.register(CONF_LAMBDA, LAMBDA_ACTION_SCHEMA)
-def lambda_action_to_code(config, action_id, template_arg, args):
-    for lambda_ in process_lambda(config, args, return_type=void):
-        yield None
-    rhs = LambdaAction.new(template_arg, lambda_)
-    type = LambdaAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-LAMBDA_CONDITION_SCHEMA = cv.lambda_
-
-
-@CONDITION_REGISTRY.register(CONF_LAMBDA, LAMBDA_CONDITION_SCHEMA)
-def lambda_condition_to_code(config, condition_id, template_arg, args):
-    for lambda_ in process_lambda(config, args, return_type=bool_):
-        yield
-    rhs = LambdaCondition.new(template_arg, lambda_)
-    type = LambdaCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)
-
-
-CONF_COMPONENT_UPDATE = 'component.update'
-COMPONENT_UPDATE_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(PollingComponent),
-})
-
-
-@ACTION_REGISTRY.register(CONF_COMPONENT_UPDATE, COMPONENT_UPDATE_ACTION_SCHEMA)
-def component_update_action_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = UpdateComponentAction.new(template_arg, var)
-    type = UpdateComponentAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-def build_action(full_config, template_arg, args):
-    action_id = full_config[CONF_ACTION_ID]
-    key, config = next((k, v) for k, v in full_config.items() if k in ACTION_REGISTRY)
-
-    builder = ACTION_REGISTRY[key][1]
-    for result in builder(config, action_id, template_arg, args):
-        yield None
-    yield result
-
-
-def build_actions(config, templ, arg_type):
-    actions = []
-    for conf in config:
-        for action in build_action(conf, templ, arg_type):
-            yield None
-        actions.append(action)
-    yield actions
-
-
-def build_condition(full_config, template_arg, args):
-    action_id = full_config[CONF_CONDITION_ID]
-    key, config = next((k, v) for k, v in full_config.items() if k in CONDITION_REGISTRY)
-
-    builder = CONDITION_REGISTRY[key][1]
-    for result in builder(config, action_id, template_arg, args):
-        yield None
-    yield result
-
-
-def build_conditions(config, templ, args):
-    conditions = []
-    for conf in config:
-        for condition in build_condition(conf, templ, args):
-            yield None
-        conditions.append(condition)
-    yield conditions
-
-
-def build_automation_(trigger, args, config):
-    arg_types = [arg[0] for arg in args]
-    templ = TemplateArguments(*arg_types)
-    rhs = App.make_automation(templ, trigger)
-    type = Automation.template(templ)
-    obj = Pvariable(config[CONF_AUTOMATION_ID], rhs, type=type)
-    for actions in build_actions(config[CONF_THEN], templ, args):
-        yield None
-    add(obj.add_actions(actions))
-    yield obj
-
-
-def build_automations(trigger, args, config):
-    CORE.add_job(build_automation_, trigger, args, config)

esphome/components/ads1115.py

@@ -1,27 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_ID
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-DEPENDENCIES = ['i2c']
-MULTI_CONF = True
-
-ADS1115Component = sensor.sensor_ns.class_('ADS1115Component', Component, i2c.I2CDevice)
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(ADS1115Component),
-    vol.Required(CONF_ADDRESS): cv.i2c_address,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_ads1115_component(config[CONF_ADDRESS])
-    var = Pvariable(config[CONF_ID], rhs)
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_ADS1115_SENSOR'

esphome/components/apds9960.py

@@ -1,33 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['i2c']
-MULTI_CONF = True
-
-CONF_APDS9960_ID = 'apds9960_id'
-APDS9960 = sensor.sensor_ns.class_('APDS9960', PollingComponent, i2c.I2CDevice)
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(APDS9960),
-    vol.Optional(CONF_ADDRESS): cv.i2c_address,
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_apds9960(config.get(CONF_UPDATE_INTERVAL))
-    var = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_ADDRESS in config:
-        add(var.set_address(config[CONF_ADDRESS]))
-
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_APDS9960'

esphome/components/api.py

@@ -1,141 +0,0 @@
-import voluptuous as vol
-
-from esphome import automation
-from esphome.automation import ACTION_REGISTRY, CONDITION_REGISTRY, Condition
-import esphome.config_validation as cv
-from esphome.const import CONF_DATA, CONF_DATA_TEMPLATE, CONF_ID, CONF_PASSWORD, CONF_PORT, \
-    CONF_REBOOT_TIMEOUT, CONF_SERVICE, CONF_VARIABLES, CONF_SERVICES, CONF_TRIGGER_ID
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import Action, App, Component, StoringController, esphome_ns, Trigger, \
-    bool_, int32, float_, std_string
-
-api_ns = esphome_ns.namespace('api')
-APIServer = api_ns.class_('APIServer', Component, StoringController)
-HomeAssistantServiceCallAction = api_ns.class_('HomeAssistantServiceCallAction', Action)
-KeyValuePair = api_ns.class_('KeyValuePair')
-TemplatableKeyValuePair = api_ns.class_('TemplatableKeyValuePair')
-APIConnectedCondition = api_ns.class_('APIConnectedCondition', Condition)
-
-UserService = api_ns.class_('UserService', Trigger)
-ServiceTypeArgument = api_ns.class_('ServiceTypeArgument')
-ServiceArgType = api_ns.enum('ServiceArgType')
-SERVICE_ARG_TYPES = {
-    'bool': ServiceArgType.SERVICE_ARG_TYPE_BOOL,
-    'int': ServiceArgType.SERVICE_ARG_TYPE_INT,
-    'float': ServiceArgType.SERVICE_ARG_TYPE_FLOAT,
-    'string': ServiceArgType.SERVICE_ARG_TYPE_STRING,
-}
-SERVICE_ARG_NATIVE_TYPES = {
-    'bool': bool_,
-    'int': int32,
-    'float': float_,
-    'string': std_string,
-}
-
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(APIServer),
-    vol.Optional(CONF_PORT, default=6053): cv.port,
-    vol.Optional(CONF_PASSWORD, default=''): cv.string_strict,
-    vol.Optional(CONF_REBOOT_TIMEOUT): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_SERVICES): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(UserService),
-        vol.Required(CONF_SERVICE): cv.valid_name,
-        vol.Optional(CONF_VARIABLES, default={}): cv.Schema({
-            cv.validate_id_name: cv.one_of(*SERVICE_ARG_TYPES, lower=True),
-        }),
-    }),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.init_api_server()
-    api = Pvariable(config[CONF_ID], rhs)
-
-    if config[CONF_PORT] != 6053:
-        add(api.set_port(config[CONF_PORT]))
-    if config.get(CONF_PASSWORD):
-        add(api.set_password(config[CONF_PASSWORD]))
-    if CONF_REBOOT_TIMEOUT in config:
-        add(api.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
-
-    for conf in config.get(CONF_SERVICES, []):
-        template_args = []
-        func_args = []
-        service_type_args = []
-        for name, var_ in conf[CONF_VARIABLES].items():
-            native = SERVICE_ARG_NATIVE_TYPES[var_]
-            template_args.append(native)
-            func_args.append((native, name))
-            service_type_args.append(ServiceTypeArgument(name, SERVICE_ARG_TYPES[var_]))
-        func = api.make_user_service_trigger.template(*template_args)
-        rhs = func(conf[CONF_SERVICE], service_type_args)
-        type_ = UserService.template(*template_args)
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs, type=type_)
-        automation.build_automations(trigger, func_args, conf)
-
-    setup_component(api, config)
-
-
-BUILD_FLAGS = '-DUSE_API'
-
-
-def lib_deps(config):
-    if CORE.is_esp32:
-        return 'AsyncTCP@1.0.3'
-    if CORE.is_esp8266:
-        return 'ESPAsyncTCP@1.1.3'
-    raise NotImplementedError
-
-
-CONF_HOMEASSISTANT_SERVICE = 'homeassistant.service'
-HOMEASSISTANT_SERVIC_ACTION_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.use_variable_id(APIServer),
-    vol.Required(CONF_SERVICE): cv.string,
-    vol.Optional(CONF_DATA): cv.Schema({
-        cv.string: cv.string,
-    }),
-    vol.Optional(CONF_DATA_TEMPLATE): cv.Schema({
-        cv.string: cv.string,
-    }),
-    vol.Optional(CONF_VARIABLES): cv.Schema({
-        cv.string: cv.lambda_,
-    }),
-})
-
-
-@ACTION_REGISTRY.register(CONF_HOMEASSISTANT_SERVICE, HOMEASSISTANT_SERVIC_ACTION_SCHEMA)
-def homeassistant_service_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_home_assistant_service_call_action(template_arg)
-    type = HomeAssistantServiceCallAction.template(template_arg)
-    act = Pvariable(action_id, rhs, type=type)
-    add(act.set_service(config[CONF_SERVICE]))
-    if CONF_DATA in config:
-        datas = [KeyValuePair(k, v) for k, v in config[CONF_DATA].items()]
-        add(act.set_data(datas))
-    if CONF_DATA_TEMPLATE in config:
-        datas = [KeyValuePair(k, v) for k, v in config[CONF_DATA_TEMPLATE].items()]
-        add(act.set_data_template(datas))
-    if CONF_VARIABLES in config:
-        datas = []
-        for key, value in config[CONF_VARIABLES].items():
-            for value_ in process_lambda(value, []):
-                yield None
-            datas.append(TemplatableKeyValuePair(key, value_))
-        add(act.set_variables(datas))
-    yield act
-
-
-CONF_API_CONNECTED = 'api.connected'
-API_CONNECTED_CONDITION_SCHEMA = cv.Schema({})
-
-
-@CONDITION_REGISTRY.register(CONF_API_CONNECTED, API_CONNECTED_CONDITION_SCHEMA)
-def api_connected_to_code(config, condition_id, template_arg, args):
-    rhs = APIConnectedCondition.new(template_arg)
-    type = APIConnectedCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)

esphome/components/binary_sensor/__init__.py

@@ -1,331 +0,0 @@
-import voluptuous as vol
-
-from esphome import automation, core
-from esphome.automation import CONDITION_REGISTRY, Condition, maybe_simple_id
-from esphome.components import mqtt
-from esphome.components.mqtt import setup_mqtt_component
-import esphome.config_validation as cv
-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_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_STATE, CONF_TIMING, CONF_TRIGGER_ID, CONF_FOR
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, StructInitializer, add, get_variable, process_lambda
-from esphome.cpp_types import App, Component, Nameable, Trigger, bool_, esphome_ns, optional
-from esphome.py_compat import string_types
-
-DEVICE_CLASSES = [
-    '', 'battery', 'cold', 'connectivity', 'door', 'garage_door', 'gas',
-    'heat', 'light', 'lock', 'moisture', 'motion', 'moving', 'occupancy',
-    'opening', 'plug', 'power', 'presence', 'problem', 'safety', 'smoke',
-    'sound', 'vibration', 'window'
-]
-
-PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
-
-})
-
-binary_sensor_ns = esphome_ns.namespace('binary_sensor')
-BinarySensor = binary_sensor_ns.class_('BinarySensor', Nameable)
-BinarySensorPtr = BinarySensor.operator('ptr')
-MQTTBinarySensorComponent = binary_sensor_ns.class_('MQTTBinarySensorComponent', mqtt.MQTTComponent)
-
-# Triggers
-PressTrigger = binary_sensor_ns.class_('PressTrigger', Trigger.template())
-ReleaseTrigger = binary_sensor_ns.class_('ReleaseTrigger', Trigger.template())
-ClickTrigger = binary_sensor_ns.class_('ClickTrigger', Trigger.template())
-DoubleClickTrigger = binary_sensor_ns.class_('DoubleClickTrigger', Trigger.template())
-MultiClickTrigger = binary_sensor_ns.class_('MultiClickTrigger', Trigger.template(), Component)
-MultiClickTriggerEvent = binary_sensor_ns.struct('MultiClickTriggerEvent')
-StateTrigger = binary_sensor_ns.class_('StateTrigger', Trigger.template(bool_))
-
-# Condition
-BinarySensorCondition = binary_sensor_ns.class_('BinarySensorCondition', Condition)
-
-# Filters
-Filter = binary_sensor_ns.class_('Filter')
-DelayedOnFilter = binary_sensor_ns.class_('DelayedOnFilter', Filter, Component)
-DelayedOffFilter = binary_sensor_ns.class_('DelayedOffFilter', Filter, Component)
-HeartbeatFilter = binary_sensor_ns.class_('HeartbeatFilter', Filter, Component)
-InvertFilter = binary_sensor_ns.class_('InvertFilter', Filter)
-LambdaFilter = binary_sensor_ns.class_('LambdaFilter', Filter)
-
-FILTER_KEYS = [CONF_INVERT, CONF_DELAYED_ON, CONF_DELAYED_OFF, CONF_LAMBDA, CONF_HEARTBEAT]
-
-FILTERS_SCHEMA = cv.ensure_list({
-    vol.Optional(CONF_INVERT): None,
-    vol.Optional(CONF_DELAYED_ON): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_DELAYED_OFF): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_LAMBDA): cv.lambda_,
-
-    vol.Optional(CONF_HEARTBEAT): cv.invalid("The heartbeat filter has been removed in 1.11.0"),
-}, cv.has_exactly_one_key(*FILTER_KEYS))
-
-MULTI_CLICK_TIMING_SCHEMA = cv.Schema({
-    vol.Optional(CONF_STATE): cv.boolean,
-    vol.Optional(CONF_MIN_LENGTH): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_MAX_LENGTH): cv.positive_time_period_milliseconds,
-})
-
-
-def parse_multi_click_timing_str(value):
-    if not isinstance(value, string_types):
-        return value
-
-    parts = value.lower().split(' ')
-    if len(parts) != 5:
-        raise vol.Invalid("Multi click timing grammar consists of exactly 5 words, not {}"
-                          "".format(len(parts)))
-    try:
-        state = cv.boolean(parts[0])
-    except vol.Invalid:
-        raise vol.Invalid(u"First word must either be ON or OFF, not {}".format(parts[0]))
-
-    if parts[1] != 'for':
-        raise vol.Invalid(u"Second word must be 'for', got {}".format(parts[1]))
-
-    if parts[2] == 'at':
-        if parts[3] == 'least':
-            key = CONF_MIN_LENGTH
-        elif parts[3] == 'most':
-            key = CONF_MAX_LENGTH
-        else:
-            raise vol.Invalid(u"Third word after at must either be 'least' or 'most', got {}"
-                              u"".format(parts[3]))
-        try:
-            length = cv.positive_time_period_milliseconds(parts[4])
-        except vol.Invalid as err:
-            raise vol.Invalid(u"Multi Click Grammar Parsing length failed: {}".format(err))
-        return {
-            CONF_STATE: state,
-            key: str(length)
-        }
-
-    if parts[3] != 'to':
-        raise vol.Invalid("Multi click grammar: 4th word must be 'to'")
-
-    try:
-        min_length = cv.positive_time_period_milliseconds(parts[2])
-    except vol.Invalid as err:
-        raise vol.Invalid(u"Multi Click Grammar Parsing minimum length failed: {}".format(err))
-
-    try:
-        max_length = cv.positive_time_period_milliseconds(parts[4])
-    except vol.Invalid as err:
-        raise vol.Invalid(u"Multi Click Grammar Parsing minimum length failed: {}".format(err))
-
-    return {
-        CONF_STATE: state,
-        CONF_MIN_LENGTH: str(min_length),
-        CONF_MAX_LENGTH: str(max_length)
-    }
-
-
-def validate_multi_click_timing(value):
-    if not isinstance(value, list):
-        raise vol.Invalid("Timing option must be a *list* of times!")
-    timings = []
-    state = None
-    for i, v_ in enumerate(value):
-        v_ = MULTI_CLICK_TIMING_SCHEMA(v_)
-        min_length = v_.get(CONF_MIN_LENGTH)
-        max_length = v_.get(CONF_MAX_LENGTH)
-        if min_length is None and max_length is None:
-            raise vol.Invalid("At least one of min_length and max_length is required!")
-        if min_length is None and max_length is not None:
-            min_length = core.TimePeriodMilliseconds(milliseconds=0)
-
-        new_state = v_.get(CONF_STATE, not state)
-        if new_state == state:
-            raise vol.Invalid("Timings must have alternating state. Indices {} and {} have "
-                              "the same state {}".format(i, i + 1, state))
-        if max_length is not None and max_length < min_length:
-            raise vol.Invalid("Max length ({}) must be larger than min length ({})."
-                              "".format(max_length, min_length))
-
-        state = new_state
-        tim = {
-            CONF_STATE: new_state,
-            CONF_MIN_LENGTH: min_length,
-        }
-        if max_length is not None:
-            tim[CONF_MAX_LENGTH] = max_length
-        timings.append(tim)
-    return timings
-
-
-BINARY_SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({
-    cv.GenerateID(CONF_MQTT_ID): cv.declare_variable_id(MQTTBinarySensorComponent),
-
-    vol.Optional(CONF_DEVICE_CLASS): cv.one_of(*DEVICE_CLASSES, lower=True),
-    vol.Optional(CONF_FILTERS): FILTERS_SCHEMA,
-    vol.Optional(CONF_ON_PRESS): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(PressTrigger),
-    }),
-    vol.Optional(CONF_ON_RELEASE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(ReleaseTrigger),
-    }),
-    vol.Optional(CONF_ON_CLICK): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(ClickTrigger),
-        vol.Optional(CONF_MIN_LENGTH, default='50ms'): cv.positive_time_period_milliseconds,
-        vol.Optional(CONF_MAX_LENGTH, default='350ms'): cv.positive_time_period_milliseconds,
-    }),
-    vol.Optional(CONF_ON_DOUBLE_CLICK): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(DoubleClickTrigger),
-        vol.Optional(CONF_MIN_LENGTH, default='50ms'): cv.positive_time_period_milliseconds,
-        vol.Optional(CONF_MAX_LENGTH, default='350ms'): cv.positive_time_period_milliseconds,
-    }),
-    vol.Optional(CONF_ON_MULTI_CLICK): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(MultiClickTrigger),
-        vol.Required(CONF_TIMING): vol.All([parse_multi_click_timing_str],
-                                           validate_multi_click_timing),
-        vol.Optional(CONF_INVALID_COOLDOWN): cv.positive_time_period_milliseconds,
-    }),
-    vol.Optional(CONF_ON_STATE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(StateTrigger),
-    }),
-
-    vol.Optional(CONF_INVERTED): cv.invalid(
-        "The inverted binary_sensor property has been replaced by the "
-        "new 'invert' binary  sensor filter. Please see "
-        "https://esphome.io/components/binary_sensor/index.html."
-    ),
-})
-
-BINARY_SENSOR_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(BINARY_SENSOR_SCHEMA.schema)
-
-
-def setup_filter(config):
-    if CONF_INVERT in config:
-        yield InvertFilter.new()
-    elif CONF_DELAYED_OFF in config:
-        yield App.register_component(DelayedOffFilter.new(config[CONF_DELAYED_OFF]))
-    elif CONF_DELAYED_ON in config:
-        yield App.register_component(DelayedOnFilter.new(config[CONF_DELAYED_ON]))
-    elif CONF_LAMBDA in config:
-        for lambda_ in process_lambda(config[CONF_LAMBDA], [(bool_, 'x')],
-                                      return_type=optional.template(bool_)):
-            yield None
-        yield LambdaFilter.new(lambda_)
-
-
-def setup_filters(config):
-    filters = []
-    for conf in config:
-        for filter in setup_filter(conf):
-            yield None
-        filters.append(filter)
-    yield filters
-
-
-def setup_binary_sensor_core_(binary_sensor_var, config):
-    if CONF_INTERNAL in config:
-        add(binary_sensor_var.set_internal(CONF_INTERNAL))
-    if CONF_DEVICE_CLASS in config:
-        add(binary_sensor_var.set_device_class(config[CONF_DEVICE_CLASS]))
-    if CONF_INVERTED in config:
-        add(binary_sensor_var.set_inverted(config[CONF_INVERTED]))
-    if CONF_FILTERS in config:
-        for filters in setup_filters(config[CONF_FILTERS]):
-            yield
-        add(binary_sensor_var.add_filters(filters))
-
-    for conf in config.get(CONF_ON_PRESS, []):
-        rhs = binary_sensor_var.make_press_trigger()
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [], conf)
-
-    for conf in config.get(CONF_ON_RELEASE, []):
-        rhs = binary_sensor_var.make_release_trigger()
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [], conf)
-
-    for conf in config.get(CONF_ON_CLICK, []):
-        rhs = binary_sensor_var.make_click_trigger(conf[CONF_MIN_LENGTH], conf[CONF_MAX_LENGTH])
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [], conf)
-
-    for conf in config.get(CONF_ON_DOUBLE_CLICK, []):
-        rhs = binary_sensor_var.make_double_click_trigger(conf[CONF_MIN_LENGTH],
-                                                          conf[CONF_MAX_LENGTH])
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [], conf)
-
-    for conf in config.get(CONF_ON_MULTI_CLICK, []):
-        timings = []
-        for tim in conf[CONF_TIMING]:
-            timings.append(StructInitializer(
-                MultiClickTriggerEvent,
-                ('state', tim[CONF_STATE]),
-                ('min_length', tim[CONF_MIN_LENGTH]),
-                ('max_length', tim.get(CONF_MAX_LENGTH, 4294967294)),
-            ))
-        rhs = App.register_component(binary_sensor_var.make_multi_click_trigger(timings))
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        if CONF_INVALID_COOLDOWN in conf:
-            add(trigger.set_invalid_cooldown(conf[CONF_INVALID_COOLDOWN]))
-        automation.build_automations(trigger, [], conf)
-
-    for conf in config.get(CONF_ON_STATE, []):
-        rhs = binary_sensor_var.make_state_trigger()
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [(bool_, 'x')], conf)
-
-    setup_mqtt_component(binary_sensor_var.Pget_mqtt(), config)
-
-
-def setup_binary_sensor(binary_sensor_obj, config):
-    if not CORE.has_id(config[CONF_ID]):
-        binary_sensor_obj = Pvariable(config[CONF_ID], binary_sensor_obj, has_side_effects=True)
-    CORE.add_job(setup_binary_sensor_core_, binary_sensor_obj, config)
-
-
-def register_binary_sensor(var, config):
-    binary_sensor_var = Pvariable(config[CONF_ID], var, has_side_effects=True)
-    add(App.register_binary_sensor(binary_sensor_var))
-    CORE.add_job(setup_binary_sensor_core_, binary_sensor_var, config)
-
-
-def core_to_hass_config(data, config):
-    ret = mqtt.build_hass_config(data, 'binary_sensor', config,
-                                 include_state=True, include_command=False)
-    if ret is None:
-        return None
-    if CONF_DEVICE_CLASS in config:
-        ret['device_class'] = config[CONF_DEVICE_CLASS]
-    return ret
-
-
-BUILD_FLAGS = '-DUSE_BINARY_SENSOR'
-
-CONF_BINARY_SENSOR_IS_ON = 'binary_sensor.is_on'
-BINARY_SENSOR_IS_ON_CONDITION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(BinarySensor),
-    vol.Optional(CONF_FOR): cv.positive_time_period_milliseconds,
-})
-
-
-@CONDITION_REGISTRY.register(CONF_BINARY_SENSOR_IS_ON, BINARY_SENSOR_IS_ON_CONDITION_SCHEMA)
-def binary_sensor_is_on_to_code(config, condition_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_binary_sensor_is_on_condition(template_arg, config.get(CONF_FOR))
-    type = BinarySensorCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)
-
-
-CONF_BINARY_SENSOR_IS_OFF = 'binary_sensor.is_off'
-BINARY_SENSOR_IS_OFF_CONDITION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(BinarySensor),
-    vol.Optional(CONF_FOR): cv.positive_time_period_milliseconds,
-})
-
-
-@CONDITION_REGISTRY.register(CONF_BINARY_SENSOR_IS_OFF, BINARY_SENSOR_IS_OFF_CONDITION_SCHEMA)
-def binary_sensor_is_off_to_code(config, condition_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_binary_sensor_is_off_condition(template_arg, config.get(CONF_FOR))
-    type = BinarySensorCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)

esphome/components/binary_sensor/apds9960.py

@@ -1,36 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor, sensor
-from esphome.components.apds9960 import APDS9960, CONF_APDS9960_ID
-import esphome.config_validation as cv
-from esphome.const import CONF_DIRECTION, CONF_NAME
-from esphome.cpp_generator import get_variable
-
-DEPENDENCIES = ['apds9960']
-APDS9960GestureDirectionBinarySensor = sensor.sensor_ns.class_(
-    'APDS9960GestureDirectionBinarySensor', binary_sensor.BinarySensor)
-
-DIRECTIONS = {
-    'UP': 'make_up_direction',
-    'DOWN': 'make_down_direction',
-    'LEFT': 'make_left_direction',
-    'RIGHT': 'make_right_direction',
-}
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(APDS9960GestureDirectionBinarySensor),
-    vol.Required(CONF_DIRECTION): cv.one_of(*DIRECTIONS, upper=True),
-    cv.GenerateID(CONF_APDS9960_ID): cv.use_variable_id(APDS9960)
-}))
-
-
-def to_code(config):
-    for hub in get_variable(config[CONF_APDS9960_ID]):
-        yield
-    func = getattr(hub, DIRECTIONS[config[CONF_DIRECTION]])
-    rhs = func(config[CONF_NAME])
-    binary_sensor.register_binary_sensor(rhs, config)
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/custom.py

@@ -1,39 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_BINARY_SENSORS, CONF_ID, CONF_LAMBDA, CONF_NAME
-from esphome.cpp_generator import add, process_lambda, variable
-from esphome.cpp_types import std_vector
-
-CustomBinarySensorConstructor = binary_sensor.binary_sensor_ns.class_(
-    'CustomBinarySensorConstructor')
-
-PLATFORM_SCHEMA = binary_sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(CustomBinarySensorConstructor),
-    vol.Required(CONF_LAMBDA): cv.lambda_,
-    vol.Required(CONF_BINARY_SENSORS):
-        cv.ensure_list(binary_sensor.BINARY_SENSOR_SCHEMA.extend({
-            cv.GenerateID(): cv.declare_variable_id(binary_sensor.BinarySensor),
-        })),
-})
-
-
-def to_code(config):
-    for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                    return_type=std_vector.template(binary_sensor.BinarySensorPtr)):
-        yield
-
-    rhs = CustomBinarySensorConstructor(template_)
-    custom = variable(config[CONF_ID], rhs)
-    for i, conf in enumerate(config[CONF_BINARY_SENSORS]):
-        rhs = custom.Pget_binary_sensor(i)
-        add(rhs.set_name(conf[CONF_NAME]))
-        binary_sensor.register_binary_sensor(rhs, conf)
-
-
-BUILD_FLAGS = '-DUSE_CUSTOM_BINARY_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [binary_sensor.core_to_hass_config(data, sens) for sens in config[CONF_BINARY_SENSORS]]

esphome/components/binary_sensor/esp32_ble_tracker.py

@@ -1,29 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor
-from esphome.components.esp32_ble_tracker import CONF_ESP32_BLE_ID, ESP32BLETracker, \
-    make_address_array
-import esphome.config_validation as cv
-from esphome.const import CONF_MAC_ADDRESS, CONF_NAME
-from esphome.cpp_generator import get_variable
-from esphome.cpp_types import esphome_ns
-
-DEPENDENCIES = ['esp32_ble_tracker']
-ESP32BLEPresenceDevice = esphome_ns.class_('ESP32BLEPresenceDevice', binary_sensor.BinarySensor)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(ESP32BLEPresenceDevice),
-    vol.Required(CONF_MAC_ADDRESS): cv.mac_address,
-    cv.GenerateID(CONF_ESP32_BLE_ID): cv.use_variable_id(ESP32BLETracker)
-}))
-
-
-def to_code(config):
-    for hub in get_variable(config[CONF_ESP32_BLE_ID]):
-        yield
-    rhs = hub.make_presence_sensor(config[CONF_NAME], make_address_array(config[CONF_MAC_ADDRESS]))
-    binary_sensor.register_binary_sensor(rhs, config)
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/gpio.py

@@ -1,35 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import binary_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME, CONF_PIN
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
-from esphome.cpp_types import App, Component
-
-GPIOBinarySensorComponent = binary_sensor.binary_sensor_ns.class_('GPIOBinarySensorComponent',
-                                                                  binary_sensor.BinarySensor,
-                                                                  Component)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(GPIOBinarySensorComponent),
-    vol.Required(CONF_PIN): pins.gpio_input_pin_schema
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    pin = None
-    for pin in gpio_input_pin_expression(config[CONF_PIN]):
-        yield
-    rhs = App.make_gpio_binary_sensor(config[CONF_NAME], pin)
-    gpio = Pvariable(config[CONF_ID], rhs)
-    binary_sensor.setup_binary_sensor(gpio, config)
-    setup_component(gpio, config)
-
-
-BUILD_FLAGS = '-DUSE_GPIO_BINARY_SENSOR'
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/homeassistant.py

@@ -1,30 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ENTITY_ID, CONF_ID, CONF_NAME
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_types import App
-
-DEPENDENCIES = ['api']
-
-HomeassistantBinarySensor = binary_sensor.binary_sensor_ns.class_('HomeassistantBinarySensor',
-                                                                  binary_sensor.BinarySensor)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(HomeassistantBinarySensor),
-    vol.Required(CONF_ENTITY_ID): cv.entity_id,
-}))
-
-
-def to_code(config):
-    rhs = App.make_homeassistant_binary_sensor(config[CONF_NAME], config[CONF_ENTITY_ID])
-    subs = Pvariable(config[CONF_ID], rhs)
-    binary_sensor.setup_binary_sensor(subs, config)
-
-
-BUILD_FLAGS = '-DUSE_HOMEASSISTANT_BINARY_SENSOR'
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/mpr121.py

@@ -1,28 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor
-from esphome.components.mpr121 import MPR121Component, CONF_MPR121_ID
-import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_NAME
-from esphome.cpp_generator import get_variable
-
-DEPENDENCIES = ['mpr121']
-MPR121Channel = binary_sensor.binary_sensor_ns.class_(
-    'MPR121Channel', binary_sensor.BinarySensor)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(MPR121Channel),
-    cv.GenerateID(CONF_MPR121_ID): cv.use_variable_id(MPR121Component),
-    vol.Required(CONF_CHANNEL): vol.All(vol.Coerce(int), vol.Range(min=0, max=11))
-}))
-
-
-def to_code(config):
-    for hub in get_variable(config[CONF_MPR121_ID]):
-        yield
-    rhs = MPR121Channel.new(config[CONF_NAME], config[CONF_CHANNEL])
-    binary_sensor.register_binary_sensor(hub.add_channel(rhs), config)
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/rdm6300.py

@@ -1,30 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor, rdm6300
-import esphome.config_validation as cv
-from esphome.const import CONF_NAME, CONF_UID
-from esphome.cpp_generator import get_variable
-
-DEPENDENCIES = ['rdm6300']
-
-CONF_RDM6300_ID = 'rdm6300_id'
-
-RDM6300BinarySensor = binary_sensor.binary_sensor_ns.class_('RDM6300BinarySensor',
-                                                            binary_sensor.BinarySensor)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(RDM6300BinarySensor),
-    vol.Required(CONF_UID): cv.uint32_t,
-    cv.GenerateID(CONF_RDM6300_ID): cv.use_variable_id(rdm6300.RDM6300Component)
-}))
-
-
-def to_code(config):
-    for hub in get_variable(config[CONF_RDM6300_ID]):
-        yield
-    rhs = hub.make_card(config[CONF_NAME], config[CONF_UID])
-    binary_sensor.register_binary_sensor(rhs, config)
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/remote_receiver.py

@@ -1,151 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import binary_sensor
-from esphome.components.remote_receiver import RemoteReceiverComponent, remote_ns
-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_D_SCHEMA, binary_code, build_rc_switch_protocol
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_CHANNEL, CONF_CODE, CONF_COMMAND, CONF_DATA, \
-    CONF_DEVICE, CONF_FAMILY, CONF_GROUP, CONF_ID, CONF_JVC, 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_TYPE_D, CONF_SAMSUNG, CONF_SONY, \
-    CONF_STATE, CONF_RC5
-from esphome.cpp_generator import Pvariable, get_variable, progmem_array
-from esphome.cpp_types import int32
-
-DEPENDENCIES = ['remote_receiver']
-
-REMOTE_KEYS = [CONF_JVC, CONF_NEC, CONF_LG, CONF_SONY, CONF_PANASONIC, CONF_SAMSUNG, 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_RC5]
-
-CONF_REMOTE_RECEIVER_ID = 'remote_receiver_id'
-CONF_RECEIVER_ID = 'receiver_id'
-
-RemoteReceiver = remote_ns.class_('RemoteReceiver', binary_sensor.BinarySensor)
-JVCReceiver = remote_ns.class_('JVCReceiver', RemoteReceiver)
-LGReceiver = remote_ns.class_('LGReceiver', RemoteReceiver)
-NECReceiver = remote_ns.class_('NECReceiver', RemoteReceiver)
-PanasonicReceiver = remote_ns.class_('PanasonicReceiver', RemoteReceiver)
-RawReceiver = remote_ns.class_('RawReceiver', RemoteReceiver)
-SamsungReceiver = remote_ns.class_('SamsungReceiver', RemoteReceiver)
-SonyReceiver = remote_ns.class_('SonyReceiver', RemoteReceiver)
-RC5Receiver = remote_ns.class_('RC5Receiver', RemoteReceiver)
-RCSwitchRawReceiver = remote_ns.class_('RCSwitchRawReceiver', RemoteReceiver)
-RCSwitchTypeAReceiver = remote_ns.class_('RCSwitchTypeAReceiver', RCSwitchRawReceiver)
-RCSwitchTypeBReceiver = remote_ns.class_('RCSwitchTypeBReceiver', RCSwitchRawReceiver)
-RCSwitchTypeCReceiver = remote_ns.class_('RCSwitchTypeCReceiver', RCSwitchRawReceiver)
-RCSwitchTypeDReceiver = remote_ns.class_('RCSwitchTypeDReceiver', RCSwitchRawReceiver)
-
-
-def validate_raw(value):
-    if isinstance(value, dict):
-        return cv.Schema({
-            cv.GenerateID(): cv.declare_variable_id(int32),
-            vol.Required(CONF_DATA): [vol.Any(vol.Coerce(int), cv.time_period_microseconds)],
-        })(value)
-    return validate_raw({
-        CONF_DATA: value
-    })
-
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(RemoteReceiver),
-    vol.Optional(CONF_JVC): cv.Schema({
-        vol.Required(CONF_DATA): cv.hex_uint32_t,
-    }),
-    vol.Optional(CONF_LG): cv.Schema({
-        vol.Required(CONF_DATA): cv.hex_uint32_t,
-        vol.Optional(CONF_NBITS, default=28): cv.one_of(28, 32, int=True),
-    }),
-    vol.Optional(CONF_NEC): cv.Schema({
-        vol.Required(CONF_ADDRESS): cv.hex_uint16_t,
-        vol.Required(CONF_COMMAND): cv.hex_uint16_t,
-    }),
-    vol.Optional(CONF_SAMSUNG): cv.Schema({
-        vol.Required(CONF_DATA): cv.hex_uint32_t,
-    }),
-    vol.Optional(CONF_SONY): cv.Schema({
-        vol.Required(CONF_DATA): cv.hex_uint32_t,
-        vol.Optional(CONF_NBITS, default=12): cv.one_of(12, 15, 20, int=True),
-    }),
-    vol.Optional(CONF_PANASONIC): cv.Schema({
-        vol.Required(CONF_ADDRESS): cv.hex_uint16_t,
-        vol.Required(CONF_COMMAND): cv.hex_uint32_t,
-    }),
-    vol.Optional(CONF_RC5): cv.Schema({
-        vol.Required(CONF_ADDRESS): vol.All(cv.hex_int, vol.Range(min=0, max=0x1F)),
-        vol.Required(CONF_COMMAND): vol.All(cv.hex_int, vol.Range(min=0, max=0x3F)),
-    }),
-    vol.Optional(CONF_RAW): validate_raw,
-    vol.Optional(CONF_RC_SWITCH_RAW): RC_SWITCH_RAW_SCHEMA,
-    vol.Optional(CONF_RC_SWITCH_TYPE_A): RC_SWITCH_TYPE_A_SCHEMA,
-    vol.Optional(CONF_RC_SWITCH_TYPE_B): RC_SWITCH_TYPE_B_SCHEMA,
-    vol.Optional(CONF_RC_SWITCH_TYPE_C): RC_SWITCH_TYPE_C_SCHEMA,
-    vol.Optional(CONF_RC_SWITCH_TYPE_D): RC_SWITCH_TYPE_D_SCHEMA,
-
-    cv.GenerateID(CONF_REMOTE_RECEIVER_ID): cv.use_variable_id(RemoteReceiverComponent),
-    cv.GenerateID(CONF_RECEIVER_ID): cv.declare_variable_id(RemoteReceiver),
-}), cv.has_exactly_one_key(*REMOTE_KEYS))
-
-
-def receiver_base(full_config):
-    name = full_config[CONF_NAME]
-    key, config = next((k, v) for k, v in full_config.items() if k in REMOTE_KEYS)
-    if key == CONF_JVC:
-        return JVCReceiver.new(name, config[CONF_DATA])
-    if key == CONF_LG:
-        return LGReceiver.new(name, config[CONF_DATA], config[CONF_NBITS])
-    if key == CONF_NEC:
-        return NECReceiver.new(name, config[CONF_ADDRESS], config[CONF_COMMAND])
-    if key == CONF_PANASONIC:
-        return PanasonicReceiver.new(name, config[CONF_ADDRESS], config[CONF_COMMAND])
-    if key == CONF_SAMSUNG:
-        return SamsungReceiver.new(name, config[CONF_DATA])
-    if key == CONF_SONY:
-        return SonyReceiver.new(name, config[CONF_DATA], config[CONF_NBITS])
-    if key == CONF_RC5:
-        return RC5Receiver.new(name, config[CONF_ADDRESS], config[CONF_COMMAND])
-    if key == CONF_RAW:
-        arr = progmem_array(config[CONF_ID], config[CONF_DATA])
-        return RawReceiver.new(name, arr, len(config[CONF_DATA]))
-    if key == CONF_RC_SWITCH_RAW:
-        return RCSwitchRawReceiver.new(name, build_rc_switch_protocol(config[CONF_PROTOCOL]),
-                                       binary_code(config[CONF_CODE]), len(config[CONF_CODE]))
-    if key == CONF_RC_SWITCH_TYPE_A:
-        return RCSwitchTypeAReceiver.new(name, build_rc_switch_protocol(config[CONF_PROTOCOL]),
-                                         binary_code(config[CONF_GROUP]),
-                                         binary_code(config[CONF_DEVICE]),
-                                         config[CONF_STATE])
-    if key == CONF_RC_SWITCH_TYPE_B:
-        return RCSwitchTypeBReceiver.new(name, build_rc_switch_protocol(config[CONF_PROTOCOL]),
-                                         config[CONF_ADDRESS], config[CONF_CHANNEL],
-                                         config[CONF_STATE])
-    if key == CONF_RC_SWITCH_TYPE_C:
-        return RCSwitchTypeCReceiver.new(name, build_rc_switch_protocol(config[CONF_PROTOCOL]),
-                                         ord(config[CONF_FAMILY][0]) - ord('a'),
-                                         config[CONF_GROUP], config[CONF_DEVICE],
-                                         config[CONF_STATE])
-    if key == CONF_RC_SWITCH_TYPE_D:
-        return RCSwitchTypeDReceiver.new(name, build_rc_switch_protocol(config[CONF_PROTOCOL]),
-                                         ord(config[CONF_GROUP][0]) - ord('a'),
-                                         config[CONF_DEVICE], config[CONF_STATE])
-
-    raise NotImplementedError("Unknown receiver type {}".format(config))
-
-
-def to_code(config):
-    for remote in get_variable(config[CONF_REMOTE_RECEIVER_ID]):
-        yield
-    rhs = receiver_base(config)
-    receiver = Pvariable(config[CONF_RECEIVER_ID], rhs)
-
-    binary_sensor.register_binary_sensor(remote.add_decoder(receiver), config)
-
-
-BUILD_FLAGS = '-DUSE_REMOTE_RECEIVER'
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/status.py

@@ -1,28 +0,0 @@
-from esphome.components import binary_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-StatusBinarySensor = binary_sensor.binary_sensor_ns.class_('StatusBinarySensor',
-                                                           binary_sensor.BinarySensor,
-                                                           Component)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(StatusBinarySensor),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_status_binary_sensor(config[CONF_NAME])
-    status = Pvariable(config[CONF_ID], rhs)
-    binary_sensor.setup_binary_sensor(status, config)
-    setup_component(status, config)
-
-
-BUILD_FLAGS = '-DUSE_STATUS_BINARY_SENSOR'
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/binary_sensor/template.py

@@ -1,60 +0,0 @@
-import voluptuous as vol
-
-from esphome.automation import ACTION_REGISTRY
-from esphome.components import binary_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE
-from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import Action, App, Component, bool_, optional
-
-TemplateBinarySensor = binary_sensor.binary_sensor_ns.class_('TemplateBinarySensor',
-                                                             binary_sensor.BinarySensor,
-                                                             Component)
-BinarySensorPublishAction = binary_sensor.binary_sensor_ns.class_('BinarySensorPublishAction',
-                                                                  Action)
-
-PLATFORM_SCHEMA = cv.nameable(binary_sensor.BINARY_SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TemplateBinarySensor),
-    vol.Optional(CONF_LAMBDA): cv.lambda_,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_template_binary_sensor(config[CONF_NAME])
-    var = Pvariable(config[CONF_ID], rhs)
-    binary_sensor.setup_binary_sensor(var, config)
-    setup_component(var, config)
-
-    if CONF_LAMBDA in config:
-        for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                        return_type=optional.template(bool_)):
-            yield
-        add(var.set_template(template_))
-
-
-BUILD_FLAGS = '-DUSE_TEMPLATE_BINARY_SENSOR'
-
-CONF_BINARY_SENSOR_TEMPLATE_PUBLISH = 'binary_sensor.template.publish'
-BINARY_SENSOR_TEMPLATE_PUBLISH_ACTION_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.use_variable_id(binary_sensor.BinarySensor),
-    vol.Required(CONF_STATE): cv.templatable(cv.boolean),
-})
-
-
-@ACTION_REGISTRY.register(CONF_BINARY_SENSOR_TEMPLATE_PUBLISH,
-                          BINARY_SENSOR_TEMPLATE_PUBLISH_ACTION_SCHEMA)
-def binary_sensor_template_publish_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_binary_sensor_publish_action(template_arg)
-    type = BinarySensorPublishAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    for template_ in templatable(config[CONF_STATE], args, bool_):
-        yield None
-    add(action.set_state(template_))
-    yield action
-
-
-def to_hass_config(data, config):
-    return binary_sensor.core_to_hass_config(data, config)

esphome/components/cover/__init__.py

@@ -1,105 +0,0 @@
-import voluptuous as vol
-
-from esphome.automation import ACTION_REGISTRY, maybe_simple_id
-from esphome.components import mqtt
-from esphome.components.mqtt import setup_mqtt_component
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_INTERNAL, CONF_MQTT_ID
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, add, get_variable
-from esphome.cpp_types import Action, Nameable, esphome_ns
-
-PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
-
-})
-
-cover_ns = esphome_ns.namespace('cover')
-
-Cover = cover_ns.class_('Cover', Nameable)
-MQTTCoverComponent = cover_ns.class_('MQTTCoverComponent', mqtt.MQTTComponent)
-
-CoverState = cover_ns.class_('CoverState')
-COVER_OPEN = cover_ns.COVER_OPEN
-COVER_CLOSED = cover_ns.COVER_CLOSED
-
-validate_cover_state = cv.one_of('OPEN', 'CLOSED', upper=True)
-COVER_STATES = {
-    'OPEN': COVER_OPEN,
-    'CLOSED': COVER_CLOSED,
-}
-
-# Actions
-OpenAction = cover_ns.class_('OpenAction', Action)
-CloseAction = cover_ns.class_('CloseAction', Action)
-StopAction = cover_ns.class_('StopAction', Action)
-
-COVER_SCHEMA = cv.MQTT_COMMAND_COMPONENT_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(Cover),
-    cv.GenerateID(CONF_MQTT_ID): cv.declare_variable_id(MQTTCoverComponent),
-})
-
-COVER_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(COVER_SCHEMA.schema)
-
-
-def setup_cover_core_(cover_var, config):
-    if CONF_INTERNAL in config:
-        add(cover_var.set_internal(config[CONF_INTERNAL]))
-    setup_mqtt_component(cover_var.Pget_mqtt(), config)
-
-
-def setup_cover(cover_obj, config):
-    CORE.add_job(setup_cover_core_, cover_obj, config)
-
-
-BUILD_FLAGS = '-DUSE_COVER'
-
-CONF_COVER_OPEN = 'cover.open'
-COVER_OPEN_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(Cover),
-})
-
-
-@ACTION_REGISTRY.register(CONF_COVER_OPEN, COVER_OPEN_ACTION_SCHEMA)
-def cover_open_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_open_action(template_arg)
-    type = OpenAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-CONF_COVER_CLOSE = 'cover.close'
-COVER_CLOSE_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(Cover),
-})
-
-
-@ACTION_REGISTRY.register(CONF_COVER_CLOSE, COVER_CLOSE_ACTION_SCHEMA)
-def cover_close_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_close_action(template_arg)
-    type = CloseAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-CONF_COVER_STOP = 'cover.stop'
-COVER_STOP_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(Cover),
-})
-
-
-@ACTION_REGISTRY.register(CONF_COVER_STOP, COVER_STOP_ACTION_SCHEMA)
-def cover_stop_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_stop_action(template_arg)
-    type = StopAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-def core_to_hass_config(data, config):
-    ret = mqtt.build_hass_config(data, 'cover', config, include_state=True, include_command=True)
-    if ret is None:
-        return None
-    return ret

esphome/components/cover/template.py

@@ -1,88 +0,0 @@
-import voluptuous as vol
-
-from esphome import automation
-from esphome.automation import ACTION_REGISTRY
-from esphome.components import cover
-import esphome.config_validation as cv
-from esphome.const import CONF_ASSUMED_STATE, CONF_CLOSE_ACTION, CONF_ID, CONF_LAMBDA, CONF_NAME, \
-    CONF_OPEN_ACTION, CONF_OPTIMISTIC, CONF_STATE, CONF_STOP_ACTION
-from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import Action, App, optional
-from esphome.py_compat import string_types
-
-TemplateCover = cover.cover_ns.class_('TemplateCover', cover.Cover)
-CoverPublishAction = cover.cover_ns.class_('CoverPublishAction', Action)
-
-PLATFORM_SCHEMA = cv.nameable(cover.COVER_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TemplateCover),
-    vol.Optional(CONF_LAMBDA): cv.lambda_,
-    vol.Optional(CONF_OPTIMISTIC): cv.boolean,
-    vol.Optional(CONF_ASSUMED_STATE): cv.boolean,
-    vol.Optional(CONF_OPEN_ACTION): automation.validate_automation(single=True),
-    vol.Optional(CONF_CLOSE_ACTION): automation.validate_automation(single=True),
-    vol.Optional(CONF_STOP_ACTION): automation.validate_automation(single=True),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_template_cover(config[CONF_NAME])
-    var = Pvariable(config[CONF_ID], rhs)
-
-    cover.setup_cover(var, config)
-    setup_component(var, config)
-
-    if CONF_LAMBDA in config:
-        for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                        return_type=optional.template(cover.CoverState)):
-            yield
-        add(var.set_state_lambda(template_))
-    if CONF_OPEN_ACTION in config:
-        automation.build_automations(var.get_open_trigger(), [],
-                                     config[CONF_OPEN_ACTION])
-    if CONF_CLOSE_ACTION in config:
-        automation.build_automations(var.get_close_trigger(), [],
-                                     config[CONF_CLOSE_ACTION])
-    if CONF_STOP_ACTION in config:
-        automation.build_automations(var.get_stop_trigger(), [],
-                                     config[CONF_STOP_ACTION])
-    if CONF_OPTIMISTIC in config:
-        add(var.set_optimistic(config[CONF_OPTIMISTIC]))
-    if CONF_ASSUMED_STATE in config:
-        add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
-
-
-BUILD_FLAGS = '-DUSE_TEMPLATE_COVER'
-
-CONF_COVER_TEMPLATE_PUBLISH = 'cover.template.publish'
-COVER_TEMPLATE_PUBLISH_ACTION_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.use_variable_id(cover.Cover),
-    vol.Required(CONF_STATE): cv.templatable(cover.validate_cover_state),
-})
-
-
-@ACTION_REGISTRY.register(CONF_COVER_TEMPLATE_PUBLISH,
-                          COVER_TEMPLATE_PUBLISH_ACTION_SCHEMA)
-def cover_template_publish_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_cover_publish_action(template_arg)
-    type = CoverPublishAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    state = config[CONF_STATE]
-    if isinstance(state, string_types):
-        template_ = cover.COVER_STATES[state]
-    else:
-        for template_ in templatable(state, args, cover.CoverState):
-            yield None
-    add(action.set_state(template_))
-    yield action
-
-
-def to_hass_config(data, config):
-    ret = cover.core_to_hass_config(data, config)
-    if ret is None:
-        return None
-    if CONF_OPTIMISTIC in config:
-        ret['optimistic'] = config[CONF_OPTIMISTIC]
-    return ret

esphome/components/custom_component.py

@@ -1,33 +0,0 @@
-import voluptuous as vol
-
-import esphome.config_validation as cv
-from esphome.const import CONF_COMPONENTS, CONF_ID, CONF_LAMBDA
-from esphome.cpp_generator import Pvariable, process_lambda, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import Component, ComponentPtr, esphome_ns, std_vector
-
-CustomComponentConstructor = esphome_ns.class_('CustomComponentConstructor')
-MULTI_CONF = True
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(CustomComponentConstructor),
-    vol.Required(CONF_LAMBDA): cv.lambda_,
-    vol.Optional(CONF_COMPONENTS): cv.ensure_list(cv.Schema({
-        cv.GenerateID(): cv.declare_variable_id(Component)
-    }).extend(cv.COMPONENT_SCHEMA.schema)),
-})
-
-
-def to_code(config):
-    for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                    return_type=std_vector.template(ComponentPtr)):
-        yield
-
-    rhs = CustomComponentConstructor(template_)
-    custom = variable(config[CONF_ID], rhs)
-    for i, comp_config in enumerate(config.get(CONF_COMPONENTS, [])):
-        comp = Pvariable(comp_config[CONF_ID], custom.get_component(i))
-        setup_component(comp, comp_config)
-
-
-BUILD_FLAGS = '-DUSE_CUSTOM_COMPONENT'

esphome/components/dallas.py

@@ -1,27 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_PIN, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DallasComponent = sensor.sensor_ns.class_('DallasComponent', PollingComponent)
-MULTI_CONF = True
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(DallasComponent),
-    vol.Required(CONF_PIN): pins.input_pin,
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_dallas_component(config[CONF_PIN], config.get(CONF_UPDATE_INTERVAL))
-    var = Pvariable(config[CONF_ID], rhs)
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_DALLAS_SENSOR'

esphome/components/debug.py

@@ -1,14 +0,0 @@
-import esphome.config_validation as cv
-from esphome.cpp_generator import add
-from esphome.cpp_types import App
-
-DEPENDENCIES = ['logger']
-
-CONFIG_SCHEMA = cv.Schema({})
-
-
-def to_code(config):
-    add(App.make_debug_component())
-
-
-BUILD_FLAGS = '-DUSE_DEBUG_COMPONENT'

esphome/components/deep_sleep.py

@@ -1,118 +0,0 @@
-import voluptuous as vol
-
-from esphome import config_validation as cv, pins
-from esphome.automation import ACTION_REGISTRY, maybe_simple_id
-from esphome.const import CONF_ID, CONF_MODE, CONF_NUMBER, CONF_PINS, CONF_RUN_CYCLES, \
-    CONF_RUN_DURATION, CONF_SLEEP_DURATION, CONF_WAKEUP_PIN
-from esphome.cpp_generator import Pvariable, StructInitializer, add, get_variable
-from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
-from esphome.cpp_types import Action, App, Component, esphome_ns, global_ns
-
-
-def validate_pin_number(value):
-    valid_pins = [0, 2, 4, 12, 13, 14, 15, 25, 26, 27, 32, 39]
-    if value[CONF_NUMBER] not in valid_pins:
-        raise vol.Invalid(u"Only pins {} support wakeup"
-                          u"".format(', '.join(str(x) for x in valid_pins)))
-    return value
-
-
-DeepSleepComponent = esphome_ns.class_('DeepSleepComponent', Component)
-EnterDeepSleepAction = esphome_ns.class_('EnterDeepSleepAction', Action)
-PreventDeepSleepAction = esphome_ns.class_('PreventDeepSleepAction', Action)
-
-WakeupPinMode = esphome_ns.enum('WakeupPinMode')
-WAKEUP_PIN_MODES = {
-    'IGNORE': WakeupPinMode.WAKEUP_PIN_MODE_IGNORE,
-    'KEEP_AWAKE': WakeupPinMode.WAKEUP_PIN_MODE_KEEP_AWAKE,
-    'INVERT_WAKEUP': WakeupPinMode.WAKEUP_PIN_MODE_INVERT_WAKEUP,
-}
-
-esp_sleep_ext1_wakeup_mode_t = global_ns.enum('esp_sleep_ext1_wakeup_mode_t')
-Ext1Wakeup = esphome_ns.struct('Ext1Wakeup')
-EXT1_WAKEUP_MODES = {
-    '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,
-}
-
-CONF_WAKEUP_PIN_MODE = 'wakeup_pin_mode'
-CONF_ESP32_EXT1_WAKEUP = 'esp32_ext1_wakeup'
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(DeepSleepComponent),
-    vol.Optional(CONF_SLEEP_DURATION): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_WAKEUP_PIN): vol.All(cv.only_on_esp32, pins.internal_gpio_input_pin_schema,
-                                           validate_pin_number),
-    vol.Optional(CONF_WAKEUP_PIN_MODE): vol.All(cv.only_on_esp32,
-                                                cv.one_of(*WAKEUP_PIN_MODES), upper=True),
-    vol.Optional(CONF_ESP32_EXT1_WAKEUP): vol.All(cv.only_on_esp32, cv.Schema({
-        vol.Required(CONF_PINS): cv.ensure_list(pins.shorthand_input_pin, validate_pin_number),
-        vol.Required(CONF_MODE): cv.one_of(*EXT1_WAKEUP_MODES, upper=True),
-    })),
-    vol.Optional(CONF_RUN_DURATION): cv.positive_time_period_milliseconds,
-
-    vol.Optional(CONF_RUN_CYCLES): cv.invalid("The run_cycles option has been removed in 1.11.0 as "
-                                              "it was essentially the same as a run_duration of 0s."
-                                              "Please use run_duration now.")
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_deep_sleep_component()
-    deep_sleep = Pvariable(config[CONF_ID], rhs)
-    if CONF_SLEEP_DURATION in config:
-        add(deep_sleep.set_sleep_duration(config[CONF_SLEEP_DURATION]))
-    if CONF_WAKEUP_PIN in config:
-        for pin in gpio_input_pin_expression(config[CONF_WAKEUP_PIN]):
-            yield
-        add(deep_sleep.set_wakeup_pin(pin))
-    if CONF_WAKEUP_PIN_MODE in config:
-        add(deep_sleep.set_wakeup_pin_mode(WAKEUP_PIN_MODES[config[CONF_WAKEUP_PIN_MODE]]))
-    if CONF_RUN_DURATION in config:
-        add(deep_sleep.set_run_duration(config[CONF_RUN_DURATION]))
-
-    if CONF_ESP32_EXT1_WAKEUP in config:
-        conf = config[CONF_ESP32_EXT1_WAKEUP]
-        mask = 0
-        for pin in conf[CONF_PINS]:
-            mask |= 1 << pin[CONF_NUMBER]
-        struct = StructInitializer(
-            Ext1Wakeup,
-            ('mask', mask),
-            ('wakeup_mode', EXT1_WAKEUP_MODES[conf[CONF_MODE]])
-        )
-        add(deep_sleep.set_ext1_wakeup(struct))
-
-    setup_component(deep_sleep, config)
-
-
-BUILD_FLAGS = '-DUSE_DEEP_SLEEP'
-
-CONF_DEEP_SLEEP_ENTER = 'deep_sleep.enter'
-DEEP_SLEEP_ENTER_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(DeepSleepComponent),
-})
-
-
-@ACTION_REGISTRY.register(CONF_DEEP_SLEEP_ENTER, DEEP_SLEEP_ENTER_ACTION_SCHEMA)
-def deep_sleep_enter_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_enter_deep_sleep_action(template_arg)
-    type = EnterDeepSleepAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-CONF_DEEP_SLEEP_PREVENT = 'deep_sleep.prevent'
-DEEP_SLEEP_PREVENT_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(DeepSleepComponent),
-})
-
-
-@ACTION_REGISTRY.register(CONF_DEEP_SLEEP_PREVENT, DEEP_SLEEP_PREVENT_ACTION_SCHEMA)
-def deep_sleep_prevent_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_prevent_deep_sleep_action(template_arg)
-    type = PreventDeepSleepAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)

esphome/components/display/__init__.py

@@ -1,127 +0,0 @@
-# coding=utf-8
-import voluptuous as vol
-
-from esphome import core
-from esphome.automation import ACTION_REGISTRY, maybe_simple_id
-import esphome.config_validation as cv
-from esphome.const import CONF_LAMBDA, CONF_ROTATION, CONF_UPDATE_INTERVAL, CONF_PAGES, CONF_ID
-from esphome.core import CORE
-from esphome.cpp_generator import add, process_lambda, Pvariable, templatable, get_variable
-from esphome.cpp_types import esphome_ns, void, Action
-
-PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
-
-})
-
-display_ns = esphome_ns.namespace('display')
-DisplayBuffer = display_ns.class_('DisplayBuffer')
-DisplayPage = display_ns.class_('DisplayPage')
-DisplayPagePtr = DisplayPage.operator('ptr')
-DisplayBufferRef = DisplayBuffer.operator('ref')
-DisplayPageShowAction = display_ns.class_('DisplayPageShowAction', Action)
-DisplayPageShowNextAction = display_ns.class_('DisplayPageShowNextAction', Action)
-DisplayPageShowPrevAction = display_ns.class_('DisplayPageShowPrevAction', Action)
-
-DISPLAY_ROTATIONS = {
-    0: display_ns.DISPLAY_ROTATION_0_DEGREES,
-    90: display_ns.DISPLAY_ROTATION_90_DEGREES,
-    180: display_ns.DISPLAY_ROTATION_180_DEGREES,
-    270: display_ns.DISPLAY_ROTATION_270_DEGREES,
-}
-
-
-def validate_rotation(value):
-    value = cv.string(value)
-    if value.endswith(u"°"):
-        value = value[:-1]
-    try:
-        value = int(value)
-    except ValueError:
-        raise vol.Invalid(u"Expected integer for rotation")
-    return cv.one_of(*DISPLAY_ROTATIONS)(value)
-
-
-BASIC_DISPLAY_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-    vol.Optional(CONF_LAMBDA): cv.lambda_,
-})
-
-FULL_DISPLAY_PLATFORM_SCHEMA = BASIC_DISPLAY_PLATFORM_SCHEMA.extend({
-    vol.Optional(CONF_ROTATION): validate_rotation,
-    vol.Optional(CONF_PAGES): vol.All(cv.ensure_list({
-        cv.GenerateID(): cv.declare_variable_id(DisplayPage),
-        vol.Required(CONF_LAMBDA): cv.lambda_,
-    }), vol.Length(min=1)),
-})
-
-
-def setup_display_core_(display_var, config):
-    if CONF_UPDATE_INTERVAL in config:
-        add(display_var.set_update_interval(config[CONF_UPDATE_INTERVAL]))
-    if CONF_ROTATION in config:
-        add(display_var.set_rotation(DISPLAY_ROTATIONS[config[CONF_ROTATION]]))
-    if CONF_PAGES in config:
-        pages = []
-        for conf in config[CONF_PAGES]:
-            for lambda_ in process_lambda(conf[CONF_LAMBDA], [(DisplayBufferRef, 'it')],
-                                          return_type=void):
-                yield
-            var = Pvariable(conf[CONF_ID], DisplayPage.new(lambda_))
-            pages.append(var)
-        add(display_var.set_pages(pages))
-
-
-CONF_DISPLAY_PAGE_SHOW = 'display.page.show'
-DISPLAY_PAGE_SHOW_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.templatable(cv.use_variable_id(DisplayPage)),
-})
-
-
-@ACTION_REGISTRY.register(CONF_DISPLAY_PAGE_SHOW, DISPLAY_PAGE_SHOW_ACTION_SCHEMA)
-def display_page_show_to_code(config, action_id, template_arg, args):
-    type = DisplayPageShowAction.template(template_arg)
-    action = Pvariable(action_id, type.new(), type=type)
-    if isinstance(config[CONF_ID], core.Lambda):
-        for template_ in templatable(config[CONF_ID], args, DisplayPagePtr):
-            yield None
-        add(action.set_page(template_))
-    else:
-        for var in get_variable(config[CONF_ID]):
-            yield None
-        add(action.set_page(var))
-    yield action
-
-
-CONF_DISPLAY_PAGE_SHOW_NEXT = 'display.page.show_next'
-DISPLAY_PAGE_SHOW_NEXT_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.templatable(cv.use_variable_id(DisplayBuffer)),
-})
-
-
-@ACTION_REGISTRY.register(CONF_DISPLAY_PAGE_SHOW_NEXT, DISPLAY_PAGE_SHOW_NEXT_ACTION_SCHEMA)
-def display_page_show_next_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    type = DisplayPageShowNextAction.template(template_arg)
-    yield Pvariable(action_id, type.new(var), type=type)
-
-
-CONF_DISPLAY_PAGE_SHOW_PREVIOUS = 'display.page.show_previous'
-DISPLAY_PAGE_SHOW_PREVIOUS_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.templatable(cv.use_variable_id(DisplayBuffer)),
-})
-
-
-@ACTION_REGISTRY.register(CONF_DISPLAY_PAGE_SHOW_PREVIOUS, DISPLAY_PAGE_SHOW_PREVIOUS_ACTION_SCHEMA)
-def display_page_show_previous_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    type = DisplayPageShowPrevAction.template(template_arg)
-    yield Pvariable(action_id, type.new(var), type=type)
-
-
-def setup_display(display_var, config):
-    CORE.add_job(setup_display_core_, display_var, config)
-
-
-BUILD_FLAGS = '-DUSE_DISPLAY'

esphome/components/display/nextion.py

@@ -1,36 +0,0 @@
-from esphome.components import display, uart
-from esphome.components.uart import UARTComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_UART_ID
-from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent, void
-
-DEPENDENCIES = ['uart']
-
-Nextion = display.display_ns.class_('Nextion', PollingComponent, uart.UARTDevice)
-NextionRef = Nextion.operator('ref')
-
-PLATFORM_SCHEMA = display.BASIC_DISPLAY_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(Nextion),
-    cv.GenerateID(CONF_UART_ID): cv.use_variable_id(UARTComponent),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for uart_ in get_variable(config[CONF_UART_ID]):
-        yield
-    rhs = App.make_nextion(uart_)
-    nextion = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_LAMBDA in config:
-        for lambda_ in process_lambda(config[CONF_LAMBDA], [(NextionRef, 'it')],
-                                      return_type=void):
-            yield
-        add(nextion.set_writer(lambda_))
-
-    display.setup_display(nextion, config)
-    setup_component(nextion, config)
-
-
-BUILD_FLAGS = '-DUSE_NEXTION'

esphome/components/display/ssd1306_spi.py

@@ -1,71 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import display, spi
-from esphome.components.spi import SPIComponent
-import esphome.config_validation as cv
-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_PAGES
-from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, PollingComponent, void
-
-DEPENDENCIES = ['spi']
-
-SSD1306 = display.display_ns.class_('SSD1306', PollingComponent, display.DisplayBuffer)
-SPISSD1306 = display.display_ns.class_('SPISSD1306', SSD1306, spi.SPIDevice)
-SSD1306Model = display.display_ns.enum('SSD1306Model')
-
-MODELS = {
-    'SSD1306_128X32': SSD1306Model.SSD1306_MODEL_128_32,
-    'SSD1306_128X64': SSD1306Model.SSD1306_MODEL_128_64,
-    'SSD1306_96X16': SSD1306Model.SSD1306_MODEL_96_16,
-    'SSD1306_64X48': SSD1306Model.SSD1306_MODEL_64_48,
-    'SH1106_128X32': SSD1306Model.SH1106_MODEL_128_32,
-    'SH1106_128X64': SSD1306Model.SH1106_MODEL_128_64,
-    'SH1106_96X16': SSD1306Model.SH1106_MODEL_96_16,
-    'SH1106_64X48': SSD1306Model.SH1106_MODEL_64_48,
-}
-
-SSD1306_MODEL = cv.one_of(*MODELS, upper=True, space="_")
-
-PLATFORM_SCHEMA = vol.All(display.FULL_DISPLAY_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(SPISSD1306),
-    cv.GenerateID(CONF_SPI_ID): cv.use_variable_id(SPIComponent),
-    vol.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
-    vol.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-    vol.Required(CONF_MODEL): SSD1306_MODEL,
-    vol.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_EXTERNAL_VCC): cv.boolean,
-}).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
-
-
-def to_code(config):
-    for spi_ in get_variable(config[CONF_SPI_ID]):
-        yield
-    for cs in gpio_output_pin_expression(config[CONF_CS_PIN]):
-        yield
-    for dc in gpio_output_pin_expression(config[CONF_DC_PIN]):
-        yield
-
-    rhs = App.make_spi_ssd1306(spi_, cs, dc)
-    ssd = Pvariable(config[CONF_ID], rhs)
-    add(ssd.set_model(MODELS[config[CONF_MODEL]]))
-
-    if CONF_RESET_PIN in config:
-        for reset in gpio_output_pin_expression(config[CONF_RESET_PIN]):
-            yield
-        add(ssd.set_reset_pin(reset))
-    if CONF_EXTERNAL_VCC in config:
-        add(ssd.set_external_vcc(config[CONF_EXTERNAL_VCC]))
-    if CONF_LAMBDA in config:
-        for lambda_ in process_lambda(config[CONF_LAMBDA],
-                                      [(display.DisplayBufferRef, 'it')], return_type=void):
-            yield
-        add(ssd.set_writer(lambda_))
-
-    display.setup_display(ssd, config)
-    setup_component(ssd, config)
-
-
-BUILD_FLAGS = '-DUSE_SSD1306'

esphome/components/esp32_ble_beacon.py

@@ -1,39 +0,0 @@
-import voluptuous as vol
-
-from esphome import config_validation as cv
-from esphome.const import CONF_ID, CONF_SCAN_INTERVAL, CONF_TYPE, CONF_UUID, ESP_PLATFORM_ESP32
-from esphome.cpp_generator import Pvariable, RawExpression, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component, esphome_ns
-
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-
-ESP32BLEBeacon = esphome_ns.class_('ESP32BLEBeacon', Component)
-
-CONF_MAJOR = 'major'
-CONF_MINOR = 'minor'
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(ESP32BLEBeacon),
-    vol.Required(CONF_TYPE): cv.one_of('IBEACON', upper=True),
-    vol.Required(CONF_UUID): cv.uuid,
-    vol.Optional(CONF_MAJOR): cv.uint16_t,
-    vol.Optional(CONF_MINOR): cv.uint16_t,
-    vol.Optional(CONF_SCAN_INTERVAL): cv.positive_time_period_milliseconds,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    uuid = config[CONF_UUID].hex
-    uuid_arr = [RawExpression('0x{}'.format(uuid[i:i + 2])) for i in range(0, len(uuid), 2)]
-    rhs = App.make_esp32_ble_beacon(uuid_arr)
-    ble = Pvariable(config[CONF_ID], rhs)
-    if CONF_MAJOR in config:
-        add(ble.set_major(config[CONF_MAJOR]))
-    if CONF_MINOR in config:
-        add(ble.set_minor(config[CONF_MINOR]))
-
-    setup_component(ble, config)
-
-
-BUILD_FLAGS = '-DUSE_ESP32_BLE_BEACON'

esphome/components/esp32_ble_tracker.py

@@ -1,40 +0,0 @@
-import voluptuous as vol
-
-from esphome import config_validation as cv
-from esphome.components import sensor
-from esphome.const import CONF_ID, CONF_SCAN_INTERVAL, ESP_PLATFORM_ESP32
-from esphome.core import HexInt
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component, esphome_ns
-
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-
-CONF_ESP32_BLE_ID = 'esp32_ble_id'
-ESP32BLETracker = esphome_ns.class_('ESP32BLETracker', Component)
-XiaomiSensor = esphome_ns.class_('XiaomiSensor', sensor.Sensor)
-XiaomiDevice = esphome_ns.class_('XiaomiDevice')
-XIAOMI_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(XiaomiSensor)
-})
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(ESP32BLETracker),
-    vol.Optional(CONF_SCAN_INTERVAL): cv.positive_time_period_seconds,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def make_address_array(address):
-    return [HexInt(i) for i in address.parts]
-
-
-def to_code(config):
-    rhs = App.make_esp32_ble_tracker()
-    ble = Pvariable(config[CONF_ID], rhs)
-    if CONF_SCAN_INTERVAL in config:
-        add(ble.set_scan_interval(config[CONF_SCAN_INTERVAL]))
-
-    setup_component(ble, config)
-
-
-BUILD_FLAGS = '-DUSE_ESP32_BLE_TRACKER'

esphome/components/esp32_camera.py

@@ -1,130 +0,0 @@
-import voluptuous as vol
-
-from esphome import config_validation as cv, pins
-from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_NAME, CONF_PIN, CONF_SCL, CONF_SDA, \
-    ESP_PLATFORM_ESP32
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_types import App, Nameable, PollingComponent, esphome_ns
-
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-
-ESP32Camera = esphome_ns.class_('ESP32Camera', PollingComponent, Nameable)
-ESP32CameraFrameSize = esphome_ns.enum('ESP32CameraFrameSize')
-FRAME_SIZES = {
-    '160X120': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120,
-    'QQVGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_160X120,
-    '128x160': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_128X160,
-    'QQVGA2': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_128X160,
-    '176X144': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_176X144,
-    'QCIF': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_176X144,
-    '240X176': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_240X176,
-    'HQVGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_240X176,
-    '320X240': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_320X240,
-    'QVGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_320X240,
-    '400X296': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_400X296,
-    'CIF': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_400X296,
-    '640X480': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_640X480,
-    'VGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_640X480,
-    '800X600': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_800X600,
-    'SVGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_800X600,
-    '1024X768': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1024X768,
-    'XGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1024X768,
-    '1280x1024': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1280X1024,
-    'SXGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1280X1024,
-    '1600X1200': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
-    'UXGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
-}
-
-CONF_DATA_PINS = 'data_pins'
-CONF_VSYNC_PIN = 'vsync_pin'
-CONF_HREF_PIN = 'href_pin'
-CONF_PIXEL_CLOCK_PIN = 'pixel_clock_pin'
-CONF_EXTERNAL_CLOCK = 'external_clock'
-CONF_I2C_PINS = 'i2c_pins'
-CONF_RESET_PIN = 'reset_pin'
-CONF_POWER_DOWN_PIN = 'power_down_pin'
-
-CONF_MAX_FRAMERATE = 'max_framerate'
-CONF_IDLE_FRAMERATE = 'idle_framerate'
-CONF_RESOLUTION = 'resolution'
-CONF_JPEG_QUALITY = 'jpeg_quality'
-CONF_VERTICAL_FLIP = 'vertical_flip'
-CONF_HORIZONTAL_MIRROR = 'horizontal_mirror'
-CONF_CONTRAST = 'contrast'
-CONF_BRIGHTNESS = 'brightness'
-CONF_SATURATION = 'saturation'
-CONF_TEST_PATTERN = 'test_pattern'
-
-camera_range_param = vol.All(cv.int_, vol.Range(min=-2, max=2))
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(ESP32Camera),
-    vol.Required(CONF_NAME): cv.string,
-    vol.Required(CONF_DATA_PINS): vol.All([pins.input_pin], vol.Length(min=8, max=8)),
-    vol.Required(CONF_VSYNC_PIN): pins.input_pin,
-    vol.Required(CONF_HREF_PIN): pins.input_pin,
-    vol.Required(CONF_PIXEL_CLOCK_PIN): pins.input_pin,
-    vol.Required(CONF_EXTERNAL_CLOCK): vol.Schema({
-        vol.Required(CONF_PIN): pins.output_pin,
-        vol.Optional(CONF_FREQUENCY, default='20MHz'): vol.All(cv.frequency, vol.In([20e6, 10e6])),
-    }),
-    vol.Required(CONF_I2C_PINS): vol.Schema({
-        vol.Required(CONF_SDA): pins.output_pin,
-        vol.Required(CONF_SCL): pins.output_pin,
-    }),
-    vol.Optional(CONF_RESET_PIN): pins.output_pin,
-    vol.Optional(CONF_POWER_DOWN_PIN): pins.output_pin,
-
-    vol.Optional(CONF_MAX_FRAMERATE, default='10 fps'): vol.All(cv.framerate,
-                                                                vol.Range(min=0, min_included=False,
-                                                                          max=60)),
-    vol.Optional(CONF_IDLE_FRAMERATE, default='0.1 fps'): vol.All(cv.framerate,
-                                                                  vol.Range(min=0, max=1)),
-    vol.Optional(CONF_RESOLUTION, default='640X480'): cv.one_of(*FRAME_SIZES, upper=True),
-    vol.Optional(CONF_JPEG_QUALITY, default=10): vol.All(cv.int_, vol.Range(min=10, max=63)),
-    vol.Optional(CONF_CONTRAST, default=0): camera_range_param,
-    vol.Optional(CONF_BRIGHTNESS, default=0): camera_range_param,
-    vol.Optional(CONF_SATURATION, default=0): camera_range_param,
-    vol.Optional(CONF_VERTICAL_FLIP, default=True): cv.boolean,
-    vol.Optional(CONF_HORIZONTAL_MIRROR, default=True): cv.boolean,
-    vol.Optional(CONF_TEST_PATTERN, default=False): cv.boolean,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-SETTERS = {
-    CONF_DATA_PINS: 'set_data_pins',
-    CONF_VSYNC_PIN: 'set_vsync_pin',
-    CONF_HREF_PIN: 'set_href_pin',
-    CONF_PIXEL_CLOCK_PIN: 'set_pixel_clock_pin',
-    CONF_RESET_PIN: 'set_reset_pin',
-    CONF_POWER_DOWN_PIN: 'set_power_down_pin',
-    CONF_JPEG_QUALITY: 'set_jpeg_quality',
-    CONF_VERTICAL_FLIP: 'set_vertical_flip',
-    CONF_HORIZONTAL_MIRROR: 'set_horizontal_mirror',
-    CONF_CONTRAST: 'set_contrast',
-    CONF_BRIGHTNESS: 'set_brightness',
-    CONF_SATURATION: 'set_saturation',
-    CONF_TEST_PATTERN: 'set_test_pattern',
-}
-
-
-def to_code(config):
-    rhs = App.register_component(ESP32Camera.new(config[CONF_NAME]))
-    cam = Pvariable(config[CONF_ID], rhs)
-
-    for key, setter in SETTERS.items():
-        if key in config:
-            add(getattr(cam, setter)(config[key]))
-
-    extclk = config[CONF_EXTERNAL_CLOCK]
-    add(cam.set_external_clock(extclk[CONF_PIN], extclk[CONF_FREQUENCY]))
-    i2c_pins = config[CONF_I2C_PINS]
-    add(cam.set_i2c_pins(i2c_pins[CONF_SDA], i2c_pins[CONF_SCL]))
-    add(cam.set_max_update_interval(1000 / config[CONF_MAX_FRAMERATE]))
-    if config[CONF_IDLE_FRAMERATE] == 0:
-        add(cam.set_idle_update_interval(0))
-    else:
-        add(cam.set_idle_update_interval(1000 / config[CONF_IDLE_FRAMERATE]))
-    add(cam.set_frame_size(FRAME_SIZES[config[CONF_RESOLUTION]]))
-
-
-BUILD_FLAGS = '-DUSE_ESP32_CAMERA'

esphome/components/ethernet.py

@@ -1,85 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import wifi
-import esphome.config_validation as cv
-from esphome.const import CONF_DOMAIN, CONF_ID, CONF_MANUAL_IP, CONF_STATIC_IP, CONF_TYPE, \
-    CONF_USE_ADDRESS, ESP_PLATFORM_ESP32
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_output_pin_expression
-from esphome.cpp_types import App, Component, esphome_ns, global_ns
-
-CONFLICTS_WITH = ['wifi']
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-
-CONF_PHY_ADDR = 'phy_addr'
-CONF_MDC_PIN = 'mdc_pin'
-CONF_MDIO_PIN = 'mdio_pin'
-CONF_CLK_MODE = 'clk_mode'
-CONF_POWER_PIN = 'power_pin'
-
-EthernetType = esphome_ns.enum('EthernetType')
-ETHERNET_TYPES = {
-    'LAN8720': EthernetType.ETHERNET_TYPE_LAN8720,
-    'TLK110': EthernetType.ETHERNET_TYPE_TLK110,
-}
-
-eth_clock_mode_t = global_ns.enum('eth_clock_mode_t')
-CLK_MODES = {
-    'GPIO0_IN': eth_clock_mode_t.ETH_CLOCK_GPIO0_IN,
-    'GPIO0_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO0_OUT,
-    'GPIO16_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO16_OUT,
-    'GPIO17_OUT': eth_clock_mode_t.ETH_CLOCK_GPIO17_OUT,
-}
-
-EthernetComponent = esphome_ns.class_('EthernetComponent', Component)
-
-
-def validate(config):
-    if CONF_USE_ADDRESS not in config:
-        if CONF_MANUAL_IP in config:
-            use_address = str(config[CONF_MANUAL_IP][CONF_STATIC_IP])
-        else:
-            use_address = CORE.name + config[CONF_DOMAIN]
-        config[CONF_USE_ADDRESS] = use_address
-    return config
-
-
-CONFIG_SCHEMA = vol.All(cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(EthernetComponent),
-    vol.Required(CONF_TYPE): cv.one_of(*ETHERNET_TYPES, upper=True),
-    vol.Required(CONF_MDC_PIN): pins.output_pin,
-    vol.Required(CONF_MDIO_PIN): pins.input_output_pin,
-    vol.Optional(CONF_CLK_MODE, default='GPIO0_IN'): cv.one_of(*CLK_MODES, upper=True, space='_'),
-    vol.Optional(CONF_PHY_ADDR, default=0): vol.All(cv.int_, vol.Range(min=0, max=31)),
-    vol.Optional(CONF_POWER_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_MANUAL_IP): wifi.STA_MANUAL_IP_SCHEMA,
-    vol.Optional(CONF_DOMAIN, default='.local'): cv.domain_name,
-    vol.Optional(CONF_USE_ADDRESS): cv.string_strict,
-
-    vol.Optional('hostname'): cv.invalid("The hostname option has been removed in 1.11.0"),
-}), validate)
-
-
-def to_code(config):
-    rhs = App.init_ethernet()
-    eth = Pvariable(config[CONF_ID], rhs)
-
-    add(eth.set_phy_addr(config[CONF_PHY_ADDR]))
-    add(eth.set_mdc_pin(config[CONF_MDC_PIN]))
-    add(eth.set_mdio_pin(config[CONF_MDIO_PIN]))
-    add(eth.set_type(ETHERNET_TYPES[config[CONF_TYPE]]))
-    add(eth.set_clk_mode(CLK_MODES[config[CONF_CLK_MODE]]))
-    add(eth.set_use_address(config[CONF_USE_ADDRESS]))
-
-    if CONF_POWER_PIN in config:
-        for pin in gpio_output_pin_expression(config[CONF_POWER_PIN]):
-            yield
-        add(eth.set_power_pin(pin))
-
-    if CONF_MANUAL_IP in config:
-        add(eth.set_manual_ip(wifi.manual_ip(config[CONF_MANUAL_IP])))
-
-
-REQUIRED_BUILD_FLAGS = '-DUSE_ETHERNET'

esphome/components/fan/__init__.py

@@ -1,144 +0,0 @@
-import voluptuous as vol
-
-from esphome.automation import ACTION_REGISTRY, maybe_simple_id
-from esphome.components import mqtt
-from esphome.components.mqtt import setup_mqtt_component
-import esphome.config_validation as cv
-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_SPEED, CONF_SPEED_COMMAND_TOPIC, CONF_SPEED_STATE_TOPIC
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, add, get_variable, templatable
-from esphome.cpp_types import Action, Application, Component, Nameable, bool_, esphome_ns
-from esphome.py_compat import string_types
-
-PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
-
-})
-
-fan_ns = esphome_ns.namespace('fan')
-FanState = fan_ns.class_('FanState', Nameable, Component)
-MQTTFanComponent = fan_ns.class_('MQTTFanComponent', mqtt.MQTTComponent)
-MakeFan = Application.struct('MakeFan')
-
-# Actions
-TurnOnAction = fan_ns.class_('TurnOnAction', Action)
-TurnOffAction = fan_ns.class_('TurnOffAction', Action)
-ToggleAction = fan_ns.class_('ToggleAction', Action)
-
-FanSpeed = fan_ns.enum('FanSpeed')
-FAN_SPEED_OFF = FanSpeed.FAN_SPEED_OFF
-FAN_SPEED_LOW = FanSpeed.FAN_SPEED_LOW
-FAN_SPEED_MEDIUM = FanSpeed.FAN_SPEED_MEDIUM
-FAN_SPEED_HIGH = FanSpeed.FAN_SPEED_HIGH
-
-FAN_SCHEMA = cv.MQTT_COMMAND_COMPONENT_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(FanState),
-    cv.GenerateID(CONF_MQTT_ID): cv.declare_variable_id(MQTTFanComponent),
-    vol.Optional(CONF_OSCILLATION_STATE_TOPIC): vol.All(cv.requires_component('mqtt'),
-                                                        cv.publish_topic),
-    vol.Optional(CONF_OSCILLATION_COMMAND_TOPIC): vol.All(cv.requires_component('mqtt'),
-                                                          cv.subscribe_topic),
-})
-
-FAN_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(FAN_SCHEMA.schema)
-
-FAN_SPEEDS = {
-    'OFF': FAN_SPEED_OFF,
-    'LOW': FAN_SPEED_LOW,
-    'MEDIUM': FAN_SPEED_MEDIUM,
-    'HIGH': FAN_SPEED_HIGH,
-}
-
-
-def setup_fan_core_(fan_var, config):
-    if CONF_INTERNAL in config:
-        add(fan_var.set_internal(config[CONF_INTERNAL]))
-
-    mqtt_ = fan_var.Pget_mqtt()
-    if CONF_OSCILLATION_STATE_TOPIC in config:
-        add(mqtt_.set_custom_oscillation_state_topic(config[CONF_OSCILLATION_STATE_TOPIC]))
-    if CONF_OSCILLATION_COMMAND_TOPIC in config:
-        add(mqtt_.set_custom_oscillation_command_topic(config[CONF_OSCILLATION_COMMAND_TOPIC]))
-    if CONF_SPEED_STATE_TOPIC in config:
-        add(mqtt_.set_custom_speed_state_topic(config[CONF_SPEED_STATE_TOPIC]))
-    if CONF_SPEED_COMMAND_TOPIC in config:
-        add(mqtt_.set_custom_speed_command_topic(config[CONF_SPEED_COMMAND_TOPIC]))
-    setup_mqtt_component(mqtt_, config)
-
-
-def setup_fan(fan_obj, config):
-    fan_var = Pvariable(config[CONF_ID], fan_obj, has_side_effects=False)
-    CORE.add_job(setup_fan_core_, fan_var, config)
-
-
-BUILD_FLAGS = '-DUSE_FAN'
-
-CONF_FAN_TOGGLE = 'fan.toggle'
-FAN_TOGGLE_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(FanState),
-})
-
-
-@ACTION_REGISTRY.register(CONF_FAN_TOGGLE, FAN_TOGGLE_ACTION_SCHEMA)
-def fan_toggle_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_toggle_action(template_arg)
-    type = ToggleAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-CONF_FAN_TURN_OFF = 'fan.turn_off'
-FAN_TURN_OFF_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(FanState),
-})
-
-
-@ACTION_REGISTRY.register(CONF_FAN_TURN_OFF, FAN_TURN_OFF_ACTION_SCHEMA)
-def fan_turn_off_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_turn_off_action(template_arg)
-    type = TurnOffAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-CONF_FAN_TURN_ON = 'fan.turn_on'
-FAN_TURN_ON_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(FanState),
-    vol.Optional(CONF_OSCILLATING): cv.templatable(cv.boolean),
-    vol.Optional(CONF_SPEED): cv.templatable(cv.one_of(*FAN_SPEEDS, upper=True)),
-})
-
-
-@ACTION_REGISTRY.register(CONF_FAN_TURN_ON, FAN_TURN_ON_ACTION_SCHEMA)
-def fan_turn_on_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_turn_on_action(template_arg)
-    type = TurnOnAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    if CONF_OSCILLATING in config:
-        for template_ in templatable(config[CONF_OSCILLATING], args, bool_):
-            yield None
-        add(action.set_oscillating(template_))
-    if CONF_SPEED in config:
-        for template_ in templatable(config[CONF_SPEED], args, FanSpeed):
-            yield None
-        if isinstance(template_, string_types):
-            template_ = FAN_SPEEDS[template_]
-        add(action.set_speed(template_))
-    yield action
-
-
-def core_to_hass_config(data, config):
-    ret = mqtt.build_hass_config(data, 'fan', config, include_state=True, include_command=True)
-    if ret is None:
-        return None
-    if CONF_OSCILLATION_OUTPUT in config:
-        default = mqtt.get_default_topic_for(data, 'fan', config[CONF_NAME], 'oscillation/state')
-        ret['oscillation_state_topic'] = config.get(CONF_OSCILLATION_STATE_TOPIC, default)
-        default = mqtt.get_default_topic_for(data, 'fan', config[CONF_NAME], 'oscillation/command')
-        ret['oscillation_command__topic'] = config.get(CONF_OSCILLATION_COMMAND_TOPIC, default)
-    return ret

esphome/components/fan/binary.py

@@ -1,34 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import fan, output
-import esphome.config_validation as cv
-from esphome.const import CONF_MAKE_ID, CONF_NAME, CONF_OSCILLATION_OUTPUT, CONF_OUTPUT
-from esphome.cpp_generator import add, get_variable, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-PLATFORM_SCHEMA = cv.nameable(fan.FAN_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(fan.MakeFan),
-    vol.Required(CONF_OUTPUT): cv.use_variable_id(output.BinaryOutput),
-    vol.Optional(CONF_OSCILLATION_OUTPUT): cv.use_variable_id(output.BinaryOutput),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for output_ in get_variable(config[CONF_OUTPUT]):
-        yield
-
-    rhs = App.make_fan(config[CONF_NAME])
-    fan_struct = variable(config[CONF_MAKE_ID], rhs)
-    add(fan_struct.Poutput.set_binary(output_))
-    if CONF_OSCILLATION_OUTPUT in config:
-        for oscillation_output in get_variable(config[CONF_OSCILLATION_OUTPUT]):
-            yield
-        add(fan_struct.Poutput.set_oscillation(oscillation_output))
-
-    fan.setup_fan(fan_struct.Pstate, config)
-    setup_component(fan_struct.Poutput, config)
-
-
-def to_hass_config(data, config):
-    return fan.core_to_hass_config(data, config)

esphome/components/fan/speed.py

@@ -1,55 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import fan, mqtt, output
-import esphome.config_validation as cv
-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_SPEED_STATE_TOPIC
-from esphome.cpp_generator import add, get_variable, variable
-from esphome.cpp_types import App
-
-PLATFORM_SCHEMA = cv.nameable(fan.FAN_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(fan.MakeFan),
-    vol.Required(CONF_OUTPUT): cv.use_variable_id(output.FloatOutput),
-    vol.Optional(CONF_SPEED_STATE_TOPIC): cv.publish_topic,
-    vol.Optional(CONF_SPEED_COMMAND_TOPIC): cv.subscribe_topic,
-    vol.Optional(CONF_OSCILLATION_OUTPUT): cv.use_variable_id(output.BinaryOutput),
-    vol.Optional(CONF_SPEED): cv.Schema({
-        vol.Required(CONF_LOW): cv.percentage,
-        vol.Required(CONF_MEDIUM): cv.percentage,
-        vol.Required(CONF_HIGH): cv.percentage,
-    }),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for output_ in get_variable(config[CONF_OUTPUT]):
-        yield
-    rhs = App.make_fan(config[CONF_NAME])
-    fan_struct = variable(config[CONF_MAKE_ID], rhs)
-    if CONF_SPEED in config:
-        speeds = config[CONF_SPEED]
-        add(fan_struct.Poutput.set_speed(output_,
-                                         speeds[CONF_LOW],
-                                         speeds[CONF_MEDIUM],
-                                         speeds[CONF_HIGH]))
-    else:
-        add(fan_struct.Poutput.set_speed(output_))
-
-    if CONF_OSCILLATION_OUTPUT in config:
-        for oscillation_output in get_variable(config[CONF_OSCILLATION_OUTPUT]):
-            yield
-        add(fan_struct.Poutput.set_oscillation(oscillation_output))
-
-    fan.setup_fan(fan_struct.Pstate, config)
-
-
-def to_hass_config(data, config):
-    ret = fan.core_to_hass_config(data, config)
-    if ret is None:
-        return None
-    default = mqtt.get_default_topic_for(data, 'fan', config[CONF_NAME], 'speed/state')
-    ret['speed_state_topic'] = config.get(CONF_SPEED_STATE_TOPIC, default)
-    default = mqtt.get_default_topic_for(data, 'fan', config[CONF_NAME], 'speed/command')
-    ret['speed_command__topic'] = config.get(CONF_SPEED_COMMAND_TOPIC, default)
-    return ret

esphome/components/font.py

@@ -1,119 +0,0 @@
-# coding=utf-8
-import voluptuous as vol
-
-from esphome import core
-from esphome.components import display
-import esphome.config_validation as cv
-from esphome.const import CONF_FILE, CONF_GLYPHS, CONF_ID, CONF_SIZE
-from esphome.core import CORE, HexInt
-from esphome.cpp_generator import Pvariable, progmem_array, safe_exp
-from esphome.cpp_types import App, uint8
-from esphome.py_compat import sort_by_cmp
-
-DEPENDENCIES = ['display']
-MULTI_CONF = True
-
-Font = display.display_ns.class_('Font')
-Glyph = display.display_ns.class_('Glyph')
-
-
-def validate_glyphs(value):
-    if isinstance(value, list):
-        value = cv.Schema([cv.string])(value)
-    value = cv.Schema([cv.string])(list(value))
-
-    def comparator(x, y):
-        x_ = x.encode('utf-8')
-        y_ = y.encode('utf-8')
-
-        for c in range(min(len(x_), len(y_))):
-            if x_[c] < y_[c]:
-                return -1
-            if x_[c] > y_[c]:
-                return 1
-
-        if len(x_) < len(y_):
-            return -1
-        if len(x_) > len(y_):
-            return 1
-        raise vol.Invalid(u"Found duplicate glyph {}".format(x))
-
-    sort_by_cmp(value, comparator)
-    return value
-
-
-def validate_pillow_installed(value):
-    try:
-        import PIL
-    except ImportError:
-        raise vol.Invalid("Please install the pillow python package to use this feature. "
-                          "(pip install pillow)")
-
-    if PIL.__version__[0] < '4':
-        raise vol.Invalid("Please update your pillow installation to at least 4.0.x. "
-                          "(pip install -U pillow)")
-
-    return value
-
-
-def validate_truetype_file(value):
-    if value.endswith('.zip'):  # for Google Fonts downloads
-        raise vol.Invalid(u"Please unzip the font archive '{}' first and then use the .ttf files "
-                          u"inside.".format(value))
-    if not value.endswith('.ttf'):
-        raise vol.Invalid(u"Only truetype (.ttf) files are supported. Please make sure you're "
-                          u"using the correct format or rename the extension to .ttf")
-    return cv.file_(value)
-
-
-DEFAULT_GLYPHS = u' !"%()+,-.:0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
-CONF_RAW_DATA_ID = 'raw_data_id'
-
-FONT_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.declare_variable_id(Font),
-    vol.Required(CONF_FILE): validate_truetype_file,
-    vol.Optional(CONF_GLYPHS, default=DEFAULT_GLYPHS): validate_glyphs,
-    vol.Optional(CONF_SIZE, default=20): vol.All(cv.int_, vol.Range(min=1)),
-    cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_variable_id(uint8),
-})
-
-CONFIG_SCHEMA = vol.All(validate_pillow_installed, FONT_SCHEMA)
-
-
-def to_code(config):
-    from PIL import ImageFont
-
-    path = CORE.relative_path(config[CONF_FILE])
-    try:
-        font = ImageFont.truetype(path, config[CONF_SIZE])
-    except Exception as e:
-        raise core.EsphomeError(u"Could not load truetype file {}: {}".format(path, e))
-
-    ascent, descent = font.getmetrics()
-
-    glyph_args = {}
-    data = []
-    for glyph in config[CONF_GLYPHS]:
-        mask = font.getmask(glyph, mode='1')
-        _, (offset_x, offset_y) = font.font.getsize(glyph)
-        width, height = mask.size
-        width8 = ((width + 7) // 8) * 8
-        glyph_data = [0 for _ in range(height * width8 // 8)]  # noqa: F812
-        for y in range(height):
-            for x in range(width):
-                if not mask.getpixel((x, y)):
-                    continue
-                pos = x + y * width8
-                glyph_data[pos // 8] |= 0x80 >> (pos % 8)
-        glyph_args[glyph] = (len(data), offset_x, offset_y, width, height)
-        data += glyph_data
-
-    rhs = safe_exp([HexInt(x) for x in data])
-    prog_arr = progmem_array(config[CONF_RAW_DATA_ID], rhs)
-
-    glyphs = []
-    for glyph in config[CONF_GLYPHS]:
-        glyphs.append(Glyph(glyph, prog_arr, *glyph_args[glyph]))
-
-    rhs = App.make_font(glyphs, ascent, ascent + descent)
-    Pvariable(config[CONF_ID], rhs)

esphome/components/globals.py

@@ -1,35 +0,0 @@
-import voluptuous as vol
-
-from esphome import config_validation as cv
-from esphome.const import CONF_ID, CONF_INITIAL_VALUE, CONF_RESTORE_VALUE, CONF_TYPE
-from esphome.cpp_generator import Pvariable, RawExpression, TemplateArguments, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component, esphome_ns
-
-GlobalVariableComponent = esphome_ns.class_('GlobalVariableComponent', Component)
-
-MULTI_CONF = True
-
-CONFIG_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.declare_variable_id(GlobalVariableComponent),
-    vol.Required(CONF_TYPE): cv.string_strict,
-    vol.Optional(CONF_INITIAL_VALUE): cv.string_strict,
-    vol.Optional(CONF_RESTORE_VALUE): cv.boolean,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    type_ = RawExpression(config[CONF_TYPE])
-    template_args = TemplateArguments(type_)
-    res_type = GlobalVariableComponent.template(template_args)
-    initial_value = None
-    if CONF_INITIAL_VALUE in config:
-        initial_value = RawExpression(config[CONF_INITIAL_VALUE])
-    rhs = App.Pmake_global_variable(template_args, initial_value)
-    glob = Pvariable(config[CONF_ID], rhs, type=res_type)
-
-    if config.get(CONF_RESTORE_VALUE, False):
-        hash_ = hash(config[CONF_ID].id) % 2**32
-        add(glob.set_restore_value(hash_))
-
-    setup_component(glob, config)

esphome/components/image.py

@@ -1,63 +0,0 @@
-# coding=utf-8
-import logging
-
-import voluptuous as vol
-
-from esphome import core
-from esphome.components import display, font
-import esphome.config_validation as cv
-from esphome.const import CONF_FILE, CONF_ID, CONF_RESIZE
-from esphome.core import CORE, HexInt
-from esphome.cpp_generator import Pvariable, progmem_array, safe_exp
-from esphome.cpp_types import App, uint8
-
-_LOGGER = logging.getLogger(__name__)
-
-DEPENDENCIES = ['display']
-MULTI_CONF = True
-
-Image_ = display.display_ns.class_('Image')
-
-CONF_RAW_DATA_ID = 'raw_data_id'
-
-IMAGE_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.declare_variable_id(Image_),
-    vol.Required(CONF_FILE): cv.file_,
-    vol.Optional(CONF_RESIZE): cv.dimensions,
-    cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_variable_id(uint8),
-})
-
-CONFIG_SCHEMA = vol.All(font.validate_pillow_installed, IMAGE_SCHEMA)
-
-
-def to_code(config):
-    from PIL import Image
-
-    path = CORE.relative_path(config[CONF_FILE])
-    try:
-        image = Image.open(path)
-    except Exception as e:
-        raise core.EsphomeError(u"Could not load image file {}: {}".format(path, e))
-
-    if CONF_RESIZE in config:
-        image.thumbnail(config[CONF_RESIZE])
-
-    image = image.convert('1', dither=Image.NONE)
-    width, height = image.size
-    if width > 500 or height > 500:
-        _LOGGER.warning("The image you requested is very big. Please consider using the resize "
-                        "parameter")
-    width8 = ((width + 7) // 8) * 8
-    data = [0 for _ in range(height * width8 // 8)]
-    for y in range(height):
-        for x in range(width):
-            if image.getpixel((x, y)):
-                continue
-            pos = x + y * width8
-            data[pos // 8] |= 0x80 >> (pos % 8)
-
-    rhs = safe_exp([HexInt(x) for x in data])
-    prog_arr = progmem_array(config[CONF_RAW_DATA_ID], rhs)
-
-    rhs = App.make_image(prog_arr, width, height)
-    Pvariable(config[CONF_ID], rhs)

esphome/components/interval.py

@@ -1,24 +0,0 @@
-import voluptuous as vol
-
-from esphome import automation
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent, Trigger, esphome_ns
-
-IntervalTrigger = esphome_ns.class_('IntervalTrigger', Trigger.template(), PollingComponent)
-
-CONFIG_SCHEMA = automation.validate_automation(cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(IntervalTrigger),
-    vol.Required(CONF_INTERVAL): cv.positive_time_period_milliseconds,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for conf in config:
-        rhs = App.register_component(IntervalTrigger.new(conf[CONF_INTERVAL]))
-        trigger = Pvariable(conf[CONF_ID], rhs)
-        setup_component(trigger, conf)
-
-        automation.build_automations(trigger, [], conf)

esphome/components/light/binary.py

@@ -1,28 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import light, output
-import esphome.config_validation as cv
-from esphome.const import CONF_EFFECTS, CONF_MAKE_ID, CONF_NAME, CONF_OUTPUT
-from esphome.cpp_generator import get_variable, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),
-    vol.Required(CONF_OUTPUT): cv.use_variable_id(output.BinaryOutput),
-    vol.Optional(CONF_EFFECTS): light.validate_effects(light.BINARY_EFFECTS),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for output_ in get_variable(config[CONF_OUTPUT]):
-        yield
-    rhs = App.make_binary_light(config[CONF_NAME], output_)
-    light_struct = variable(config[CONF_MAKE_ID], rhs)
-    light.setup_light(light_struct.Pstate, config)
-    setup_component(light_struct.Pstate, config)
-
-
-def to_hass_config(data, config):
-    return light.core_to_hass_config(data, config, brightness=False, rgb=False, color_temp=False,
-                                     white_value=False)

esphome/components/light/monochromatic.py

@@ -1,31 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import light, output
-import esphome.config_validation as cv
-from esphome.const import CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, \
-    CONF_MAKE_ID, CONF_NAME, CONF_OUTPUT
-from esphome.cpp_generator import get_variable, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),
-    vol.Required(CONF_OUTPUT): cv.use_variable_id(output.FloatOutput),
-    vol.Optional(CONF_GAMMA_CORRECT): cv.positive_float,
-    vol.Optional(CONF_DEFAULT_TRANSITION_LENGTH): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_EFFECTS): light.validate_effects(light.MONOCHROMATIC_EFFECTS),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for output_ in get_variable(config[CONF_OUTPUT]):
-        yield
-    rhs = App.make_monochromatic_light(config[CONF_NAME], output_)
-    light_struct = variable(config[CONF_MAKE_ID], rhs)
-    light.setup_light(light_struct.Pstate, config)
-    setup_component(light_struct.Pstate, config)
-
-
-def to_hass_config(data, config):
-    return light.core_to_hass_config(data, config, brightness=True, rgb=False, color_temp=False,
-                                     white_value=False)

esphome/components/light/neopixelbus.py

@@ -1,195 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import light
-from esphome.components.light import AddressableLight
-from esphome.components.power_supply import PowerSupplyComponent
-import esphome.config_validation as cv
-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_NAME, CONF_NUM_LEDS, CONF_PIN, CONF_POWER_SUPPLY, CONF_TYPE, CONF_VARIANT
-from esphome.core import CORE
-from esphome.cpp_generator import TemplateArguments, add, get_variable, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Application, Component, global_ns
-
-NeoPixelBusLightOutputBase = light.light_ns.class_('NeoPixelBusLightOutputBase', Component,
-                                                   AddressableLight)
-ESPNeoPixelOrder = light.light_ns.namespace('ESPNeoPixelOrder')
-
-
-def validate_type(value):
-    value = cv.string(value).upper()
-    if 'R' not in value:
-        raise vol.Invalid("Must have R in type")
-    if 'G' not in value:
-        raise vol.Invalid("Must have G in type")
-    if 'B' not in value:
-        raise vol.Invalid("Must have B in type")
-    rest = set(value) - set('RGBW')
-    if rest:
-        raise vol.Invalid("Type has invalid color: {}".format(', '.join(rest)))
-    if len(set(value)) != len(value):
-        raise vol.Invalid("Type has duplicate color!")
-    return value
-
-
-def validate_variant(value):
-    value = cv.string(value).upper()
-    if value == 'WS2813':
-        value = 'WS2812X'
-    if value == 'WS2812':
-        value = '800KBPS'
-    if value == 'LC8812':
-        value = 'SK6812'
-    return cv.one_of(*VARIANTS)(value)
-
-
-def validate_method(value):
-    if value is None:
-        if CORE.is_esp32:
-            return 'ESP32_I2S_1'
-        if CORE.is_esp8266:
-            return 'ESP8266_DMA'
-        raise NotImplementedError
-
-    if CORE.is_esp32:
-        return cv.one_of(*ESP32_METHODS, upper=True, space='_')(value)
-    if CORE.is_esp8266:
-        return cv.one_of(*ESP8266_METHODS, upper=True, space='_')(value)
-    raise NotImplementedError
-
-
-def validate_method_pin(value):
-    method = value[CONF_METHOD]
-    method_pins = {
-        'ESP8266_DMA': [3],
-        'ESP8266_UART0': [1],
-        'ESP8266_ASYNC_UART0': [1],
-        'ESP8266_UART1': [2],
-        'ESP8266_ASYNC_UART1': [2],
-        'ESP32_I2S_0': list(range(0, 32)),
-        'ESP32_I2S_1': list(range(0, 32)),
-    }
-    if CORE.is_esp8266:
-        method_pins['BIT_BANG'] = list(range(0, 16))
-    elif CORE.is_esp32:
-        method_pins['BIT_BANG'] = list(range(0, 32))
-    pins_ = method_pins[method]
-    for opt in (CONF_PIN, CONF_CLOCK_PIN, CONF_DATA_PIN):
-        if opt in value and value[opt] not in pins_:
-            raise vol.Invalid("Method {} only supports pin(s) {}".format(
-                method, ', '.join('GPIO{}'.format(x) for x in pins_)
-            ), path=[CONF_METHOD])
-    return value
-
-
-VARIANTS = {
-    'WS2812X': 'Ws2812x',
-    'SK6812': 'Sk6812',
-    '800KBPS': '800Kbps',
-    '400KBPS': '400Kbps',
-}
-
-ESP8266_METHODS = {
-    'ESP8266_DMA': 'NeoEsp8266Dma{}Method',
-    'ESP8266_UART0': 'NeoEsp8266Uart0{}Method',
-    'ESP8266_UART1': 'NeoEsp8266Uart1{}Method',
-    'ESP8266_ASYNC_UART0': 'NeoEsp8266AsyncUart0{}Method',
-    'ESP8266_ASYNC_UART1': 'NeoEsp8266AsyncUart1{}Method',
-    'BIT_BANG': 'NeoEsp8266BitBang{}Method',
-}
-ESP32_METHODS = {
-    'ESP32_I2S_0': 'NeoEsp32I2s0{}Method',
-    'ESP32_I2S_1': 'NeoEsp32I2s1{}Method',
-    'BIT_BANG': 'NeoEsp32BitBang{}Method',
-}
-
-
-def format_method(config):
-    variant = VARIANTS[config[CONF_VARIANT]]
-    method = config[CONF_METHOD]
-    if CORE.is_esp8266:
-        return ESP8266_METHODS[method].format(variant)
-    if CORE.is_esp32:
-        return ESP32_METHODS[method].format(variant)
-    raise NotImplementedError
-
-
-def validate(config):
-    if CONF_PIN in config:
-        if CONF_CLOCK_PIN in config or CONF_DATA_PIN in config:
-            raise vol.Invalid("Cannot specify both 'pin' and 'clock_pin'+'data_pin'")
-        return config
-    if CONF_CLOCK_PIN in config:
-        if CONF_DATA_PIN not in config:
-            raise vol.Invalid("If you give clock_pin, you must also specify data_pin")
-        return config
-    raise vol.Invalid("Must specify at least one of 'pin' or 'clock_pin'+'data_pin'")
-
-
-MakeNeoPixelBusLight = Application.struct('MakeNeoPixelBusLight')
-
-PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(light.AddressableLightState),
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(MakeNeoPixelBusLight),
-
-    vol.Optional(CONF_TYPE, default='GRB'): validate_type,
-    vol.Optional(CONF_VARIANT, default='800KBPS'): validate_variant,
-    vol.Optional(CONF_METHOD, default=None): validate_method,
-    vol.Optional(CONF_PIN): pins.output_pin,
-    vol.Optional(CONF_CLOCK_PIN): pins.output_pin,
-    vol.Optional(CONF_DATA_PIN): pins.output_pin,
-
-    vol.Required(CONF_NUM_LEDS): cv.positive_not_null_int,
-
-    vol.Optional(CONF_GAMMA_CORRECT): cv.positive_float,
-    vol.Optional(CONF_COLOR_CORRECT): vol.All([cv.percentage], vol.Length(min=3, max=4)),
-    vol.Optional(CONF_DEFAULT_TRANSITION_LENGTH): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_POWER_SUPPLY): cv.use_variable_id(PowerSupplyComponent),
-    vol.Optional(CONF_EFFECTS): light.validate_effects(light.ADDRESSABLE_EFFECTS),
-}).extend(cv.COMPONENT_SCHEMA.schema), validate, validate_method_pin)
-
-
-def to_code(config):
-    type_ = config[CONF_TYPE]
-    has_white = 'W' in type_
-    if has_white:
-        func = App.make_neo_pixel_bus_rgbw_light
-        color_feat = global_ns.NeoRgbwFeature
-    else:
-        func = App.make_neo_pixel_bus_rgb_light
-        color_feat = global_ns.NeoRgbFeature
-
-    template = TemplateArguments(getattr(global_ns, format_method(config)), color_feat)
-    rhs = func(template, config[CONF_NAME])
-    make = variable(config[CONF_MAKE_ID], rhs, type=MakeNeoPixelBusLight.template(template))
-    output = make.Poutput
-
-    if CONF_PIN in config:
-        add(output.add_leds(config[CONF_NUM_LEDS], config[CONF_PIN]))
-    else:
-        add(output.add_leds(config[CONF_NUM_LEDS], config[CONF_CLOCK_PIN], config[CONF_DATA_PIN]))
-
-    add(output.set_pixel_order(getattr(ESPNeoPixelOrder, type_)))
-
-    if CONF_POWER_SUPPLY in config:
-        for power_supply in get_variable(config[CONF_POWER_SUPPLY]):
-            yield
-        add(output.set_power_supply(power_supply))
-
-    if CONF_COLOR_CORRECT in config:
-        add(output.set_correction(*config[CONF_COLOR_CORRECT]))
-
-    light.setup_light(make.Pstate, config)
-    setup_component(output, config)
-
-
-REQUIRED_BUILD_FLAGS = '-DUSE_NEO_PIXEL_BUS_LIGHT'
-
-LIB_DEPS = 'NeoPixelBus@2.4.1'
-
-
-def to_hass_config(data, config):
-    return light.core_to_hass_config(data, config, brightness=True, rgb=True, color_temp=False,
-                                     white_value='W' in config[CONF_TYPE])

esphome/components/light/partition.py

@@ -1,52 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import light
-from esphome.components.light import AddressableLight
-import esphome.config_validation as cv
-from esphome.const import CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_FROM, CONF_ID, \
-    CONF_MAKE_ID, CONF_NAME, CONF_SEGMENTS, CONF_TO
-from esphome.cpp_generator import get_variable, variable
-from esphome.cpp_types import App, Application
-
-AddressableSegment = light.light_ns.class_('AddressableSegment')
-PartitionLightOutput = light.light_ns.class_('PartitionLightOutput', AddressableLight)
-MakePartitionLight = Application.struct('MakePartitionLight')
-
-
-def validate_from_to(value):
-    if value[CONF_FROM] > value[CONF_TO]:
-        raise vol.Invalid(u"From ({}) must not be larger than to ({})"
-                          u"".format(value[CONF_FROM], value[CONF_TO]))
-    return value
-
-
-PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(light.AddressableLightState),
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(MakePartitionLight),
-
-    vol.Required(CONF_SEGMENTS): vol.All(cv.ensure_list({
-        vol.Required(CONF_ID): cv.use_variable_id(light.AddressableLightState),
-        vol.Required(CONF_FROM): cv.positive_int,
-        vol.Required(CONF_TO): cv.positive_int,
-    }, validate_from_to), vol.Length(min=1)),
-
-    vol.Optional(CONF_DEFAULT_TRANSITION_LENGTH): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_EFFECTS): light.validate_effects(light.ADDRESSABLE_EFFECTS),
-}))
-
-
-def to_code(config):
-    segments = []
-    for conf in config[CONF_SEGMENTS]:
-        for var in get_variable(conf[CONF_ID]):
-            yield
-        segments.append(AddressableSegment(var, conf[CONF_FROM],
-                                           conf[CONF_TO] - conf[CONF_FROM] + 1))
-
-    rhs = App.make_partition_light(config[CONF_NAME], segments)
-    make = variable(config[CONF_MAKE_ID], rhs)
-    light.setup_light(make.Pstate, config)
-
-
-def to_hass_config(data, config):
-    return light.core_to_hass_config(data, config, brightness=True, rgb=True, color_temp=False)

esphome/components/light/rgb.py

@@ -1,37 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import light, output
-import esphome.config_validation as cv
-from esphome.const import CONF_BLUE, CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, \
-    CONF_GAMMA_CORRECT, CONF_GREEN, CONF_MAKE_ID, CONF_NAME, CONF_RED
-from esphome.cpp_generator import get_variable, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),
-    vol.Required(CONF_RED): cv.use_variable_id(output.FloatOutput),
-    vol.Required(CONF_GREEN): cv.use_variable_id(output.FloatOutput),
-    vol.Required(CONF_BLUE): cv.use_variable_id(output.FloatOutput),
-    vol.Optional(CONF_GAMMA_CORRECT): cv.positive_float,
-    vol.Optional(CONF_DEFAULT_TRANSITION_LENGTH): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_EFFECTS): light.validate_effects(light.RGB_EFFECTS),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for red in get_variable(config[CONF_RED]):
-        yield
-    for green in get_variable(config[CONF_GREEN]):
-        yield
-    for blue in get_variable(config[CONF_BLUE]):
-        yield
-    rhs = App.make_rgb_light(config[CONF_NAME], red, green, blue)
-    light_struct = variable(config[CONF_MAKE_ID], rhs)
-    light.setup_light(light_struct.Pstate, config)
-    setup_component(light_struct.Pstate, config)
-
-
-def to_hass_config(data, config):
-    return light.core_to_hass_config(data, config, brightness=True, rgb=True, color_temp=False,
-                                     white_value=False)

esphome/components/light/rgbw.py

@@ -1,40 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import light, output
-import esphome.config_validation as cv
-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
-from esphome.cpp_generator import get_variable, variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-PLATFORM_SCHEMA = cv.nameable(light.LIGHT_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(CONF_MAKE_ID): cv.declare_variable_id(light.MakeLight),
-    vol.Required(CONF_RED): cv.use_variable_id(output.FloatOutput),
-    vol.Required(CONF_GREEN): cv.use_variable_id(output.FloatOutput),
-    vol.Required(CONF_BLUE): cv.use_variable_id(output.FloatOutput),
-    vol.Required(CONF_WHITE): cv.use_variable_id(output.FloatOutput),
-    vol.Optional(CONF_GAMMA_CORRECT): cv.positive_float,
-    vol.Optional(CONF_DEFAULT_TRANSITION_LENGTH): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_EFFECTS): light.validate_effects(light.RGB_EFFECTS),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for red in get_variable(config[CONF_RED]):
-        yield
-    for green in get_variable(config[CONF_GREEN]):
-        yield
-    for blue in get_variable(config[CONF_BLUE]):
-        yield
-    for white in get_variable(config[CONF_WHITE]):
-        yield
-    rhs = App.make_rgbw_light(config[CONF_NAME], red, green, blue, white)
-    light_struct = variable(config[CONF_MAKE_ID], rhs)
-    light.setup_light(light_struct.Pstate, config)
-    setup_component(light_struct.Pstate, config)
-
-
-def to_hass_config(data, config):
-    return light.core_to_hass_config(data, config, brightness=True, rgb=True, color_temp=False,
-                                     white_value=True)

esphome/components/logger.py

@@ -1,184 +0,0 @@
-import re
-
-import voluptuous as vol
-
-from esphome.automation import ACTION_REGISTRY, LambdaAction
-import esphome.config_validation as cv
-from esphome.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_HARDWARE_UART, CONF_ID, \
-    CONF_LEVEL, CONF_LOGS, CONF_TAG, CONF_TX_BUFFER_SIZE
-from esphome.core import CORE, EsphomeError, Lambda
-from esphome.cpp_generator import Pvariable, RawExpression, add, process_lambda, statement
-from esphome.cpp_types import App, Component, esphome_ns, global_ns, void
-from esphome.py_compat import text_type
-
-LOG_LEVELS = {
-    'NONE': global_ns.ESPHOME_LOG_LEVEL_NONE,
-    'ERROR': global_ns.ESPHOME_LOG_LEVEL_ERROR,
-    'WARN': global_ns.ESPHOME_LOG_LEVEL_WARN,
-    'INFO': global_ns.ESPHOME_LOG_LEVEL_INFO,
-    'DEBUG': global_ns.ESPHOME_LOG_LEVEL_DEBUG,
-    'VERBOSE': global_ns.ESPHOME_LOG_LEVEL_VERBOSE,
-    'VERY_VERBOSE': global_ns.ESPHOME_LOG_LEVEL_VERY_VERBOSE,
-}
-
-LOG_LEVEL_TO_ESP_LOG = {
-    'ERROR': global_ns.ESP_LOGE,
-    'WARN': global_ns.ESP_LOGW,
-    'INFO': global_ns.ESP_LOGI,
-    'DEBUG': global_ns.ESP_LOGD,
-    'VERBOSE': global_ns.ESP_LOGV,
-    'VERY_VERBOSE': global_ns.ESP_LOGVV,
-}
-
-LOG_LEVEL_SEVERITY = ['NONE', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'VERBOSE', 'VERY_VERBOSE']
-
-UART_SELECTION_ESP32 = ['UART0', 'UART1', 'UART2']
-
-UART_SELECTION_ESP8266 = ['UART0', 'UART0_SWAP', 'UART1']
-
-HARDWARE_UART_TO_UART_SELECTION = {
-    'UART0': global_ns.UART_SELECTION_UART0,
-    'UART0_SWAP': global_ns.UART_SELECTION_UART0_SWAP,
-    'UART1': global_ns.UART_SELECTION_UART1,
-    'UART2': global_ns.UART_SELECTION_UART2,
-}
-
-HARDWARE_UART_TO_SERIAL = {
-    'UART0': 'Serial',
-    'UART0_SWAP': 'Serial',
-    'UART1': 'Serial1',
-    'UART2': 'Serial2',
-}
-
-# pylint: disable=invalid-name
-is_log_level = cv.one_of(*LOG_LEVELS, upper=True)
-
-
-def uart_selection(value):
-    if CORE.is_esp32:
-        return cv.one_of(*UART_SELECTION_ESP32, upper=True)(value)
-    if CORE.is_esp8266:
-        return cv.one_of(*UART_SELECTION_ESP8266, upper=True)(value)
-    raise NotImplementedError
-
-
-def validate_local_no_higher_than_global(value):
-    global_level = value.get(CONF_LEVEL, 'DEBUG')
-    for tag, level in value.get(CONF_LOGS, {}).items():
-        if LOG_LEVEL_SEVERITY.index(level) > LOG_LEVEL_SEVERITY.index(global_level):
-            raise EsphomeError(u"The local log level {} for {} must be less severe than the "
-                               u"global log level {}.".format(level, tag, global_level))
-    return value
-
-
-LogComponent = esphome_ns.class_('LogComponent', Component)
-
-CONFIG_SCHEMA = vol.All(cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(LogComponent),
-    vol.Optional(CONF_BAUD_RATE, default=115200): cv.positive_int,
-    vol.Optional(CONF_TX_BUFFER_SIZE, default=512): cv.validate_bytes,
-    vol.Optional(CONF_HARDWARE_UART, default='UART0'): uart_selection,
-    vol.Optional(CONF_LEVEL): is_log_level,
-    vol.Optional(CONF_LOGS): cv.Schema({
-        cv.string: is_log_level,
-    })
-}), validate_local_no_higher_than_global)
-
-
-def to_code(config):
-    rhs = App.init_log(config.get(CONF_BAUD_RATE),
-                       config.get(CONF_TX_BUFFER_SIZE),
-                       HARDWARE_UART_TO_UART_SELECTION[config.get(CONF_HARDWARE_UART)])
-    log = Pvariable(config[CONF_ID], rhs)
-    if CONF_LEVEL in config:
-        add(log.set_global_log_level(LOG_LEVELS[config[CONF_LEVEL]]))
-    for tag, level in config.get(CONF_LOGS, {}).items():
-        add(log.set_log_level(tag, LOG_LEVELS[level]))
-
-
-def required_build_flags(config):
-    flags = []
-    if CONF_LEVEL in config:
-        flags.append(u'-DESPHOME_LOG_LEVEL={}'.format(str(LOG_LEVELS[config[CONF_LEVEL]])))
-        this_severity = LOG_LEVEL_SEVERITY.index(config[CONF_LEVEL])
-        verbose_severity = LOG_LEVEL_SEVERITY.index('VERBOSE')
-        very_verbose_severity = LOG_LEVEL_SEVERITY.index('VERY_VERBOSE')
-        is_at_least_verbose = this_severity >= verbose_severity
-        is_at_least_very_verbose = this_severity >= very_verbose_severity
-        has_serial_logging = config.get(CONF_BAUD_RATE) != 0
-        if CORE.is_esp8266 and has_serial_logging and is_at_least_verbose:
-            debug_serial_port = HARDWARE_UART_TO_SERIAL[config.get(CONF_HARDWARE_UART)]
-            flags.append(u"-DDEBUG_ESP_PORT={}".format(debug_serial_port))
-            flags.append(u"-DLWIP_DEBUG")
-            DEBUG_COMPONENTS = {
-                'HTTP_CLIENT',
-                'HTTP_SERVER',
-                'HTTP_UPDATE',
-                'OTA',
-                'SSL',
-                'TLS_MEM',
-                'UPDATER',
-                'WIFI',
-            }
-            for comp in DEBUG_COMPONENTS:
-                flags.append(u"-DDEBUG_ESP_{}".format(comp))
-        if CORE.is_esp32 and is_at_least_verbose:
-            flags.append('-DCORE_DEBUG_LEVEL=5')
-        if CORE.is_esp32 and is_at_least_very_verbose:
-            flags.append('-DENABLE_I2C_DEBUG_BUFFER')
-
-    return flags
-
-
-def maybe_simple_message(schema):
-    def validator(value):
-        if isinstance(value, dict):
-            return cv.Schema(schema)(value)
-        return cv.Schema(schema)({CONF_FORMAT: value})
-
-    return validator
-
-
-def validate_printf(value):
-    # https://stackoverflow.com/questions/30011379/how-can-i-parse-a-c-format-string-in-python
-    # pylint: disable=anomalous-backslash-in-string
-    cfmt = u"""\
-    (                                  # start of capture group 1
-    %                                  # literal "%"
-    (?:                                # first option
-    (?:[-+0 #]{0,5})                   # optional flags
-    (?:\d+|\*)?                        # width
-    (?:\.(?:\d+|\*))?                  # precision
-    (?:h|l|ll|w|I|I32|I64)?            # size
-    [cCdiouxXeEfgGaAnpsSZ]             # type
-    ) |                                # OR
-    %%)                                # literal "%%"
-    """  # noqa
-    matches = re.findall(cfmt, value[CONF_FORMAT], flags=re.X)
-    if len(matches) != len(value[CONF_ARGS]):
-        raise vol.Invalid(u"Found {} printf-patterns ({}), but {} args were given!"
-                          u"".format(len(matches), u', '.join(matches), len(value[CONF_ARGS])))
-    return value
-
-
-CONF_LOGGER_LOG = 'logger.log'
-LOGGER_LOG_ACTION_SCHEMA = vol.All(maybe_simple_message({
-    vol.Required(CONF_FORMAT): cv.string,
-    vol.Optional(CONF_ARGS, default=list): cv.ensure_list(cv.lambda_),
-    vol.Optional(CONF_LEVEL, default="DEBUG"): cv.one_of(*LOG_LEVEL_TO_ESP_LOG, upper=True),
-    vol.Optional(CONF_TAG, default="main"): cv.string,
-}), validate_printf)
-
-
-@ACTION_REGISTRY.register(CONF_LOGGER_LOG, LOGGER_LOG_ACTION_SCHEMA)
-def logger_log_action_to_code(config, action_id, template_arg, args):
-    esp_log = LOG_LEVEL_TO_ESP_LOG[config[CONF_LEVEL]]
-    args_ = [RawExpression(text_type(x)) for x in config[CONF_ARGS]]
-
-    text = text_type(statement(esp_log(config[CONF_TAG], config[CONF_FORMAT], *args_)))
-
-    for lambda_ in process_lambda(Lambda(text), args, return_type=void):
-        yield None
-    rhs = LambdaAction.new(template_arg, lambda_)
-    type = LambdaAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)

esphome/components/mcp23017.py

@@ -1,35 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_ID
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, GPIOInputPin, GPIOOutputPin, io_ns, esphome_ns
-
-DEPENDENCIES = ['i2c']
-MULTI_CONF = True
-
-MCP23017GPIOMode = esphome_ns.enum('MCP23017GPIOMode')
-MCP23017_GPIO_MODES = {
-    'INPUT': MCP23017GPIOMode.MCP23017_INPUT,
-    'INPUT_PULLUP': MCP23017GPIOMode.MCP23017_INPUT_PULLUP,
-    'OUTPUT': MCP23017GPIOMode.MCP23017_OUTPUT,
-}
-
-MCP23017GPIOInputPin = io_ns.class_('MCP23017GPIOInputPin', GPIOInputPin)
-MCP23017GPIOOutputPin = io_ns.class_('MCP23017GPIOOutputPin', GPIOOutputPin)
-
-CONFIG_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.declare_variable_id(pins.MCP23017),
-    vol.Optional(CONF_ADDRESS, default=0x20): cv.i2c_address,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_mcp23017_component(config[CONF_ADDRESS])
-    var = Pvariable(config[CONF_ID], rhs)
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_MCP23017'

esphome/components/mpr121.py

@@ -1,29 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, binary_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_ID
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-DEPENDENCIES = ['i2c']
-MULTI_CONF = True
-
-CONF_MPR121_ID = 'mpr121_id'
-MPR121Component = binary_sensor.binary_sensor_ns.class_('MPR121Component', Component, i2c.I2CDevice)
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(MPR121Component),
-    vol.Optional(CONF_ADDRESS): cv.i2c_address
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_mpr121(config.get(CONF_ADDRESS))
-    var = Pvariable(config[CONF_ID], rhs)
-
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_MPR121'

esphome/components/mqtt.py

@@ -1,360 +0,0 @@
-from collections import OrderedDict
-import re
-
-import voluptuous as vol
-
-from esphome import automation
-from esphome.automation import ACTION_REGISTRY, CONDITION_REGISTRY, Condition
-from esphome.components import logger
-import esphome.config_validation as cv
-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_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_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_TOPIC_PREFIX, CONF_TRIGGER_ID, CONF_USERNAME, CONF_WILL_MESSAGE
-from esphome.core import EsphomeError
-from esphome.cpp_generator import Pvariable, RawExpression, StructInitializer, TemplateArguments, \
-    add, get_variable, process_lambda, templatable
-from esphome.cpp_types import Action, App, Component, JsonObjectConstRef, JsonObjectRef, \
-    Trigger, bool_, esphome_ns, optional, std_string, uint8, void
-
-
-def validate_message_just_topic(value):
-    value = cv.publish_topic(value)
-    return MQTT_MESSAGE_BASE({CONF_TOPIC: value})
-
-
-MQTT_MESSAGE_BASE = cv.Schema({
-    vol.Required(CONF_TOPIC): cv.publish_topic,
-    vol.Optional(CONF_QOS, default=0): cv.mqtt_qos,
-    vol.Optional(CONF_RETAIN, default=True): cv.boolean,
-})
-
-MQTT_MESSAGE_TEMPLATE_SCHEMA = vol.Any(None, MQTT_MESSAGE_BASE, validate_message_just_topic)
-
-MQTT_MESSAGE_SCHEMA = vol.Any(None, MQTT_MESSAGE_BASE.extend({
-    vol.Required(CONF_PAYLOAD): cv.mqtt_payload,
-}))
-
-mqtt_ns = esphome_ns.namespace('mqtt')
-MQTTMessage = mqtt_ns.struct('MQTTMessage')
-MQTTClientComponent = mqtt_ns.class_('MQTTClientComponent', Component)
-MQTTPublishAction = mqtt_ns.class_('MQTTPublishAction', Action)
-MQTTPublishJsonAction = mqtt_ns.class_('MQTTPublishJsonAction', Action)
-MQTTMessageTrigger = mqtt_ns.class_('MQTTMessageTrigger', Trigger.template(std_string))
-MQTTJsonMessageTrigger = mqtt_ns.class_('MQTTJsonMessageTrigger',
-                                        Trigger.template(JsonObjectConstRef))
-MQTTComponent = mqtt_ns.class_('MQTTComponent', Component)
-MQTTConnectedCondition = mqtt_ns.class_('MQTTConnectedCondition', Condition)
-
-
-def validate_config(value):
-    if CONF_PORT not in value:
-        parts = value[CONF_BROKER].split(u':')
-        if len(parts) == 2:
-            value[CONF_BROKER] = parts[0]
-            value[CONF_PORT] = cv.port(parts[1])
-        else:
-            value[CONF_PORT] = 1883
-    return value
-
-
-def validate_fingerprint(value):
-    value = cv.string(value)
-    if re.match(r'^[0-9a-f]{40}$', value) is None:
-        raise vol.Invalid(u"fingerprint must be valid SHA1 hash")
-    return value
-
-
-CONFIG_SCHEMA = vol.All(cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(MQTTClientComponent),
-    vol.Required(CONF_BROKER): cv.string_strict,
-    vol.Optional(CONF_PORT): cv.port,
-    vol.Optional(CONF_USERNAME, default=''): cv.string,
-    vol.Optional(CONF_PASSWORD, default=''): cv.string,
-    vol.Optional(CONF_CLIENT_ID): vol.All(cv.string, vol.Length(max=23)),
-    vol.Optional(CONF_DISCOVERY): vol.Any(cv.boolean, cv.one_of("CLEAN", upper=True)),
-    vol.Optional(CONF_DISCOVERY_RETAIN): cv.boolean,
-    vol.Optional(CONF_DISCOVERY_PREFIX): cv.publish_topic,
-    vol.Optional(CONF_BIRTH_MESSAGE): MQTT_MESSAGE_SCHEMA,
-    vol.Optional(CONF_WILL_MESSAGE): MQTT_MESSAGE_SCHEMA,
-    vol.Optional(CONF_SHUTDOWN_MESSAGE): MQTT_MESSAGE_SCHEMA,
-    vol.Optional(CONF_TOPIC_PREFIX): cv.publish_topic,
-    vol.Optional(CONF_LOG_TOPIC): vol.Any(None, MQTT_MESSAGE_BASE.extend({
-        vol.Optional(CONF_LEVEL): logger.is_log_level,
-    }), validate_message_just_topic),
-    vol.Optional(CONF_SSL_FINGERPRINTS): vol.All(cv.only_on_esp8266,
-                                                 cv.ensure_list(validate_fingerprint)),
-    vol.Optional(CONF_KEEPALIVE): cv.positive_time_period_seconds,
-    vol.Optional(CONF_REBOOT_TIMEOUT): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_ON_MESSAGE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(MQTTMessageTrigger),
-        vol.Required(CONF_TOPIC): cv.subscribe_topic,
-        vol.Optional(CONF_QOS): cv.mqtt_qos,
-        vol.Optional(CONF_PAYLOAD): cv.string_strict,
-    }),
-    vol.Optional(CONF_ON_JSON_MESSAGE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(MQTTJsonMessageTrigger),
-        vol.Required(CONF_TOPIC): cv.subscribe_topic,
-        vol.Optional(CONF_QOS, default=0): cv.mqtt_qos,
-    }),
-}), validate_config)
-
-
-def exp_mqtt_message(config):
-    if config is None:
-        return optional(TemplateArguments(MQTTMessage))
-    exp = StructInitializer(
-        MQTTMessage,
-        ('topic', config[CONF_TOPIC]),
-        ('payload', config.get(CONF_PAYLOAD, "")),
-        ('qos', config[CONF_QOS]),
-        ('retain', config[CONF_RETAIN])
-    )
-    return exp
-
-
-def to_code(config):
-    rhs = App.init_mqtt(config[CONF_BROKER], config[CONF_PORT],
-                        config[CONF_USERNAME], config[CONF_PASSWORD])
-    mqtt = Pvariable(config[CONF_ID], rhs)
-
-    discovery = config.get(CONF_DISCOVERY, True)
-    discovery_retain = config.get(CONF_DISCOVERY_RETAIN, True)
-    discovery_prefix = config.get(CONF_DISCOVERY_PREFIX, 'homeassistant')
-
-    if not discovery:
-        add(mqtt.disable_discovery())
-    elif discovery == "CLEAN":
-        add(mqtt.set_discovery_info(discovery_prefix, discovery_retain, True))
-    elif CONF_DISCOVERY_RETAIN in config or CONF_DISCOVERY_PREFIX in config:
-        add(mqtt.set_discovery_info(discovery_prefix, discovery_retain))
-
-    if CONF_TOPIC_PREFIX in config:
-        add(mqtt.set_topic_prefix(config[CONF_TOPIC_PREFIX]))
-
-    if CONF_BIRTH_MESSAGE in config:
-        birth_message = config[CONF_BIRTH_MESSAGE]
-        if not birth_message:
-            add(mqtt.disable_birth_message())
-        else:
-            add(mqtt.set_birth_message(exp_mqtt_message(birth_message)))
-    if CONF_WILL_MESSAGE in config:
-        will_message = config[CONF_WILL_MESSAGE]
-        if not will_message:
-            add(mqtt.disable_last_will())
-        else:
-            add(mqtt.set_last_will(exp_mqtt_message(will_message)))
-    if CONF_SHUTDOWN_MESSAGE in config:
-        shutdown_message = config[CONF_SHUTDOWN_MESSAGE]
-        if not shutdown_message:
-            add(mqtt.disable_shutdown_message())
-        else:
-            add(mqtt.set_shutdown_message(exp_mqtt_message(shutdown_message)))
-
-    if CONF_CLIENT_ID in config:
-        add(mqtt.set_client_id(config[CONF_CLIENT_ID]))
-
-    if CONF_LOG_TOPIC in config:
-        log_topic = config[CONF_LOG_TOPIC]
-        if not log_topic:
-            add(mqtt.disable_log_message())
-        else:
-            add(mqtt.set_log_message_template(exp_mqtt_message(log_topic)))
-
-            if CONF_LEVEL in log_topic:
-                add(mqtt.set_log_level(logger.LOG_LEVELS[log_topic[CONF_LEVEL]]))
-
-    if CONF_SSL_FINGERPRINTS in config:
-        for fingerprint in config[CONF_SSL_FINGERPRINTS]:
-            arr = [RawExpression("0x{}".format(fingerprint[i:i + 2])) for i in range(0, 40, 2)]
-            add(mqtt.add_ssl_fingerprint(arr))
-
-    if CONF_KEEPALIVE in config:
-        add(mqtt.set_keep_alive(config[CONF_KEEPALIVE]))
-
-    if CONF_REBOOT_TIMEOUT in config:
-        add(mqtt.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
-
-    for conf in config.get(CONF_ON_MESSAGE, []):
-        rhs = App.register_component(mqtt.make_message_trigger(conf[CONF_TOPIC]))
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        if CONF_QOS in conf:
-            add(trigger.set_qos(conf[CONF_QOS]))
-        if CONF_PAYLOAD in conf:
-            add(trigger.set_payload(conf[CONF_PAYLOAD]))
-        automation.build_automations(trigger, [(std_string, 'x')], conf)
-
-    for conf in config.get(CONF_ON_JSON_MESSAGE, []):
-        rhs = mqtt.make_json_message_trigger(conf[CONF_TOPIC], conf[CONF_QOS])
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [(JsonObjectConstRef, 'x')], conf)
-
-
-CONF_MQTT_PUBLISH = 'mqtt.publish'
-MQTT_PUBLISH_ACTION_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.use_variable_id(MQTTClientComponent),
-    vol.Required(CONF_TOPIC): cv.templatable(cv.publish_topic),
-    vol.Required(CONF_PAYLOAD): cv.templatable(cv.mqtt_payload),
-    vol.Optional(CONF_QOS): cv.templatable(cv.mqtt_qos),
-    vol.Optional(CONF_RETAIN): cv.templatable(cv.boolean),
-})
-
-
-@ACTION_REGISTRY.register(CONF_MQTT_PUBLISH, MQTT_PUBLISH_ACTION_SCHEMA)
-def mqtt_publish_action_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_publish_action(template_arg)
-    type = MQTTPublishAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    for template_ in templatable(config[CONF_TOPIC], args, std_string):
-        yield None
-    add(action.set_topic(template_))
-
-    for template_ in templatable(config[CONF_PAYLOAD], args, std_string):
-        yield None
-    add(action.set_payload(template_))
-    if CONF_QOS in config:
-        for template_ in templatable(config[CONF_QOS], args, uint8):
-            yield
-        add(action.set_qos(template_))
-    if CONF_RETAIN in config:
-        for template_ in templatable(config[CONF_RETAIN], args, bool_):
-            yield None
-        add(action.set_retain(template_))
-    yield action
-
-
-CONF_MQTT_PUBLISH_JSON = 'mqtt.publish_json'
-MQTT_PUBLISH_JSON_ACTION_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.use_variable_id(MQTTClientComponent),
-    vol.Required(CONF_TOPIC): cv.templatable(cv.publish_topic),
-    vol.Required(CONF_PAYLOAD): cv.lambda_,
-    vol.Optional(CONF_QOS): cv.mqtt_qos,
-    vol.Optional(CONF_RETAIN): cv.boolean,
-})
-
-
-@ACTION_REGISTRY.register(CONF_MQTT_PUBLISH_JSON, MQTT_PUBLISH_JSON_ACTION_SCHEMA)
-def mqtt_publish_json_action_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_publish_json_action(template_arg)
-    type = MQTTPublishJsonAction.template(template_arg)
-    action = Pvariable(action_id, rhs, type=type)
-    for template_ in templatable(config[CONF_TOPIC], args, std_string):
-        yield None
-    add(action.set_topic(template_))
-
-    args_ = args + [(JsonObjectRef, 'root')]
-    for lambda_ in process_lambda(config[CONF_PAYLOAD], args_, return_type=void):
-        yield None
-    add(action.set_payload(lambda_))
-    if CONF_QOS in config:
-        add(action.set_qos(config[CONF_QOS]))
-    if CONF_RETAIN in config:
-        add(action.set_retain(config[CONF_RETAIN]))
-    yield action
-
-
-def required_build_flags(config):
-    if CONF_SSL_FINGERPRINTS in config:
-        return '-DASYNC_TCP_SSL_ENABLED=1'
-    return None
-
-
-def get_default_topic_for(data, component_type, name, suffix):
-    whitelist = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_'
-    sanitized_name = ''.join(x for x in name.lower().replace(' ', '_') if x in whitelist)
-    return '{}/{}/{}/{}'.format(data.topic_prefix, component_type,
-                                sanitized_name, suffix)
-
-
-def build_hass_config(data, component_type, config, include_state=True, include_command=True):
-    if config.get(CONF_INTERNAL, False):
-        return None
-    ret = OrderedDict()
-    ret['platform'] = 'mqtt'
-    ret['name'] = config[CONF_NAME]
-    if include_state:
-        default = get_default_topic_for(data, component_type, config[CONF_NAME], 'state')
-        ret['state_topic'] = config.get(CONF_STATE_TOPIC, default)
-    if include_command:
-        default = get_default_topic_for(data, component_type, config[CONF_NAME], 'command')
-        ret['command_topic'] = config.get(CONF_STATE_TOPIC, default)
-    avail = config.get(CONF_AVAILABILITY, data.availability)
-    if avail:
-        ret['availability_topic'] = avail[CONF_TOPIC]
-        payload_available = avail[CONF_PAYLOAD_AVAILABLE]
-        if payload_available != 'online':
-            ret['payload_available'] = payload_available
-        payload_not_available = avail[CONF_PAYLOAD_NOT_AVAILABLE]
-        if payload_not_available != 'offline':
-            ret['payload_not_available'] = payload_not_available
-    return ret
-
-
-class GenerateHassConfigData(object):
-    def __init__(self, config):
-        if 'mqtt' not in config:
-            raise EsphomeError("Cannot generate Home Assistant MQTT config if MQTT is not "
-                               "used!")
-        mqtt = config[CONF_MQTT]
-        self.topic_prefix = mqtt.get(CONF_TOPIC_PREFIX, config[CONF_ESPHOME][CONF_NAME])
-        birth_message = mqtt.get(CONF_BIRTH_MESSAGE)
-        if CONF_BIRTH_MESSAGE not in mqtt:
-            birth_message = {
-                CONF_TOPIC: self.topic_prefix + '/status',
-                CONF_PAYLOAD: 'online',
-            }
-        will_message = mqtt.get(CONF_WILL_MESSAGE)
-        if CONF_WILL_MESSAGE not in mqtt:
-            will_message = {
-                CONF_TOPIC: self.topic_prefix + '/status',
-                CONF_PAYLOAD: 'offline'
-            }
-        if not birth_message or not will_message:
-            self.availability = None
-        elif birth_message[CONF_TOPIC] != will_message[CONF_TOPIC]:
-            self.availability = None
-        else:
-            self.availability = {
-                CONF_TOPIC: birth_message[CONF_TOPIC],
-                CONF_PAYLOAD_AVAILABLE: birth_message[CONF_PAYLOAD],
-                CONF_PAYLOAD_NOT_AVAILABLE: will_message[CONF_PAYLOAD],
-            }
-
-
-def setup_mqtt_component(obj, config):
-    if CONF_RETAIN in config:
-        add(obj.set_retain(config[CONF_RETAIN]))
-    if not config.get(CONF_DISCOVERY, True):
-        add(obj.disable_discovery())
-    if CONF_STATE_TOPIC in config:
-        add(obj.set_custom_state_topic(config[CONF_STATE_TOPIC]))
-    if CONF_COMMAND_TOPIC in config:
-        add(obj.set_custom_command_topic(config[CONF_COMMAND_TOPIC]))
-    if CONF_AVAILABILITY in config:
-        availability = config[CONF_AVAILABILITY]
-        if not availability:
-            add(obj.disable_availability())
-        else:
-            add(obj.set_availability(availability[CONF_TOPIC], availability[CONF_PAYLOAD_AVAILABLE],
-                                     availability[CONF_PAYLOAD_NOT_AVAILABLE]))
-
-
-LIB_DEPS = 'AsyncMqttClient@0.8.2'
-BUILD_FLAGS = '-DUSE_MQTT'
-
-CONF_MQTT_CONNECTED = 'mqtt.connected'
-MQTT_CONNECTED_CONDITION_SCHEMA = cv.Schema({})
-
-
-@CONDITION_REGISTRY.register(CONF_MQTT_CONNECTED, MQTT_CONNECTED_CONDITION_SCHEMA)
-def mqtt_connected_to_code(config, condition_id, template_arg, args):
-    rhs = MQTTConnectedCondition.new(template_arg)
-    type = MQTTConnectedCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)

esphome/components/my9231.py

@@ -1,46 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import output
-import esphome.config_validation as cv
-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)
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, Component
-
-MY9231OutputComponent = output.output_ns.class_('MY9231OutputComponent', Component)
-MULTI_CONF = True
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(MY9231OutputComponent),
-    vol.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
-    vol.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_NUM_CHANNELS): vol.All(vol.Coerce(int),
-                                             vol.Range(3, 1020)),
-    vol.Optional(CONF_NUM_CHIPS): vol.All(vol.Coerce(int),
-                                          vol.Range(1, 255)),
-    vol.Optional(CONF_BIT_DEPTH): cv.one_of(8, 12, 14, 16, int=True),
-    vol.Optional(CONF_UPDATE_ON_BOOT): vol.Coerce(bool),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for di in gpio_output_pin_expression(config[CONF_DATA_PIN]):
-        yield
-    for dcki in gpio_output_pin_expression(config[CONF_CLOCK_PIN]):
-        yield
-    rhs = App.make_my9231_component(di, dcki)
-    my9231 = Pvariable(config[CONF_ID], rhs)
-    if CONF_NUM_CHANNELS in config:
-        add(my9231.set_num_channels(config[CONF_NUM_CHANNELS]))
-    if CONF_NUM_CHIPS in config:
-        add(my9231.set_num_chips(config[CONF_NUM_CHIPS]))
-    if CONF_BIT_DEPTH in config:
-        add(my9231.set_bit_depth(config[CONF_BIT_DEPTH]))
-    if CONF_UPDATE_ON_BOOT in config:
-        add(my9231.set_update(config[CONF_UPDATE_ON_BOOT]))
-    setup_component(my9231, config)
-
-
-BUILD_FLAGS = '-DUSE_MY9231_OUTPUT'

esphome/components/output/copy.py

@@ -1,58 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import output
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_OUTPUTS, CONF_TYPE
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import setup_component
-
-BinaryCopyOutput = output.output_ns.class_('BinaryCopyOutput', output.BinaryOutput)
-FloatCopyOutput = output.output_ns.class_('FloatCopyOutput', output.FloatOutput)
-
-BINARY_SCHEMA = output.PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_ID): cv.declare_variable_id(BinaryCopyOutput),
-    vol.Required(CONF_TYPE): 'binary',
-    vol.Required(CONF_OUTPUTS): cv.ensure_list(cv.use_variable_id(output.BinaryOutput)),
-})
-
-FLOAT_SCHEMA = output.PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_ID): cv.declare_variable_id(FloatCopyOutput),
-    vol.Required(CONF_TYPE): 'float',
-    vol.Required(CONF_OUTPUTS): cv.ensure_list(cv.use_variable_id(output.FloatOutput)),
-})
-
-
-def validate_copy_output(value):
-    if not isinstance(value, dict):
-        raise vol.Invalid("Value must be dict")
-    type = cv.string_strict(value.get(CONF_TYPE, 'float')).lower()
-    value[CONF_TYPE] = type
-    if type == 'binary':
-        return BINARY_SCHEMA(value)
-    if type == 'float':
-        return FLOAT_SCHEMA(value)
-    raise vol.Invalid("type must either be binary or float, not {}!".format(type))
-
-
-PLATFORM_SCHEMA = validate_copy_output
-
-
-def to_code(config):
-    outputs = []
-    for out in config[CONF_OUTPUTS]:
-        for var in get_variable(out):
-            yield
-        outputs.append(var)
-
-    klass = {
-        'binary': BinaryCopyOutput,
-        'float': FloatCopyOutput,
-    }[config[CONF_TYPE]]
-    rhs = klass.new(outputs)
-    gpio = Pvariable(config[CONF_ID], rhs)
-
-    output.setup_output_platform(gpio, config)
-    setup_component(gpio, config)
-
-
-BUILD_FLAGS = '-DUSE_COPY_OUTPUT'

esphome/components/output/custom.py

@@ -1,68 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import output
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE
-from esphome.cpp_generator import process_lambda, variable
-from esphome.cpp_types import std_vector
-
-CustomBinaryOutputConstructor = output.output_ns.class_('CustomBinaryOutputConstructor')
-CustomFloatOutputConstructor = output.output_ns.class_('CustomFloatOutputConstructor')
-
-BINARY_SCHEMA = output.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(CustomBinaryOutputConstructor),
-    vol.Required(CONF_LAMBDA): cv.lambda_,
-    vol.Required(CONF_TYPE): 'binary',
-    vol.Required(CONF_OUTPUTS):
-        cv.ensure_list(output.BINARY_OUTPUT_SCHEMA.extend({
-            cv.GenerateID(): cv.declare_variable_id(output.BinaryOutput),
-        })),
-})
-
-FLOAT_SCHEMA = output.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(CustomFloatOutputConstructor),
-    vol.Required(CONF_LAMBDA): cv.lambda_,
-    vol.Required(CONF_TYPE): 'float',
-    vol.Required(CONF_OUTPUTS):
-        cv.ensure_list(output.FLOAT_OUTPUT_SCHEMA.extend({
-            cv.GenerateID(): cv.declare_variable_id(output.FloatOutput),
-        })),
-})
-
-
-def validate_custom_output(value):
-    if not isinstance(value, dict):
-        raise vol.Invalid("Value must be dict")
-    if CONF_TYPE not in value:
-        raise vol.Invalid("type not specified!")
-    type = cv.string_strict(value[CONF_TYPE]).lower()
-    value[CONF_TYPE] = type
-    if type == 'binary':
-        return BINARY_SCHEMA(value)
-    if type == 'float':
-        return FLOAT_SCHEMA(value)
-    raise vol.Invalid("type must either be binary or float, not {}!".format(type))
-
-
-PLATFORM_SCHEMA = validate_custom_output
-
-
-def to_code(config):
-    type = config[CONF_TYPE]
-    if type == 'binary':
-        ret_type = output.BinaryOutputPtr
-        klass = CustomBinaryOutputConstructor
-    else:
-        ret_type = output.FloatOutputPtr
-        klass = CustomFloatOutputConstructor
-    for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                    return_type=std_vector.template(ret_type)):
-        yield
-
-    rhs = klass(template_)
-    custom = variable(config[CONF_ID], rhs)
-    for i, conf in enumerate(config[CONF_OUTPUTS]):
-        output.register_output(custom.get_output(i), conf)
-
-
-BUILD_FLAGS = '-DUSE_CUSTOM_OUTPUT'

esphome/components/output/esp8266_pwm.py

@@ -1,42 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import output
-import esphome.config_validation as cv
-from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_NUMBER, CONF_PIN, ESP_PLATFORM_ESP8266
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, Component
-
-ESP_PLATFORMS = [ESP_PLATFORM_ESP8266]
-
-
-def valid_pwm_pin(value):
-    num = value[CONF_NUMBER]
-    cv.one_of(0, 1, 2, 3, 4, 5, 9, 10, 12, 13, 14, 15, 16)(num)
-    return value
-
-
-ESP8266PWMOutput = output.output_ns.class_('ESP8266PWMOutput', output.FloatOutput, Component)
-
-PLATFORM_SCHEMA = output.FLOAT_OUTPUT_PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_ID): cv.declare_variable_id(ESP8266PWMOutput),
-    vol.Required(CONF_PIN): vol.All(pins.internal_gpio_output_pin_schema, valid_pwm_pin),
-    vol.Optional(CONF_FREQUENCY): vol.All(cv.frequency, vol.Range(min=1.0e-6)),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for pin in gpio_output_pin_expression(config[CONF_PIN]):
-        yield
-    rhs = App.make_esp8266_pwm_output(pin)
-    gpio = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_FREQUENCY in config:
-        add(gpio.set_frequency(config[CONF_FREQUENCY]))
-
-    output.setup_output_platform(gpio, config)
-    setup_component(gpio, config)
-
-
-BUILD_FLAGS = '-DUSE_ESP8266_PWM_OUTPUT'

esphome/components/output/gpio.py

@@ -1,29 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import output
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_PIN
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, Component
-
-GPIOBinaryOutputComponent = output.output_ns.class_('GPIOBinaryOutputComponent',
-                                                    output.BinaryOutput, Component)
-
-PLATFORM_SCHEMA = output.BINARY_OUTPUT_PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_ID): cv.declare_variable_id(GPIOBinaryOutputComponent),
-    vol.Required(CONF_PIN): pins.gpio_output_pin_schema,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for pin in gpio_output_pin_expression(config[CONF_PIN]):
-        yield
-    rhs = App.make_gpio_output(pin)
-    gpio = Pvariable(config[CONF_ID], rhs)
-    output.setup_output_platform(gpio, config)
-    setup_component(gpio, config)
-
-
-BUILD_FLAGS = '-DUSE_GPIO_OUTPUT'

esphome/components/output/my9231.py

@@ -1,36 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import output
-from esphome.components.my9231 import MY9231OutputComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_ID, CONF_MY9231_ID, CONF_POWER_SUPPLY
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import setup_component
-
-DEPENDENCIES = ['my9231']
-
-Channel = MY9231OutputComponent.class_('Channel', output.FloatOutput)
-
-PLATFORM_SCHEMA = output.FLOAT_OUTPUT_PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_ID): cv.declare_variable_id(Channel),
-    vol.Required(CONF_CHANNEL): vol.All(vol.Coerce(int),
-                                        vol.Range(min=0, max=65535)),
-    cv.GenerateID(CONF_MY9231_ID): cv.use_variable_id(MY9231OutputComponent),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    power_supply = None
-    if CONF_POWER_SUPPLY in config:
-        for power_supply in get_variable(config[CONF_POWER_SUPPLY]):
-            yield
-    my9231 = None
-    for my9231 in get_variable(config[CONF_MY9231_ID]):
-        yield
-    rhs = my9231.create_channel(config[CONF_CHANNEL], power_supply)
-    out = Pvariable(config[CONF_ID], rhs)
-    output.setup_output_platform(out, config, skip_power_supply=True)
-    setup_component(out, config)
-
-
-BUILD_FLAGS = '-DUSE_MY9231_OUTPUT'

esphome/components/pca9685.py

@@ -1,32 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, output
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_FREQUENCY, CONF_ID
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-DEPENDENCIES = ['i2c']
-MULTI_CONF = True
-
-PCA9685OutputComponent = output.output_ns.class_('PCA9685OutputComponent',
-                                                 Component, i2c.I2CDevice)
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(PCA9685OutputComponent),
-    vol.Required(CONF_FREQUENCY): vol.All(cv.frequency,
-                                          vol.Range(min=23.84, max=1525.88)),
-    vol.Optional(CONF_ADDRESS): cv.i2c_address,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_pca9685_component(config.get(CONF_FREQUENCY))
-    pca9685 = Pvariable(config[CONF_ID], rhs)
-    if CONF_ADDRESS in config:
-        add(pca9685.set_address(config[CONF_ADDRESS]))
-    setup_component(pca9685, config)
-
-
-BUILD_FLAGS = '-DUSE_PCA9685_OUTPUT'

esphome/components/pcf8574.py

@@ -1,36 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_PCF8575
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, GPIOInputPin, GPIOOutputPin, io_ns
-
-DEPENDENCIES = ['i2c']
-MULTI_CONF = True
-
-PCF8574GPIOMode = io_ns.enum('PCF8574GPIOMode')
-PCF8675_GPIO_MODES = {
-    'INPUT': PCF8574GPIOMode.PCF8574_INPUT,
-    'INPUT_PULLUP': PCF8574GPIOMode.PCF8574_INPUT_PULLUP,
-    'OUTPUT': PCF8574GPIOMode.PCF8574_OUTPUT,
-}
-
-PCF8574GPIOInputPin = io_ns.class_('PCF8574GPIOInputPin', GPIOInputPin)
-PCF8574GPIOOutputPin = io_ns.class_('PCF8574GPIOOutputPin', GPIOOutputPin)
-
-CONFIG_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.declare_variable_id(pins.PCF8574Component),
-    vol.Optional(CONF_ADDRESS, default=0x21): cv.i2c_address,
-    vol.Optional(CONF_PCF8575, default=False): cv.boolean,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_pcf8574_component(config[CONF_ADDRESS], config[CONF_PCF8575])
-    var = Pvariable(config[CONF_ID], rhs)
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_PCF8574'

esphome/components/pn532.py

@@ -1,46 +0,0 @@
-import voluptuous as vol
-
-from esphome import automation, pins
-from esphome.components import binary_sensor, spi
-from esphome.components.spi import SPIComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_CS_PIN, CONF_ID, CONF_ON_TAG, CONF_SPI_ID, CONF_TRIGGER_ID, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, PollingComponent, Trigger, std_string
-
-DEPENDENCIES = ['spi']
-MULTI_CONF = True
-
-PN532Component = binary_sensor.binary_sensor_ns.class_('PN532Component', PollingComponent,
-                                                       spi.SPIDevice)
-PN532Trigger = binary_sensor.binary_sensor_ns.class_('PN532Trigger', Trigger.template(std_string))
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(PN532Component),
-    cv.GenerateID(CONF_SPI_ID): cv.use_variable_id(SPIComponent),
-    vol.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-    vol.Optional(CONF_ON_TAG): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(PN532Trigger),
-    }),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for spi_ in get_variable(config[CONF_SPI_ID]):
-        yield
-    for cs in gpio_output_pin_expression(config[CONF_CS_PIN]):
-        yield
-    rhs = App.make_pn532_component(spi_, cs, config.get(CONF_UPDATE_INTERVAL))
-    pn532 = Pvariable(config[CONF_ID], rhs)
-
-    for conf_ in config.get(CONF_ON_TAG, []):
-        trigger = Pvariable(conf_[CONF_TRIGGER_ID], pn532.make_trigger())
-        automation.build_automations(trigger, [(std_string, 'x')], conf_)
-
-    setup_component(pn532, config)
-
-
-BUILD_FLAGS = '-DUSE_PN532'

esphome/components/power_supply.py

@@ -1,36 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-import esphome.config_validation as cv
-from esphome.const import CONF_ENABLE_TIME, CONF_ID, CONF_KEEP_ON_TIME, CONF_PIN
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, Component, esphome_ns
-
-PowerSupplyComponent = esphome_ns.class_('PowerSupplyComponent', Component)
-
-MULTI_CONF = True
-
-CONFIG_SCHEMA = cv.Schema({
-    vol.Required(CONF_ID): cv.declare_variable_id(PowerSupplyComponent),
-    vol.Required(CONF_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_ENABLE_TIME): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_KEEP_ON_TIME): cv.positive_time_period_milliseconds,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for pin in gpio_output_pin_expression(config[CONF_PIN]):
-        yield
-
-    rhs = App.make_power_supply(pin)
-    psu = Pvariable(config[CONF_ID], rhs)
-    if CONF_ENABLE_TIME in config:
-        add(psu.set_enable_time(config[CONF_ENABLE_TIME]))
-    if CONF_KEEP_ON_TIME in config:
-        add(psu.set_keep_on_time(config[CONF_KEEP_ON_TIME]))
-
-    setup_component(psu, config)
-
-
-BUILD_FLAGS = '-DUSE_OUTPUT'

esphome/components/rdm6300.py

@@ -1,27 +0,0 @@
-from esphome.components import binary_sensor, uart
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_UART_ID
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-DEPENDENCIES = ['uart']
-
-RDM6300Component = binary_sensor.binary_sensor_ns.class_('RDM6300Component', Component,
-                                                         uart.UARTDevice)
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(RDM6300Component),
-    cv.GenerateID(CONF_UART_ID): cv.use_variable_id(uart.UARTComponent),
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for uart_ in get_variable(config[CONF_UART_ID]):
-        yield
-    rhs = App.make_rdm6300_component(uart_)
-    var = Pvariable(config[CONF_ID], rhs)
-    setup_component(var, config)
-
-
-BUILD_FLAGS = '-DUSE_RDM6300'

esphome/components/remote_receiver.py

@@ -1,76 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-import esphome.config_validation as cv
-from esphome.const import CONF_BUFFER_SIZE, CONF_DUMP, CONF_FILTER, CONF_ID, CONF_IDLE, \
-    CONF_PIN, CONF_TOLERANCE
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
-from esphome.cpp_types import App, Component, esphome_ns
-from esphome.py_compat import string_types
-
-remote_ns = esphome_ns.namespace('remote')
-MULTI_CONF = True
-
-RemoteControlComponentBase = remote_ns.class_('RemoteControlComponentBase')
-RemoteReceiverComponent = remote_ns.class_('RemoteReceiverComponent',
-                                           RemoteControlComponentBase,
-                                           Component)
-
-RemoteReceiveDumper = remote_ns.class_('RemoteReceiveDumper')
-
-DUMPERS = {
-    'jvc': remote_ns.class_('JVCDumper', RemoteReceiveDumper),
-    'lg': remote_ns.class_('LGDumper', RemoteReceiveDumper),
-    'nec': remote_ns.class_('NECDumper', RemoteReceiveDumper),
-    'panasonic': remote_ns.class_('PanasonicDumper', RemoteReceiveDumper),
-    'raw': remote_ns.class_('RawDumper', RemoteReceiveDumper),
-    'samsung': remote_ns.class_('SamsungDumper', RemoteReceiveDumper),
-    'sony': remote_ns.class_('SonyDumper', RemoteReceiveDumper),
-    'rc_switch': remote_ns.class_('RCSwitchDumper', RemoteReceiveDumper),
-    'rc5': remote_ns.class_('RC5Dumper', RemoteReceiveDumper),
-}
-
-
-def validate_dumpers_all(value):
-    if not isinstance(value, string_types):
-        raise vol.Invalid("Not valid dumpers")
-    if value.upper() == "ALL":
-        return list(sorted(list(DUMPERS)))
-    raise vol.Invalid("Not valid dumpers")
-
-
-CONFIG_SCHEMA = cv.Schema({
-    cv.GenerateID(): cv.declare_variable_id(RemoteReceiverComponent),
-    vol.Required(CONF_PIN): vol.All(pins.internal_gpio_input_pin_schema,
-                                    pins.validate_has_interrupt),
-    vol.Optional(CONF_DUMP, default=[]):
-        vol.Any(validate_dumpers_all, cv.ensure_list(cv.one_of(*DUMPERS, lower=True))),
-    vol.Optional(CONF_TOLERANCE): vol.All(cv.percentage_int, vol.Range(min=0)),
-    vol.Optional(CONF_BUFFER_SIZE): cv.validate_bytes,
-    vol.Optional(CONF_FILTER): cv.positive_time_period_microseconds,
-    vol.Optional(CONF_IDLE): cv.positive_time_period_microseconds,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for pin in gpio_input_pin_expression(config[CONF_PIN]):
-        yield
-    rhs = App.make_remote_receiver_component(pin)
-    receiver = Pvariable(config[CONF_ID], rhs)
-
-    for dumper in config[CONF_DUMP]:
-        add(receiver.add_dumper(DUMPERS[dumper].new()))
-    if CONF_TOLERANCE in config:
-        add(receiver.set_tolerance(config[CONF_TOLERANCE]))
-    if CONF_BUFFER_SIZE in config:
-        add(receiver.set_buffer_size(config[CONF_BUFFER_SIZE]))
-    if CONF_FILTER in config:
-        add(receiver.set_filter_us(config[CONF_FILTER]))
-    if CONF_IDLE in config:
-        add(receiver.set_idle_us(config[CONF_IDLE]))
-
-    setup_component(receiver, config)
-
-
-BUILD_FLAGS = '-DUSE_REMOTE_RECEIVER'

esphome/components/script.py

@@ -1,52 +0,0 @@
-import voluptuous as vol
-
-from esphome import automation
-from esphome.automation import ACTION_REGISTRY, maybe_simple_id
-import esphome.config_validation as cv
-from esphome.const import CONF_ID
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_types import Action, Trigger, esphome_ns
-
-Script = esphome_ns.class_('Script', Trigger.template())
-ScriptExecuteAction = esphome_ns.class_('ScriptExecuteAction', Action)
-ScriptStopAction = esphome_ns.class_('ScriptStopAction', Action)
-
-CONFIG_SCHEMA = automation.validate_automation({
-    vol.Required(CONF_ID): cv.declare_variable_id(Script),
-})
-
-
-def to_code(config):
-    for conf in config:
-        trigger = Pvariable(conf[CONF_ID], Script.new())
-        automation.build_automations(trigger, [], conf)
-
-
-CONF_SCRIPT_EXECUTE = 'script.execute'
-SCRIPT_EXECUTE_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(Script),
-})
-
-
-@ACTION_REGISTRY.register(CONF_SCRIPT_EXECUTE, SCRIPT_EXECUTE_ACTION_SCHEMA)
-def script_execute_action_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_execute_action(template_arg)
-    type = ScriptExecuteAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)
-
-
-CONF_SCRIPT_STOP = 'script.stop'
-SCRIPT_STOP_ACTION_SCHEMA = maybe_simple_id({
-    vol.Required(CONF_ID): cv.use_variable_id(Script),
-})
-
-
-@ACTION_REGISTRY.register(CONF_SCRIPT_STOP, SCRIPT_STOP_ACTION_SCHEMA)
-def script_stop_action_to_code(config, action_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_stop_action(template_arg)
-    type = ScriptStopAction.template(template_arg)
-    yield Pvariable(action_id, rhs, type=type)

esphome/components/sensor/__init__.py

@@ -1,313 +0,0 @@
-import math
-
-import voluptuous as vol
-
-from esphome import automation
-from esphome.automation import CONDITION_REGISTRY
-from esphome.components import mqtt
-from esphome.components.mqtt import setup_mqtt_component
-import esphome.config_validation as cv
-from esphome.const import CONF_ABOVE, CONF_ACCURACY_DECIMALS, CONF_ALPHA, CONF_BELOW, \
-    CONF_CALIBRATE_LINEAR, CONF_DEBOUNCE, CONF_DELTA, CONF_EXPIRE_AFTER, \
-    CONF_EXPONENTIAL_MOVING_AVERAGE, CONF_FILTERS, CONF_FILTER_OUT, CONF_FROM, \
-    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_ON_VALUE_RANGE, CONF_OR, \
-    CONF_SEND_EVERY, CONF_SEND_FIRST_AT, CONF_SLIDING_WINDOW_MOVING_AVERAGE, \
-    CONF_THROTTLE, CONF_TO, CONF_TRIGGER_ID, CONF_UNIQUE, CONF_UNIT_OF_MEASUREMENT, \
-    CONF_WINDOW_SIZE
-from esphome.core import CORE
-from esphome.cpp_generator import Pvariable, add, get_variable, process_lambda, templatable
-from esphome.cpp_types import App, Component, Nameable, PollingComponent, Trigger, \
-    esphome_ns, float_, optional
-
-PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
-
-})
-
-
-def validate_recursive_filter(value):
-    return FILTERS_SCHEMA(value)
-
-
-def validate_send_first_at(value):
-    send_first_at = value.get(CONF_SEND_FIRST_AT)
-    send_every = value[CONF_SEND_EVERY]
-    if send_first_at is not None and send_first_at > send_every:
-        raise vol.Invalid("send_first_at must be smaller than or equal to send_every! {} <= {}"
-                          "".format(send_first_at, send_every))
-    return value
-
-
-FILTER_KEYS = [CONF_OFFSET, CONF_MULTIPLY, CONF_FILTER_OUT,
-               CONF_SLIDING_WINDOW_MOVING_AVERAGE, CONF_EXPONENTIAL_MOVING_AVERAGE, CONF_LAMBDA,
-               CONF_THROTTLE, CONF_DELTA, CONF_HEARTBEAT, CONF_DEBOUNCE, CONF_OR,
-               CONF_CALIBRATE_LINEAR]
-
-
-def validate_datapoint(value):
-    if isinstance(value, dict):
-        return cv.Schema({
-            vol.Required(CONF_FROM): cv.float_,
-            vol.Required(CONF_TO): cv.float_,
-        })(value)
-    value = cv.string(value)
-    if '->' not in value:
-        raise vol.Invalid("Datapoint mapping must contain '->'")
-    a, b = value.split('->', 1)
-    a, b = a.strip(), b.strip()
-    return validate_datapoint({
-        CONF_FROM: cv.float_(a),
-        CONF_TO: cv.float_(b)
-    })
-
-
-FILTERS_SCHEMA = cv.ensure_list({
-    vol.Optional(CONF_OFFSET): cv.float_,
-    vol.Optional(CONF_MULTIPLY): cv.float_,
-    vol.Optional(CONF_FILTER_OUT): cv.float_,
-    vol.Optional('filter_nan'): cv.invalid("The filter_nan filter has been removed. Please use "
-                                           "'filter_out: nan' instead"),
-    vol.Optional(CONF_SLIDING_WINDOW_MOVING_AVERAGE): vol.All(cv.Schema({
-        vol.Optional(CONF_WINDOW_SIZE, default=15): cv.positive_not_null_int,
-        vol.Optional(CONF_SEND_EVERY, default=15): cv.positive_not_null_int,
-        vol.Optional(CONF_SEND_FIRST_AT): cv.positive_not_null_int,
-    }), validate_send_first_at),
-    vol.Optional(CONF_EXPONENTIAL_MOVING_AVERAGE): cv.Schema({
-        vol.Optional(CONF_ALPHA, default=0.1): cv.positive_float,
-        vol.Optional(CONF_SEND_EVERY, default=15): cv.positive_not_null_int,
-    }),
-    vol.Optional(CONF_CALIBRATE_LINEAR): vol.All(
-        cv.ensure_list(validate_datapoint), vol.Length(min=2)),
-    vol.Optional(CONF_LAMBDA): cv.lambda_,
-    vol.Optional(CONF_THROTTLE): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_DELTA): cv.float_,
-    vol.Optional(CONF_UNIQUE): cv.invalid("The unique filter has been removed in 1.12, please "
-                                          "replace with a delta filter with small value."),
-    vol.Optional(CONF_HEARTBEAT): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_DEBOUNCE): cv.positive_time_period_milliseconds,
-    vol.Optional(CONF_OR): validate_recursive_filter,
-}, cv.has_exactly_one_key(*FILTER_KEYS))
-
-# Base
-sensor_ns = esphome_ns.namespace('sensor')
-Sensor = sensor_ns.class_('Sensor', Nameable)
-SensorPtr = Sensor.operator('ptr')
-MQTTSensorComponent = sensor_ns.class_('MQTTSensorComponent', mqtt.MQTTComponent)
-
-PollingSensorComponent = sensor_ns.class_('PollingSensorComponent', PollingComponent, Sensor)
-EmptySensor = sensor_ns.class_('EmptySensor', Sensor)
-EmptyPollingParentSensor = sensor_ns.class_('EmptyPollingParentSensor', EmptySensor)
-
-# Triggers
-SensorStateTrigger = sensor_ns.class_('SensorStateTrigger', Trigger.template(float_))
-SensorRawStateTrigger = sensor_ns.class_('SensorRawStateTrigger', Trigger.template(float_))
-ValueRangeTrigger = sensor_ns.class_('ValueRangeTrigger', Trigger.template(float_), Component)
-
-# Filters
-Filter = sensor_ns.class_('Filter')
-SlidingWindowMovingAverageFilter = sensor_ns.class_('SlidingWindowMovingAverageFilter', Filter)
-ExponentialMovingAverageFilter = sensor_ns.class_('ExponentialMovingAverageFilter', Filter)
-LambdaFilter = sensor_ns.class_('LambdaFilter', Filter)
-OffsetFilter = sensor_ns.class_('OffsetFilter', Filter)
-MultiplyFilter = sensor_ns.class_('MultiplyFilter', Filter)
-FilterOutValueFilter = sensor_ns.class_('FilterOutValueFilter', Filter)
-ThrottleFilter = sensor_ns.class_('ThrottleFilter', Filter)
-DebounceFilter = sensor_ns.class_('DebounceFilter', Filter, Component)
-HeartbeatFilter = sensor_ns.class_('HeartbeatFilter', Filter, Component)
-DeltaFilter = sensor_ns.class_('DeltaFilter', Filter)
-OrFilter = sensor_ns.class_('OrFilter', Filter)
-CalibrateLinearFilter = sensor_ns.class_('CalibrateLinearFilter', Filter)
-SensorInRangeCondition = sensor_ns.class_('SensorInRangeCondition', Filter)
-
-SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({
-    cv.GenerateID(CONF_MQTT_ID): cv.declare_variable_id(MQTTSensorComponent),
-    vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string_strict,
-    vol.Optional(CONF_ICON): cv.icon,
-    vol.Optional(CONF_ACCURACY_DECIMALS): vol.Coerce(int),
-    vol.Optional(CONF_EXPIRE_AFTER): vol.All(cv.requires_component('mqtt'),
-                                             vol.Any(None, cv.positive_time_period_milliseconds)),
-    vol.Optional(CONF_FILTERS): FILTERS_SCHEMA,
-    vol.Optional(CONF_ON_VALUE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(SensorStateTrigger),
-    }),
-    vol.Optional(CONF_ON_RAW_VALUE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(SensorRawStateTrigger),
-    }),
-    vol.Optional(CONF_ON_VALUE_RANGE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(ValueRangeTrigger),
-        vol.Optional(CONF_ABOVE): cv.float_,
-        vol.Optional(CONF_BELOW): cv.float_,
-    }, cv.has_at_least_one_key(CONF_ABOVE, CONF_BELOW)),
-})
-
-SENSOR_PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(SENSOR_SCHEMA.schema)
-
-
-def setup_filter(config):
-    if CONF_OFFSET in config:
-        yield OffsetFilter.new(config[CONF_OFFSET])
-    elif CONF_MULTIPLY in config:
-        yield MultiplyFilter.new(config[CONF_MULTIPLY])
-    elif CONF_FILTER_OUT in config:
-        yield FilterOutValueFilter.new(config[CONF_FILTER_OUT])
-    elif CONF_SLIDING_WINDOW_MOVING_AVERAGE in config:
-        conf = config[CONF_SLIDING_WINDOW_MOVING_AVERAGE]
-        yield SlidingWindowMovingAverageFilter.new(conf[CONF_WINDOW_SIZE], conf[CONF_SEND_EVERY],
-                                                   conf.get(CONF_SEND_FIRST_AT))
-    elif CONF_EXPONENTIAL_MOVING_AVERAGE in config:
-        conf = config[CONF_EXPONENTIAL_MOVING_AVERAGE]
-        yield ExponentialMovingAverageFilter.new(conf[CONF_ALPHA], conf[CONF_SEND_EVERY])
-    elif CONF_LAMBDA in config:
-        for lambda_ in process_lambda(config[CONF_LAMBDA], [(float_, 'x')],
-                                      return_type=optional.template(float_)):
-            yield None
-        yield LambdaFilter.new(lambda_)
-    elif CONF_THROTTLE in config:
-        yield ThrottleFilter.new(config[CONF_THROTTLE])
-    elif CONF_DELTA in config:
-        yield DeltaFilter.new(config[CONF_DELTA])
-    elif CONF_OR in config:
-        for filters in setup_filters(config[CONF_OR]):
-            yield None
-        yield OrFilter.new(filters)
-    elif CONF_HEARTBEAT in config:
-        yield App.register_component(HeartbeatFilter.new(config[CONF_HEARTBEAT]))
-    elif CONF_DEBOUNCE in config:
-        yield App.register_component(DebounceFilter.new(config[CONF_DEBOUNCE]))
-    elif CONF_CALIBRATE_LINEAR in config:
-        x = [conf[CONF_FROM] for conf in config[CONF_CALIBRATE_LINEAR]]
-        y = [conf[CONF_TO] for conf in config[CONF_CALIBRATE_LINEAR]]
-        k, b = fit_linear(x, y)
-        yield CalibrateLinearFilter.new(k, b)
-
-
-def setup_filters(config):
-    filters = []
-    for conf in config:
-        for filter in setup_filter(conf):
-            yield None
-        filters.append(filter)
-    yield filters
-
-
-def setup_sensor_core_(sensor_var, config):
-    if CONF_INTERNAL in config:
-        add(sensor_var.set_internal(config[CONF_INTERNAL]))
-    if CONF_UNIT_OF_MEASUREMENT in config:
-        add(sensor_var.set_unit_of_measurement(config[CONF_UNIT_OF_MEASUREMENT]))
-    if CONF_ICON in config:
-        add(sensor_var.set_icon(config[CONF_ICON]))
-    if CONF_ACCURACY_DECIMALS in config:
-        add(sensor_var.set_accuracy_decimals(config[CONF_ACCURACY_DECIMALS]))
-    if CONF_FILTERS in config:
-        for filters in setup_filters(config[CONF_FILTERS]):
-            yield
-        add(sensor_var.set_filters(filters))
-
-    for conf in config.get(CONF_ON_VALUE, []):
-        rhs = sensor_var.make_state_trigger()
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [(float_, 'x')], conf)
-    for conf in config.get(CONF_ON_RAW_VALUE, []):
-        rhs = sensor_var.make_raw_state_trigger()
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        automation.build_automations(trigger, [(float_, 'x')], conf)
-    for conf in config.get(CONF_ON_VALUE_RANGE, []):
-        rhs = sensor_var.make_value_range_trigger()
-        trigger = Pvariable(conf[CONF_TRIGGER_ID], rhs)
-        add(App.register_component(trigger))
-        if CONF_ABOVE in conf:
-            for template_ in templatable(conf[CONF_ABOVE], float_, float_):
-                yield
-            add(trigger.set_min(template_))
-        if CONF_BELOW in conf:
-            for template_ in templatable(conf[CONF_BELOW], float_, float_):
-                yield
-            add(trigger.set_max(template_))
-        automation.build_automations(trigger, [(float_, 'x')], conf)
-
-    mqtt_ = sensor_var.Pget_mqtt()
-    if CONF_EXPIRE_AFTER in config:
-        if config[CONF_EXPIRE_AFTER] is None:
-            add(mqtt_.disable_expire_after())
-        else:
-            add(mqtt_.set_expire_after(config[CONF_EXPIRE_AFTER]))
-    setup_mqtt_component(mqtt_, config)
-
-
-def setup_sensor(sensor_obj, config):
-    if not CORE.has_id(config[CONF_ID]):
-        sensor_obj = Pvariable(config[CONF_ID], sensor_obj, has_side_effects=True)
-    CORE.add_job(setup_sensor_core_, sensor_obj, config)
-
-
-def register_sensor(var, config):
-    sensor_var = Pvariable(config[CONF_ID], var, has_side_effects=True)
-    add(App.register_sensor(sensor_var))
-    CORE.add_job(setup_sensor_core_, sensor_var, config)
-
-
-BUILD_FLAGS = '-DUSE_SENSOR'
-
-CONF_SENSOR_IN_RANGE = 'sensor.in_range'
-SENSOR_IN_RANGE_CONDITION_SCHEMA = vol.All({
-    vol.Required(CONF_ID): cv.use_variable_id(Sensor),
-    vol.Optional(CONF_ABOVE): cv.float_,
-    vol.Optional(CONF_BELOW): cv.float_,
-}, cv.has_at_least_one_key(CONF_ABOVE, CONF_BELOW))
-
-
-@CONDITION_REGISTRY.register(CONF_SENSOR_IN_RANGE, SENSOR_IN_RANGE_CONDITION_SCHEMA)
-def sensor_in_range_to_code(config, condition_id, template_arg, args):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_sensor_in_range_condition(template_arg)
-    type = SensorInRangeCondition.template(template_arg)
-    cond = Pvariable(condition_id, rhs, type=type)
-
-    if CONF_ABOVE in config:
-        add(cond.set_min(config[CONF_ABOVE]))
-    if CONF_BELOW in config:
-        add(cond.set_max(config[CONF_BELOW]))
-
-    yield cond
-
-
-def core_to_hass_config(data, config):
-    ret = mqtt.build_hass_config(data, 'sensor', config, include_state=True, include_command=False)
-    if ret is None:
-        return None
-    if CONF_UNIT_OF_MEASUREMENT in config:
-        ret['unit_of_measurement'] = config[CONF_UNIT_OF_MEASUREMENT]
-    if CONF_EXPIRE_AFTER in config:
-        expire = config[CONF_EXPIRE_AFTER]
-        if expire is not None:
-            ret['expire_after'] = expire.total_seconds
-    if CONF_ICON in config:
-        ret['icon'] = config[CONF_ICON]
-    return ret
-
-
-def _mean(xs):
-    return sum(xs) / len(xs)
-
-
-def _std(x):
-    return math.sqrt(sum((x_ - _mean(x))**2 for x_ in x) / (len(x) - 1))
-
-
-def _correlation_coeff(x, y):
-    m_x, m_y = _mean(x), _mean(y)
-    s_xy = sum((x_ - m_x) * (y_ - m_y) for x_, y_ in zip(x, y))
-    s_sq_x = sum((x_ - m_x)**2 for x_ in x)
-    s_sq_y = sum((y_ - m_y)**2 for y_ in y)
-    return s_xy / math.sqrt(s_sq_x * s_sq_y)
-
-
-def fit_linear(x, y):
-    assert len(x) == len(y)
-    m_x, m_y = _mean(x), _mean(y)
-    r = _correlation_coeff(x, y)
-    k = r * (_std(y) / _std(x))
-    b = m_y - k * m_x
-    return k, b

esphome/components/sensor/ads1115.py

@@ -1,76 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-from esphome.components.ads1115 import ADS1115Component
-import esphome.config_validation as cv
-from esphome.const import CONF_ADS1115_ID, CONF_GAIN, CONF_MULTIPLEXER, CONF_NAME, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import get_variable
-from esphome.py_compat import string_types
-
-DEPENDENCIES = ['ads1115']
-
-ADS1115Multiplexer = sensor.sensor_ns.enum('ADS1115Multiplexer')
-MUX = {
-    'A0_A1': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P0_N1,
-    'A0_A3': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P0_N3,
-    'A1_A3': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P1_N3,
-    'A2_A3': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P2_N3,
-    'A0_GND': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P0_NG,
-    'A1_GND': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P1_NG,
-    'A2_GND': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P2_NG,
-    'A3_GND': ADS1115Multiplexer.ADS1115_MULTIPLEXER_P3_NG,
-}
-
-ADS1115Gain = sensor.sensor_ns.enum('ADS1115Gain')
-GAIN = {
-    '6.144': ADS1115Gain.ADS1115_GAIN_6P144,
-    '4.096': ADS1115Gain.ADS1115_GAIN_4P096,
-    '2.048': ADS1115Gain.ADS1115_GAIN_2P048,
-    '1.024': ADS1115Gain.ADS1115_GAIN_1P024,
-    '0.512': ADS1115Gain.ADS1115_GAIN_0P512,
-    '0.256': ADS1115Gain.ADS1115_GAIN_0P256,
-}
-
-
-def validate_gain(value):
-    if isinstance(value, float):
-        value = u'{:0.03f}'.format(value)
-    elif not isinstance(value, string_types):
-        raise vol.Invalid('invalid gain "{}"'.format(value))
-
-    return cv.one_of(*GAIN)(value)
-
-
-def validate_mux(value):
-    value = cv.string(value).upper()
-    value = value.replace(' ', '_')
-    return cv.one_of(*MUX)(value)
-
-
-ADS1115Sensor = sensor.sensor_ns.class_('ADS1115Sensor', sensor.EmptySensor)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(ADS1115Sensor),
-    vol.Required(CONF_MULTIPLEXER): validate_mux,
-    vol.Required(CONF_GAIN): validate_gain,
-    cv.GenerateID(CONF_ADS1115_ID): cv.use_variable_id(ADS1115Component),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}))
-
-
-def to_code(config):
-    for hub in get_variable(config[CONF_ADS1115_ID]):
-        yield
-
-    mux = MUX[config[CONF_MULTIPLEXER]]
-    gain = GAIN[config[CONF_GAIN]]
-    rhs = hub.get_sensor(config[CONF_NAME], mux, gain, config.get(CONF_UPDATE_INTERVAL))
-    sensor.register_sensor(rhs, config)
-
-
-BUILD_FLAGS = '-DUSE_ADS1115_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/apds9960.py

@@ -1,35 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-from esphome.components.apds9960 import APDS9960, CONF_APDS9960_ID
-import esphome.config_validation as cv
-from esphome.const import CONF_NAME, CONF_TYPE
-from esphome.cpp_generator import get_variable
-
-DEPENDENCIES = ['apds9960']
-
-TYPES = {
-    'CLEAR': 'make_clear_channel',
-    'RED': 'make_red_channel',
-    'GREEN': 'make_green_channel',
-    'BLUE': 'make_blue_channel',
-    'PROXIMITY': 'make_proximity',
-}
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(sensor.Sensor),
-    vol.Required(CONF_TYPE): cv.one_of(*TYPES, upper=True),
-    cv.GenerateID(CONF_APDS9960_ID): cv.use_variable_id(APDS9960)
-}))
-
-
-def to_code(config):
-    for hub in get_variable(config[CONF_APDS9960_ID]):
-        yield
-    func = getattr(hub, TYPES[config[CONF_TYPE]])
-    rhs = func(config[CONF_NAME])
-    sensor.register_sensor(rhs, config)
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)