Report energy in kWh in the web interface and in Joule via MQTT.

Enable energy reporting for all supported chips in the web interface.

code/espurna/config/general.h

@@ -538,7 +538,9 @@ PROGMEM const char* const custom_reset_string[] = {
 #define POWER_VOLTAGE_DECIMALS          0       // Decimals for voltage values
 #define POWER_POWER_DECIMALS            0       // Decimals for power values
 #define POWER_ENERGY_DECIMALS           3       // Decimals for energy values
-#define POWER_ENERGY_FACTOR             (1. / 3600.0) // Ws => Wh
+#define POWER_ENERGY_DECIMALS_WEB       5       // Decimals for energy values
+#define POWER_ENERGY_FACTOR             1       // Watt seconds / Joule
+#define POWER_ENERGY_FACTOR_WEB         (1. / 3600. / 1000.) // kWh
 
 #if POWER_PROVIDER == POWER_PROVIDER_EMON_ANALOG
     #define EMON_CURRENT_RATIO          30      // Current ratio in the clamp (30V/1A)

code/espurna/power.ino

@@ -140,7 +140,7 @@ void _powerRead() {
             root["pwrCurrent"] = roundTo(current, POWER_CURRENT_DECIMALS);
             root["pwrVoltage"] = roundTo(voltage, POWER_VOLTAGE_DECIMALS);
             root["pwrApparent"] = roundTo(apparent, POWER_POWER_DECIMALS);
-            root["pwrEnergy"] = roundTo(_power_energy * POWER_ENERGY_FACTOR, POWER_ENERGY_DECIMALS);
+            root["pwrEnergy"] = roundTo(_power_energy * POWER_ENERGY_FACTOR_WEB, POWER_ENERGY_DECIMALS_WEB);
             #if POWER_HAS_ACTIVE
                 root["pwrActive"] = roundTo(active, POWER_POWER_DECIMALS);
                 root["pwrReactive"] = roundTo(reactive, POWER_POWER_DECIMALS);

code/html/index.html

@@ -220,9 +220,9 @@
                                     <input class="pure-u-1 pure-u-sm-3-4" type="text" name="pwrFactor" post="%" readonly />
                                 </div>
 
-                                <div class="pure-g module module-hlw">
-                                    <label class="pure-u-1 pure-u-sm-1-4" for="pwrFactor">Energy</label>
-                                    <input class="pure-u-1 pure-u-sm-3-4" type="text" name="pwrEnergy" post=" Wh" readonly />
+                                <div class="pure-g module module-emon module-hlw module-v9261f module-ech1560">
+                                    <label class="pure-u-1 pure-u-sm-1-4" for="pwrEnergy">Energy</label>
+                                    <input class="pure-u-1 pure-u-sm-3-4" type="text" name="pwrEnergy" post=" kWh" readonly />
                                 </div>
 
                                 <div class="pure-u-1 state">