sns: always try to load magnitude units from settings

also, drop special builds flags in favour of sane defaults
chaudhryfaisal · Sep 30, 2020 · 1f1d6a9 · 1f1d6a9
1 parent b0bb384
commit 1f1d6a9
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 90 deletions.
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
@@ -4655,9 +4655,6 @@
     #define HLW8012_POWER_RATIO         3414290
     #define HLW8012_INTERRUPT_ON        FALLING
 
-    #define SENSOR_ENERGY_UNITS         ENERGY_KWH
-    #define SENSOR_POWER_UNITS          POWER_WATTS
-
 // -----------------------------------------------------------------------------
 // Kogan Smarter Home Plug with Energy Meter (Australia)
 // Product code: KASPEMHA
@@ -4703,9 +4700,6 @@
     #define HLW8012_POWER_RATIO         3414290
     #define HLW8012_INTERRUPT_ON        FALLING
 
-    #define SENSOR_ENERGY_UNITS         ENERGY_KWH
-    #define SENSOR_POWER_UNITS          POWER_WATTS
-
 // -----------------------------------------------------------------------------
 // KINGART_CURTAIN_SWITCH
 // -----------------------------------------------------------------------------

diff --git a/code/espurna/config/sensors.h b/code/espurna/config/sensors.h
@@ -69,18 +69,6 @@
 #define SENSOR_ADDRESS_TOPIC                "address"       // Topic to publish sensor addresses
 
 
-#ifndef SENSOR_TEMPERATURE_UNITS
-#define SENSOR_TEMPERATURE_UNITS            TMP_CELSIUS     // Temperature units (TMP_CELSIUS | TMP_FAHRENHEIT)
-#endif
-
-#ifndef SENSOR_ENERGY_UNITS
-#define SENSOR_ENERGY_UNITS                 ENERGY_JOULES   // Energy units (ENERGY_JOULES | ENERGY_KWH)
-#endif
-
-#ifndef SENSOR_POWER_UNITS
-#define SENSOR_POWER_UNITS                  POWER_WATTS     // Power units (POWER_WATTS | POWER_KILOWATTS)
-#endif
-
 // -----------------------------------------------------------------------------
 // Magnitude offset correction
 // -----------------------------------------------------------------------------

diff --git a/code/espurna/config/types.h b/code/espurna/config/types.h
@@ -275,20 +275,6 @@
 #define UV_INDEX_EXTREME            4       // 11 or more means extreme risk of harm from unprotected sun exposure.
                                             // Take all precautions because unprotected skin and eyes can burn in minutes.
 
-//------------------------------------------------------------------------------
-// UNITS
-//------------------------------------------------------------------------------
-
-#define POWER_WATTS                 sensor::Unit::Watt
-#define POWER_KILOWATTS             sensor::Unit::Kilowatt
-
-#define ENERGY_JOULES               sensor::Unit::Joule
-#define ENERGY_KWH                  sensor::Unit::KilowattHour
-
-#define TMP_CELSIUS                 sensor::Unit::Celcius
-#define TMP_FAHRENHEIT              sensor::Unit::Farenheit
-#define TMP_KELVIN                  sensor::Unit::Kelvin
-
 //--------------------------------------------------------------------------------
 // Sensor ID
 // These should remain over time, do not modify them, only add new ones at the end

diff --git a/code/espurna/sensor.cpp b/code/espurna/sensor.cpp
@@ -829,40 +829,48 @@ sensor::Unit _magnitudeUnitFilter(const sensor_magnitude_t& magnitude, sensor::U
     auto result = magnitude.units;
 
     switch (magnitude.type) {
-        case MAGNITUDE_TEMPERATURE: {
-            switch (updated) {
-                case sensor::Unit::Celcius:
-                case sensor::Unit::Farenheit:
-                case sensor::Unit::Kelvin:
-                    result = updated;
-                    break;
-                default:
-                    break;
-            }
+
+    case MAGNITUDE_TEMPERATURE: {
+        switch (updated) {
+        case sensor::Unit::Celcius:
+        case sensor::Unit::Farenheit:
+        case sensor::Unit::Kelvin:
+            result = updated;
             break;
-        }
-        case MAGNITUDE_POWER_ACTIVE: {
-            switch (updated) {
-                case sensor::Unit::Kilowatt:
-                case sensor::Unit::Watt:
-                    result = updated;
-                    break;
-                default:
-                    break;
-            }
+        default:
             break;
         }
-        case MAGNITUDE_ENERGY: {
-            switch (updated) {
-                case sensor::Unit::KilowattHour:
-                case sensor::Unit::Joule:
-                    result = updated;
-                    break;
-                default:
-                    break;
-            }
+        break;
+    }
+
+    case MAGNITUDE_POWER_ACTIVE: {
+        switch (updated) {
+        case sensor::Unit::Kilowatt:
+        case sensor::Unit::Watt:
+            result = updated;
+            break;
+        default:
             break;
         }
+        break;
+    }
+
+    case MAGNITUDE_ENERGY: {
+       switch (updated) {
+       case sensor::Unit::KilowattHour:
+       case sensor::Unit::Joule:
+           result = updated;
+           break;
+       default:
+           break;
+       }
+       break;
+    }
+
+    default:
+        result = updated;
+        break;
+
     }
 
     return result;
@@ -2396,12 +2404,6 @@ void _sensorConfigure() {
 
     // Update magnitude config, filter sizes and reset energy if needed
     {
-
-        // TODO: instead of using global enum, have a local mapping?
-        const auto tmpUnits = getSetting("tmpUnits", SENSOR_TEMPERATURE_UNITS);
-        const auto pwrUnits = getSetting("pwrUnits", SENSOR_POWER_UNITS);
-        const auto eneUnits = getSetting("eneUnits", SENSOR_ENERGY_UNITS);
-
         for (unsigned char index = 0; index < _magnitudes.size(); ++index) {
 
             auto& magnitude = _magnitudes.at(index);
@@ -2444,29 +2446,16 @@ void _sensorConfigure() {
                 }
             }
 
-            // adjust type-specific units (TODO: try to adjust settings to use type prefixes?)
-            switch (magnitude.type) {
-                case MAGNITUDE_TEMPERATURE:
-                    magnitude.units = _magnitudeUnitFilter(
-                        magnitude,
-                        getSetting({"tmpUnits", magnitude.index_global}, tmpUnits)
-                    );
-                    break;
-                case MAGNITUDE_POWER_ACTIVE:
-                    magnitude.units = _magnitudeUnitFilter(
-                        magnitude,
-                        getSetting({"pwrUnits", magnitude.index_global}, pwrUnits)
-                    );
-                    break;
-                case MAGNITUDE_ENERGY:
-                    magnitude.units = _magnitudeUnitFilter(
-                        magnitude,
-                        getSetting({"eneUnits", magnitude.index_global}, eneUnits)
-                    );
-                    break;
-                default:
-                    magnitude.units = magnitude.sensor->units(magnitude.slot);
-                    break;
+            // adjust type-specific units
+            {
+                const sensor::Unit default_unit { magnitude.sensor->units(magnitude.slot) };
+                const settings_key_t key {
+                    String(_magnitudeSettingsPrefix(magnitude.type)) + F("Units") + String(magnitude.index_global, 10) };
+
+                magnitude.units = _magnitudeUnitFilter(
+                    magnitude,
+                    getSetting(key, default_unit)
+                );
             }
 
             // some magnitudes allow to be corrected with an offset