From 665a473d9cffd7e0cfbe5c592879ad44ed3e6fbf Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack.wilsdon@gmail.com>
Date: Thu, 6 Dec 2018 19:59:50 +0000
Subject: [PATCH] Fix energy ratio input for pulse meter sensor (#1394)

* Fix energy ratio input for pulse meter sensor

* checkout origin/dev -- webui files
---
 code/espurna/sensor.ino                 | 3 +++
 code/espurna/sensors/PulseMeterSensor.h | 2 +-
 code/html/index.html                    | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/code/espurna/sensor.ino b/code/espurna/sensor.ino
index f686c634..bba1f959 100644
--- a/code/espurna/sensor.ino
+++ b/code/espurna/sensor.ino
@@ -204,6 +204,7 @@ void _sensorWebSocketStart(JsonObject& root) {
         #if PULSEMETER_SUPPORT
             if (sensor->getID() == SENSOR_PULSEMETER_ID) {
                 root["pmVisible"] = 1;
+                root["pwrRatioE"] = ((PulseMeterSensor *) sensor)->getEnergyRatio();
             }
         #endif
 
@@ -1091,6 +1092,8 @@ void _sensorConfigure() {
                     delSetting("eneTotal");
                     _sensorResetTS();
                 }
+
+                sensor->setEnergyRatio(getSetting("pwrRatioE", PULSEMETER_ENERGY_RATIO).toInt());
             }
         #endif // PULSEMETER_SUPPORT
 
diff --git a/code/espurna/sensors/PulseMeterSensor.h b/code/espurna/sensors/PulseMeterSensor.h
index e8405cc1..46121339 100644
--- a/code/espurna/sensors/PulseMeterSensor.h
+++ b/code/espurna/sensors/PulseMeterSensor.h
@@ -53,7 +53,7 @@ class PulseMeterSensor : public BaseSensor {
             return _gpio;
         }
 
-        unsigned char getEnergyRatio() {
+        unsigned long getEnergyRatio() {
             return _ratio;
         }
 
diff --git a/code/html/index.html b/code/html/index.html
index 54e42640..64597151 100644
--- a/code/html/index.html
+++ b/code/html/index.html
@@ -1341,8 +1341,7 @@
 
                                 <div class="pure-g module module-pm">
                                     <label class="pure-u-1 pure-u-lg-1-4">Energy Ratio</label>
-                                    <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="pwrRatioE" tabindex="55" /></div>
-                                    <div class="pure-u-0 pure-u-lg-1-2"></div>
+                                    <input class="pure-u-1 pure-u-lg-3-4" name="pwrRatioE" type="text" tabindex="55" placeholder="0" />
                                     <div class="pure-u-0 pure-u-lg-1-4"></div>
                                     <div class="pure-u-1 pure-u-lg-3-4 hint">Energy ratio in pulses/kWh.</div>
                                 </div>