Skip to content

Commit

Permalink
Merge branch 'current' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
OttoWinter committed Feb 20, 2019
2 parents 1a440e0 + 813cdae commit 5ac6cee
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
Binary file modified _static/favicon-192x192.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _static/favicon-256x256.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions _static/site.webmanifest
Expand Up @@ -22,6 +22,11 @@
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/_static/favicon-256x256.png",
"sizes": "256x256",
"type": "image/png"
},
{
"src": "/_static/favicon-512x512.png",
"sizes": "512x512",
Expand Down
12 changes: 3 additions & 9 deletions _templates/layout.html
Expand Up @@ -9,6 +9,7 @@
<link rel="apple-touch-icon" sizes="180x180" href="/_static/apple-touch-icon.png">
<link rel="shortcut icon" href="/_static/favicon.ico">
<link rel="icon" type="image/png" sizes="512x512" href="/_static/favicon-512x512.png">
<link rel="icon" type="image/png" sizes="256x256" href="/_static/favicon-256x256.png">
<link rel="icon" type="image/png" sizes="192x192" href="/_static/favicon-192x192.png">
<link rel="icon" type="image/png" sizes="128x128" href="/_static/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="32x32" href="/_static/favicon-32x32.png">
Expand Down Expand Up @@ -36,18 +37,11 @@
</div>

<script async src="https://www.googletagmanager.com/gtag/js?id=UA-113203480-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());

gtag('config', 'UA-113203480-2', {'anonymize_ip': true});
</script>
<script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'UA-113203480-2', {'anonymize_ip': true});</script>

<script>
var old = window.localStorage.getItem("release");
if (old === null) {
window.localStorage.setItem("release", "{{ release }}");
if (old === null) { window.localStorage.setItem("release", "{{ release }}");
} else if (old !== "{{ release }}") {
document.getElementById("upgrade-footer").classList.add("not-hidden");
document.getElementById("upgrade-footer-changelog").addEventListener('click', function () {
Expand Down
18 changes: 9 additions & 9 deletions components/binary_sensor/custom.rst
Expand Up @@ -29,7 +29,7 @@ same as the gpio binary sensor.
// This will be called every "update_interval" milliseconds.
// Publish an OFF state
bool state = digitalRead(5)
bool state = digitalRead(5);
publish_state(state);
}
};
Expand All @@ -46,14 +46,14 @@ And in YAML:
- my_binary_sensor.h
binary_sensor:
- platform: custom
lambda: |-
auto my_custom_sensor = new MyCustomBinarySensor();
App.register_component(my_custom_sensor);
return {my_custom_sensor};
binary_sensors:
name: "My Custom Binary Sensor"
- platform: custom
lambda: |-
auto my_custom_sensor = new MyCustomBinarySensor();
App.register_component(my_custom_sensor);
return {my_custom_sensor};
binary_sensors:
name: "My Custom Binary Sensor"
Configuration variables:

Expand Down
1 change: 1 addition & 0 deletions devices/sonoff.rst
Expand Up @@ -205,6 +205,7 @@ Sonoff T1 1CH, 2CH, 3CH
GPIO5, Relay 2 and Blue LED,
GPIO10, Button 3 (inverted),
GPIO4, Relay 3 and Blue LED,
GPIO13, Blue LED (inverted),
GPIO1, UART TX pin (for external sensors)
GPIO3, UART RX pin (for external sensors)

Expand Down
4 changes: 2 additions & 2 deletions github.py
Expand Up @@ -10,13 +10,13 @@
def libpr_role(name, rawtext, text, lineno, inliner, options=None,
content=None):
ref = 'https://github.com/esphome/esphome-core/pull/{}'.format(text)
return [make_link_node(rawtext, 'lib#{}'.format(text), ref, options)], []
return [make_link_node(rawtext, 'core#{}'.format(text), ref, options)], []


def yamlpr_role(name, rawtext, text, lineno, inliner, options=None,
content=None):
ref = 'https://github.com/esphome/esphome/pull/{}'.format(text)
return [make_link_node(rawtext, 'yaml#{}'.format(text), ref, options)], []
return [make_link_node(rawtext, 'esphome#{}'.format(text), ref, options)], []


def docspr_role(name, rawtext, text, lineno, inliner, options=None,
Expand Down

0 comments on commit 5ac6cee

Please sign in to comment.