Merge branch 'current' into next

This commit is contained in:
Otto Winter 2019-11-17 23:31:01 +01:00
commit f80c48dbfa
No known key found for this signature in database
GPG Key ID: DB66C0BE6013F97E
11 changed files with 148 additions and 9 deletions

View File

@ -38,7 +38,7 @@ PROJECT_NAME = "ESPHome"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 1.14.1 PROJECT_NUMBER = 1.14.2
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a # for a project that appears at the top of each page and should give viewer a

View File

@ -1,5 +1,5 @@
ESPHOME_PATH = ../esphome ESPHOME_PATH = ../esphome
ESPHOME_REF = v1.14.1 ESPHOME_REF = v1.14.2
.PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png

View File

@ -1 +1 @@
1.14.1 1.14.2

View File

@ -141,6 +141,11 @@ Release 1.14.1 - November 2
- esphome: Add servo missing restore option to codegen :esphomepr:`829` - esphome: Add servo missing restore option to codegen :esphomepr:`829`
- docs: Document missing servo restore option :docspr:`398` - docs: Document missing servo restore option :docspr:`398`
Release 1.14.2 - November 3
---------------------------
- esphome: Fix weird ESP8266 wifi crashes :esphomepr:`831`
Notable Changes & New Features Notable Changes & New Features
------------------------------ ------------------------------

View File

@ -16,7 +16,6 @@ bluetooth low energy device.
# Example configuration entry # Example configuration entry
esp32_ble_tracker: esp32_ble_tracker:
scan_interval: 300s
binary_sensor: binary_sensor:
# Presence based on MAC address # Presence based on MAC address

View File

@ -46,7 +46,7 @@ As the communication with the :ref:`I²C Bus <i2c>`, you need to have an ``i2c:`
Configuration variables: Configuration variables:
************************ ************************
- **dimensions** (**Required**, string): The dimensions of the display with ``ROWSxCOLUMNS``. If you're not - **dimensions** (**Required**, string): The dimensions of the display with ``COLUMNSxROWS``. If you're not
sure, power the display up and just count them. sure, power the display up and just count them.
- **address** (*Optional*, int): The :ref:`I²C <i2c>` address of the PCF8574 chip, defaults to ``0x3F``. - **address** (*Optional*, int): The :ref:`I²C <i2c>` address of the PCF8574 chip, defaults to ``0x3F``.
- **lambda** (*Optional*, :ref:`lambda <config-lambda>`): The lambda to use for rendering the content on the display. - **lambda** (*Optional*, :ref:`lambda <config-lambda>`): The lambda to use for rendering the content on the display.
@ -90,7 +90,7 @@ commonly sold with a PCF8574 chip which only need two lines to the ESP, for that
Configuration variables: Configuration variables:
************************ ************************
- **dimensions** (**Required**, string): The dimensions of the display with ``ROWSxCOLUMNS``. If you're not - **dimensions** (**Required**, string): The dimensions of the display with ``COLUMNSxROWS``. If you're not
sure, power the display up and just count them. sure, power the display up and just count them.
- **data_pins** (**Required**, list of :ref:`Pin Schemas <config-pin_schema>`): A list of the data pins you - **data_pins** (**Required**, list of :ref:`Pin Schemas <config-pin_schema>`): A list of the data pins you
have hooked up to the LCD. The list can either be 8 items long (when you have connected all 8 data pins), or have hooked up to the LCD. The list can either be 8 items long (when you have connected all 8 data pins), or

View File

@ -11,7 +11,7 @@ The ``as3935`` sensor platform allows you to use your as3935 sensor
in order to get notified when a thunderstorm is getting close. in order to get notified when a thunderstorm is getting close.
The AS3935 can detect the presence of lightning activity and provide an estimation The AS3935 can detect the presence of lightning activity and provide an estimation
on the diestance to the head of the storm. The chip issues a notification through an interrupt on the distance to the head of the storm. The chip issues a notification through an interrupt
pin. pin.
The AS3935 can be configured to use either the SPI **or** I2C protocol for data communication. The AS3935 can be configured to use either the SPI **or** I2C protocol for data communication.

View File

@ -14,7 +14,6 @@ instructions for setting up this platform.
# Example configuration entry # Example configuration entry
esp32_ble_tracker: esp32_ble_tracker:
scan_interval: 300s
sensor: sensor:
# RSSI based on MAC address # RSSI based on MAC address

View File

@ -72,7 +72,7 @@ author = 'Otto Winter'
# The short X.Y version. # The short X.Y version.
version = '1.14' version = '1.14'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.14.1' release = '1.14.2'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

View File

@ -211,10 +211,144 @@ which these adaptions created by `@cryptelli <https://community.home-assistant.i
name: Status name: Status
switch: switch:
- platform: gpio
id: red_led
pin:
number: GPIO4
inverted: true
- platform: gpio - platform: gpio
name: "Mirabella Genio Smart Plug" name: "Mirabella Genio Smart Plug"
pin: GPIO12 pin: GPIO12
id: relay id: relay
# Turn on red LED
on_turn_on:
- switch.turn_on: red_led
# Turns off red LED
on_turn_off:
- switch.turn_off: red_led
3.3 Gosund SP1
**************
.. code-block:: yaml
esphome:
name: gosund_sp1_smart_plug
platform: ESP8266
board: esp8285
wifi:
ssid: 'WIFI'
password: 'WIFIPASS'
logger:
api:
ota:
binary_sensor:
- platform: gpio
pin:
number: GPIO3
inverted: True
name: "Power Button"
on_press:
- switch.toggle: relay
switch:
- platform: gpio
id: led
pin: GPIO1
- platform: gpio
name: "Gosund SP1 Smart Plug"
pin: GPIO14
id: relay
on_turn_on:
- switch.turn_on: led
on_turn_off:
- switch.turn_off: led
sensor:
- platform: hlw8012
sel_pin:
number: GPIO12
inverted: True
cf_pin: GPIO04
cf1_pin: GPIO05
current_resistor: 0.00221
voltage_divider: 871
current:
name: "Gosund SP1 Smart Plug current"
unit_of_measurement: A
voltage:
name: "Gosund SP1 Smart Plug Voltage"
unit_of_measurement: V
power:
name: "Gosund SP1 Smart Plug Wattage"
unit_of_measurement: W
id: "energy_temp_Wattage"
change_mode_every: 8
update_interval: 10s
Check the following page for calibrating the measurements: :ref:`sensor-filter-calibrate_linear`.
3.4 Topersun WL-SC01 Smart Plug
*******************************
.. code-block:: yaml
esphome:
name: topersun_smart_plug
platform: ESP8266
board: esp01_1m
wifi:
ssid: 'WIFI'
password: 'WIFIPASS'
logger:
api:
ota:
binary_sensor:
- platform: gpio
pin:
number: 14
mode: INPUT_PULLUP
inverted: true
name: "Power Button"
on_press:
- switch.toggle: relay
- platform: status
name: "Status"
switch:
- platform: gpio
id: green_led
pin:
number: GPIO4
inverted: true
- platform: gpio
name: "Brilliant Smart Plug"
pin: GPIO12
id: relay
# Turn off green LED to show red when turned on.
on_turn_on:
- switch.turn_off: green_led
# Turns on the green LED once the plug is turned off.
on_turn_off:
- switch.turn_on: green_led
4. Adding to Home Assistant 4. Adding to Home Assistant
--------------------------- ---------------------------

