Merge branch 'dev' of github.com:xoseperez/espurna into dev

code/espurna/config/hardware.h

@@ -1458,6 +1458,8 @@
     #define HLW8012_CF1_PIN     5
     #define HLW8012_CF_PIN      4
 
+    #define HLW8012_VOLTAGE_R_UP            ( 2 * 1000000 )  // Upstream voltage resistor
+
 // -----------------------------------------------------------------------------
 // Euromate (?) Wifi Stecker Shuko
 // https://www.obi.de/hausfunksteuerung/wifi-stecker-schuko/p/2291706

code/espurna/homeassistant.ino

@@ -26,7 +26,7 @@ void _haSendMagnitude(unsigned char i, JsonObject& config) {
     config["platform"] = "mqtt";
     config["device_class"] = "sensor";
     config["state_topic"] = mqttTopic(magnitudeTopicIndex(i).c_str(), false);
-    config["unit_of_measurement"] = magnitudeUnits(type);
+    config["unit_of_measurement"] = String("\"") + magnitudeUnits(type) + String("\"");
 
 }
 

code/html/index.html

@@ -857,7 +857,7 @@
                                     <div class="pure-u-0 pure-u-lg-1-4"></div>
                                     <div class="pure-u-1 pure-u-lg-3-4 hint">
                                         These are the settings you should copy to your Home Assistant "configuration.yaml" file.
-                                        If any of the sections below (switch, light, sensor) already exists, do not dupplicate it,
+                                        If any of the sections below (switch, light, sensor) already exists, do not duplicate it,
                                         simply copy the contents of the section below the ones already present.
                                     </div>
                                 </div>

code/platformio.ini

@@ -1473,7 +1473,7 @@ upload_port = "${env.ESPURNA_IP}"
 upload_flags = --auth=${env.ESPURNA_AUTH} --port 8266
 extra_scripts = ${common.extra_scripts}
 
-[env:tunbox-powerstrip02]
+[env:tonbux-powerstrip02]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m
@@ -1484,7 +1484,7 @@ build_flags = ${common.build_flags} -DTONBUX_POWERSTRIP02
 monitor_baud = 115200
 extra_scripts = ${common.extra_scripts}
 
-[env:tunbox-powerstrip02-ota]
+[env:tonbux-powerstrip02-ota]
 platform = ${common.platform}
 framework = arduino
 board = esp01_1m