начал писать систему формирования виджетов

data_svelte/config.json

@@ -61,7 +61,7 @@
         "type": "Reading",
         "subtype": "InputValue",
         "id": "txt",
-        "widget": "input",
+        "widget": "inputDigit",
         "page": "Лимиты",
         "descr": "Порог"
     },

data_svelte/widgets/alarm.json

@@ -0,0 +1,6 @@
+{
+    "widget": "anydata",
+    "icon": "body",
+    "color": "red",
+    "descrColor": "red"
+}

data_svelte/widgets/anydata.json

@@ -0,0 +1,5 @@
+{
+  "widget": "anydata",
+  "after": "",
+  "icon": ""
+}

data_svelte/widgets/anydataAlarm.json

@@ -0,0 +1,6 @@
+{
+  "widget": "anydata",
+  "after": "",
+  "color":"red",
+  "icon": "walk"
+}

data_svelte/widgets/anydataAmp.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "Amp",
+    "icon": "speedometer"
+}

data_svelte/widgets/anydataHtz.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "Htz",
+    "icon": "speedometer"
+}

data_svelte/widgets/anydataHum.json

@@ -0,0 +1,6 @@
+{
+  "widget": "anydata",
+  "after": "%",
+  "icon": "water",
+  "color": "#88AADF"
+}

data_svelte/widgets/anydataPpb.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "ppb",
+    "icon": "body"
+  }

data_svelte/widgets/anydataPpm.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "ppm",
+    "icon": "body"
+  }

data_svelte/widgets/anydataPress.json

@@ -0,0 +1,5 @@
+{
+  "widget": "anydata",
+  "after": "mm",
+  "icon": "speedometer"
+}

data_svelte/widgets/anydataTemp.json

@@ -0,0 +1,16 @@
+{
+  "widget": "anydata",
+  "after": "°С",
+  "icon": "thermometer",
+  "font": "OCR A Std",
+  "color": [
+  { "level": -20, "value": "#0000CC" },
+  { "level": -10, "value": "#0000CC" },
+  { "level": 0, "value": "#0000CC" },
+  { "level": 12, "value": "#3366FF" },
+  { "level": 16, "value": "#33CCFF" },
+  { "level": 18, "value": "#009933" },
+  { "level": 30, "value": "#FF9900" },
+	{ "level": 40, "value": "red" }
+  ]
+}

data_svelte/widgets/anydataTime.json

@@ -0,0 +1,5 @@
+{
+  "widget": "anydata",
+  "after": "",
+  "icon": "speedometer"
+}

data_svelte/widgets/anydataVlt.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "Vlt",
+    "icon": "speedometer"
+}

data_svelte/widgets/anydataWhr.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "Whr",
+    "icon": "speedometer"
+}

data_svelte/widgets/anydataWtt.json

@@ -0,0 +1,5 @@
+{
+    "widget": "anydata",
+    "after": "Wtt",
+    "icon": "speedometer"
+}

data_svelte/widgets/btn.json

@@ -0,0 +1,6 @@
+{
+    "widget": "btn",
+    "size": "large",
+    "color": "green",
+    "send": "test"
+}

data_svelte/widgets/chart.json

@@ -0,0 +1,5 @@
+{
+  "widget": "chart",
+  "dateFormat": "HH:mm",
+  "pointRadius": 0
+}

data_svelte/widgets/chart2.json

@@ -0,0 +1,4 @@
+{
+  "widget": "chart",
+  "dateFormat": "HH:mm"
+}

data_svelte/widgets/chart3.json

@@ -0,0 +1,5 @@
+{
+    "widget": "chart",
+    "dateFormat": "DD.MM.YYYY",
+    "type":"bar"
+}

data_svelte/widgets/chart4.json

@@ -0,0 +1,4 @@
+{
+    "widget": "chart",
+    "dateFormat": "DD.MM.YYYY"
+}

data_svelte/widgets/fillgauge.json

@@ -0,0 +1,7 @@
+{
+    "widget": "fillgauge",
+    "circleColor": "#00FFFF",
+    "textColor": "#FFFFFF",
+    "waveTextColor": "#000000",
+    "waveColor": "#00FFFF"
+}

data_svelte/widgets/inputDate.json

@@ -0,0 +1,6 @@
+{
+  "widget" : "input",
+  "size"   : "small",
+  "color"  : "orange",
+  "type"   : "date"
+}

data_svelte/widgets/inputDigit.json

@@ -0,0 +1,5 @@
+{
+  "widget" : "input", 
+  "color"  : "blue",
+  "type"   : "number"
+}

data_svelte/widgets/inputDigitTemp.json

@@ -0,0 +1,7 @@
+{
+  "widget" : "input", 
+  "color"  : "green",
+  "type"   : "number",
+  "size"   : "small",
+  "icon": "thermometer"
+}

data_svelte/widgets/inputText.json

@@ -0,0 +1,6 @@
+{
+  "widget" : "input",
+  "size"   : "small",
+  "color"  : "orange",
+  "type"   : "text"
+}

data_svelte/widgets/inputTime.json

@@ -0,0 +1,5 @@
+{
+  "widget" : "input",
+  "color"  : "blue",
+  "type"   : "time"
+}

