From a035516a209a91f88fe6197da974f13f0283a46f Mon Sep 17 00:00:00 2001
From: Luc <8822552+luc-github@users.noreply.github.com>
Date: Thu, 27 Aug 2020 19:25:42 +0200
Subject: [PATCH] Isolate sensor unit for easier post treatment

---
 esp3d/src/modules/sensor/analogsensor.cpp | 5 +++--
 esp3d/src/modules/sensor/bmx280.cpp       | 7 ++++---
 esp3d/src/modules/sensor/dht.cpp          | 5 +++--
 esp3d/src/modules/sensor/sensor.h         | 5 ++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/esp3d/src/modules/sensor/analogsensor.cpp b/esp3d/src/modules/sensor/analogsensor.cpp
index a8f348be..bd34871b 100644
--- a/esp3d/src/modules/sensor/analogsensor.cpp
+++ b/esp3d/src/modules/sensor/analogsensor.cpp
@@ -78,8 +78,9 @@ const char * AnalogSensorDevice::GetModelString(uint8_t i)
 const char * AnalogSensorDevice::GetData()
 {
     static String s;
-    s = String(SENSOR_CONVERTER(analogRead(ESP3D_SENSOR_PIN)));
-    s += SENSOR__UNIT;
+    s = String(SENSOR_CONVERTER(analogRead(ESP3D_SENSOR_PIN))) + "[";
+    s +=  SENSOR__UNIT;
+    s +="]";
     return s.c_str();
 }
 
diff --git a/esp3d/src/modules/sensor/bmx280.cpp b/esp3d/src/modules/sensor/bmx280.cpp
index 414451bf..c15f1ebe 100644
--- a/esp3d/src/modules/sensor/bmx280.cpp
+++ b/esp3d/src/modules/sensor/bmx280.cpp
@@ -167,11 +167,12 @@ const char * BMX280SensorDevice::GetData()
                         temperature =  toFahrenheit(temperature);
                     }
                     s= String(temperature,1);
+                    s+= "[";
                     s+= SENSOR__UNIT;
-                    s+= " " +String(pressure,1);
-                    s+= "Pa";
+                    s+= "] " +String(pressure,1);
+                    s+= "[Pa]";
                     if (bmx280_device->isBME280()) {
-                        s+=" " + String(humidity,1) + "%";
+                        s+=" " + String(humidity,1) + "[%]";
                     }
                 } else {
                     s="DISCONNECTED";
diff --git a/esp3d/src/modules/sensor/dht.cpp b/esp3d/src/modules/sensor/dht.cpp
index 970d3448..a3d76557 100644
--- a/esp3d/src/modules/sensor/dht.cpp
+++ b/esp3d/src/modules/sensor/dht.cpp
@@ -134,8 +134,9 @@ const char * DHTSensorDevice::GetData()
         }
         if ( String(humidity,1)!="nan") {
             s= String(temperature,1);
-            s+= SENSOR__UNIT;
-            s+=" " + String(humidity,1) + "%";
+            s+= "[";
+            s+= SENSOR__UNIT+
+            s+="] " + String(humidity,1) + "[%]";
         } else {
             s="DISCONNECTED";
             log_esp3d("No valid data");
diff --git a/esp3d/src/modules/sensor/sensor.h b/esp3d/src/modules/sensor/sensor.h
index e641a459..fe608d75 100644
--- a/esp3d/src/modules/sensor/sensor.h
+++ b/esp3d/src/modules/sensor/sensor.h
@@ -45,7 +45,10 @@ public:
     {
         return 0;
     }
-    virtual uint8_t GetModel(uint8_t i=0){ return 0;}
+    virtual uint8_t GetModel(uint8_t i=0)
+    {
+        return 0;
+    }
     virtual const char *GetModelString(uint8_t i=0)
     {
         return "None";