Fix Gitlab CI

.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).

.gitignore

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

.gitlab-ci.yml

@@ -2,126 +2,299 @@
 # 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.2.1
-        BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH}
-        DOCKERFILE=docker/Dockerfile.hassio
-      else
-        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:1.2.1
-        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
+    - docker run --rm --privileged hassioaddons/qemu-user-static:latest
+    - BUILD_FROM=homeassistant/${ADDON_ARCH}-base-ubuntu:latest
+    - ADDON_VERSION="${CI_COMMIT_TAG#v}"
+    - ADDON_VERSION="${ADDON_VERSION:-${CI_COMMIT_SHA:0:7}}"
+    - ESPHOMELIB_VERSION="${ESPHOMELIB_VERSION:-dev}"
+    - echo "Build from ${BUILD_FROM}"
+    - echo "Add-on version ${ADDON_VERSION}"
+    - echo "Esphomelib version ${ESPHOMELIB_VERSION}"
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:dev"
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - |
+      docker build \
+        --build-arg "BUILD_FROM=${BUILD_FROM}" \
+        --build-arg "ADDON_ARCH=${ADDON_ARCH}" \
+        --build-arg "ADDON_VERSION=${ADDON_VERSION}" \
+        --build-arg "ESPHOMELIB_VERSION=${ESPHOMELIB_VERSION}" \
+        --tag "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:dev" \
+        --tag "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        --file "docker/Dockerfile.hassio" \
+        .
+    - |
+      if [ "${DO_PUSH:-true}" = true ]; then
+        echo "Pushing to CI registry"
+        docker push ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}
+        docker push ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:dev
+      fi
+
+# Generic deploy template
+.deploy-release: &deploy-release
+  <<: *docker-builder
+  stage: deploy
+  script:
+    - version="${CI_COMMIT_TAG#v}"
+    - echo "Publishing release version ${version}"
+    - docker pull "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - docker push "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - docker push "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - docker push "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+
+    - echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+
+    - echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:latest"
+
+    - echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+  only:
+  - /^v\d+\.\d+\.\d+$/
+  except:
+  - /^(?!master).+@/
+
+.deploy-beta: &deploy-beta
+  <<: *docker-builder
+  stage: deploy
+  script:
+    - version="${CI_COMMIT_TAG#v}"
+    - echo "Publishing beta version ${version}"
+    - docker pull "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}"
+    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - docker push "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+
+    - echo "Tag ${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - docker push "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+
+    - echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:${version}"
+
+    - echo "Tag ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - |
+      docker tag \
+        "${CI_REGISTRY}/esphomeyaml-hassio-${ADDON_ARCH}:${CI_COMMIT_SHA}" \
+        "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+    - docker push "ottowinter/esphomeyaml-hassio-${ADDON_ARCH}:rc"
+  only:
+  - /^v\d+\.\d+\.\d+b\d+$/
+  except:
+  - /^(?!rc).+@/
+
+# Build jobs
+build:normal:
+  <<: *docker-builder
+  stage: build
+  script:
+    - docker build -t "${CI_REGISTRY}/esphomeyaml:dev" .
+
+.build-hassio-edge: &build-hassio-edge
+  <<: *build-hassio
+  except:
+    - /^v\d+\.\d+\.\d+$/
+    - /^v\d+\.\d+\.\d+b\d+$/
+
+.build-hassio-release: &build-hassio-release
+  <<: *build-hassio
+  only:
+    - /^v\d+\.\d+\.\d+$/
+    - /^v\d+\.\d+\.\d+b\d+$/
+
+build:hassio-armhf-edge:
+  <<: *build-hassio-edge
+  variables:
+    ADDON_ARCH: armhf
+    DO_PUSH: "false"
+
+build:hassio-armhf:
+  <<: *build-hassio-release
+  variables:
+    ADDON_ARCH: armhf
+    ESPHOMELIB_VERSION: "${CI_COMMIT_TAG}"
+
+#build:hassio-aarch64-edge:
+#  <<: *build-hassio-edge
+#  variables:
+#    ADDON_ARCH: aarch64
+#    DO_PUSH: "false"
+
+#build:hassio-aarch64:
+#  <<: *build-hassio-release
+#  variables:
+#    ADDON_ARCH: aarch64
+#    ESPHOMELIB_VERSION: "${CI_COMMIT_TAG}"
+
+build:hassio-i386-edge:
+  <<: *build-hassio-edge
+  variables:
+    ADDON_ARCH: i386
+    DO_PUSH: "false"
+
+build:hassio-i386:
+  <<: *build-hassio-release
+  variables:
+    ADDON_ARCH: i386
+    ESPHOMELIB_VERSION: "${CI_COMMIT_TAG}"
+
+build:hassio-amd64-edge:
+  <<: *build-hassio-edge
+  variables:
+    ADDON_ARCH: amd64
+    DO_PUSH: "false"
+
+build:hassio-amd64:
+  <<: *build-hassio-release
+  variables:
+    ADDON_ARCH: amd64
+    ESPHOMELIB_VERSION: "${CI_COMMIT_TAG}"
+
+# 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 +302,8 @@ test3:
   - python setup.py sdist
   - twine upload dist/*
   tags:
-  - docker
+  - python2.7
+  - esphomeyaml-test
 
 deploy-release:pypi:
   <<: *deploy-pypi
@@ -144,204 +318,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,31 +1,20 @@
 sudo: false
 language: python
-
-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.2.2 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.2.2 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,29 @@
+ARG BUILD_FROM=python:2.7
+FROM ${BUILD_FROM}
+MAINTAINER Otto Winter <contact@otto-winter.com>
+
+RUN apt-get update && apt-get install -y \
+        python-pil \
+        git \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* && \
+    pip install --no-cache-dir --no-binary :all: platformio && \
+    platformio settings set enable_telemetry No && \
+    platformio settings set check_libraries_interval 1000000 && \
+    platformio settings set check_platformio_interval 1000000 && \
+    platformio settings set check_platforms_interval 1000000
+
+ENV ESPHOMEYAML_OTA_HOST_PORT=6123
+EXPOSE 6123
+VOLUME /config
+WORKDIR /usr/src/app
+
+COPY docker/platformio.ini /pio/platformio.ini
+RUN platformio run -d /pio; rm -rf /pio
+
+COPY . .
+RUN pip install --no-cache-dir --no-binary :all: -e . && \
+    pip install --no-cache-dir --no-binary :all: tzlocal
+
+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.2.1
-FROM ${BUILD_FROM}
-
-COPY . .
-RUN \
-    pip2 install --no-cache-dir --no-binary :all: -e .
-
-WORKDIR /config
-ENTRYPOINT ["esphome"]
-CMD ["/config", "dashboard"]

docker/Dockerfile.builder

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

docker/Dockerfile.hassio

@@ -1,20 +1,42 @@
-ARG BUILD_FROM=esphome/esphome-hassio-base-amd64:1.2.1
+# Dockerfile for HassIO add-on
+ARG BUILD_FROM=homeassistant/amd64-base-ubuntu:latest
 FROM ${BUILD_FROM}
 
-# Copy root filesystem
-COPY docker/rootfs/ /
-COPY setup.py setup.cfg MANIFEST.in /opt/esphome/
-COPY esphome /opt/esphome/esphome
+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/* && \
+    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
 
-RUN \
-    pip2 install --no-cache-dir --no-binary :all: -e /opt/esphome
+COPY docker/platformio.ini /pio/platformio.ini
+RUN platformio run -d /pio; rm -rf /pio
 
-# Build arguments
-ARG BUILD_VERSION=dev
+ARG ESPHOMELIB_VERSION="dev"
+RUN platformio lib -g install "https://github.com/OttoWinter/esphomelib.git#${ESPHOMELIB_VERSION}"
+
+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"]
+
+# Build arugments
+ARG ADDON_ARCH
+ARG ADDON_VERSION
 
 # Labels
 LABEL \
-    io.hass.name="ESPHome" \
-    io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
+    io.hass.name="esphomeyaml" \
+    io.hass.description="esphomeyaml HassIO add-on for intelligently managing all your ESP8266/ESP32 devices." \
+    io.hass.arch="${ADDON_ARCH}" \
     io.hass.type="addon" \
-    io.hass.version=${BUILD_VERSION}
+    io.hass.version="${ADDON_VERSION}" \
+    io.hass.url="https://esphomelib.com/esphomeyaml/index.html" \
+    maintainer="Otto Winter <contact@otto-winter.com>"

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/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.2.1" \
-      --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.2.1" \
-      -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.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,14 +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
-
-if hass.config.true 'leave_front_door_open'; then
-    export DISABLE_HA_AUTHENTICATION=true
-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,391 +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_WHILE, CONF_WAIT_UNTIL
-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])
-        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])
-        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 vol.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 = vol.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 = vol.Schema({
-    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(Trigger),
-    cv.GenerateID(CONF_AUTOMATION_ID): cv.declare_variable_id(Automation),
-    vol.Optional(CONF_IF): validate_recursive_condition,
-    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, arg_type, template_arg):
-    for conditions in build_conditions(config, arg_type):
-        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, arg_type, template_arg):
-    for conditions in build_conditions(config, arg_type):
-        yield
-    rhs = OrCondition.new(template_arg, conditions)
-    type = OrCondition.template(template_arg)
-    yield Pvariable(condition_id, rhs, type=type)
-
-
-RANGE_CONDITION_SCHEMA = vol.All(vol.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, arg_type, template_arg):
-    for conditions in build_conditions(config, arg_type):
-        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], arg_type, float_):
-            yield
-        condition.set_min(template_)
-    if CONF_BELOW in config:
-        for template_ in templatable(config[CONF_BELOW], arg_type, 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, arg_type, template_arg):
-    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, arg_type, 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, arg_type, template_arg):
-    for conditions in build_conditions(config[CONF_CONDITION], arg_type):
-        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], arg_type):
-            yield None
-        add(action.add_then(actions))
-    if CONF_ELSE in config:
-        for actions in build_actions(config[CONF_ELSE], arg_type):
-            yield None
-        add(action.add_else(actions))
-    yield action
-
-
-WHILE_ACTION_SCHEMA = vol.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, arg_type, template_arg):
-    for conditions in build_conditions(config[CONF_CONDITION], arg_type):
-        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], arg_type):
-        yield None
-    add(action.add_then(actions))
-    yield action
-
-
-def validate_wait_until(value):
-    schema = vol.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, arg_type, template_arg):
-    for conditions in build_conditions(config[CONF_CONDITION], arg_type):
-        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, arg_type, template_arg):
-    for lambda_ in process_lambda(config, [(arg_type, 'x')], 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, arg_type, template_arg):
-    for lambda_ in process_lambda(config, [(arg_type, 'x')], 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, arg_type, template_arg):
-    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, arg_type):
-    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]
-    template_arg = TemplateArguments(arg_type)
-    for result in builder(config, action_id, arg_type, template_arg):
-        yield None
-    yield result
-
-
-def build_actions(config, arg_type):
-    actions = []
-    for conf in config:
-        for action in build_action(conf, arg_type):
-            yield None
-        actions.append(action)
-    yield actions
-
-
-def build_condition(full_config, arg_type):
-    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]
-    template_arg = TemplateArguments(arg_type)
-    for result in builder(config, action_id, arg_type, template_arg):
-        yield None
-    yield result
-
-
-def build_conditions(config, arg_type):
-    conditions = []
-    for conf in config:
-        for condition in build_condition(conf, arg_type):
-            yield None
-        conditions.append(condition)
-    yield conditions
-
-
-def build_automation_(trigger, arg_type, config):
-    rhs = App.make_automation(TemplateArguments(arg_type), trigger)
-    type = Automation.template(arg_type)
-    obj = Pvariable(config[CONF_AUTOMATION_ID], rhs, type=type)
-    if CONF_IF in config:
-        conditions = None
-        for conditions in build_conditions(config[CONF_IF], arg_type):
-            yield None
-        add(obj.add_conditions(conditions))
-    actions = None
-    for actions in build_actions(config[CONF_THEN], arg_type):
-        yield None
-    add(obj.add_actions(actions))
-    yield obj
-
-
-def build_automation(trigger, arg_type, config):
-    CORE.add_job(build_automation_, trigger, arg_type, 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 = vol.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 = vol.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,88 +0,0 @@
-import voluptuous as vol
-
-from esphome.automation import ACTION_REGISTRY
-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
-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
-
-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')
-
-CONFIG_SCHEMA = vol.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,
-}).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]))
-
-    setup_component(api, config)
-
-
-BUILD_FLAGS = '-DUSE_API'
-
-
-def lib_deps(config):
-    if CORE.is_esp32:
-        return 'AsyncTCP@1.0.1'
-    if CORE.is_esp8266:
-        return 'ESPAsyncTCP@1.1.3'
-    raise NotImplementedError
-
-
-CONF_HOMEASSISTANT_SERVICE = 'homeassistant.service'
-HOMEASSISTANT_SERVIC_ACTION_SCHEMA = vol.Schema({
-    cv.GenerateID(): cv.use_variable_id(APIServer),
-    vol.Required(CONF_SERVICE): cv.string,
-    vol.Optional(CONF_DATA): vol.Schema({
-        cv.string: cv.string,
-    }),
-    vol.Optional(CONF_DATA_TEMPLATE): vol.Schema({
-        cv.string: cv.string,
-    }),
-    vol.Optional(CONF_VARIABLES): vol.Schema({
-        cv.string: cv.lambda_,
-    }),
-})
-
-
-@ACTION_REGISTRY.register(CONF_HOMEASSISTANT_SERVICE, HOMEASSISTANT_SERVIC_ACTION_SCHEMA)
-def homeassistant_service_to_code(config, action_id, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_home_assistant_service_call_action(template_arg)
-    type = HomeAssistantServiceCallAction.template(arg_type)
-    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

esphome/components/binary_sensor/__init__.py

@@ -1,329 +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
-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, NoArg, 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(NoArg))
-ReleaseTrigger = binary_sensor_ns.class_('ReleaseTrigger', Trigger.template(NoArg))
-ClickTrigger = binary_sensor_ns.class_('ClickTrigger', Trigger.template(NoArg))
-DoubleClickTrigger = binary_sensor_ns.class_('DoubleClickTrigger', Trigger.template(NoArg))
-MultiClickTrigger = binary_sensor_ns.class_('MultiClickTrigger', Trigger.template(NoArg), 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 = vol.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_automation(trigger, NoArg, 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_automation(trigger, NoArg, 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_automation(trigger, NoArg, 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_automation(trigger, NoArg, 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_automation(trigger, NoArg, 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_automation(trigger, bool_, 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),
-})
-
-
-@CONDITION_REGISTRY.register(CONF_BINARY_SENSOR_IS_ON, BINARY_SENSOR_IS_ON_CONDITION_SCHEMA)
-def binary_sensor_is_on_to_code(config, condition_id, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_binary_sensor_is_on_condition(template_arg)
-    type = BinarySensorCondition.template(arg_type)
-    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),
-})
-
-
-@CONDITION_REGISTRY.register(CONF_BINARY_SENSOR_IS_OFF, BINARY_SENSOR_IS_OFF_CONDITION_SCHEMA)
-def binary_sensor_is_off_to_code(config, condition_id, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_binary_sensor_is_off_condition(template_arg)
-    type = BinarySensorCondition.template(arg_type)
-    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/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/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 = vol.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, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_binary_sensor_publish_action(template_arg)
-    type = BinarySensorPublishAction.template(arg_type)
-    action = Pvariable(action_id, rhs, type=type)
-    for template_ in templatable(config[CONF_STATE], arg_type, 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/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, NoArg, 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_automation(var.get_open_trigger(), NoArg,
-                                    config[CONF_OPEN_ACTION])
-    if CONF_CLOSE_ACTION in config:
-        automation.build_automation(var.get_close_trigger(), NoArg,
-                                    config[CONF_CLOSE_ACTION])
-    if CONF_STOP_ACTION in config:
-        automation.build_automation(var.get_stop_trigger(), NoArg,
-                                    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 = vol.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, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_cover_publish_action(template_arg)
-    type = CoverPublishAction.template(arg_type)
-    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, arg_type, 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 = vol.Schema({
-    cv.GenerateID(): cv.declare_variable_id(CustomComponentConstructor),
-    vol.Required(CONF_LAMBDA): cv.lambda_,
-    vol.Optional(CONF_COMPONENTS): cv.ensure_list(vol.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 = vol.Schema({
-    cv.GenerateID(): cv.declare_variable_id(DallasComponent),
-    vol.Required(CONF_PIN): pins.input_pullup_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/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, arg_type, template_arg):
-    type = DisplayPageShowAction.template(arg_type)
-    action = Pvariable(action_id, type.new(), type=type)
-    if isinstance(config[CONF_ID], core.Lambda):
-        for template_ in templatable(config[CONF_ID], arg_type, 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, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    type = DisplayPageShowNextAction.template(arg_type)
-    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, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    type = DisplayPageShowPrevAction.template(arg_type)
-    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_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 = vol.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/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(vol.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/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/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 = vol.Schema([cv.string])(value)
-    value = vol.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 = vol.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 = vol.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 = vol.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, NoArg, PollingComponent, Trigger, esphome_ns
-
-IntervalTrigger = esphome_ns.class_('IntervalTrigger', Trigger.template(NoArg), PollingComponent)
-
-CONFIG_SCHEMA = automation.validate_automation(vol.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_automation(trigger, NoArg, 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/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/logger.py

@@ -1,180 +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(vol.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): vol.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')
-        is_at_least_verbose = this_severity >= 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')
-
-    return flags
-
-
-def maybe_simple_message(schema):
-    def validator(value):
-        if isinstance(value, dict):
-            return vol.Schema(schema)(value)
-        return vol.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, arg_type, template_arg):
-    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), [(arg_type, 'x')], 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/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 = vol.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/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 = vol.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 = vol.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 = vol.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_automation(trigger, std_string, 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 = vol.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,29 +0,0 @@
-import voluptuous as vol
-
-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 = vol.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,75 +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 = vol.Schema({
-    cv.GenerateID(): cv.declare_variable_id(RemoteReceiverComponent),
-    vol.Required(CONF_PIN): pins.gpio_input_pin_schema,
-    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, NoArg, Trigger, esphome_ns
-
-Script = esphome_ns.class_('Script', Trigger.template(NoArg))
-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_automation(trigger, NoArg, 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, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_execute_action(template_arg)
-    type = ScriptExecuteAction.template(arg_type)
-    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, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_stop_action(template_arg)
-    type = ScriptStopAction.template(arg_type)
-    yield Pvariable(action_id, rhs, type=type)

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_6P096,
-    '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)

esphome/components/sensor/bh1750.py

@@ -1,45 +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_NAME, CONF_RESOLUTION, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-DEPENDENCIES = ['i2c']
-
-BH1750Resolution = sensor.sensor_ns.enum('BH1750Resolution')
-BH1750_RESOLUTIONS = {
-    4.0: BH1750Resolution.BH1750_RESOLUTION_4P0_LX,
-    1.0: BH1750Resolution.BH1750_RESOLUTION_1P0_LX,
-    0.5: BH1750Resolution.BH1750_RESOLUTION_0P5_LX,
-}
-
-BH1750Sensor = sensor.sensor_ns.class_('BH1750Sensor', sensor.PollingSensorComponent,
-                                       i2c.I2CDevice)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(BH1750Sensor),
-    vol.Optional(CONF_ADDRESS, default=0x23): cv.i2c_address,
-    vol.Optional(CONF_RESOLUTION): vol.All(cv.positive_float, cv.one_of(*BH1750_RESOLUTIONS)),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_bh1750_sensor(config[CONF_NAME], config[CONF_ADDRESS],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    bh1750 = Pvariable(config[CONF_ID], rhs)
-    if CONF_RESOLUTION in config:
-        add(bh1750.set_resolution(BH1750_RESOLUTIONS[config[CONF_RESOLUTION]]))
-    sensor.setup_sensor(bh1750, config)
-    setup_component(bh1750, config)
-
-
-BUILD_FLAGS = '-DUSE_BH1750'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/bme280.py

@@ -1,93 +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_HUMIDITY, CONF_ID, CONF_IIR_FILTER, CONF_NAME, \
-    CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, 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']
-
-BME280Oversampling = sensor.sensor_ns.enum('BME280Oversampling')
-OVERSAMPLING_OPTIONS = {
-    'NONE': BME280Oversampling.BME280_OVERSAMPLING_NONE,
-    '1X': BME280Oversampling.BME280_OVERSAMPLING_1X,
-    '2X': BME280Oversampling.BME280_OVERSAMPLING_2X,
-    '4X': BME280Oversampling.BME280_OVERSAMPLING_4X,
-    '8X': BME280Oversampling.BME280_OVERSAMPLING_8X,
-    '16X': BME280Oversampling.BME280_OVERSAMPLING_16X,
-}
-
-BME280IIRFilter = sensor.sensor_ns.enum('BME280IIRFilter')
-IIR_FILTER_OPTIONS = {
-    'OFF': BME280IIRFilter.BME280_IIR_FILTER_OFF,
-    '2X': BME280IIRFilter.BME280_IIR_FILTER_2X,
-    '4X': BME280IIRFilter.BME280_IIR_FILTER_4X,
-    '8X': BME280IIRFilter.BME280_IIR_FILTER_8X,
-    '16X': BME280IIRFilter.BME280_IIR_FILTER_16X,
-}
-
-BME280_OVERSAMPLING_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({
-    vol.Optional(CONF_OVERSAMPLING): cv.one_of(*OVERSAMPLING_OPTIONS, upper=True),
-})
-
-BME280Component = sensor.sensor_ns.class_('BME280Component', PollingComponent, i2c.I2CDevice)
-BME280TemperatureSensor = sensor.sensor_ns.class_('BME280TemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-BME280PressureSensor = sensor.sensor_ns.class_('BME280PressureSensor',
-                                               sensor.EmptyPollingParentSensor)
-BME280HumiditySensor = sensor.sensor_ns.class_('BME280HumiditySensor',
-                                               sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(BME280Component),
-    vol.Optional(CONF_ADDRESS, default=0x77): cv.i2c_address,
-    vol.Required(CONF_TEMPERATURE): cv.nameable(BME280_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME280TemperatureSensor),
-    })),
-    vol.Required(CONF_PRESSURE): cv.nameable(BME280_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME280PressureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(BME280_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME280HumiditySensor),
-    })),
-    vol.Optional(CONF_IIR_FILTER): cv.one_of(*IIR_FILTER_OPTIONS, upper=True),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_bme280_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_PRESSURE][CONF_NAME],
-                                 config[CONF_HUMIDITY][CONF_NAME],
-                                 config[CONF_ADDRESS],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    bme280 = Pvariable(config[CONF_ID], rhs)
-    if CONF_OVERSAMPLING in config[CONF_TEMPERATURE]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_TEMPERATURE][CONF_OVERSAMPLING]]
-        add(bme280.set_temperature_oversampling(constant))
-    if CONF_OVERSAMPLING in config[CONF_PRESSURE]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_PRESSURE][CONF_OVERSAMPLING]]
-        add(bme280.set_pressure_oversampling(constant))
-    if CONF_OVERSAMPLING in config[CONF_HUMIDITY]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_HUMIDITY][CONF_OVERSAMPLING]]
-        add(bme280.set_humidity_oversampling(constant))
-    if CONF_IIR_FILTER in config:
-        constant = IIR_FILTER_OPTIONS[config[CONF_IIR_FILTER]]
-        add(bme280.set_iir_filter(constant))
-
-    sensor.setup_sensor(bme280.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(bme280.Pget_pressure_sensor(), config[CONF_PRESSURE])
-    sensor.setup_sensor(bme280.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    setup_component(bme280, config)
-
-
-BUILD_FLAGS = '-DUSE_BME280'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_PRESSURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY])]

esphome/components/sensor/bme680.py

@@ -1,117 +0,0 @@
-import voluptuous as vol
-
-from esphome import core
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_DURATION, CONF_GAS_RESISTANCE, CONF_HEATER, \
-    CONF_HUMIDITY, CONF_ID, CONF_IIR_FILTER, CONF_NAME, CONF_OVERSAMPLING, CONF_PRESSURE, \
-    CONF_TEMPERATURE, 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']
-
-BME680Oversampling = sensor.sensor_ns.enum('BME680Oversampling')
-OVERSAMPLING_OPTIONS = {
-    'NONE': BME680Oversampling.BME680_OVERSAMPLING_NONE,
-    '1X': BME680Oversampling.BME680_OVERSAMPLING_1X,
-    '2X': BME680Oversampling.BME680_OVERSAMPLING_2X,
-    '4X': BME680Oversampling.BME680_OVERSAMPLING_4X,
-    '8X': BME680Oversampling.BME680_OVERSAMPLING_8X,
-    '16X': BME680Oversampling.BME680_OVERSAMPLING_16X,
-}
-
-BME680IIRFilter = sensor.sensor_ns.enum('BME680IIRFilter')
-IIR_FILTER_OPTIONS = {
-    'OFF': BME680IIRFilter.BME680_IIR_FILTER_OFF,
-    '1X': BME680IIRFilter.BME680_IIR_FILTER_1X,
-    '3X': BME680IIRFilter.BME680_IIR_FILTER_3X,
-    '7X': BME680IIRFilter.BME680_IIR_FILTER_7X,
-    '15X': BME680IIRFilter.BME680_IIR_FILTER_15X,
-    '31X': BME680IIRFilter.BME680_IIR_FILTER_31X,
-    '63X': BME680IIRFilter.BME680_IIR_FILTER_63X,
-    '127X': BME680IIRFilter.BME680_IIR_FILTER_127X,
-}
-
-BME680_OVERSAMPLING_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({
-    vol.Optional(CONF_OVERSAMPLING): cv.one_of(*OVERSAMPLING_OPTIONS, upper=True),
-})
-
-BME680Component = sensor.sensor_ns.class_('BME680Component', PollingComponent, i2c.I2CDevice)
-BME680TemperatureSensor = sensor.sensor_ns.class_('BME680TemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-BME680PressureSensor = sensor.sensor_ns.class_('BME680PressureSensor',
-                                               sensor.EmptyPollingParentSensor)
-BME680HumiditySensor = sensor.sensor_ns.class_('BME680HumiditySensor',
-                                               sensor.EmptyPollingParentSensor)
-BME680GasResistanceSensor = sensor.sensor_ns.class_('BME680GasResistanceSensor',
-                                                    sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(BME680Component),
-    vol.Optional(CONF_ADDRESS, default=0x76): cv.i2c_address,
-    vol.Required(CONF_TEMPERATURE): cv.nameable(BME680_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME680TemperatureSensor),
-    })),
-    vol.Required(CONF_PRESSURE): cv.nameable(BME680_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME680PressureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(BME680_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME680HumiditySensor),
-    })),
-    vol.Required(CONF_GAS_RESISTANCE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BME680GasResistanceSensor),
-    })),
-    vol.Optional(CONF_IIR_FILTER): cv.one_of(*IIR_FILTER_OPTIONS, upper=True),
-    vol.Optional(CONF_HEATER): vol.Any(None, vol.All(vol.Schema({
-        vol.Optional(CONF_TEMPERATURE, default=320): vol.All(vol.Coerce(int), vol.Range(200, 400)),
-        vol.Optional(CONF_DURATION, default='150ms'): vol.All(
-            cv.positive_time_period_milliseconds, vol.Range(max=core.TimePeriod(milliseconds=4032)))
-    }, cv.has_at_least_one_key(CONF_TEMPERATURE, CONF_DURATION)))),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_bme680_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_PRESSURE][CONF_NAME],
-                                 config[CONF_HUMIDITY][CONF_NAME],
-                                 config[CONF_GAS_RESISTANCE][CONF_NAME],
-                                 config[CONF_ADDRESS],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    bme680 = Pvariable(config[CONF_ID], rhs)
-    if CONF_OVERSAMPLING in config[CONF_TEMPERATURE]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_TEMPERATURE][CONF_OVERSAMPLING]]
-        add(bme680.set_temperature_oversampling(constant))
-    if CONF_OVERSAMPLING in config[CONF_PRESSURE]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_PRESSURE][CONF_OVERSAMPLING]]
-        add(bme680.set_pressure_oversampling(constant))
-    if CONF_OVERSAMPLING in config[CONF_HUMIDITY]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_HUMIDITY][CONF_OVERSAMPLING]]
-        add(bme680.set_humidity_oversampling(constant))
-    if CONF_IIR_FILTER in config:
-        constant = IIR_FILTER_OPTIONS[config[CONF_IIR_FILTER]]
-        add(bme680.set_iir_filter(constant))
-    if CONF_HEATER in config:
-        conf = config[CONF_HEATER]
-        if not conf:
-            add(bme680.set_heater(0, 0))
-        else:
-            add(bme680.set_heater(conf[CONF_TEMPERATURE], conf[CONF_DURATION]))
-
-    sensor.setup_sensor(bme680.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(bme680.Pget_pressure_sensor(), config[CONF_PRESSURE])
-    sensor.setup_sensor(bme680.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    sensor.setup_sensor(bme680.Pget_gas_resistance_sensor(), config[CONF_GAS_RESISTANCE])
-    setup_component(bme680, config)
-
-
-BUILD_FLAGS = '-DUSE_BME680'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_PRESSURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY]),
-            sensor.core_to_hass_config(data, config[CONF_GAS_RESISTANCE])]

esphome/components/sensor/bmp085.py

@@ -1,50 +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_NAME, CONF_PRESSURE, CONF_TEMPERATURE, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import HexIntLiteral, Pvariable, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['i2c']
-
-BMP085Component = sensor.sensor_ns.class_('BMP085Component', PollingComponent, i2c.I2CDevice)
-BMP085TemperatureSensor = sensor.sensor_ns.class_('BMP085TemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-BMP085PressureSensor = sensor.sensor_ns.class_('BMP085PressureSensor',
-                                               sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(BMP085Component),
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BMP085TemperatureSensor),
-    })),
-    vol.Required(CONF_PRESSURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BMP085PressureSensor),
-    })),
-    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_bmp085_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_PRESSURE][CONF_NAME],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    bmp = Pvariable(config[CONF_ID], rhs)
-    if CONF_ADDRESS in config:
-        add(bmp.set_address(HexIntLiteral(config[CONF_ADDRESS])))
-
-    sensor.setup_sensor(bmp.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(bmp.Pget_pressure_sensor(), config[CONF_PRESSURE])
-    setup_component(bmp, config)
-
-
-BUILD_FLAGS = '-DUSE_BMP085_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_PRESSURE])]

esphome/components/sensor/bmp280.py

@@ -1,82 +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_IIR_FILTER, CONF_NAME, \
-    CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, 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']
-
-BMP280Oversampling = sensor.sensor_ns.enum('BMP280Oversampling')
-OVERSAMPLING_OPTIONS = {
-    'NONE': BMP280Oversampling.BMP280_OVERSAMPLING_NONE,
-    '1X': BMP280Oversampling.BMP280_OVERSAMPLING_1X,
-    '2X': BMP280Oversampling.BMP280_OVERSAMPLING_2X,
-    '4X': BMP280Oversampling.BMP280_OVERSAMPLING_4X,
-    '8X': BMP280Oversampling.BMP280_OVERSAMPLING_8X,
-    '16X': BMP280Oversampling.BMP280_OVERSAMPLING_16X,
-}
-
-BMP280IIRFilter = sensor.sensor_ns.enum('BMP280IIRFilter')
-IIR_FILTER_OPTIONS = {
-    'OFF': BMP280IIRFilter.BMP280_IIR_FILTER_OFF,
-    '2X': BMP280IIRFilter.BMP280_IIR_FILTER_2X,
-    '4X': BMP280IIRFilter.BMP280_IIR_FILTER_4X,
-    '8X': BMP280IIRFilter.BMP280_IIR_FILTER_8X,
-    '16X': BMP280IIRFilter.BMP280_IIR_FILTER_16X,
-}
-
-BMP280_OVERSAMPLING_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({
-    vol.Optional(CONF_OVERSAMPLING): cv.one_of(*OVERSAMPLING_OPTIONS, upper=True),
-})
-
-BMP280Component = sensor.sensor_ns.class_('BMP280Component', PollingComponent, i2c.I2CDevice)
-BMP280TemperatureSensor = sensor.sensor_ns.class_('BMP280TemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-BMP280PressureSensor = sensor.sensor_ns.class_('BMP280PressureSensor',
-                                               sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(BMP280Component),
-    vol.Optional(CONF_ADDRESS, default=0x77): cv.i2c_address,
-    vol.Required(CONF_TEMPERATURE): cv.nameable(BMP280_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BMP280TemperatureSensor),
-    })),
-    vol.Required(CONF_PRESSURE): cv.nameable(BMP280_OVERSAMPLING_SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(BMP280PressureSensor),
-    })),
-    vol.Optional(CONF_IIR_FILTER): cv.one_of(*IIR_FILTER_OPTIONS, upper=True),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_bmp280_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_PRESSURE][CONF_NAME],
-                                 config[CONF_ADDRESS],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    bmp280 = Pvariable(config[CONF_ID], rhs)
-    if CONF_OVERSAMPLING in config[CONF_TEMPERATURE]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_TEMPERATURE][CONF_OVERSAMPLING]]
-        add(bmp280.set_temperature_oversampling(constant))
-    if CONF_OVERSAMPLING in config[CONF_PRESSURE]:
-        constant = OVERSAMPLING_OPTIONS[config[CONF_PRESSURE][CONF_OVERSAMPLING]]
-        add(bmp280.set_pressure_oversampling(constant))
-    if CONF_IIR_FILTER in config:
-        constant = IIR_FILTER_OPTIONS[config[CONF_IIR_FILTER]]
-        add(bmp280.set_iir_filter(constant))
-
-    sensor.setup_sensor(bmp280.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(bmp280.Pget_pressure_sensor(), config[CONF_PRESSURE])
-    setup_component(bmp280, config)
-
-
-BUILD_FLAGS = '-DUSE_BMP280'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_PRESSURE])]

esphome/components/sensor/cse7766.py

@@ -1,67 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor, uart
-from esphome.components.uart import UARTComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_CURRENT, CONF_ID, CONF_NAME, CONF_POWER, CONF_UART_ID, \
-    CONF_UPDATE_INTERVAL, CONF_VOLTAGE
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['uart']
-
-CSE7766Component = sensor.sensor_ns.class_('CSE7766Component', PollingComponent, uart.UARTDevice)
-CSE7766VoltageSensor = sensor.sensor_ns.class_('CSE7766VoltageSensor',
-                                               sensor.EmptySensor)
-CSE7766CurrentSensor = sensor.sensor_ns.class_('CSE7766CurrentSensor',
-                                               sensor.EmptySensor)
-CSE7766PowerSensor = sensor.sensor_ns.class_('CSE7766PowerSensor',
-                                             sensor.EmptySensor)
-
-PLATFORM_SCHEMA = vol.All(sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(CSE7766Component),
-    cv.GenerateID(CONF_UART_ID): cv.use_variable_id(UARTComponent),
-
-    vol.Optional(CONF_VOLTAGE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(CSE7766VoltageSensor),
-    })),
-    vol.Optional(CONF_CURRENT): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(CSE7766CurrentSensor),
-    })),
-    vol.Optional(CONF_POWER): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(CSE7766PowerSensor),
-    })),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_least_one_key(CONF_VOLTAGE, CONF_CURRENT,
-                                                               CONF_POWER))
-
-
-def to_code(config):
-    for uart_ in get_variable(config[CONF_UART_ID]):
-        yield
-
-    rhs = App.make_cse7766(uart_, config.get(CONF_UPDATE_INTERVAL))
-    cse = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sensor.register_sensor(cse.make_voltage_sensor(conf[CONF_NAME]), conf)
-    if CONF_CURRENT in config:
-        conf = config[CONF_CURRENT]
-        sensor.register_sensor(cse.make_current_sensor(conf[CONF_NAME]), conf)
-    if CONF_POWER in config:
-        conf = config[CONF_POWER]
-        sensor.register_sensor(cse.make_power_sensor(conf[CONF_NAME]), conf)
-    setup_component(cse, config)
-
-
-BUILD_FLAGS = '-DUSE_CSE7766'
-
-
-def to_hass_config(data, config):
-    ret = []
-    for key in (CONF_VOLTAGE, CONF_CURRENT, CONF_POWER):
-        if key in config:
-            ret.append(sensor.core_to_hass_config(data, config[key]))
-    return ret

esphome/components/sensor/custom.py

@@ -1,37 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_SENSORS
-from esphome.cpp_generator import add, process_lambda, variable
-from esphome.cpp_types import std_vector
-
-CustomSensorConstructor = sensor.sensor_ns.class_('CustomSensorConstructor')
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(CustomSensorConstructor),
-    vol.Required(CONF_LAMBDA): cv.lambda_,
-    vol.Required(CONF_SENSORS): cv.ensure_list(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(sensor.Sensor),
-    })),
-})
-
-
-def to_code(config):
-    for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                    return_type=std_vector.template(sensor.SensorPtr)):
-        yield
-
-    rhs = CustomSensorConstructor(template_)
-    custom = variable(config[CONF_ID], rhs)
-    for i, conf in enumerate(config[CONF_SENSORS]):
-        rhs = custom.Pget_sensor(i)
-        add(rhs.set_name(conf[CONF_NAME]))
-        sensor.register_sensor(rhs, conf)
-
-
-BUILD_FLAGS = '-DUSE_CUSTOM_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, sens) for sens in config[CONF_SENSORS]]

esphome/components/sensor/dht.py

@@ -1,64 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_MODEL, CONF_NAME, \
-    CONF_PIN, CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_output_pin_expression, setup_component
-from esphome.cpp_types import App, PollingComponent
-from esphome.pins import gpio_input_pullup_pin_schema
-
-DHTModel = sensor.sensor_ns.enum('DHTModel')
-DHT_MODELS = {
-    'AUTO_DETECT': DHTModel.DHT_MODEL_AUTO_DETECT,
-    'DHT11': DHTModel.DHT_MODEL_DHT11,
-    'DHT22': DHTModel.DHT_MODEL_DHT22,
-    'AM2302': DHTModel.DHT_MODEL_AM2302,
-    'RHT03': DHTModel.DHT_MODEL_RHT03,
-    'SI7021': DHTModel.DHT_MODEL_SI7021,
-}
-
-DHTComponent = sensor.sensor_ns.class_('DHTComponent', PollingComponent)
-DHTTemperatureSensor = sensor.sensor_ns.class_('DHTTemperatureSensor',
-                                               sensor.EmptyPollingParentSensor)
-DHTHumiditySensor = sensor.sensor_ns.class_('DHTHumiditySensor',
-                                            sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(DHTComponent),
-    vol.Required(CONF_PIN): gpio_input_pullup_pin_schema,
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(DHTTemperatureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(DHTHumiditySensor),
-    })),
-    vol.Optional(CONF_MODEL): cv.one_of(*DHT_MODELS, upper=True),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for pin in gpio_output_pin_expression(config[CONF_PIN]):
-        yield
-    rhs = App.make_dht_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                              config[CONF_HUMIDITY][CONF_NAME],
-                              pin, config.get(CONF_UPDATE_INTERVAL))
-    dht = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_MODEL in config:
-        constant = DHT_MODELS[config[CONF_MODEL]]
-        add(dht.set_dht_model(constant))
-
-    sensor.setup_sensor(dht.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(dht.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    setup_component(dht, config)
-
-
-BUILD_FLAGS = '-DUSE_DHT_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY])]

esphome/components/sensor/dht12.py

@@ -1,47 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['i2c']
-
-DHT12Component = sensor.sensor_ns.class_('DHT12Component', PollingComponent, i2c.I2CDevice)
-DHT12TemperatureSensor = sensor.sensor_ns.class_('DHT12TemperatureSensor',
-                                                 sensor.EmptyPollingParentSensor)
-DHT12HumiditySensor = sensor.sensor_ns.class_('DHT12HumiditySensor',
-                                              sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(DHT12Component),
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(DHT12TemperatureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(DHT12HumiditySensor),
-    })),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_dht12_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                config[CONF_HUMIDITY][CONF_NAME],
-                                config.get(CONF_UPDATE_INTERVAL))
-    dht = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(dht.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(dht.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    setup_component(dht, config)
-
-
-BUILD_FLAGS = '-DUSE_DHT12_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY])]

esphome/components/sensor/duty_cycle.py

@@ -1,34 +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_NAME, CONF_PIN, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
-from esphome.cpp_types import App
-
-DutyCycleSensor = sensor.sensor_ns.class_('DutyCycleSensor', sensor.PollingSensorComponent)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(DutyCycleSensor),
-    vol.Required(CONF_PIN): pins.internal_gpio_input_pin_schema,
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for pin in gpio_input_pin_expression(config[CONF_PIN]):
-        yield
-    rhs = App.make_duty_cycle_sensor(config[CONF_NAME], pin,
-                                     config.get(CONF_UPDATE_INTERVAL))
-    duty = Pvariable(config[CONF_ID], rhs)
-    sensor.setup_sensor(duty, config)
-    setup_component(duty, config)
-
-
-BUILD_FLAGS = '-DUSE_DUTY_CYCLE_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/esp32_hall.py

@@ -1,32 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL, ESP_PLATFORM_ESP32
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Application
-
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-
-MakeESP32HallSensor = Application.struct('MakeESP32HallSensor')
-ESP32HallSensor = sensor.sensor_ns.class_('ESP32HallSensor', sensor.PollingSensorComponent)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(ESP32HallSensor),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_esp32_hall_sensor(config[CONF_NAME], config.get(CONF_UPDATE_INTERVAL))
-    hall = Pvariable(config[CONF_ID], rhs)
-    sensor.setup_sensor(hall, config)
-    setup_component(hall, config)
-
-
-BUILD_FLAGS = '-DUSE_ESP32_HALL_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/hdc1080.py

@@ -1,47 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['i2c']
-
-HDC1080Component = sensor.sensor_ns.class_('HDC1080Component', PollingComponent, i2c.I2CDevice)
-HDC1080TemperatureSensor = sensor.sensor_ns.class_('HDC1080TemperatureSensor',
-                                                   sensor.EmptyPollingParentSensor)
-HDC1080HumiditySensor = sensor.sensor_ns.class_('HDC1080HumiditySensor',
-                                                sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(HDC1080Component),
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(HDC1080TemperatureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(HDC1080HumiditySensor),
-    })),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_hdc1080_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                  config[CONF_HUMIDITY][CONF_NAME],
-                                  config.get(CONF_UPDATE_INTERVAL))
-    hdc1080 = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(hdc1080.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(hdc1080.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    setup_component(hdc1080, config)
-
-
-BUILD_FLAGS = '-DUSE_HDC1080_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY])]

esphome/components/sensor/homeassistant.py

@@ -1,29 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import 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']
-
-HomeassistantSensor = sensor.sensor_ns.class_('HomeassistantSensor', sensor.Sensor)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(HomeassistantSensor),
-    vol.Required(CONF_ENTITY_ID): cv.entity_id,
-}))
-
-
-def to_code(config):
-    rhs = App.make_homeassistant_sensor(config[CONF_NAME], config[CONF_ENTITY_ID])
-    subs = Pvariable(config[CONF_ID], rhs)
-    sensor.setup_sensor(subs, config)
-
-
-BUILD_FLAGS = '-DUSE_HOMEASSISTANT_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/htu21d.py

@@ -1,48 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_NAME, CONF_TEMPERATURE, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Application, PollingComponent
-
-DEPENDENCIES = ['i2c']
-
-MakeHTU21DSensor = Application.struct('MakeHTU21DSensor')
-HTU21DComponent = sensor.sensor_ns.class_('HTU21DComponent', PollingComponent, i2c.I2CDevice)
-HTU21DTemperatureSensor = sensor.sensor_ns.class_('HTU21DTemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-HTU21DHumiditySensor = sensor.sensor_ns.class_('HTU21DHumiditySensor',
-                                               sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(HTU21DComponent),
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(HTU21DTemperatureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(HTU21DHumiditySensor),
-    })),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_htu21d_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_HUMIDITY][CONF_NAME],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    htu21d = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(htu21d.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(htu21d.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    setup_component(htu21d, config)
-
-
-BUILD_FLAGS = '-DUSE_HTU21D_SENSOR'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY])]

esphome/components/sensor/hx711.py

@@ -1,53 +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_CLK_PIN, CONF_GAIN, CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import gpio_input_pin_expression, setup_component
-from esphome.cpp_types import App, Application
-
-MakeHX711Sensor = Application.struct('MakeHX711Sensor')
-HX711Sensor = sensor.sensor_ns.class_('HX711Sensor', sensor.PollingSensorComponent)
-
-CONF_DOUT_PIN = 'dout_pin'
-
-HX711Gain = sensor.sensor_ns.enum('HX711Gain')
-GAINS = {
-    128: HX711Gain.HX711_GAIN_128,
-    32: HX711Gain.HX711_GAIN_32,
-    64: HX711Gain.HX711_GAIN_64,
-}
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(HX711Sensor),
-    vol.Required(CONF_DOUT_PIN): pins.gpio_input_pin_schema,
-    vol.Required(CONF_CLK_PIN): pins.gpio_output_pin_schema,
-    vol.Optional(CONF_GAIN): cv.one_of(*GAINS, int=True),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for dout_pin in gpio_input_pin_expression(config[CONF_DOUT_PIN]):
-        yield
-    for sck_pin in gpio_input_pin_expression(config[CONF_CLK_PIN]):
-        yield
-
-    rhs = App.make_hx711_sensor(config[CONF_NAME], dout_pin, sck_pin,
-                                config.get(CONF_UPDATE_INTERVAL))
-    hx711 = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_GAIN in config:
-        add(hx711.set_gain(GAINS[config[CONF_GAIN]]))
-
-    sensor.setup_sensor(hx711, config)
-    setup_component(hx711, config)
-
-
-BUILD_FLAGS = '-DUSE_HX711'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/max31855.py

@@ -1,39 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import sensor, spi
-from esphome.components.spi import SPIComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_CS_PIN, CONF_ID, CONF_NAME, CONF_SPI_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
-
-MAX31855Sensor = sensor.sensor_ns.class_('MAX31855Sensor', sensor.PollingSensorComponent,
-                                         spi.SPIDevice)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(MAX31855Sensor),
-    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,
-}).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_max31855_sensor(config[CONF_NAME], spi_, cs,
-                                   config.get(CONF_UPDATE_INTERVAL))
-    max31855 = Pvariable(config[CONF_ID], rhs)
-    sensor.setup_sensor(max31855, config)
-    setup_component(max31855, config)
-
-
-BUILD_FLAGS = '-DUSE_MAX31855_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/max6675.py

@@ -1,40 +0,0 @@
-import voluptuous as vol
-
-from esphome import pins
-from esphome.components import sensor, spi
-from esphome.components.spi import SPIComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_CS_PIN, CONF_ID, CONF_NAME, CONF_SPI_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
-
-MAX6675Sensor = sensor.sensor_ns.class_('MAX6675Sensor', sensor.PollingSensorComponent,
-                                        spi.SPIDevice)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(MAX6675Sensor),
-    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,
-}).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_max6675_sensor(config[CONF_NAME], spi_, cs,
-                                  config.get(CONF_UPDATE_INTERVAL))
-    max6675 = Pvariable(config[CONF_ID], rhs)
-    sensor.setup_sensor(max6675, config)
-    setup_component(max6675, config)
-
-
-BUILD_FLAGS = '-DUSE_MAX6675_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/mhz19.py

@@ -1,55 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor, uart
-from esphome.components.uart import UARTComponent
-import esphome.config_validation as cv
-from esphome.const import CONF_CO2, CONF_ID, CONF_NAME, CONF_TEMPERATURE, CONF_UART_ID, \
-    CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['uart']
-
-MHZ19Component = sensor.sensor_ns.class_('MHZ19Component', PollingComponent, uart.UARTDevice)
-MHZ19TemperatureSensor = sensor.sensor_ns.class_('MHZ19TemperatureSensor',
-                                                 sensor.EmptyPollingParentSensor)
-MHZ19CO2Sensor = sensor.sensor_ns.class_('MHZ19CO2Sensor', sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(MHZ19Component),
-    cv.GenerateID(CONF_UART_ID): cv.use_variable_id(UARTComponent),
-    vol.Required(CONF_CO2): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(MHZ19CO2Sensor),
-    })),
-    vol.Optional(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(MHZ19TemperatureSensor),
-    })),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    for uart_ in get_variable(config[CONF_UART_ID]):
-        yield
-    rhs = App.make_mhz19_sensor(uart_, config[CONF_CO2][CONF_NAME],
-                                config.get(CONF_UPDATE_INTERVAL))
-    mhz19 = Pvariable(config[CONF_ID], rhs)
-    sensor.setup_sensor(mhz19.Pget_co2_sensor(), config[CONF_CO2])
-
-    if CONF_TEMPERATURE in config:
-        sensor.register_sensor(mhz19.Pmake_temperature_sensor(config[CONF_TEMPERATURE][CONF_NAME]),
-                               config[CONF_TEMPERATURE])
-
-    setup_component(mhz19, config)
-
-
-BUILD_FLAGS = '-DUSE_MHZ19'
-
-
-def to_hass_config(data, config):
-    ret = []
-    for key in (CONF_CO2, CONF_TEMPERATURE):
-        if key in config:
-            ret.append(sensor.core_to_hass_config(data, config[key]))
-    return ret

esphome/components/sensor/mqtt_subscribe.py

@@ -1,36 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME, CONF_QOS, CONF_TOPIC
-from esphome.cpp_generator import Pvariable, add
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-DEPENDENCIES = ['mqtt']
-
-MQTTSubscribeSensor = sensor.sensor_ns.class_('MQTTSubscribeSensor', sensor.Sensor, Component)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(MQTTSubscribeSensor),
-    vol.Required(CONF_TOPIC): cv.subscribe_topic,
-    vol.Optional(CONF_QOS): cv.mqtt_qos,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_mqtt_subscribe_sensor(config[CONF_NAME], config[CONF_TOPIC])
-    subs = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_QOS in config:
-        add(subs.set_qos(config[CONF_QOS]))
-
-    sensor.setup_sensor(subs, config)
-    setup_component(subs, config)
-
-
-BUILD_FLAGS = '-DUSE_MQTT_SUBSCRIBE_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/ms5611.py

@@ -1,51 +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_NAME, CONF_PRESSURE, \
-    CONF_TEMPERATURE, 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']
-
-MS5611Component = sensor.sensor_ns.class_('MS5611Component', PollingComponent, i2c.I2CDevice)
-MS5611TemperatureSensor = sensor.sensor_ns.class_('MS5611TemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-MS5611PressureSensor = sensor.sensor_ns.class_('MS5611PressureSensor',
-                                               sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(MS5611Component),
-    vol.Optional(CONF_ADDRESS): cv.i2c_address,
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(MS5611TemperatureSensor),
-    })),
-    vol.Required(CONF_PRESSURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(MS5611PressureSensor),
-    })),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_ms5611_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_PRESSURE][CONF_NAME],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    ms5611 = Pvariable(config[CONF_ID], rhs)
-
-    if CONF_ADDRESS in config:
-        add(ms5611.set_address(config[CONF_ADDRESS]))
-
-    sensor.setup_sensor(ms5611.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(ms5611.Pget_pressure_sensor(), config[CONF_PRESSURE])
-    setup_component(ms5611, config)
-
-
-BUILD_FLAGS = '-DUSE_MS5611'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_PRESSURE])]

esphome/components/sensor/sht3xd.py

@@ -1,49 +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_HUMIDITY, CONF_ID, CONF_NAME, \
-    CONF_TEMPERATURE, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, PollingComponent
-
-DEPENDENCIES = ['i2c']
-
-SHT3XDComponent = sensor.sensor_ns.class_('SHT3XDComponent', PollingComponent, i2c.I2CDevice)
-SHT3XDTemperatureSensor = sensor.sensor_ns.class_('SHT3XDTemperatureSensor',
-                                                  sensor.EmptyPollingParentSensor)
-SHT3XDHumiditySensor = sensor.sensor_ns.class_('SHT3XDHumiditySensor',
-                                               sensor.EmptyPollingParentSensor)
-
-PLATFORM_SCHEMA = sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(SHT3XDComponent),
-    vol.Required(CONF_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(SHT3XDTemperatureSensor),
-    })),
-    vol.Required(CONF_HUMIDITY): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(SHT3XDHumiditySensor),
-    })),
-    vol.Optional(CONF_ADDRESS, default=0x44): cv.i2c_address,
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema)
-
-
-def to_code(config):
-    rhs = App.make_sht3xd_sensor(config[CONF_TEMPERATURE][CONF_NAME],
-                                 config[CONF_HUMIDITY][CONF_NAME],
-                                 config[CONF_ADDRESS],
-                                 config.get(CONF_UPDATE_INTERVAL))
-    sht3xd = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(sht3xd.Pget_temperature_sensor(), config[CONF_TEMPERATURE])
-    sensor.setup_sensor(sht3xd.Pget_humidity_sensor(), config[CONF_HUMIDITY])
-    setup_component(sht3xd, config)
-
-
-BUILD_FLAGS = '-DUSE_SHT3XD'
-
-
-def to_hass_config(data, config):
-    return [sensor.core_to_hass_config(data, config[CONF_TEMPERATURE]),
-            sensor.core_to_hass_config(data, config[CONF_HUMIDITY])]

esphome/components/sensor/tcs34725.py

@@ -1,113 +0,0 @@
-# coding=utf-8
-import voluptuous as vol
-
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_COLOR_TEMPERATURE, CONF_GAIN, CONF_ID, \
-    CONF_ILLUMINANCE, CONF_INTEGRATION_TIME, CONF_NAME, 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']
-
-CONF_RED_CHANNEL = 'red_channel'
-CONF_GREEN_CHANNEL = 'green_channel'
-CONF_BLUE_CHANNEL = 'blue_channel'
-CONF_CLEAR_CHANNEL = 'clear_channel'
-
-TCS34725Component = sensor.sensor_ns.class_('TCS34725Component', PollingComponent,
-                                            i2c.I2CDevice)
-
-TCS34725IntegrationTime = sensor.sensor_ns.enum('TCS34725IntegrationTime')
-TCS34725_INTEGRATION_TIMES = {
-    '2.4ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_2_4MS,
-    '24ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_24MS,
-    '50ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_50MS,
-    '101ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_101MS,
-    '154ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_154MS,
-    '700ms': TCS34725IntegrationTime.TCS34725_INTEGRATION_TIME_700MS,
-}
-
-TCS34725Gain = sensor.sensor_ns.enum('TCS34725Gain')
-TCS34725_GAINS = {
-    '1X': TCS34725Gain.TCS34725_GAIN_1X,
-    '4X': TCS34725Gain.TCS34725_GAIN_4X,
-    '16X': TCS34725Gain.TCS34725_GAIN_16X,
-    '60X': TCS34725Gain.TCS34725_GAIN_60X,
-}
-
-TCS35725IlluminanceSensor = sensor.sensor_ns.class_('TCS35725IlluminanceSensor',
-                                                    sensor.EmptyPollingParentSensor)
-TCS35725ColorTemperatureSensor = sensor.sensor_ns.class_('TCS35725ColorTemperatureSensor',
-                                                         sensor.EmptyPollingParentSensor)
-TCS35725ColorChannelSensor = sensor.sensor_ns.class_('TCS35725ColorChannelSensor',
-                                                     sensor.EmptyPollingParentSensor)
-
-COLOR_CHANNEL_SENSOR_SCHEMA = sensor.SENSOR_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TCS35725ColorChannelSensor),
-})
-
-SENSOR_KEYS = [CONF_RED_CHANNEL, CONF_GREEN_CHANNEL, CONF_BLUE_CHANNEL,
-               CONF_CLEAR_CHANNEL, CONF_ILLUMINANCE, CONF_COLOR_TEMPERATURE]
-
-PLATFORM_SCHEMA = vol.All(sensor.PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TCS34725Component),
-    vol.Optional(CONF_ADDRESS): cv.i2c_address,
-    vol.Optional(CONF_RED_CHANNEL): cv.nameable(COLOR_CHANNEL_SENSOR_SCHEMA),
-    vol.Optional(CONF_GREEN_CHANNEL): cv.nameable(COLOR_CHANNEL_SENSOR_SCHEMA),
-    vol.Optional(CONF_BLUE_CHANNEL): cv.nameable(COLOR_CHANNEL_SENSOR_SCHEMA),
-    vol.Optional(CONF_CLEAR_CHANNEL): cv.nameable(COLOR_CHANNEL_SENSOR_SCHEMA),
-    vol.Optional(CONF_ILLUMINANCE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(TCS35725IlluminanceSensor),
-    })),
-    vol.Optional(CONF_COLOR_TEMPERATURE): cv.nameable(sensor.SENSOR_SCHEMA.extend({
-        cv.GenerateID(): cv.declare_variable_id(TCS35725ColorTemperatureSensor),
-    })),
-    vol.Optional(CONF_INTEGRATION_TIME): cv.one_of(*TCS34725_INTEGRATION_TIMES, lower=True),
-    vol.Optional(CONF_GAIN): vol.All(vol.Upper, cv.one_of(*TCS34725_GAINS), upper=True),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema), cv.has_at_least_one_key(*SENSOR_KEYS))
-
-
-def to_code(config):
-    rhs = App.make_tcs34725(config.get(CONF_UPDATE_INTERVAL))
-    tcs = Pvariable(config[CONF_ID], rhs)
-    if CONF_ADDRESS in config:
-        add(tcs.set_address(config[CONF_ADDRESS]))
-    if CONF_INTEGRATION_TIME in config:
-        add(tcs.set_integration_time(TCS34725_INTEGRATION_TIMES[config[CONF_INTEGRATION_TIME]]))
-    if CONF_GAIN in config:
-        add(tcs.set_gain(TCS34725_GAINS[config[CONF_GAIN]]))
-    if CONF_RED_CHANNEL in config:
-        conf = config[CONF_RED_CHANNEL]
-        sensor.register_sensor(tcs.Pmake_red_sensor(conf[CONF_NAME]), conf)
-    if CONF_GREEN_CHANNEL in config:
-        conf = config[CONF_GREEN_CHANNEL]
-        sensor.register_sensor(tcs.Pmake_green_sensor(conf[CONF_NAME]), conf)
-    if CONF_BLUE_CHANNEL in config:
-        conf = config[CONF_BLUE_CHANNEL]
-        sensor.register_sensor(tcs.Pmake_blue_sensor(conf[CONF_NAME]), conf)
-    if CONF_CLEAR_CHANNEL in config:
-        conf = config[CONF_CLEAR_CHANNEL]
-        sensor.register_sensor(tcs.Pmake_clear_sensor(conf[CONF_NAME]), conf)
-    if CONF_ILLUMINANCE in config:
-        conf = config[CONF_ILLUMINANCE]
-        sensor.register_sensor(tcs.Pmake_illuminance_sensor(conf[CONF_NAME]), conf)
-    if CONF_COLOR_TEMPERATURE in config:
-        conf = config[CONF_COLOR_TEMPERATURE]
-        sensor.register_sensor(tcs.Pmake_color_temperature_sensor(conf[CONF_NAME]), conf)
-
-    setup_component(tcs, config)
-
-
-BUILD_FLAGS = '-DUSE_TCS34725'
-
-
-def to_hass_config(data, config):
-    ret = []
-    for key in (CONF_RED_CHANNEL, CONF_GREEN_CHANNEL, CONF_BLUE_CHANNEL, CONF_CLEAR_CHANNEL,
-                CONF_ILLUMINANCE, CONF_COLOR_TEMPERATURE):
-        if key in config:
-            ret.append(sensor.core_to_hass_config(data, config[key]))
-    return ret

esphome/components/sensor/template.py

@@ -1,58 +0,0 @@
-import voluptuous as vol
-
-from esphome.automation import ACTION_REGISTRY
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_STATE, CONF_UPDATE_INTERVAL
-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, float_, optional
-
-TemplateSensor = sensor.sensor_ns.class_('TemplateSensor', sensor.PollingSensorComponent)
-SensorPublishAction = sensor.sensor_ns.class_('SensorPublishAction', Action)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TemplateSensor),
-    vol.Optional(CONF_LAMBDA): cv.lambda_,
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_template_sensor(config[CONF_NAME], config.get(CONF_UPDATE_INTERVAL))
-    template = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(template, config)
-    setup_component(template, config)
-
-    if CONF_LAMBDA in config:
-        for template_ in process_lambda(config[CONF_LAMBDA], [],
-                                        return_type=optional.template(float_)):
-            yield
-        add(template.set_template(template_))
-
-
-BUILD_FLAGS = '-DUSE_TEMPLATE_SENSOR'
-
-CONF_SENSOR_TEMPLATE_PUBLISH = 'sensor.template.publish'
-SENSOR_TEMPLATE_PUBLISH_ACTION_SCHEMA = vol.Schema({
-    vol.Required(CONF_ID): cv.use_variable_id(sensor.Sensor),
-    vol.Required(CONF_STATE): cv.templatable(cv.float_),
-})
-
-
-@ACTION_REGISTRY.register(CONF_SENSOR_TEMPLATE_PUBLISH, SENSOR_TEMPLATE_PUBLISH_ACTION_SCHEMA)
-def sensor_template_publish_to_code(config, action_id, arg_type, template_arg):
-    for var in get_variable(config[CONF_ID]):
-        yield None
-    rhs = var.make_sensor_publish_action(template_arg)
-    type = SensorPublishAction.template(arg_type)
-    action = Pvariable(action_id, rhs, type=type)
-    for template_ in templatable(config[CONF_STATE], arg_type, float_):
-        yield None
-    add(action.set_state(template_))
-    yield action
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/total_daily_energy.py

@@ -1,38 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor, time
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME, CONF_TIME_ID
-from esphome.cpp_generator import Pvariable, get_variable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App, Component
-
-DEPENDENCIES = ['time']
-
-CONF_POWER_ID = 'power_id'
-TotalDailyEnergy = sensor.sensor_ns.class_('TotalDailyEnergy', sensor.Sensor, Component)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(TotalDailyEnergy),
-    cv.GenerateID(CONF_TIME_ID): cv.use_variable_id(time.RealTimeClockComponent),
-    vol.Required(CONF_POWER_ID): cv.use_variable_id(sensor.Sensor),
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    for time_ in get_variable(config[CONF_TIME_ID]):
-        yield
-    for sens in get_variable(config[CONF_POWER_ID]):
-        yield
-    rhs = App.make_total_daily_energy_sensor(config[CONF_NAME], time_, sens)
-    total_energy = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(total_energy, config)
-    setup_component(total_energy, config)
-
-
-BUILD_FLAGS = '-DUSE_TOTAL_DAILY_ENERGY_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/uptime.py

@@ -1,30 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-UptimeSensor = sensor.sensor_ns.class_('UptimeSensor', sensor.PollingSensorComponent)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(UptimeSensor),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_uptime_sensor(config[CONF_NAME], config.get(CONF_UPDATE_INTERVAL))
-    uptime = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(uptime, config)
-    setup_component(uptime, config)
-
-
-BUILD_FLAGS = '-DUSE_UPTIME_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)

esphome/components/sensor/wifi_signal.py

@@ -1,30 +0,0 @@
-import voluptuous as vol
-
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_NAME, CONF_UPDATE_INTERVAL
-from esphome.cpp_generator import Pvariable
-from esphome.cpp_helpers import setup_component
-from esphome.cpp_types import App
-
-WiFiSignalSensor = sensor.sensor_ns.class_('WiFiSignalSensor', sensor.PollingSensorComponent)
-
-PLATFORM_SCHEMA = cv.nameable(sensor.SENSOR_PLATFORM_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(WiFiSignalSensor),
-    vol.Optional(CONF_UPDATE_INTERVAL): cv.update_interval,
-}).extend(cv.COMPONENT_SCHEMA.schema))
-
-
-def to_code(config):
-    rhs = App.make_wifi_signal_sensor(config[CONF_NAME], config.get(CONF_UPDATE_INTERVAL))
-    wifi = Pvariable(config[CONF_ID], rhs)
-
-    sensor.setup_sensor(wifi, config)
-    setup_component(wifi, config)
-
-
-BUILD_FLAGS = '-DUSE_WIFI_SIGNAL_SENSOR'
-
-
-def to_hass_config(data, config):
-    return sensor.core_to_hass_config(data, config)