Var changes

include/items/ButtonOutClass.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <Arduino.h>
+
 #include "Class/LineParsing.h"
 #include "Global.h"
 
@@ -7,28 +8,25 @@ class ButtonOutClass : public LineParsing {
    public:
     ButtonOutClass() : LineParsing(){};
 
-    void pinModeSet() {
+    void init() {
         if (_pin != "") {
             pinMode(_pin.toInt(), OUTPUT);
         }
+        jsonWriteStr(configOptionJson, _key + "_pin", _pin);
+        jsonWriteStr(configOptionJson, _key + "_inv", _inv);
     }
 
     void pinStateSetDefault() {
-        if (_inv == "" && _state != "") {
-            pinChange(_key, _pin, _state, true);
-        }
+        pinChange(_key, _state);
     }
 
-    void pinStateSetInvDefault() {
-        if (_inv != "" && _state != "") {
-            pinChange(_key, _pin, _state, false);
-        }
-    }
 
-    void pinChange(String key, String pin, String state, bool rev) {
+    void pinChange(String key, String state) {
+        String pin = jsonReadStr(configOptionJson, key + "_pin");
+        String inv = jsonReadStr(configOptionJson, key + "_inv");
         int pinInt = pin.toInt();
-        int stateInt;
-        if (rev) {
+
+        if (inv == "") {
             digitalWrite(pinInt, state.toInt());
         } else {
             digitalWrite(pinInt, !state.toInt());

include/items/SensorDallasClass.h

@@ -0,0 +1,46 @@
+#pragma once
+#include <Arduino.h>
+
+#include "Class/LineParsing.h"
+#include "Global.h"
+#include "items/SensorConvertingClass.h"
+
+class SensorDallasClass : public SensorConvertingClass {
+   public:
+    SensorDallasClass() : SensorConvertingClass(){};
+
+    void SensorDallasInit() {
+        oneWire = new OneWire((uint8_t)_pin.toInt());
+        sensors.setOneWire(oneWire);
+        sensors.begin();
+        sensors.setResolution(48);
+
+        sensorReadingMap += _key + ",";
+        dallasEnterCounter++;
+
+        jsonWriteInt(configOptionJson, _key + "_num", dallasEnterCounter);
+        jsonWriteStr(configOptionJson, _key + "_map", _map);
+        jsonWriteStr(configOptionJson, _key + "_с", _c);
+    }
+
+    void SensorDallasRead(String key) {
+        float value;
+        byte num = sensors.getDS18Count();
+        sensors.requestTemperatures();
+
+        int cnt = jsonReadInt(configOptionJson, key + "_num");
+
+        for (byte i = 0; i < num; i++) {
+            if (i == cnt) {
+                value = sensors.getTempCByIndex(i);
+                //value = this->mapping(key, value);
+                float valueFl = this->correction(key, value);
+                eventGen(key, "");
+                jsonWriteStr(configLiveJson, key, String(valueFl));
+                MqttClient::publishStatus(key, String(valueFl));
+                Serial.println("[I] sensor '" + key + "' data: " + String(valueFl));
+            }
+        }
+    }
+};
+extern SensorDallasClass mySensorDallas;

include/items/SensorUltrasonicClass.h

@@ -2,16 +2,25 @@
 #include <Arduino.h>
 
 #include "Class/LineParsing.h"
-#include "items/SensorConvertingClass.h"
 #include "Global.h"
+#include "items/SensorConvertingClass.h"
 
 class SensorUltrasonic : public SensorConvertingClass {
    public:
     SensorUltrasonic() : SensorConvertingClass(){};
+    void init() {
+        sensorReadingMap += _key + ",";
+        String trig = selectFromMarkerToMarker(_pin, ",", 0);
+        String echo = selectFromMarkerToMarker(_pin, ",", 1);
+        jsonWriteStr(configOptionJson, _key + "_trig", trig);
+        jsonWriteStr(configOptionJson, _key + "_echo", echo);
+        jsonWriteStr(configOptionJson, _key + "_map", _map);
+        jsonWriteStr(configOptionJson, _key + "_с", _c);
+    }
 
-    int SensorUltrasonicRead(String key, String pin) {
-        int trig = selectFromMarkerToMarker(pin, ",", 0).toInt();
-        int echo = selectFromMarkerToMarker(pin, ",", 1).toInt();
+    void SensorUltrasonicRead(String key) {
+        int trig = jsonReadStr(configOptionJson, key + "_trig").toInt();
+        int echo = jsonReadStr(configOptionJson, key + "_echo").toInt();
         int value;
 
         digitalWrite(trig, LOW);
@@ -28,7 +37,6 @@ class SensorUltrasonic : public SensorConvertingClass {
         jsonWriteStr(configLiveJson, key, String(valueFl));
         MqttClient::publishStatus(key, String(valueFl));
         Serial.println("[I] sensor '" + key + "' data: " + String(valueFl));
-        return value;
     }
 };
 extern SensorUltrasonic mySensorUltrasonic;

include/items/itemsGlobal.h

@@ -22,4 +22,7 @@ extern void analogAdc();
 extern void analogReading(); 
 
 extern void ultrasonicCm();
-extern void ultrasonicReading();
+extern void ultrasonicReading();
+
+extern void dallasTemp();
+extern void dallasReading();