Merge branch 'current' into next
This commit is contained in:
commit
76757b2a96
2
Doxygen
2
Doxygen
|
@ -38,7 +38,7 @@ PROJECT_NAME = "ESPHome"
|
|||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = 1.13.1
|
||||
PROJECT_NUMBER = 1.13.2
|
||||
|
||||
# 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
|
||||
|
|
2
Makefile
2
Makefile
|
@ -1,5 +1,5 @@
|
|||
ESPHOME_PATH = ../esphome
|
||||
ESPHOME_REF = v1.13.1
|
||||
ESPHOME_REF = v1.13.2
|
||||
|
||||
.PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
1.13.1
|
||||
1.13.2
|
|
@ -134,6 +134,18 @@ Release 1.13.1 - May 30
|
|||
- esphome: Dashboard work around Hass.io bug :esphomepr:`575`
|
||||
- esphome: Fix waveshare 7.5in model :esphomepr:`576`
|
||||
|
||||
Release 1.13.2 - May 31
|
||||
-----------------------
|
||||
|
||||
- esphome: Fix remote_receiver binary_sensor schema :esphomepr:`578`
|
||||
- esphome: Fix MQTT client_id changed :esphomepr:`579`
|
||||
- esphome: Fix Rotary Encoder :esphomepr:`580`
|
||||
- esphome: Fix travis build :esphomepr:`582`
|
||||
- esphome: Fix MQTT on_message trigger :esphomepr:`583`
|
||||
- esphome: Fix light partition :esphomepr:`584`
|
||||
- esphome: Fix i2c setup priority :esphomepr:`585`
|
||||
- docs: add note for asynchronously update of adc :docspr:`259` by :ghuser:`escoand`
|
||||
|
||||
All changes
|
||||
-----------
|
||||
|
||||
|
|
|
@ -63,11 +63,12 @@ a 4.0 A device is showing a value of 0.1333 in the logs. Now go into your config
|
|||
name: "Measured Current"
|
||||
update_interval: 60s
|
||||
filters:
|
||||
# Measured value of 0 maps to 0A
|
||||
- 0 -> 0
|
||||
# Known load: 4.0A
|
||||
# Value shown in logs: 0.1333A
|
||||
- 0.1333 -> 4.0
|
||||
- calibrate_linear:
|
||||
# Measured value of 0 maps to 0A
|
||||
- 0 -> 0
|
||||
# Known load: 4.0A
|
||||
# Value shown in logs: 0.1333A
|
||||
- 0.1333 -> 4.0
|
||||
|
||||
Recompile and upload, now your CT clamp sensor is calibrated!
|
||||
|
||||
|
|
2
conf.py
2
conf.py
|
@ -72,7 +72,7 @@ author = 'Otto Winter'
|
|||
# The short X.Y version.
|
||||
version = '1.13'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '1.13.1'
|
||||
release = '1.13.2'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
@ -55,47 +55,41 @@ for some motors.
|
|||
then:
|
||||
# logic for cycling through movements: open->stop->close->stop->...
|
||||
- lambda: |
|
||||
if (id(cover).state == COVER_OPEN) {
|
||||
if (id(open).state){
|
||||
// cover is in opening movement, stop it
|
||||
id(cover).stop();
|
||||
if (id(my_cover).current_operation == COVER_OPERATION_IDLE) {
|
||||
// Cover is idle, check current state and either open or close cover.
|
||||
if (id(my_cover).is_fully_closed()) {
|
||||
id(my_cover).open();
|
||||
} else {
|
||||
// cover has finished opening, close it
|
||||
id(cover).close();
|
||||
id(my_cover).close();
|
||||
}
|
||||
} else {
|
||||
if (id(close).state){
|
||||
// cover is in closing movement, stop it
|
||||
id(cover).stop();
|
||||
} else {
|
||||
// cover has finished closing, open it
|
||||
id(cover).open();
|
||||
}
|
||||
// Cover is opening/closing. Stop it.
|
||||
id(my_cover).stop();
|
||||
}
|
||||
|
||||
switch:
|
||||
- platform: gpio
|
||||
pin: GPIO12
|
||||
interlock: [open, close]
|
||||
id: open
|
||||
interlock: &interlock [open_cover, close_cover]
|
||||
id: open_cover
|
||||
- platform: gpio
|
||||
pin: GPIO5
|
||||
interlock: [open, close]
|
||||
id: close
|
||||
interlock: *interlock
|
||||
id: close_cover
|
||||
|
||||
cover:
|
||||
- platform: time_based
|
||||
name: "Cover"
|
||||
id: cover
|
||||
id: my_cover
|
||||
open_action:
|
||||
- switch.turn_on: open
|
||||
- switch.turn_on: open_cover
|
||||
open_duration: 60s
|
||||
close_action:
|
||||
- switch.turn_on: close
|
||||
- switch.turn_on: close_cover
|
||||
close_duration: 60s
|
||||
stop_action:
|
||||
- switch.turn_off: open
|
||||
- switch.turn_off: close
|
||||
- switch.turn_off: open_cover
|
||||
- switch.turn_off: close_cover
|
||||
|
||||
See Also
|
||||
--------
|
||||
|
|
|
@ -38,9 +38,9 @@ exposes all of the basic functions.
|
|||
================================================== ==================================================
|
||||
``GPIO0`` Button (inverted)
|
||||
-------------------------------------------------- --------------------------------------------------
|
||||
``GPIO1`` ``RX`` pin (C1 Pin 2)
|
||||
``GPIO1`` ``TX`` pin (C1 Pin 2)
|
||||
-------------------------------------------------- --------------------------------------------------
|
||||
``GPIO3`` ``TX`` pin (C1 Pin 3)
|
||||
``GPIO3`` ``RX`` pin (C1 Pin 3)
|
||||
-------------------------------------------------- --------------------------------------------------
|
||||
``GPIO12`` Relay
|
||||
-------------------------------------------------- --------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue