From e79115d71940471df58c04265e2853dcc45527da Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Tue, 30 Aug 2022 17:36:03 +0200
Subject: [PATCH] offset to new dallas, remove sensors if disabled

---
 src/analogsensor.cpp |  5 ++++-
 src/dallassensor.cpp | 13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
index 233f33061..cb5408b1b 100644
--- a/src/analogsensor.cpp
+++ b/src/analogsensor.cpp
@@ -60,7 +60,10 @@ void AnalogSensor::reload() {
 #if defined(EMSESP_STANDALONE)
     analog_enabled_ = true; // for local offline testing
 #endif
-
+    if (!analog_enabled_) {
+        sensors_.clear();
+        return;
+    }
     // load the list of analog sensors from the customization service
     // and store them locally and then activate them
     EMSESP::webCustomizationService.read([&](WebCustomization & settings) {
diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp
index e0e663fcc..030ad5474 100644
--- a/src/dallassensor.cpp
+++ b/src/dallassensor.cpp
@@ -36,6 +36,7 @@ void DallasSensor::start() {
     reload();
 
     if (!dallas_gpio_) {
+        sensors_.clear();
         return; // disabled if dallas gpio is 0
     }
 
@@ -152,23 +153,23 @@ void DallasSensor::loop() {
                                 if (sensor.internal_id() == get_id(addr)) {
                                     t += sensor.offset();
                                     if (t != sensor.temperature_c) {
+                                        sensor.temperature_c = t;
                                         publish_sensor(sensor);
                                         changed_ |= true;
                                     }
-                                    sensor.temperature_c = t;
-                                    sensor.read          = true;
-                                    found                = true;
+                                    sensor.read = true;
+                                    found       = true;
                                     break;
                                 }
                             }
                             // add new sensor. this will create the id string, empty name and offset
                             if (!found && (sensors_.size() < (MAX_SENSORS - 1))) {
                                 sensors_.emplace_back(addr);
-                                sensors_.back().temperature_c = t + sensors_.back().offset();
-                                sensors_.back().read          = true;
-                                changed_                      = true;
+                                sensors_.back().read = true;
+                                changed_             = true;
                                 // look in the customization service for an optional alias or offset for that particular sensor
                                 sensors_.back().apply_customization();
+                                sensors_.back().temperature_c = t + sensors_.back().offset();
                                 publish_sensor(sensors_.back()); // call publish single
                                 // sort the sensors based on name
                                 // std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.name() < b.name(); });