add analog sensor

include/Class/Sensor.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-#include "Class/LineParsing.h"
-#include "Global.h"
-
-class Sensor : public LineParsing {
-   public:
-    Sensor() : LineParsing(){};
-
-    void SensorInit() {
-        if (_pin != "") {
-            pinMode(_pin.toInt(), INPUT);
-        }
-    }
-
-    void SensorRead(String key, String pin, String state) {
-        int pinInt = pin.toInt();
-        analogWrite(pinInt, state.toInt());
-        eventGen(key, "");
-        jsonWriteInt(configLiveJson, key, state.toInt());
-        MqttClient::publishStatus(key, state);
-    }
-};
-
-//extern Sensor* mySensor;

include/Class/SensorAnalog.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <Arduino.h>
+
+#include "Class/LineParsing.h"
+#include "Global.h"
+
+class SensorAnalog : public LineParsing {
+   public:
+    SensorAnalog() : LineParsing(){};
+
+    void SensorAnalogInit() {
+        //if (_pin != "") {
+        //    pinMode(_pin.toInt(), INPUT);
+        //}
+    }
+
+    int SensorAnalogRead(String key, String pin) {
+        int pinInt = pin.toInt();
+        int value;
+#ifdef ESP32
+        value = analogRead(pinInt);
+#endif
+#ifdef ESP8266
+        pinInt = pinInt;
+        value = analogRead(A0);
+#endif
+
+        eventGen(key, "");
+        jsonWriteInt(configLiveJson, key, value);
+        MqttClient::publishStatus(key, String(value));
+        return value;
+    }
+};
+extern SensorAnalog* mySensorAnalog;

include/Cmd.h

@@ -1,5 +1,4 @@
 #pragma once
-
 #include <Arduino.h>
 
 extern void cmd_init();
@@ -22,6 +21,56 @@ extern void inputTimeSet();
 extern void textOut();
 extern void textOutSet();
 
+extern void analogAdc();
+extern void analogReading(); 
+
+
+
+
+
+
+
+
+
+extern void sensorsInit();
+
+extern void levelPr();
+extern void ultrasonicCm();
+extern void ultrasonic_reading();
+
+
+extern void analog_reading1();
+extern void analog_reading2();
+extern void dallas_reading();
+extern void dhtT_reading();
+
+extern void dallas();
+
+extern void bmp280T();
+extern void bmp280P();
+extern void bmp280T_reading();
+extern void bmp280P_reading();
+
+extern void bme280T();
+extern void bme280P();
+extern void bme280H();
+extern void bme280A();
+
+extern void bme280T_reading();
+extern void bme280P_reading();
+extern void bme280H_reading();
+extern void bme280A_reading();
+
+extern void dhtT();
+extern void dhtH();
+extern void dhtP();
+extern void dhtC();
+extern void dhtD();
+extern void dhtH_reading();
+extern void dhtP_reading();
+extern void dhtC_reading();
+extern void dhtD_reading();
+
 extern void handle_time_init();
 extern void stepper();
 extern void stepperSet();

include/Global.h

@@ -71,10 +71,12 @@ extern Bounce* buttons;
 
 extern boolean just_load;
 
+// Json
 extern String configSetupJson;   //все настройки
 extern String configLiveJson;    //все данные с датчиков (связан с mqtt)
 extern String configOptionJson;  //для трансфера
 
+// Mqtt
 extern String chipId;
 extern String prex;
 extern String all_widgets;
@@ -84,6 +86,12 @@ extern String order_loop;
 extern String itemsFile;
 extern String itemsLine;
 
+// Sensors
+extern String sensorReadingMap;
+
+
+
+
 extern String analog_value_names_list;
 extern int enter_to_analog_counter;
 
@@ -165,45 +173,7 @@ extern void setLedStatus(LedStatus_t);
 extern void eventGen(String event_name, String number);
 extern String add_set(String param_name);
 
-//Sensors
-extern void sensors_init();
 
-extern void levelPr();
-extern void ultrasonicCm();
-extern void ultrasonic_reading();
-
-extern void analog();
-extern void analog_reading1();
-extern void analog_reading2();
-extern void dallas_reading();
-extern void dhtT_reading();
-
-extern void dallas();
-
-extern void bmp280T();
-extern void bmp280P();
-extern void bmp280T_reading();
-extern void bmp280P_reading();
-
-extern void bme280T();
-extern void bme280P();
-extern void bme280H();
-extern void bme280A();
-
-extern void bme280T_reading();
-extern void bme280P_reading();
-extern void bme280H_reading();
-extern void bme280A_reading();
-
-extern void dhtT();
-extern void dhtH();
-extern void dhtP();
-extern void dhtC();
-extern void dhtD();
-extern void dhtH_reading();
-extern void dhtP_reading();
-extern void dhtC_reading();
-extern void dhtD_reading();
 
 //Timers
 extern void Timer_countdown_init();

include/Sensors.h

@@ -0,0 +1,3 @@
+#pragma once
+
+