Merge branch 'current' into beta

_static/site.webmanifest

@@ -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",

_templates/layout.html

@@ -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">
@@ -36,18 +37,11 @@
   </div>
 
   <script async src="https://www.googletagmanager.com/gtag/js?id=UA-113203480-2"></script>
-  <script>
+  <script>window.dataLayer = window.dataLayer || [];function gtag(){dataLayer.push(arguments);}gtag('js', new Date());gtag('config', 'UA-113203480-2', {'anonymize_ip': true});</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) {
+    if (old === null) { window.localStorage.setItem("release", "{{ release }}");
-      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 () {

components/binary_sensor/custom.rst

@@ -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);
       }
     };
@@ -46,14 +46,14 @@ And in YAML:
         - my_binary_sensor.h
 
     binary_sensor:
-    - platform: custom
+      - platform: custom
-      lambda: |-
+        lambda: |-
-        auto my_custom_sensor = new MyCustomBinarySensor();
+          auto my_custom_sensor = new MyCustomBinarySensor();
-        App.register_component(my_custom_sensor);
+          App.register_component(my_custom_sensor);
-        return {my_custom_sensor};
+          return {my_custom_sensor};
 
-      binary_sensors:
+        binary_sensors:
-        name: "My Custom Binary Sensor"
+          name: "My Custom Binary Sensor"
 
 Configuration variables:
 

devices/sonoff.rst

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

github.py

@@ -10,13 +10,13 @@ from docutils.parsers.rst.directives.tables import Table
 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,