From eb6c06c8e9d7b1ec490e63fc3644955446db6289 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Fri, 28 Aug 2020 03:58:54 +0300
Subject: [PATCH] not working version

---
 include/Class/SensorAnalog.h     | 15 ++++++++++-----
 include/Class/SensorConverting.h | 25 +++++++++++++++++++------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/include/Class/SensorAnalog.h b/include/Class/SensorAnalog.h
index 27f157be..0152d8f6 100644
--- a/include/Class/SensorAnalog.h
+++ b/include/Class/SensorAnalog.h
@@ -6,9 +6,11 @@
 #include "Class/SensorConverting.h"
 #include "Global.h"
 
-class SensorAnalog : public LineParsing public SensorConverting {
+class SensorAnalog : public LineParsing,
+                     public SensorConverting {
    public:
-    SensorAnalog() : LineParsing(){};
+    SensorAnalog() : LineParsing(),
+                     SensorConverting(){};
 
     void SensorAnalogInit() {
         //if (_pin != "") {
@@ -26,12 +28,15 @@ class SensorAnalog : public LineParsing public SensorConverting {
         pinInt = pinInt;
         value = analogRead(A0);
 #endif
+        float valueFl;
+        //float valueFl = this->mapping(value);
+        //      valueFl = this->correction(valueFl);
 
         eventGen(key, "");
-        jsonWriteInt(configLiveJson, key, value);
-        MqttClient::publishStatus(key, String(value));
+        jsonWriteFloat(configLiveJson, key, valueFl);
+        MqttClient::publishStatus(key, String(valueFl));
 
-        Serial.println("[I] sensor '" + key + "' data: " + String(value));
+        Serial.println("[I] sensor '" + key + "' data: " + String(valueFl));
         return value;
     }
 };
diff --git a/include/Class/SensorConverting.h b/include/Class/SensorConverting.h
index 2c1beb5e..bb04f897 100644
--- a/include/Class/SensorConverting.h
+++ b/include/Class/SensorConverting.h
@@ -9,12 +9,25 @@ class SensorConverting : public LineParsing {
    public:
     SensorConverting() : LineParsing(){};
 
-    void SensorConvertingInit() {
-     
-
-     
+    int mapping(int input) {
+        if (_map != "") {
+            _map.replace("map[", "");
+            _map.replace("]", "");
+            input = map(input,
+                        selectFromMarkerToMarker(_map, ",", 0).toInt(),
+                        selectFromMarkerToMarker(_map, ",", 1).toInt(),
+                        selectFromMarkerToMarker(_map, ",", 2).toInt(),
+                        selectFromMarkerToMarker(_map, ",", 3).toInt());
+        }
+        return input;
     }
 
-    
+    float correction(float input) {
+        _c.replace("c[", "");
+        _c.replace("]", "");
+        float coef = _c.toFloat();
+        input = input * coef;
+        return input;
+    }
 };
-extern SensorConverting* mySensorConverting;
\ No newline at end of file
+//extern SensorConverting* mySensorConverting;
\ No newline at end of file