From ac7bf70050018157a8eb55c019875fc21229d64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xose=20P=C3=A9rez?= <xose.perez@gmail.com>
Date: Tue, 12 Jun 2018 22:51:19 +0200
Subject: [PATCH] Fix calibration issues in EmonSensor (#876)

---
 code/espurna/sensors/EmonSensor.h | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/code/espurna/sensors/EmonSensor.h b/code/espurna/sensors/EmonSensor.h
index 4dd14c10..0bf2674c 100644
--- a/code/espurna/sensors/EmonSensor.h
+++ b/code/espurna/sensors/EmonSensor.h
@@ -43,6 +43,7 @@ class EmonSensor : public I2CSensor {
             if (actual == 0) return;
             if (expected == actual) return;
             _current_ratio[channel] = _current_ratio[channel] * ((double) expected / (double) actual);
+            calculateFactors(channel);
             _dirty = true;
         }
 
@@ -70,6 +71,7 @@ class EmonSensor : public I2CSensor {
             if (channel >= _channels) return;
             if (_current_ratio[channel] == current_ratio) return;
             _current_ratio[channel] = current_ratio;
+            calculateFactors(channel);
             _dirty = true;
         }
 
@@ -105,8 +107,7 @@ class EmonSensor : public I2CSensor {
             for (unsigned char i=0; i<_channels; i++) {
                 _energy[i] = _current[i] = 0;
                 _pivot[i] = _adc_counts >> 1;
-                _current_factor[i] = _current_ratio[i] * _reference / _adc_counts;
-                _multiplier[i] = calculateMultiplier(_current_factor[i]);
+                calculateFactors(i);
             }
 
             #if SENSOR_DEBUG
@@ -145,18 +146,22 @@ class EmonSensor : public I2CSensor {
 
         virtual unsigned int readADC(unsigned char channel) {}
 
-        unsigned int calculateMultiplier(double current_factor) {
+        void calculateFactors(unsigned char channel) {
+
+            _current_factor[channel] = _current_ratio[channel] * _reference / _adc_counts;
+
             unsigned int s = 1;
             unsigned int i = 1;
             unsigned int m = s * i;
             unsigned int multiplier;
-            while (m * current_factor < 1) {
+            while (m * _current_factor[channel] < 1) {
                 multiplier = m;
                 i = (i == 1) ? 2 : (i == 2) ? 5 : 1;
                 if (i == 1) s *= 10;
                 m = s * i;
             }
-            return multiplier;
+            _multiplier[channel] = multiplier;
+
         }
 
         double read(unsigned char channel) {
@@ -206,7 +211,7 @@ class EmonSensor : public I2CSensor {
                 DEBUG_MSG("[EMON] Min value: %d\n", min);
                 DEBUG_MSG("[EMON] Midpoint value: %d\n", int(_pivot[channel]));
                 DEBUG_MSG("[EMON] RMS value: %d\n", int(rms));
-                DEBUG_MSG("[EMON] Current (mA): %d\n", int(current));
+                DEBUG_MSG("[EMON] Current (mA): %d\n", int(1000 * current));
             #endif
 
             // Check timing