data_svelte/widgets/inputTimeClock.json

@@ -0,0 +1,7 @@
+{
+  "widget" : "input", 
+  "color"  : "orange",
+  "type"   : "time",
+  "size"   : "small",
+  "icon": "alarm-outline"
+}

data_svelte/widgets/progress-line.json

@@ -0,0 +1,12 @@
+{
+  "widget": "progress-line",
+  "icon": "sunny",
+  "descrColor": "",
+  "color": "",
+  "max": "100",
+  "background": "",
+  "stroke": "10",
+  "disabled": "",
+  "before": "",
+  "after": ""
+}

data_svelte/widgets/progress-round.json

@@ -0,0 +1,11 @@
+{
+  "widget": "progress-round",
+  "descrColor": "",
+  "max": "100",
+  "stroke": "20",
+  "color": "#45ccce",
+  "background": "#777",
+  "before": "",
+  "semicircle": "1",
+  "after": ""
+}

data_svelte/widgets/range.json

@@ -0,0 +1,9 @@
+ {
+  "widget" : "range",
+  "descrColor": "red",
+  "after"  : "%",
+  "k"      : 0.0977,
+  "min"    : 0, 
+  "max"    : 100, 
+  "debounce": 500
+}

data_svelte/widgets/select.json

@@ -0,0 +1,8 @@
+{
+  "widget": "select",
+  "options": [
+    "Выключен",
+    "Включен"
+  ],
+  "status": 0
+}

data_svelte/widgets/toggle.json

@@ -0,0 +1,5 @@
+{
+  "widget": "toggle",
+  "icon": "",
+  "iconOff": ""
+}

data_svelte/widgets/toggleSunMoon.json

@@ -0,0 +1,5 @@
+{
+  "widget": "toggle",
+  "icon": "sunny",
+  "iconOff": "moon"
+}

include/CreateWidget.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "Global.h"
+
+extern void createWidget(String& parameters);
+
+extern bool loadWidget(const String& filename, String& buf);
+
+extern const String getWidgetFile(const String& name);

include/ESPConfiguration.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "Global.h"
 #include "Classes/IoTSensor.h"
+#include "CreateWidget.h"
 
 extern std::vector<IoTSensor*> iotSensors;  // вектор ссылок базового класса IoTSensor - список всех запущенных сенсоров
 

include/utils/FileUtils.h

@@ -6,4 +6,5 @@ extern File seekFile(const String& filename, size_t position = 0);
 extern const String writeFile(const String& filename, const String& str);
 extern const String readFile(const String& filename, size_t max_size);
 extern const String filepath(const String& filename);
-extern bool cutFile(const String& src, const String& dst);
+extern bool cutFile(const String& src, const String& dst);
+extern const String addFileLn(const String& filename, const String& str);

src/CreateWidget.cpp

@@ -0,0 +1,47 @@
+#include "CreateWidget.h"
+
+void createWidget(String& parameters) {
+    String id = jsonReadStr(parameters, "id");
+    String widget = jsonReadStr(parameters, "widget");
+    String order = jsonReadStr(parameters, "order");
+    String page = jsonReadStr(parameters, "page");
+    String descr = jsonReadStr(parameters, "descr");
+
+    if (widget != "na") {
+        String buf = "{}";
+        if (!loadWidget(widget, buf)) {
+            return;
+        }
+        // if (_cnt != "") {
+        //     if (widget.indexOf("chart") != -1) jsonWriteStr(buf, "maxCount", _cnt);
+        // }
+
+#ifdef GATE_MODE
+        jsonWriteStr(buf, "info", " ");
+#endif
+
+        jsonWriteStr(buf, "page", page);
+        jsonWriteStr(buf, "order", order);
+        jsonWriteStr(buf, "descr", descr);
+        jsonWriteStr(buf, "topic", prex + "/" + id);
+
+#ifdef LAYOUT_IN_RAM
+        all_widgets += widget + "\r\n";
+#else
+        addFileLn("layout.txt", buf);
+#endif
+    }
+}
+
+bool loadWidget(const String& widget, String& buf) {
+    buf = readFile(getWidgetFile(widget), 2048);
+    bool res = !(buf == "Failed" || buf == "Large");
+    if (!res) {
+        SerialPrint("E", "module", "on load" + widget);
+    }
+    return res;
+}
+
+const String getWidgetFile(const String& name) {
+    return "/widgets/" + name + ".json";
+}

src/ESPConfiguration.cpp

@@ -20,6 +20,7 @@ void configure(String path) {
         myIoTSensor = (IoTSensor*)getAPI_AnalogAdc(jsonArrayElement);
         if (myIoTSensor) {
             iotSensors.push_back(myIoTSensor);
+            createWidget(jsonArrayElement);
         }
         //================================================================================================================
     }

src/utils/FileUtils.cpp

@@ -63,4 +63,15 @@ bool cutFile(const String& src, const String& dst) {
     dstFile.close();
     FileFS.remove(srcPath);
     return true;
+}
+
+const String addFileLn(const String& filename, const String& str) {
+    String path = filepath(filename);
+    auto file = FileFS.open(path, "a");
+    if (!file) {
+        return "failed";
+    }
+    file.println(str);
+    file.close();
+    return "sucсess";
 }