Small fixes (#2071)

* web: fix rfb node generator syntax, do not send as basic settings * ha: allocate discovery object later
xoseperez · Dec 18, 2019 · 0f02256 · 0f02256
1 parent 76ba6d5
commit 0f02256
Show file tree

Hide file tree

Showing 19 changed files with 8,737 additions and 8,739 deletions.
diff --git a/code/espurna/data/index.all.html.gz b/code/espurna/data/index.all.html.gz
diff --git a/code/espurna/data/index.light.html.gz b/code/espurna/data/index.light.html.gz
diff --git a/code/espurna/data/index.lightfox.html.gz b/code/espurna/data/index.lightfox.html.gz
diff --git a/code/espurna/data/index.rfbridge.html.gz b/code/espurna/data/index.rfbridge.html.gz
diff --git a/code/espurna/data/index.rfm69.html.gz b/code/espurna/data/index.rfm69.html.gz
diff --git a/code/espurna/data/index.sensor.html.gz b/code/espurna/data/index.sensor.html.gz
diff --git a/code/espurna/data/index.small.html.gz b/code/espurna/data/index.small.html.gz
diff --git a/code/espurna/data/index.thermostat.html.gz b/code/espurna/data/index.thermostat.html.gz
diff --git a/code/espurna/homeassistant.ino b/code/espurna/homeassistant.ino
@@ -543,7 +543,7 @@ void haSetup() {
 
     // On MQTT connect check if we have something to send
     mqttRegister([](unsigned int type, const char * topic, const char * payload) {
-        if (type == MQTT_CONNECT_EVENT) _haSend();
+        if (type == MQTT_CONNECT_EVENT) schedule_function(_haSend);
         if (type == MQTT_DISCONNECT_EVENT) _ha_send_flag = _ha_enabled;
     });
 

diff --git a/code/espurna/static/index.all.html.gz.h b/code/espurna/static/index.all.html.gz.h
diff --git a/code/espurna/static/index.light.html.gz.h b/code/espurna/static/index.light.html.gz.h
diff --git a/code/espurna/static/index.lightfox.html.gz.h b/code/espurna/static/index.lightfox.html.gz.h
diff --git a/code/espurna/static/index.rfbridge.html.gz.h b/code/espurna/static/index.rfbridge.html.gz.h
diff --git a/code/espurna/static/index.rfm69.html.gz.h b/code/espurna/static/index.rfm69.html.gz.h
diff --git a/code/espurna/static/index.sensor.html.gz.h b/code/espurna/static/index.sensor.html.gz.h
diff --git a/code/espurna/static/index.small.html.gz.h b/code/espurna/static/index.small.html.gz.h
diff --git a/code/espurna/static/index.thermostat.html.gz.h b/code/espurna/static/index.thermostat.html.gz.h
diff --git a/code/html/custom.js b/code/html/custom.js
@@ -493,7 +493,7 @@ function initSelectGPIO(select) {
         [13, "13 (MTCK)"],
         [14, "14 (MTMS)"],
         [15, "15 (MTDO)"],
-        [16, "15 (WAKE)"],
+        [16, "16 (WAKE)"],
     ];
     for (n in mapping) {
         var elem = $('<option value="' + mapping[n][0] + '">');
@@ -1449,12 +1449,9 @@ function addRfbNode() {
 
     var template = $("#rfbNodeTemplate").children();
     var line = $(template).clone();
-    var status = true;
     $("span", line).html(numNodes);
     $(line).find("input").each(function() {
-        $(this).data("id", numNodes);
-        $(this).attr("status", status ? 1 : 0);
-        status = !status;
+        this.dataset["id"] = numNodes;
     });
     $(line).find(".button-rfb-learn").on("click", rfbLearn);
     $(line).find(".button-rfb-forget").on("click", rfbForget);

diff --git a/code/html/index.html b/code/html/index.html
@@ -1789,15 +1789,15 @@ <h2>
 
             <div class="pure-g">
                 <div class="pure-u-1 pure-u-lg-1-4"><label>Switch ON</label></div>
-                <input class="pure-u-1 pure-u-lg-1-3" type="text" maxlength="116" name="rfbcode" data-id="1" data-status="1" />
+                <input class="pure-u-1 pure-u-lg-1-3" type="text" maxlength="116" name="rfbcode" data-status="1" data-settings-ignore="true" />
                 <div class="pure-u-1-3 pure-u-lg-1-8"><button type="button" class="pure-u-23-24 pure-button button-rfb-learn">LEARN</button></div>
                 <div class="pure-u-1-3 pure-u-lg-1-8"><button type="button" class="pure-u-23-24 pure-button button-rfb-send">SAVE</button></div>
                 <div class="pure-u-1-3 pure-u-lg-1-8"><button type="button" class="pure-u-23-24 pure-button button-rfb-forget">FORGET</button></div>
             </div>
 
             <div class="pure-g">
                 <div class="pure-u-1 pure-u-lg-1-4"><label>Switch OFF</label></div>
-                <input class="pure-u-1 pure-u-lg-1-3" type="text" maxlength="116" name="rfbcode" data-id="1" data-status="0" />
+                <input class="pure-u-1 pure-u-lg-1-3" type="text" maxlength="116" name="rfbcode" data-status="0" data-settings-ignore="true" />
                 <div class="pure-u-1-3 pure-u-lg-1-8"><button type="button" class="pure-u-23-24 pure-button button-rfb-learn">LEARN</button></div>
                 <div class="pure-u-1-3 pure-u-lg-1-8"><button type="button" class="pure-u-23-24 pure-button button-rfb-send">SAVE</button></div>
                 <div class="pure-u-1-3 pure-u-lg-1-8"><button type="button" class="pure-u-23-24 pure-button button-rfb-forget">FORGET</button></div>