рабочая версия с аналоговым сенсором

data_svelte/config.json

@@ -1,53 +1,7 @@
 [
-    {
-        "type": "Variable",
-        "subtype": "button-out",
-        "id": "btn1",
-        "widget": "toggle",
-        "page": "Кнопки",
-        "descr": "Освещение",
-        "gpio": 13,
-        "inv": false
-    },
-    {
-        "type": "Variable",
-        "subtype": "pwm-out",
-        "id": "pwm1",
-        "widget": "range",
-        "page": "Регуляторы",
-        "descr": "Освещение",
-        "gpio": 14,
-        "inv": false
-    },
     {
         "type": "Reading",
-        "subtype": "button-in",
+        "subtype": "AnalogAdc",
-        "id": "btn",
-        "widget": "toggle",
-        "page": "Кнопки",
-        "descr": "Освещение",
-        "gpio": 12,
-        "inv": false
-    },
-    {
-        "type": "Reading",
-        "subtype": "output-value",
-        "id": "txt",
-        "widget": "anydata",
-        "page": "Предупреждения",
-        "descr": "Статус"
-    },
-    {
-        "type": "Reading",
-        "subtype": "input-value",
-        "id": "txt",
-        "widget": "input",
-        "page": "Лимиты",
-        "descr": "Порог"
-    },
-    {
-        "type": "Reading",
-        "subtype": "analog-adc",
         "id": "t",
         "widget": "anydata",
         "page": "Сенсоры",
@@ -57,7 +11,7 @@
     },
     {
         "type": "Reading",
-        "subtype": "analog-adc",
+        "subtype": "AnalogAdc",
         "id": "t",
         "widget": "anydata",
         "page": "Сенсоры",
@@ -65,9 +19,55 @@
         "pin": 0,
         "int": 15
     },
+    {
+        "type": "Variable",
+        "subtype": "ButtonOut",
+        "id": "btn1",
+        "widget": "toggle",
+        "page": "Кнопки",
+        "descr": "Освещение",
+        "gpio": 13,
+        "inv": false
+    },
+    {
+        "type": "Variable",
+        "subtype": "PwmOut",
+        "id": "pwm1",
+        "widget": "range",
+        "page": "Регуляторы",
+        "descr": "Освещение",
+        "gpio": 14,
+        "inv": false
+    },
     {
         "type": "Reading",
-        "subtype": "bme280",
+        "subtype": "ButtonIn",
+        "id": "btn",
+        "widget": "toggle",
+        "page": "Кнопки",
+        "descr": "Освещение",
+        "gpio": 12,
+        "inv": false
+    },
+    {
+        "type": "Reading",
+        "subtype": "OutputValue",
+        "id": "txt",
+        "widget": "anydata",
+        "page": "Предупреждения",
+        "descr": "Статус"
+    },
+    {
+        "type": "Reading",
+        "subtype": "InputValue",
+        "id": "txt",
+        "widget": "input",
+        "page": "Лимиты",
+        "descr": "Порог"
+    },
+    {
+        "type": "Reading",
+        "subtype": "Bme280",
         "id": "t",
         "widget": "anydata",
         "page": "Сенсоры",
@@ -75,7 +75,7 @@
     },
     {
         "type": "Reading",
-        "subtype": "bme280",
+        "subtype": "Bme280",
         "id": "p",
         "widget": "anydata",
         "page": "Сенсоры",
@@ -83,7 +83,7 @@
     },
     {
         "type": "Reading",
-        "subtype": "bme280",
+        "subtype": "Bme280",
         "id": "h",
         "widget": "anydata",
         "page": "Сенсоры",

include/classes/IoTSensor.h

@@ -3,24 +3,26 @@
 #include <WString.h>
 
 class IoTSensor {
-    public:
+   public:
-        IoTSensor();
+    IoTSensor();
-        ~IoTSensor();
+    ~IoTSensor();
 
-        void loop();
+    void loop();
-        virtual void doByInterval();
+    virtual void doByInterval();
-        void init(String key, String id, unsigned long interval);
+    void init(String key, String id, unsigned long interval);
-        void regEvent(String value, String consoleInfo);
+    void regEvent(String value, String consoleInfo);
 
-        String getKey();
+    String getKey();
-        String getID();
+    String getID();
 
-        unsigned long currentMillis;
+    unsigned long currentMillis;
-        unsigned long prevMillis;
+    unsigned long prevMillis;
-        unsigned long difference;
+    unsigned long difference;
 
-    protected:
+   protected:
-        String _key;
+    String _key;
-        String _id;
+    String _id;
-        unsigned long _interval;
+    unsigned long _interval;
 };
+
+extern IoTSensor* myIoTSensor;

include/modules/AnalogAdc.h

@@ -2,10 +2,10 @@
 #include "Global.h"
 #include "Classes/IoTSensor.h"
 
-class IoTSensorA : public IoTSensor {
+class AnalogAdc : public IoTSensor {
    public:
-    IoTSensorA(String parameters);
+    AnalogAdc(String parameters);
-    ~IoTSensorA();
+    ~AnalogAdc();
 
     void doByInterval();
 
@@ -13,4 +13,4 @@ class IoTSensorA : public IoTSensor {
     unsigned int _pin;
 };
 
-extern IoTSensorA* mySensorAnalog;
+extern void* getAPI_AnalogAdc(String params);

src/Configuration.cpp

@@ -1,5 +1,5 @@
 #include "Configuration.h"
-#include "modules/IoTSensorA.h"
+#include "modules/AnalogAdc.h"
 
 std::vector<IoTSensor*> iotSensors;
 
@@ -11,20 +11,10 @@ void configure(String path) {
         if (jsonArrayElement.startsWith(",")) {
             jsonArrayElement = jsonArrayElement.substring(1, jsonArrayElement.length());  //это нужно оптимизировать в последствии
         }
-        String subtype;
+
-        if (jsonRead(jsonArrayElement, F("subtype"), subtype)) {
+        myIoTSensor = (IoTSensor*)getAPI_AnalogAdc(jsonArrayElement);
-            if (subtype == F("button-out")) {
+        if (myIoTSensor) {
-                //=============================
+            iotSensors.push_back(myIoTSensor);
-            } else if (subtype == F("pwm-out")) {
-                //=============================
-            } else if (subtype == F("analog-adc")) {
-                mySensorAnalog = new IoTSensorA(jsonArrayElement);
-                iotSensors.push_back(mySensorAnalog);
-            } else {
-                SerialPrint(F("E"), F("Config"), "type not exist " + subtype);
-            }
-        } else {
-            SerialPrint(F("E"), F("Config"), F("json error"));
         }
     }
     file.close();

src/classes/IoTSensor.cpp

@@ -37,3 +37,5 @@ void IoTSensor::regEvent(String value, String consoleInfo = "") {
 }
 
 void IoTSensor::doByInterval() {}
+
+IoTSensor* myIoTSensor;

src/modules/AnalogAdc.cpp

@@ -0,0 +1,31 @@
+#include "modules/AnalogAdc.h"
+
+// setup()
+AnalogAdc::AnalogAdc(String parameters) {
+    init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
+
+    _pin = jsonReadInt(parameters, "pin");
+}
+
+AnalogAdc::~AnalogAdc() {}
+
+// loop()
+void AnalogAdc::doByInterval() {
+    float value = analogRead(_pin);
+
+    regEvent((String)value, "analog");
+}
+
+void* getAPI_AnalogAdc(String parameters) {
+    String subtype;
+    if (!jsonRead(parameters, F("subtype"), subtype)) {  //если нет такого ключа в представленном json или он не валидный
+        SerialPrint(F("E"), F("Config"), F("json error AnalogAdc"));
+        return nullptr;
+    } else {
+        if (subtype == F("AnalogAdc")) {
+            return new AnalogAdc(parameters);
+        } else {
+            return nullptr;
+        }
+    }
+}

src/modules/IoTSensorA.cpp

@@ -1,17 +0,0 @@
-#include "modules/IoTSensorA.h"
-
-IoTSensorA::IoTSensorA(String parameters) {
-    init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
-
-    _pin = jsonReadInt(parameters, "pin");
-}
-
-IoTSensorA::~IoTSensorA() {}
-
-void IoTSensorA::doByInterval() {
-    float value = analogRead(_pin);
-
-    regEvent((String)value, "analog");  //обязательный вызов для отправки результата работы
-}
-
-IoTSensorA* mySensorAnalog;

src/modules/IoTSensorAnalog.cpp

@@ -1,29 +0,0 @@
-#include "Utils/JsonUtils.h"
-#include "Utils/SerialPrint.h"
-#include "Utils/StringUtils.h"
-#include "Classes/IoTSensor.h"
-#include <map>
-class IoTSensorAnalog : public IoTSensor {
-   private:
-    //описание переменных экземпляра датчика - аналог глобальных переменных
-    //описание параметров передаваемых из настроек датчика из веба
-    unsigned int _pin;
-
-   public:
-    //аналог setup()
-    IoTSensorAnalog(String parameters) {
-        //передаем часть базовых параметров в конструктор базового класса для обеспечения работы его методов
-        init(jsonReadStr(parameters, "key"), jsonReadStr(parameters, "id"), jsonReadInt(parameters, "int"));
-
-        _pin = jsonReadInt(parameters, "pin");
-    }
-
-    //аналог loop()
-    void doByInterval() {
-        float value = analogRead(_pin);
-
-        regEvent((String)value, "analog");  //обязательный вызов для отправки результата работы
-    }
-
-    ~IoTSensorAnalog() {}
-};