View File

@ -56,6 +56,7 @@ Custom Components & Code
- `Custom ESPHome Keypad sensor <https://github.com/Syralist/esphomekeypad>`__ by :ghuser:`Syralist` - `Custom ESPHome Keypad sensor <https://github.com/Syralist/esphomekeypad>`__ by :ghuser:`Syralist`
- `LINP-Doorbell-g03 Custom Component <https://github.com/pauln/esphome-linp-doorbell-g03>`__ by :ghuser:`pauln` - `LINP-Doorbell-g03 Custom Component <https://github.com/pauln/esphome-linp-doorbell-g03>`__ by :ghuser:`pauln`
- `ESPHome <-> Homebridge <https://www.npmjs.com/package/homebridge-esphome>`__ by `basdelfos <https://www.npmjs.com/~basdelfos>`__ - `ESPHome <-> Homebridge <https://www.npmjs.com/package/homebridge-esphome>`__ by `basdelfos <https://www.npmjs.com/~basdelfos>`__
- `Custom ESPHome for Wofea V10 Alarm <https://github.com/nbergont/wofea_v10_hack>`__ by :ghuser:`nbergont`
Sample Configurations Sample Configurations
--------------------- ---------------------
@ -74,3 +75,4 @@ Sample Configurations
- `LOHAS RGBW/CWWW Smart bulbs <https://www.youtube.com/watch?v=fTb6n6flJIw>`__ by `digiblurDIY <https://www.youtube.com/channel/UC5ZdPKE2ckcBhljTc2R_qNA>`__ - `LOHAS RGBW/CWWW Smart bulbs <https://www.youtube.com/watch?v=fTb6n6flJIw>`__ by `digiblurDIY <https://www.youtube.com/channel/UC5ZdPKE2ckcBhljTc2R_qNA>`__
- `ESPHome with MakerLife Weather Station Kit <https://github.com/mkuoppa/esphomeweatherstation>`__ by :ghuser:`mkuoppa` - `ESPHome with MakerLife Weather Station Kit <https://github.com/mkuoppa/esphomeweatherstation>`__ by :ghuser:`mkuoppa`
- `ESPHome DIY Multisensor Cat Feeder <https://github.com/335iguy/diy-multisensor-cat-feeder>`__ by :ghuser:`335iguy` - `ESPHome DIY Multisensor Cat Feeder <https://github.com/335iguy/diy-multisensor-cat-feeder>`__ by :ghuser:`335iguy`
- `ESPHome config for Universal IR Remote ZJ-A1 (russian) <https://kvvhost.ru/2019/10/30/review-firmware-zj-a1-ir-remote/>`__ by `kvvhost <https://kvvhost.ru/>`__