Merge pull request #412 from Mit4el/ver4dev

merge module from chat

.github/workflows/build_iotm.yml

@@ -0,0 +1,55 @@
+env:
+  BOARDS: '["esp8266_4mb", "esp8266_16mb", "esp32_4mb3f", "esp32c3m_4mb", "esp32s2_4mb", "esp32s3_16mb"]'
+
+name: Build Firmware
+
+on:
+  workflow_dispatch:
+
+jobs:
+  generate-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set_matrix.outputs.json }}
+    steps:
+      - name: Prepare matrix JSON Object
+        id: set_matrix
+        uses: nickofthyme/object-remap@v2.0.0
+        with:
+          __case: kebab
+          board: ${{ env.BOARDS }}
+
+  build:
+    needs: [ generate-matrix ]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }}
+        
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        ref: 'ver4dev'
+    - name: Run PrepareProject.py -b ${{ matrix.board }}
+      run: python3 ./PrepareProject.py -b ${{ matrix.board }}
+    - name: Set up Python
+      uses: actions/setup-python@v4
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install platformio
+    - name: Run PlatformIO
+      if: always()
+      run: platformio run 
+    - name: Build FS
+      if: always()
+      run: platformio run -t buildfs --disable-auto-clean
+    - name: Rearrange Artifacts
+      run: |
+        mkdir -p artifacts/${{ matrix.board }}
+        find .pio/build/${{ matrix.board }} -name "*.bin" -exec mv {} artifacts/${{ matrix.board }} \;
+      working-directory: ${{ github.workspace }}
+    - name: Attach artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: firmware-${{ matrix.board }}-${{ github.run_number }}
+        path: artifacts/${{ matrix.board }}

.gitignore

@@ -0,0 +1,2 @@
+.pio
+.vscode

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

Cmd.ino

@@ -1,582 +0,0 @@
-void CMD_init() {
-
-  sCmd.addCommand("button",  button);
-  sCmd.addCommand("buttonSet",  buttonSet);
-  sCmd.addCommand("pinSet",  pinSet);
-
-  sCmd.addCommand("pwm",  pwm);
-  sCmd.addCommand("pwmSet",  pwmSet);
-
-  sCmd.addCommand("switch",  switch_);
-
-  sCmd.addCommand("analog",  analog);
-  sCmd.addCommand("level",  level);
-  sCmd.addCommand("dallas",  dallas);
-
-  sCmd.addCommand("dhtT",  dhtT);
-  sCmd.addCommand("dhtH",  dhtH);
-  sCmd.addCommand("dhtPerception",  dhtPerception);
-  sCmd.addCommand("dhtComfort",  dhtComfort);
-
-  sCmd.addCommand("logging",  logging);
-
-  sCmd.addCommand("inputDigit",  inputDigit);
-  sCmd.addCommand("digitSet",  digitSet);
-
-  sCmd.addCommand("inputTime",  inputTime);
-  sCmd.addCommand("timeSet",  timeSet);
-
-  sCmd.addCommand("timerStart",  timerStart);
-  sCmd.addCommand("timerStop",  timerStop);
-
-  sCmd.addCommand("text",  text);
-  sCmd.addCommand("textSet",  textSet);
-
-
-  sCmd.addCommand("mqtt",  mqttOrderSend);
-  sCmd.addCommand("http",  httpOrderSend);
-  sCmd.addCommand("push",  pushControl);
-
-
-  handle_time_init();
-
-  //======новые виджеты ver2.0=======//
-  /*
-    sCmd.addCommand("inputText",  inputText);
-    sCmd.addCommand("inputTextSet",  inputTextSet);
-
-    sCmd.addCommand("inputTime",  inputTime);
-    sCmd.addCommand("inputTimeSet",  inputTimeSet);
-
-    sCmd.addCommand("inputDate",  inputDate);
-    sCmd.addCommand("inputDateSet",  inputDateSet);
-
-    sCmd.addCommand("inputDate",  inputDate);
-
-    //sCmd.addCommand("inputDropdown",  inputDropdown);
-  */
-  //=================================//
-}
-
-
-
-//==========================================================================================================
-//==========================================Модуль кнопок===================================================
-void button() {
-
-  String button_number = sCmd.next();
-  String button_param = sCmd.next();
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-
-  jsonWrite(optionJson, "button_param" + button_number, button_param);
-  jsonWrite(configJson, "buttonSet" + button_number, start_state);
-
-  if (isDigitStr (button_param)) {
-    pinMode(button_param.toInt(), OUTPUT);
-    digitalWrite(button_param.toInt(), start_state.toInt());
-  }
-
-  if  (button_param == "scenario") {
-    jsonWrite(configSetup, "scenario", start_state);
-    Scenario_init();
-    saveConfig();
-  }
-
-  if  (button_param.indexOf("line") != -1) {
-    String str = button_param;
-    while (str.length() != 0) {
-      if (str == "") return;
-      String tmp = selectToMarker (str, ",");  //line1,
-      String number = deleteBeforeDelimiter(tmp, "e");   //1,
-      number.replace(",", "");
-      Serial.println(number);
-      int number_int = number.toInt();
-      scenario_line_status[number_int] = start_state.toInt();
-      str = deleteBeforeDelimiter(str, ",");
-    }
-  }
-  createViget (viget_name, page_name, page_number, "vigets/viget.toggle.json", "buttonSet" + button_number);
-}
-
-void buttonSet() {
-
-  String button_number = sCmd.next();
-  String button_state = sCmd.next();
-  String button_param = jsonRead(optionJson, "button_param" + button_number);
-
-  if (button_param != "na" || button_param != "scenario" || button_param.indexOf("line") != -1) {
-    digitalWrite(button_param.toInt(), button_state.toInt());
-  }
-
-  if  (button_param == "scenario") {
-    jsonWrite(configSetup, "scenario", button_state);
-    Scenario_init();
-    saveConfig();
-  }
-
-  if  (button_param.indexOf("line") != -1) {
-    String str = button_param;
-    while (str.length() != 0) {
-      if (str == "") return;
-      String tmp = selectToMarker (str, ",");  //line1,
-      String number = deleteBeforeDelimiter(tmp, "e");   //1,
-      number.replace(",", "");
-      Serial.println(number);
-      int number_int = number.toInt();
-      scenario_line_status[number_int] = button_state.toInt();
-      str = deleteBeforeDelimiter(str, ",");
-    }
-  }
-
-  eventGen ("buttonSet", button_number);
-
-  jsonWrite(configJson, "buttonSet" + button_number, button_state);
-  sendSTATUS("buttonSet" + button_number, button_state);
-}
-
-void pinSet() {
-
-  String pin_number = sCmd.next();
-  String pin_state = sCmd.next();
-  pinMode(pin_number.toInt(), OUTPUT);
-  digitalWrite(pin_number.toInt(), pin_state.toInt());
-
-}
-//==================================================================================================================
-//==========================================Модуль управления ШИМ===================================================
-void pwm() {
-
-  static boolean flag = true;
-  String pwm_number = sCmd.next();
-  String pwm_pin = sCmd.next();
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-
-
-  uint8_t pwm_pin_int = pwm_pin.toInt();
-  jsonWrite(optionJson, "pwm_pin" + pwm_number, pwm_pin);
-  pinMode(pwm_pin_int, INPUT);
-  analogWrite(pwm_pin_int, start_state.toInt());
-  jsonWrite(configJson, "pwmSet" + pwm_number, start_state);
-
-  createViget (viget_name, page_name, page_number, "vigets/viget.range.json", "pwmSet" + pwm_number);
-}
-
-void pwmSet() {
-
-  String pwm_number = sCmd.next();
-  String pwm_state = sCmd.next();
-  int pwm_state_int = pwm_state.toInt();
-
-  int pin = jsonReadtoInt(optionJson, "pwm_pin" + pwm_number);
-  analogWrite(pin, pwm_state_int);
-
-  eventGen ("pwmSet", pwm_number);
-
-  jsonWrite(configJson, "pwmSet" + pwm_number, pwm_state);
-  sendSTATUS("pwmSet" + pwm_number, pwm_state);
-}
-//==================================================================================================================
-//==========================================Модуль физической кнопки================================================
-void switch_ () {
-
-  String switch_number = sCmd.next();
-  String switch_pin = sCmd.next();
-  String switch_delay = sCmd.next();
-
-  buttons[switch_number.toInt()].attach(switch_pin.toInt());
-  buttons[switch_number.toInt()].interval(switch_delay.toInt());
-  but[switch_number.toInt()] = true;
-}
-
-void handleButton()  {
-
-  static uint8_t switch_number = 1;
-
-  if (but[switch_number]) {
-    buttons[switch_number].update();
-    if (buttons[switch_number].fell()) {
-
-      eventGen ("switchSet", String(switch_number));
-
-      jsonWrite(configJson, "switchSet" + String(switch_number), "1");
-    }
-    if (buttons[switch_number].rose()) {
-
-      eventGen ("switchSet", String(switch_number));
-
-      jsonWrite(configJson, "switchSet" + String(switch_number), "0");
-    }
-  }
-  switch_number++;
-  if (switch_number == NUM_BUTTONS) switch_number = 0;
-}
-
-//=====================================================================================================================================
-//=========================================Добавление окна ввода цифры=================================================================
-void inputDigit() {
-  String value_name = sCmd.next();
-  String number = value_name.substring(5);
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWrite(configJson, "digitSet" + number, start_state);
-  createViget (viget_name, page_name, page_number, "vigets/viget.inputNum.json", "digitSet" + number);
-}
-void digitSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWrite(configJson, "digitSet" + number, value);
-  sendSTATUS("digitSet" + number, value);
-}
-//=====================================================================================================================================
-//=========================================Добавление окна ввода времени===============================================================
-void inputTime() {
-  String value_name = sCmd.next();
-  String number = value_name.substring(4);
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  start_state.replace(":", ".");
-  jsonWrite(configJson, "timeSet" + number, start_state);
-  start_state.replace(".", ":");
-  createViget (viget_name, page_name, page_number, "vigets/viget.inputTime.json", "timeSet" + number);
-}
-void timeSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  value.replace(":", ".");
-  jsonWrite(configJson, "timeSet" + number, value);
-  value.replace(".", ":");
-  sendSTATUS("timeSet" + number, value);
-}
-
-//=====================================================================================================================================
-//=========================================Добавление текстового виджета============================================================
-void text() {
-
-  String number = sCmd.next();
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-
-  createViget (viget_name, page_name, page_number, "vigets/viget.anydata.json", "textSet" + number);
-}
-
-
-void textSet() {
-
-  String number = sCmd.next();
-  String text = sCmd.next();
-  text.replace("_", " ");
-
-  if (text.indexOf("-time") >= 0) {
-    text.replace("-time", "");
-    String time = GetTime();
-    time.replace(":", ".");
-    text = GetDataDigital() + " " + time + " " + text;
-  }
-
-  jsonWrite(configJson, "textSet" + number, text);
-  sendSTATUS("textSet" + number, text);
-}
-
-void handle_time_init() {
-  ts.add(TIME, 1000, [&](void*) {
-
-    String tmp = GetTimeWOsec();
-    tmp.replace(":", ".");
-    jsonWrite(configJson, "timenowSet", tmp);
-    eventGen ("timenowSet", "");
-
-  }, nullptr, true);
-}
-//====================================================================================================================================================
-/*
-  void inputText() {
-  String number = sCmd.next();
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWrite(configJson, "inputTextSet" + number, start_state);
-  createViget (viget_name, page_name, page_number, "vigets/viget.inputText.json", "inputTextSet" + number);
-  }
-  void inputTextSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWrite(configJson, "inputTextSet" + number, value);
-  sendSTATUS("inputTextSet" + number, value);
-  }
-
-  void inputTime() {
-  String number = sCmd.next();
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWrite(configJson, "inputTimeSet" + number, start_state);
-  createViget (viget_name, page_name, page_number, "vigets/viget.inputTime.json", "inputTimeSet" + number);
-  }
-  void inputTimeSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  value.replace(":", ".");
-  jsonWrite(configJson, "inputTimeSet" + number, value);
-  value.replace(".", ":");
-  sendSTATUS("inputTimeSet" + number, value);
-  }
-
-
-  void inputDate() {
-  String number = sCmd.next();
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWrite(configJson, "inputDateSet" + number, start_state);
-  createViget (viget_name, page_name, page_number, "vigets/viget.inputDate.json", "inputDateSet" + number);
-  }
-  void inputDateSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWrite(configJson, "inputDateSet" + number, value);
-  sendSTATUS("inputDateSet" + number, value);
-  }
-*/
-//=================================================Глобальные команды удаленного управления===========================================================
-
-void mqttOrderSend() {
-
-  String id = sCmd.next();
-  String order = sCmd.next();
-
-  String  all_line = prefix + "/" + id + "/order";
-  //Serial.print(all_line);
-  //Serial.print("->");
-  //Serial.println(order);
-  int send_status = client.publish (all_line.c_str(), order.c_str(), false);
-}
-
-void httpOrderSend() {
-
-  String ip = sCmd.next();
-  String order = sCmd.next();
-  order.replace("_", "%20");
-  String url = "http://" + ip + "/cmd?command=" + order;
-  getURL(url);
-}
-
-
-
-//==============================================================================================================================
-//============================выполнение команд (в лупе) по очереди из строки order=============================================
-void handleCMD_loop() {
-
-  if (order_loop != "") {
-
-    String tmp = selectToMarker(order_loop, ",");                //выделяем из страки order первую команду rel 5 1,
-    sCmd.readStr(tmp);                                           //выполняем первую команду
-    Serial.println("[ORDER] => " + order_loop);
-    order_loop = deleteBeforeDelimiter(order_loop, ",");         //осекаем выполненную команду
-  }
-}
-
-//=============================выполнение команд (через период) по очереди из строки order=======================================
-/*void handleCMD_ticker() {
-
-  ts.add(CMD, CMD_update_int, [&](void*) {
-    if (!busy) {
-      if (order_ticker != "") {
-
-        String tmp = selectToMarker(order_ticker, ",");                //выделяем из страки order первую команду pus title body
-        if (tmp != "no_command") sCmd.readStr(tmp);                                             //выполняем первую команду
-        Serial.println("order_ticker => " + order_ticker);
-        order_ticker = deleteBeforeDelimiter(order_ticker, ",");       //осекаем выполненную команду
-      }
-    }
-  }, nullptr, true);
-  }*/
-
-
-
-//=======================================================================================================================================
-//=======================================================================================================================================
-void txtExecution(String file) {
-
-  String command_all = readFile(file, 2048) + "\r\n";  //2048
-
-  command_all.replace("\r\n", "\n");
-  command_all.replace("\r", "\n");
-
-  while (command_all.length() != 0) {
-
-    String tmp = selectToMarker (command_all, "\n");
-    //if (tmp.indexOf("//") < 0)
-    sCmd.readStr(tmp);
-    command_all = deleteBeforeDelimiter(command_all, "\n");
-  }
-}
-void stringExecution(String str) {
-
-  String command_all = str + "\r\n";  //"\r\n"
-
-  command_all.replace("\r\n", "\n");
-  command_all.replace("\r", "\n");
-
-  while (command_all.length() != 0) {
-
-    String tmp = selectToMarker (command_all, "\n");
-    //if (tmp.indexOf("//") < 0)
-    sCmd.readStr(tmp);
-    command_all = deleteBeforeDelimiter(command_all, "\n");
-  }
-}
-
-//======================================================================================================================
-//===============================================Создание виджетов=======================================================
-
-void createViget (String viget_name, String  page_name, String page_number, String file, String topic) {
-
-  String viget;
-  viget = readFile(file, 1024);
-
-  if (viget == "Failed") return;
-  if (viget == "Large") return;
-
-  viget_name.replace("#", " ");
-  page_name.replace("#", " ");
-
-  jsonWrite(viget, "page", page_name);
-  jsonWrite(viget, "order", page_number);
-  jsonWrite(viget, "descr", viget_name);
-  jsonWrite(viget, "topic", prex + "/" + topic);
-  all_vigets += viget + "\r\n";
-  viget = "";
-}
-
-/*
-  void createViget (String viget_name, String  page_name, String page_number, String file, String topic, String key, String value) {
-
-  String viget;
-  viget = readFile(file, 1024);
-
-  if (viget == "Failed") return;
-  if (viget == "Large") return;
-
-  viget_name.replace("#", " ");
-  page_name.replace("#", " ");
-
-  value.replace("#", " ");
-
-  viget = vidgetConfigWrite(viget, key, value);
-
-  jsonWrite(viget, "page", page_name);
-  jsonWrite(viget, "pageId", page_number);
-  jsonWrite(viget, "descr", viget_name);
-  jsonWrite(viget, "topic", prex + "/" + topic);
-
-  all_vigets += viget + "\r\n";
-  viget = "";
-  }
-
-  void createViget (String viget_name, String  page_name, String page_number, String file, String topic, String key, String value, String key2, String value2) {
-
-  String viget;
-  viget = readFile(file, 1024);
-
-  if (viget == "Failed") return;
-  if (viget == "Large") return;
-
-  viget_name.replace("#", " ");
-  page_name.replace("#", " ");
-
-  value.replace("#", " ");
-
-  viget = vidgetConfigWrite(viget, key, value);
-  viget = vidgetConfigWrite(viget, key2, value2);
-
-  jsonWrite(viget, "page", page_name);
-  jsonWrite(viget, "pageId", page_number);
-  jsonWrite(viget, "descr", viget_name);
-  jsonWrite(viget, "topic", prex + "/" + topic);
-
-  all_vigets += viget + "\r\n";
-  viget = "";
-  }
-*/
-String vidgetConfigWrite(String viget, String key, String value) {
-
-  if (viget == "") return "";
-  if (viget == "{}") return "";
-  int psn1 = viget.indexOf("{");
-  if (psn1 != -1) {
-    psn1 = viget.indexOf("{", psn1 + 1);
-    if (psn1 != -1) {
-      int psn2 = viget.indexOf("}", psn1);
-      String WigetConfig = viget.substring(psn1, psn2) + "}";
-      jsonWrite(WigetConfig, key, value);
-      String part1 = viget.substring(0, psn1);
-      viget = part1 + WigetConfig + "}";
-      return viget;
-
-    }
-  }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-//============разное
-
-/*
-  void delAlert() {
-
-  String alert_id = sCmd.next();
-  delViget(alert_id);
-  sendAllWigets();
-  }
-
-
-  void delViget(String text_in_viget) {
-  String viget = all_vigets;
-  while (viget.length() != 0) {
-    String tmp = selectToMarkerPlus (viget, "\r\n", 2);
-    if (tmp.indexOf(text_in_viget) > 0) {
-
-      all_vigets.replace(tmp, "");
-      //Serial.println(all_vigets);
-
-      viget = deleteBeforeDelimiter(viget, "\r\n");
-    } else {
-      viget = deleteBeforeDelimiter(viget, "\r\n");
-    }
-  }
-  }
-*/

Init.ino

@@ -1,72 +0,0 @@
-void All_init() {
-
-  server.on("/all_modules_init", HTTP_GET, [](AsyncWebServerRequest * request) {
-    Device_init();
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-
-  server.on("/scenario", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("status")) {
-      jsonWrite(configSetup, "scenario", request->getParam("status")->value());
-    }
-    saveConfig();
-    Scenario_init();
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-  server.on("/cleanlog", HTTP_GET, [](AsyncWebServerRequest * request) {
-    SPIFFS.remove("/log.analog.txt");
-    SPIFFS.remove("/log.dallas.txt");
-    SPIFFS.remove("/log.level.txt");
-    SPIFFS.remove("/log.ph.txt");
-    SPIFFS.remove("/log.txt");
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-  Device_init();
-  Scenario_init();
-  Timer_countdown_init();
-}
-
-void Device_init() {
-
-  //SENSORS-SECTION
-  ts.remove(ANALOG_);
-  ts.remove(LEVEL);
-  ts.remove(DALLAS);
-  ts.remove(DHTT);
-  ts.remove(DHTH);
-  //================
-
-  all_vigets = "";
-  txtExecution("firmware.config.txt");
-  //outcoming_date();
-}
-//-------------------------------сценарии-----------------------------------------------------
-
-void Scenario_init() {
-  if (jsonRead(configSetup, "scenario") == "1") {
-    scenario = readFile("firmware.scenario.txt", 2048);
-  }
-}
-
-void up_time() {
-  uint32_t ss = millis() / 1000;
-  uint32_t mm = ss / 60;
-  uint32_t hh = mm / 60;
-  uint32_t dd = hh / 24;
-
-  if (mm != 0) {
-    Serial.println(String(mm) + " min");
-    jsonWrite(configJson, "uptime", String(mm) + " min");
-  }
-  if (hh != 0) {
-    Serial.println(String(hh) + " hours");
-    jsonWrite(configJson, "uptime", String(hh) + " hours");
-  }
-  if (dd != 0) {
-    Serial.println(String(dd) + " days");
-    jsonWrite(configJson, "uptime", String(dd) + " days");
-  }
-}

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Dmitry Borisenko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

PrepareProject.py

@@ -0,0 +1,293 @@
+# PrepareProject.py - инструмент для подготовки проекта к компиляции.
+# Необходимо вызвать при изменении персональных настроек или состава модулей.
+# 
+# При отсутствии файла с персональными настройками, myProfile.json будет создан автоматически
+# python PrepareProject.py
+# 
+# Если myProfile.json уже существует, можно запустить PrepareProject.py с параметром -u или --update для обновления списка модулей. 
+# Данная функция будет полезна для разработчиков при добавлении модуля в папку src/modules
+# python PrepareProject.py --update 
+# python PrepareProject.py -u 
+# 
+# Возможно использовать несколько вариантов персональных настроек и уточнять имя файла при запуске с использованием параметра -p или -profile
+# python PrepareProject.py --profile <ИмяФайла>
+# python PrepareProject.py -p <ИмяФайла>
+# 
+# Используя параметры -b или --board <board_name> можно уточнить для какой платы нужно подготовить проект
+# 
+# поддерживаемые контроллеры (профили):
+# esp8266_4mb
+# esp8266_16mb
+# esp32_4mb
+# esp32cam_4mb
+# esp32_16mb
+# esp32s2_4mb
+# esp8266_1mb
+# esp8266_1mb_ota
+# esp8285_1mb
+# esp8285_1mb_ota
+# esp8266_2mb
+# esp8266_2mb_ota
+
+
+import configparser
+import os, json, sys, getopt
+from pathlib import Path
+import shutil
+
+
+config = configparser.ConfigParser()  # создаём объекта парсера INI
+
+def printHelp():
+    print('''Usage:
+        PrepareProject.py
+        -p --profile <file.json_in_root_folder>
+        -u --update
+        -h --help
+        -b --board <board_name>''')
+    with open('myProfile.json', "r", encoding='utf-8') as read_file:
+        profJson = json.load(read_file)  
+    print ('')
+    print ('Choose a board from the list:')
+    # print(profJson['projectProp']['platformio']['comments_default_envs'])
+    print ('        ', end='')
+    cnt = 0
+    for envs in profJson['projectProp']['platformio']['envs']:
+        if cnt == 5:
+            cnt = 0
+            print('')
+            print('        ', end='')
+        print(envs['name'] + ', ', end='')
+        cnt = cnt + 1
+
+
+def updateModulesInProfile(profJson):
+    profJson["modules"] = {}
+    for root,d_names,f_names in os.walk("src/modules"):
+        for fname in f_names:
+            if fname == "modinfo.json":
+                with open(os.path.join(root, fname), "r", encoding='utf-8') as read_file:
+                    modinfoJson = json.load(read_file)
+                    # проверяем есть ли уже узловой элемент и если нет, то создаем
+                    if not modinfoJson['menuSection'] in profJson["modules"]:
+                        listFromFirstElement = {modinfoJson['menuSection']: []}
+                        listFromFirstElement.update(profJson["modules"])
+                        profJson["modules"] = listFromFirstElement
+                    # добавляем информацию о модуле в узловой элемент
+                    profJson["modules"][modinfoJson['menuSection']].append({
+                        'path': os.path.normpath(root).replace("\\", "/"),
+                        'active': modinfoJson['defActive']
+                    })
+
+
+
+
+
+update = False              # признак необходимости обновить список модулей
+profile = 'myProfile.json'  # имя профиля. Будет заменено из консоли, если указано при старте
+selectDevice = ''           # имя платы для которой хотим собрать, если её указали к командной строке -b <board>
+
+argv = sys.argv[1:]
+try:
+    opts, args = getopt.getopt(argv, 'hp:ub:', ['help', 'profile=', 'update', 'board='])
+except getopt.GetoptError:
+    print('Ошибка обработки параметров!')
+    printHelp()
+    sys.exit(2)
+
+for opt, arg in opts:
+    if opt in ("-h", "--help"):
+        printHelp()
+        sys.exit()
+    elif opt in ("-p", "--profile"):
+        print('Загрузка профиля из файла:' + arg)
+        profile = arg
+    elif opt in ("-u", "--update"):
+        print('Создание новой конфигурации по исходным файлам!')
+        update = True
+    elif opt in ("-b", "--board"):
+        print('Создание профиля для платы:' + arg)
+        selectDevice = arg
+
+if Path(profile).is_file():
+    # подтягиваем уже существующий профиль
+    with open(profile, "r", encoding='utf-8') as read_file:
+        profJson = json.load(read_file)  
+    # если хотим обновить список модулей в существующем профиле
+    if update:
+        updateModulesInProfile(profJson)
+        
+        # sortedListNames = sorted(profJson["modules"])
+        # sortedModules = {}
+        # for sortedModulName in sortedList:
+            
+        # print(profJson)
+        
+        with open(profile, "w", encoding='utf-8') as write_file:
+            json.dump(profJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
+else:
+    # если файла нет - создаем по образу настроек из проекта
+    profJson = json.loads('{}')
+    # копируем параметры IOTM из settings.json в новый профиль
+    with open("data_svelte/settings.json", "r", encoding='utf-8') as read_file:
+        profJson['iotmSettings'] = json.load(read_file)
+    # устанавливаем параметры сборки
+    profJson['projectProp'] = {
+        'platformio': {
+            'default_envs': 'esp8266_4mb'
+        }
+    }
+    # загружаем список модулей для сборки
+    updateModulesInProfile(profJson)
+    # сохраняем новый профиль
+    with open(profile, "w", encoding='utf-8') as write_file:
+        json.dump(profJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
+
+deviceName = ''
+if selectDevice == '':
+    # определяем какое устройство используется в профиле
+    deviceName = profJson['projectProp']['platformio']['default_envs']  
+else:
+    for envs in profJson['projectProp']['platformio']['envs']:
+        if envs['name'] == selectDevice:
+            deviceName = selectDevice
+    if deviceName == '':
+        deviceName = profJson['projectProp']['platformio']['default_envs'] 
+        print(f"\x1b[1;31;31m Board ", selectDevice, " not found in ",profile,"!!! Use ",deviceName,"  \x1b[0m")
+
+# заполняем папку /data файлами прошивки в зависимости от устройства
+if deviceName == 'esp8266_1mb_ota' or deviceName == 'esp8285_1mb_ota' or deviceName == 'esp8266_2mb_ota': 
+    shutil.copytree("data_lite", "data_svelte", symlinks=False, ignore=None, ignore_dangling_symlinks=False, dirs_exist_ok=True)
+else:
+    shutil.copytree("data_full", "data_svelte", symlinks=False, ignore=None, ignore_dangling_symlinks=False, dirs_exist_ok=True)
+
+deviceType = 'esp32*'
+if not 'esp32' in deviceName:
+    deviceType = 'esp82*'
+if 'bk72' in deviceName:
+    deviceType = 'bk72*'
+# генерируем файлы проекта на основе подготовленного профиля
+# заполняем конфигурационный файл прошивки параметрами из профиля
+with open("data_svelte/settings.json", "r", encoding='utf-8') as read_file:
+    iotmJson = json.load(read_file)
+for key, value in profJson['iotmSettings'].items():
+    iotmJson[key] = value
+with open("data_svelte/settings.json", "w", encoding='utf-8') as write_file:
+    json.dump(iotmJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
+
+
+        
+# собираем меню прошивки из модулей
+# параллельно формируем список имен активных модулей
+# параллельно собираем необходимые активным модулям библиотеки для включения в компиляцию для текущего типа устройства (esp8266_4m, esp32_4mb, esp8266_1m, esp8266_1m_ota) 
+activeModulesName = []  # список имен активных модулей
+allLibs = ""            # подборка всех библиотек необходимых модулям для дальнейшей записи в конфигурацию platformio
+allDefs = "\n"            # для каждого модуля создаем глобальный define
+itemsCount = 1
+includeDirs = ""        # подборка путей ко всем модулям для дальнейшей записи в конфигурацию platformio
+itemsJson = json.loads('[{"name": "Выберите элемент", "num": 0}]')
+for section, modules in profJson['modules'].items():
+    itemsJson.append({"header": section})
+    for module in modules:
+        if module['active']:
+            with open(module['path'] + "/modinfo.json", "r", encoding='utf-8') as read_file:
+                moduleJson = json.load(read_file)
+                if 'moduleDefines' in moduleJson['about']:
+                    allDefs = allDefs + "\n".join("-D" + d for d in moduleJson['about']['moduleDefines'])
+                if deviceName in moduleJson['usedLibs']:   # проверяем поддерживает ли модуль текущее устройство
+                    if not 'exclude' in moduleJson['usedLibs'][deviceName]: # смотрим не нужно ли исключить данный модуль из указанной платы deviceName
+                        activeModulesName.append(moduleJson['about']['moduleName'])     # запоминаем имена для использования на след шагах
+                        includeDirs = includeDirs + "\n+<" + module['path'].replace("src/", "") + ">"  # запоминаем пути к модулям для компиляции
+                        for libPath in moduleJson['usedLibs'][deviceName]:               # запоминаем библиотеки необходимые модулю для текущей платы
+                            allLibs = allLibs + "\n" + libPath       
+                        for configItemsJson in moduleJson['configItem']:
+                            configItemsJson['num'] = itemsCount
+                            configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name']
+                            itemsCount = itemsCount + 1
+                            configItemsJson['moduleName'] = moduleJson['about']['moduleName']
+                            itemsJson.append(configItemsJson)    
+                else: # В первую очередь ищем по имени deviceName, чтобы для данной платы можно было уточнить либы. Если не нашли плату по имени в usedLibs пробуем найти её по типу deviceType
+                    if deviceType in moduleJson['usedLibs']:   # проверяем поддерживает ли модуль текущее устройство
+                        activeModulesName.append(moduleJson['about']['moduleName'])     # запоминаем имена для использования на след шагах
+                        includeDirs = includeDirs + "\n+<" + module['path'].replace("src/", "") + ">"  # запоминаем пути к модулям для компиляции
+                        for libPath in moduleJson['usedLibs'][deviceType]:               # запоминаем библиотеки необходимые модулю для текущей платы
+                            allLibs = allLibs + "\n" + libPath       
+                        for configItemsJson in moduleJson['configItem']:
+                            configItemsJson['num'] = itemsCount
+                            configItemsJson['name'] = str(itemsCount) + ". " + configItemsJson['name'] 
+                            itemsCount = itemsCount + 1 
+                            itemsJson.append(configItemsJson)
+                            configItemsJson['moduleName'] = moduleJson['about']['moduleName']     
+
+with open("data_svelte/items.json", "w", encoding='utf-8') as write_file:
+    json.dump(itemsJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
+
+
+# учитываем вызовы модулей в API.cpp
+allAPI_head = ""
+allAPI_exec = ""
+for activModuleName in activeModulesName:
+    allAPI_head = allAPI_head + "\nvoid* getAPI_" + activModuleName + "(String subtype, String params);"
+    allAPI_exec = allAPI_exec + "\nif ((tmpAPI = getAPI_" + activModuleName + "(subtype, params)) != nullptr) foundAPI = tmpAPI;"
+apicpp = '#include "ESPConfiguration.h"\n'
+apicpp = apicpp + allAPI_head
+apicpp = apicpp + '\n\nvoid* getAPI(String subtype, String params) {\nvoid* tmpAPI; void* foundAPI = nullptr;'
+apicpp = apicpp + allAPI_exec
+apicpp = apicpp + '\nreturn foundAPI;\n}'
+with open('src/modules/API.cpp', 'w') as f:
+    f.write(apicpp)
+
+# корректируем параметры platformio
+# собираем пути всех отключенных модулей для исключения их из процесса компиляции
+# excludeDirs = ""
+# for root,d_names,f_names in os.walk("src\\modules"):
+#     for fname in f_names:
+#         if fname == "modinfo.json":
+#             with open(root + "\\" + fname, "r", encoding='utf-8') as read_file:
+#                 modinfoJson = json.load(read_file)
+#                 if not modinfoJson['about']['moduleName'] in activeModulesName:
+#                     excludeDirs = excludeDirs + "\n-<" + root.replace("src\\", "") + ">"
+
+# фиксируем изменения в platformio.ini
+config.clear()
+config.read("platformio.ini")
+config["env:" + deviceName + "_fromitems"]["lib_deps"] = allLibs
+config["env:" + deviceName + "_fromitems"]["build_src_filter"] = includeDirs
+config["env:" + deviceName + "_fromitems"]["build_flags"] = allDefs
+config["platformio"]["default_envs"] = deviceName
+if "${env:" + deviceName + "_fromitems.build_flags}" not in config["env:" + deviceName]["build_flags"]:
+    config["env:" + deviceName]["build_flags"] += "\n${env:" + deviceName + "_fromitems.build_flags}"
+# config["platformio"]["data_dir"] = profJson['projectProp']['platformio']['data_dir']
+with open("platformio.ini", 'w') as configFile:
+    config.write(configFile)
+    
+    
+# сохраняем часть применяемого профиля в папку data_svelte для загрузки на контроллер и дальнейшего переиспользования
+print(f"Saving profile {profile} in /data_svelte/flashProfile.json")
+shortProfJson = json.loads('{}')
+shortProfJson['projectProp'] = {
+        'platformio': {
+            'default_envs': deviceName
+        }
+    }
+shortProfJson['modules'] = profJson['modules']
+with open("data_svelte/flashProfile.json", "w", encoding='utf-8') as write_file:
+    json.dump(shortProfJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)
+    
+    
+# import ctypes  # An included library with Python install.   
+# if update:    
+#     ctypes.windll.user32.MessageBoxW(0, "Модули профиля " + profile + " обновлены, а сам профиль применен, можно запускать компиляцию и прошивку.", "Операция завершена.", 0)
+# else:
+#     ctypes.windll.user32.MessageBoxW(0, "Профиль " + profile + " применен, можно запускать компиляцию и прошивку.", "Операция завершена.", 0)
+
+if update:    
+    shutil.copy(profile, "compilerProfile.json") 
+    print(f"\x1b[1;31;42m Profile modules " + profile + " updated, profile applied, you can run compilation and firmware.\x1b[0m")
+    
+else:
+    print(f"\x1b[1;31;42m Profile ", profile, " applied, you can run compilation and firmware.\x1b[0m")
+
+# print(f"\x1b[1;32;41m Операция завершена. \x1b[0m")
+
+        

PrepareServer.py

@@ -0,0 +1,37 @@
+# подготавливаем папку для локального сервера обновлений
+# для этого  компилируем проект и получаем бинарные файлы:
+# firmware.bin, littlefs.bin, partitions.bin и ver.json
+
+import shutil
+import configparser
+import os, json, sys, getopt
+from pathlib import Path
+
+
+def copyFileIfExist(fileName, deviceName):
+    srcFilePath = ".pio/build/" + deviceName + "/" + fileName
+    dstFilePath = "iotm/" + deviceName + "/400/" + fileName
+    if Path(srcFilePath).is_file():
+        print("Ok...... \"" + srcFilePath + "\" на месте!")
+        Path(dstFilePath).parent.mkdir(parents=True, exist_ok=True)
+        shutil.copy(srcFilePath, dstFilePath)   
+        return True
+    else:
+        print("Error...... \"" + srcFilePath + "\" НЕ существует!")
+        return False
+        
+        
+config = configparser.ConfigParser()  # создаём объекта парсера INI
+config.read("platformio.ini")
+deviceName = config["platformio"]["default_envs"]
+
+homeDir = os.path.expanduser('~')
+os.system(homeDir + "/.platformio/penv/Scripts/pio run")
+os.system(homeDir + "/.platformio/penv/Scripts/pio run -t buildfs --disable-auto-clean")
+
+if copyFileIfExist("firmware.bin", deviceName) and copyFileIfExist("littlefs.bin", deviceName):
+    copyFileIfExist("partitions.bin", deviceName)
+    versionsJson = json.loads('{"' + deviceName + '": {"0": "400"}}')
+    with open("iotm/ver.json", "w", encoding='utf-8') as write_file:
+        json.dump(versionsJson, write_file, ensure_ascii=False, indent=4, sort_keys=False)    
+    print(f"\x1b[1;31;42m Сервер для обновления 'по воздуху' для " + deviceName + " подготовлен. Не забудьте установить расширение Live Server, запустить его и прописать в ESP IP вашего компьютера. Подробнее смотрите в WIKI: https://iotmanager.org/wiki.\x1b[0m")

README.md

@@ -0,0 +1,15 @@
+# IoTManager
+
+This is a smart home based on esp8266 and esp32 microcontrollers. These microcontrollers gained their popularity due to their low cost. Each such microcontroller is able to connect to your home wifi router. They can be purchased at any robotics store or on aliexpress, there are also ready-made devices based on them. This microcontroller has a certain number of pins on which digital signals are generated. Various peripheral devices can be connected to it: sensors, relays, stepper motors, servo drives, etc.
+
+Our firmware allows you to receive data from all these devices and manage them. The iot manager app available for ios and android is used to display the data. In order to connect devices and the application, a special mqtt server is needed, in other words, an mqtt broker. All devices are first connected to a wifi router, and then to this mqtt broker, the application is also connected to it. As a result, through the application you can manage devices from anywhere in the world, monitor sensor readings, build graphs and much more. Broker mqtt can be used in the cloud, such as wqtt.ru, or your own, raised, for example, on a single-board computer raspberry pi. There is also a second way to manage devices, it works even when you do not have the Internet - control through a web browser. All your devices will be available on one page. Both methods, through the application or through the web, work simultaneously with full mutual synchronization.
+
+To achieve your goal, you only need three things:
+
+1. Buy an esp microcontroller
+2. Download the app
+3. Get a cloud broker
+
+If remote control and the application are not needed, then the last step can be omitted.
+
+The logic of each device is configured using scripts. They are needed in order to teach the device to carry out your invented algorithms. You can assign any reaction to any action. The temperature has risen - the device will turn off the heater. Humidity has fallen and the level in the tank is more than 10% - the device will start watering, if not, it will send you a telegram notification that there is not enough water. These are just a few examples. Scenarios are created by you, and their flexibility will allow you to fulfill your every desire.

Scenario.ino

@@ -1,98 +0,0 @@
-void handleScenario() {
-
-  if (jsonRead(configSetup, "scenario") == "1") {
-    if ((jsonRead(optionJson, "scenario_status") != "")) {
-      int i = 0;
-      String str = scenario;                                                   //читаем переменную с сценариями (то что из файла на странице)
-      str += "\n";
-      str.replace("\r\n", "\n");
-      str.replace("\r", "\n");
-      while (str.length() != 0) {
-        //-----------------------------------------------------------------------------------------------------------------------
-        String tmp = selectToMarker (str, "end");                               //выделяем первый сценарий из файла вместе с командами
-        if (tmp == "") return;
-        i++;
-
-        if (scenario_line_status[i] == 1) {
-          //Serial.println(i);
-          String condition = selectToMarker (tmp, "\n");                        //выделяем первую строку самого сценария  button1 = 1 (условие)
-          String param_name = selectFromMarkerToMarker(condition, " " , 0);
-          param_name = add_set(param_name);                                      //из первой страки берем имя параметра button1 и вставляем в него Set и получаем buttonSet1
-          if (param_name.indexOf("timenow") != -1){
-            param_name = param_name + "Set";
-          }
-          String order = jsonRead(optionJson, "scenario_status");                //читаем весь файл событий
-          String param = selectToMarker (order, ",");                            //читаем первое событие из файла событий
-          if (param_name == param) {                                             //если поступившее событие равно событию заданному buttonSet1 в файле начинаем его обработку
-
-            String sign = selectFromMarkerToMarker(condition, " " , 1);          //читаем знак  (=)
-            String value = selectFromMarkerToMarker(condition, " " , 2);         //читаем значение (1)
-            if (value.indexOf("digit") != -1) {
-              value = add_set(value);
-              value = jsonRead(configJson, value);
-            }
-            if (value.indexOf("time") != -1) {
-              value = add_set(value);
-              value = jsonRead(configJson, value);
-            }
-            boolean flag = false;                                                 //если одно из значений совпало то только тогда начинаем выполнять комнады
-            if (sign == "=") {
-              if (jsonRead(configJson, param_name) == value) flag = true;
-            }
-            if (sign == "!=") {
-              if (jsonRead(configJson, param_name) != value) flag = true;
-            }
-            if (sign == "<") {
-              if (jsonRead(configJson, param_name).toInt() < value.toInt()) flag = true;
-            }
-            if (sign == ">") {
-              if (jsonRead(configJson, param_name).toInt() > value.toInt()) flag = true;
-            }
-            if (sign == ">=") {
-              if (jsonRead(configJson, param_name).toInt() >= value.toInt()) flag = true;
-            }
-            if (sign == "<=") {
-              if (jsonRead(configJson, param_name).toInt() <= value.toInt()) flag = true;
-            }
-
-            if (flag) {
-              tmp = deleteBeforeDelimiter(tmp, "\n");                                 //удаляем строку самого сценария оставляя только команды
-              stringExecution(tmp);                                                   //выполняем все команды
-
-              Serial.println("[SCENARIO] '" + condition + "'");
-              //Serial.println("            " + tmp);
-            }
-          }
-        }
-        str = deleteBeforeDelimiter(str, "end\n");                                     //удаляем первый сценарий
-        //-----------------------------------------------------------------------------------------------------------------------
-      }
-      String tmp2 = jsonRead(optionJson, "scenario_status");                           //читаем файл событий
-      tmp2 = deleteBeforeDelimiter(tmp2, ",");                                         //удаляем выполненное событие
-      jsonWrite(optionJson, "scenario_status", tmp2);                                  //записываем обновленный файл событий
-      i = 0;
-    }
-  }
-}
-
-void eventGen (String event_name, String number) {   //событие выглядит как имя плюс set плюс номер: button+Set+1
-
-  if (jsonRead(configSetup, "scenario") == "1") {
-    String tmp = jsonRead(optionJson, "scenario_status") ;    //генерирование события
-    //Serial.println(event_name);
-    jsonWrite(optionJson, "scenario_status", tmp + event_name + number + ",");
-  }
-}
-
-String add_set(String param_name) {
-  String num1 = param_name.substring(param_name.length() - 1);
-  String num2 = param_name.substring(param_name.length() - 2, param_name.length() - 1);
-  if (isDigitStr(num1) && isDigitStr(num2)) {
-    param_name = param_name.substring(0, param_name.length() - 2) + "Set" + num2 + num1;
-  } else {
-    if (isDigitStr(num1)) {
-      param_name = param_name.substring(0, param_name.length() - 1) + "Set" + num1;
-    }
-  }
-  return param_name;
-}

Sensors.ino

@@ -1,400 +0,0 @@
-//===============================================================================================================================
-//=========================================Модуль аналогового сенсора============================================================
-void analog() {
-  String pin = sCmd.next();
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String analog_start = sCmd.next();
-  String analog_end = sCmd.next();
-  String analog_start_out = sCmd.next();
-  String analog_end_out = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWrite(optionJson, "analog_start", analog_start);
-  jsonWrite(optionJson, "analog_end", analog_end);
-  jsonWrite(optionJson, "analog_start_out", analog_start_out);
-  jsonWrite(optionJson, "analog_end_out", analog_end_out);
-  choose_viget_and_create(viget_name, page_name, page_number, type, "analog");
-  ts.add(ANALOG_, analog_update_int, [&](void*) {
-    static int analog_old;
-#ifdef ESP32
-    //int pin_int = pin.toInt();
-    int analog_in;// = analogRead(pin_int);
-#endif
-#ifdef ESP8266
-    int analog_in = analogRead(A0);
-#endif
-    jsonWrite(configJson, "analog_in", analog_in);
-    int analog = map(analog_in,
-                     jsonReadtoInt(optionJson, "analog_start") ,
-                     jsonReadtoInt(optionJson, "analog_end"),
-                     jsonReadtoInt(optionJson, "analog_start_out"),
-                     jsonReadtoInt(optionJson, "analog_end_out"));
-    jsonWrite(configJson, "analog", analog);
-    // if (analog_old != analog) {
-    eventGen ("analog", "");
-    sendSTATUS("analog", String(analog));
-    if (client.connected()) {
-      Serial.println("[i] sensor analog send date " + String(analog));
-    }
-    // }
-    analog_old = analog;
-  }, nullptr, true);
-}
-
-//===================================================================================================================================
-//=========================================Модуль измерения уровня в баке============================================================
-void level() {
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String empty_level = sCmd.next();
-  String full_level = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWrite(optionJson, "empty_level", empty_level);
-  jsonWrite(optionJson, "full_level", full_level);
-  pinMode(14, OUTPUT);
-  pinMode(12, INPUT);
-  choose_viget_and_create(viget_name, page_name, page_number, type, "level");
-  ts.add(LEVEL, tank_level_shooting_interval, [&](void*) {
-    long duration_;
-    int distance_cm;
-    int level;
-    static int level_old; //переменная static сохраняет свое значение между вызовами функции
-    static int counter;
-    digitalWrite(14, LOW);
-    delayMicroseconds(2);
-    digitalWrite(14, HIGH);
-    delayMicroseconds(10);
-    digitalWrite(14, LOW);
-    duration_ = pulseIn(12, HIGH, 30000); // 3000 µs = 50cm // 30000 µs = 5 m
-    distance_cm = duration_ / 29 / 2;
-    distance_cm = medianFilter.filtered(distance_cm);//отсечение промахов медианным фильтром
-    counter++;
-    if (counter > tank_level_times_to_send) {
-      counter = 0;
-      jsonWrite(configJson, "level_in", distance_cm);
-      level = map(distance_cm,
-                  jsonReadtoInt(optionJson, "empty_level"),
-                  jsonReadtoInt(optionJson, "full_level"), 0, 100);
-      //jsonWrite(configJson, "level", level);
-      //if (level_old != level) {
-      eventGen ("level", "");
-      sendSTATUS("level", String(level));
-      if (client.connected()) {
-        Serial.println("[i] sensor tank level send date " + String(level));
-      }
-      //}
-      level_old = level;
-    }
-  }, nullptr, true);
-}
-
-//==========================================================================================================================================
-//=========================================Модуль температурного сенсора ds18b20============================================================
-void dallas() {
-  String pin = sCmd.next();
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  oneWire = new OneWire((uint8_t) pin.toInt());
-  sensors.setOneWire(oneWire);
-  sensors.begin();
-  sensors.setResolution(12);
-  choose_viget_and_create(viget_name, page_name, page_number, type, "dallas");
-  ts.add(DALLAS, temp_update_int, [&](void*) {
-    float temp = 0;
-    static float temp_old;
-    sensors.requestTemperatures();
-    temp = sensors.getTempCByIndex(0);
-    jsonWrite(configJson, "dallas", String(temp));
-    //if (temp_old != temp) {
-    eventGen ("dallas", "");
-    sendSTATUS("dallas", String(temp));
-    if (client.connected()) {
-      Serial.println("[i] sensor dallas send date " + String(temp));
-    }
-    //}
-    temp_old = temp;
-  }, nullptr, true);
-}
-
-
-//======================================================================================================================
-//=========================================Модуль сенсоров DHT==========================================================
-void dhtT() {
-  String sensor_type = sCmd.next();
-  String pin = sCmd.next();
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  if (sensor_type == "DHT11") {
-    dht.setup(pin.toInt(), DHTesp::DHT11);
-  }
-  if (sensor_type == "DHT22") {
-    dht.setup(pin.toInt(), DHTesp::DHT22);
-  }
-  choose_viget_and_create(viget_name, page_name, page_number, type, "dhtT");
-  ts.add(DHTT, dhtT_update_int + dht.getMinimumSamplingPeriod(), [&](void*) {
-    float value = 0;
-    static float value_old;
-    value = dht.getTemperature();
-    jsonWrite(configJson, "dhtT", String(value));
-    //if (value_old != value) {
-    eventGen ("dhtT", "");
-    sendSTATUS("dhtT", String(value));
-    if (client.connected()) {
-      Serial.println("[i] sensor dhtT send date " + String(value));
-    }
-    //}
-    value_old = value;
-  }, nullptr, true);
-}
-
-
-void dhtH() {
-  String sensor_type = sCmd.next();
-  String pin = sCmd.next();
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  if (sensor_type == "DHT11") {
-    dht.setup(pin.toInt(), DHTesp::DHT11);
-  }
-  if (sensor_type == "DHT22") {
-    dht.setup(pin.toInt(), DHTesp::DHT22);
-  }
-  choose_viget_and_create(viget_name, page_name, page_number, type, "dhtH");
-  ts.add(DHTH, dhtH_update_int + dht.getMinimumSamplingPeriod(), [&](void*) {
-    int value = 0;
-    static int value_old;
-    value = dht.getHumidity();
-    jsonWrite(configJson, "dhtH", String(value));
-    //if (value_old != value) {
-    eventGen ("dhtH", "");
-    sendSTATUS("dhtH", String(value));
-    if (client.connected()) {
-      Serial.println("[i] sensor dhtH send date " + String(value));
-    }
-    //}
-    value_old = value;
-  }, nullptr, true);
-}
-
-void dhtPerception() {
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  choose_viget_and_create(viget_name, page_name, page_number, "any-data", "dhtPerception");
-  ts.add(DHTP, dhtPerception_update_int, [&](void*) {
-    byte value;
-    ComfortState cf;
-    value = dht.computePerception(jsonRead(configJson, "dhtT").toFloat(), jsonRead(configJson, "dhtH").toInt(), false);
-    String final_line = perception(value);  
-    jsonWrite(configJson, "dhtPerception", final_line);
-    eventGen ("dhtPerception", "");
-    sendSTATUS("dhtPerception", final_line);
-    if (client.connected()) {
-      Serial.println("[i] sensor dhtPerception send date " + final_line);
-    }
-  }, nullptr, true);
-}
-
-String perception(byte value) {
-  if (value == 0) return "Сухой воздух";
-  if (value == 1) return "Комфортно";
-  if (value == 2) return "Уютно";
-  if (value == 3) return "Хорошо";
-  if (value == 4) return "Неудобно";
-  if (value == 5) return "Довольно неудобно";
-  if (value == 6) return "Очень неудобно";
-  if (value == 7) return "Сильно неудобно, полный звиздец";
-}
-
-
-void dhtComfort() {
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  choose_viget_and_create(viget_name, page_name, page_number, "any-data", "dhtComfort");
-  ts.add(DHTC, dhtComfort_update_int, [&](void*) {
-    float value;
-    ComfortState cf;
-    value = dht.getComfortRatio(cf, jsonRead(configJson, "dhtT").toFloat(), jsonRead(configJson, "dhtH").toInt(), false);
-    String comfortStatus;
-    switch (cf) {
-      case Comfort_OK:
-        comfortStatus = "Отлично";
-        break;
-      case Comfort_TooHot:
-        comfortStatus = "Очень жарко";
-        break;
-      case Comfort_TooCold:
-        comfortStatus = "Очень холодно";
-        break;
-      case Comfort_TooDry:
-        comfortStatus = "Очень сухо";
-        break;
-      case Comfort_TooHumid:
-        comfortStatus = "Очень влажно";
-        break;
-      case Comfort_HotAndHumid:
-        comfortStatus = "Жарко и влажно";
-        break;
-      case Comfort_HotAndDry:
-        comfortStatus = "Жарко и сухо";
-        break;
-      case Comfort_ColdAndHumid:
-        comfortStatus = "Холодно и влажно";
-        break;
-      case Comfort_ColdAndDry:
-        comfortStatus = "Холодно и сухо";
-        break;
-      default:
-        comfortStatus = "Неизвестно";
-        break;
-    };
-    String final_line = comfortStatus;   
-    jsonWrite(configJson, "dhtComfort", final_line);
-    eventGen ("dhtComfort", "");
-    sendSTATUS("dhtComfort", final_line);
-    if (client.connected()) {
-      Serial.println("[i] sensor dhtComfort send date " + final_line);
-    }
-  }, nullptr, true);
-}
-
-void dhtDewPoint() {
-  String viget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  choose_viget_and_create(viget_name, page_name, page_number, "any-data", "dhtPerception");
-  ts.add(DHTP, dhtPerception_update_int, [&](void*) {
-    byte value;
-    ComfortState cf;
-    value = dht.computePerception(jsonRead(configJson, "dhtT").toFloat(), jsonRead(configJson, "dhtH").toInt(), false);
-    String final_line = perception(value);  
-    jsonWrite(configJson, "dhtPerception", final_line);
-    eventGen ("dhtPerception", "");
-    sendSTATUS("dhtPerception", final_line);
-    if (client.connected()) {
-      Serial.println("[i] sensor dhtPerception send date " + final_line);
-    }
-  }, nullptr, true);
-}
-
-
-void choose_viget_and_create(String viget_name, String page_name, String page_number, String type, String topik) {
-
-  if (type == "any-data") createViget (viget_name, page_name, page_number, "vigets/viget.anydata.json", topik);
-  if (type == "progress-line") createViget (viget_name, page_name, page_number, "vigets/viget.progressL.json", topik);
-  if (type == "progress-round") createViget (viget_name, page_name, page_number, "vigets/viget.progressR.json", topik);
-
-
-}
-//======================================================================================================================
-//===============================================Логирование============================================================
-
-void logging() {
-
-  static boolean flag = true;
-
-  String sensor_name = sCmd.next();
-  String period_min = sCmd.next();
-  String maxCount = sCmd.next();
-  String viget_name = sCmd.next();
-  viget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-
-  if (sensor_name == "analog") jsonWrite(optionJson, "analog_logging_count", maxCount);
-  if (sensor_name == "level") jsonWrite(optionJson, "level_logging_count", maxCount);
-  if (sensor_name == "dallas") jsonWrite(optionJson, "dallas_logging_count", maxCount);
-  if (sensor_name == "ph") jsonWrite(optionJson, "ph_logging_count", maxCount);
-  /*
-    if (sensor_name == "analog") createViget (viget_name, page_name, page_number, "vigets/viget.chart.json", "loganalog", "maxCount", maxCount);
-    if (sensor_name == "level") createViget (viget_name, page_name, page_number, "vigets/viget.chart.json", "loglevel", "maxCount", maxCount);
-    if (sensor_name == "dallas") createViget (viget_name, page_name, page_number, "vigets/viget.chart.json", "logdallas", "maxCount", maxCount);
-    if (sensor_name == "ph") createViget (viget_name, page_name, page_number, "vigets/viget.chart.json", "logph", "maxCount", maxCount);
-  */
-  if (sensor_name == "analog") {
-    flagLoggingAnalog = true;
-    ts.remove(ANALOG_LOG);
-    ts.add(ANALOG_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.analog.txt", jsonReadtoInt(optionJson, "analog_logging_count"), jsonRead(configJson, "analog"), false);
-    }, nullptr, true);
-  }
-
-  if (sensor_name == "level") {
-    flagLoggingLevel = true;
-    ts.remove(LEVEL_LOG);
-    ts.add(LEVEL_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.level.txt", jsonReadtoInt(optionJson, "level_logging_count"), jsonRead(configJson, "level"), false);
-    }, nullptr, true);
-  }
-
-  if (sensor_name == "dallas") {
-    flagLoggingDallas = true;
-    ts.remove(DALLAS_LOG);
-    ts.add(DALLAS_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.dallas.txt", jsonReadtoInt(optionJson, "dallas_logging_count"), jsonRead(configJson, "dallas"), false);
-    }, nullptr, true);
-  }
-
-  if (sensor_name == "ph") {
-    flagLoggingPh = true;
-    ts.remove(PH_LOG);
-    ts.add(PH_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.ph.txt", jsonReadtoInt(optionJson, "ph_logging_count"), jsonRead(configJson, "ph"), false);
-    }, nullptr, true);
-  }
-}
-
-void deleteOldDate(String file, int seted_number_of_lines, String date_to_add, boolean date_time) {
-
-  String current_time;
-
-  if (date_time) {
-    current_time = GetDataDigital() + " " + GetTimeWOsec();
-    current_time.replace(".", "");
-    current_time.replace(":", "");
-  } else {
-    current_time = "";
-  }
-
-  String log_date = readFile(file, 5000);
-  getMemoryLoad("[i] after logging procedure");
-
-  //предел количества строк 255
-
-  log_date.replace("\r\n", "\n");
-  log_date.replace("\r", "\n");
-
-  int current_number_of_lines = count(log_date, "\n");
-  Serial.println("[i] in log file " + file + " " + current_number_of_lines + " lines");
-
-
-  if (current_number_of_lines > seted_number_of_lines + 1) {
-    SPIFFS.remove("/" + file);
-    current_number_of_lines = 0;
-  }
-  if (current_number_of_lines == 0) {
-    SPIFFS.remove("/" + file);
-    current_number_of_lines = 0;
-  }
-  if (current_number_of_lines > seted_number_of_lines) {
-    log_date = deleteBeforeDelimiter(log_date, "\n");
-    log_date += current_time + " " +  date_to_add + "\n";
-    writeFile(file, log_date);
-
-  } else {
-    if (date_time) {
-      addFile(file, current_time + " " +  date_to_add);
-    } else {
-      addFile(file, date_to_add);
-    }
-  }
-}

Time.ino

@@ -1,108 +0,0 @@
-void Time_Init() {
-  server.on("/timeZone", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("timezone")) {
-      jsonWrite(configSetup, "timezone", request->getParam("timezone")->value());
-    }
-    saveConfig();
-    reconfigTime();
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-  reconfigTime();
-}
-
-void reconfigTime() {
-  if (WiFi.status() == WL_CONNECTED) {
-
-    configTime(jsonRead(configSetup, "timezone").toInt() * 3600, 0, ntpServer);
-
-    int i = 0;
-    Serial.println("[i]Awaiting for time ");
-
-#ifdef ESP32
-    struct tm timeinfo;
-    while (!getLocalTime(&timeinfo) && i <= 4) {
-      Serial.print(".");
-      i++;
-      delay(1000);
-    }
-#endif
-
-#ifdef ESP8266
-   // while (!time(nullptr) && i < 4) {
-   //   Serial.print(".");
-   //   i++;
-      delay(2000);
-   // }
-#endif
-
-    Serial.print("Time = ");
-    Serial.print(GetDataDigital());
-    Serial.print(" ");
-    Serial.println(GetTime());
-
-  } else {
-    Serial.println("[E] Get time impossible, no wifi connection");
-  }
-}
-
-// Получение текущего времени
-String GetTime() {
-  time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  String Time = ""; // Строка для результатов времени
-  Time += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017
-  int i = Time.indexOf(":"); //Ишем позицию первого символа :
-  Time = Time.substring(i - 2, i + 6); // Выделяем из строки 2 символа перед символом : и 6 символов после
-  return Time; // Возврашаем полученное время
-}
-
-String GetTimeWOsec() {
-  time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  String Time = ""; // Строка для результатов времени
-  Time += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017
-  int i = Time.indexOf(":"); //Ишем позицию первого символа :
-  Time = Time.substring(i - 2, i + 3); // Выделяем из строки 2 символа перед символом : и 6 символов после
-  return Time; // Возврашаем полученное время
-}
-
-// Получение даты
-String GetDate() {
-  time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  String Data = ""; // Строка для результатов времени
-  Data += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017
-  Data.replace("\n", "");
-  uint8_t i = Data.lastIndexOf(" "); //Ишем позицию последнего символа пробел
-  String Time = Data.substring(i - 8, i + 1); // Выделяем время и пробел
-  Data.replace(Time, ""); // Удаляем из строки 8 символов времени и пробел
-  return Data; // Возврашаем полученную дату
-}
-
-String GetDataDigital() {
-  String date = GetDate();
-
-  date = deleteBeforeDelimiter(date, " ");
-
-  date.replace("Jan", "01");
-  date.replace("Feb", "02");
-  date.replace("Mar", "03");
-  date.replace("Apr", "04");
-  date.replace("May", "05");
-  date.replace("Jun", "06");
-  date.replace("Jul", "07");
-  date.replace("Aug", "08");
-  date.replace("Sep", "09");
-  date.replace("Oct", "10");
-  date.replace("Nov", "11");
-  date.replace("Dec", "12");
-
-  String month = date.substring(0, 2);
-  String day = date.substring(3, 5);
-  String year = date.substring(8, 10);
-
-  String out = day;
-  out += ".";
-  out += month;
-  out += ".";
-  out += year;
-
-  return out;
-}

Timers.ino

@@ -1,185 +0,0 @@
-//================================================================================================================
-//=========================================Таймера=================================================================
-void Timer_countdown_init() {
-
-  ts.add(TIMER_COUNTDOWN, 1000, [&](void*) {
-
-    String old_line = jsonRead(optionJson, "timers");
-
-
-    if (old_line != "") {
-
-      Serial.println(old_line);
-
-      int i = 0;
-
-      do {
-
-        String timer = selectFromMarkerToMarker(old_line, "," , i);
-        // Serial.print("timer no " + String (i) + ": ");
-        // Serial.println(timer);
-        if (timer == "not found" || timer == "") return;
-        int number = selectToMarker (timer, ":").toInt();
-        int time = readTimer(number);
-        if (time == 0) {
-
-          delTimer (String (number));
-
-          jsonWrite(configJson, "timerSet" + String(number), "0");
-
-          eventGen ("timerSet", String(number));
-
-        } else {
-          time--;
-          addTimer(String (number), String (time));
-        }
-        i++;
-      } while (i <= 9);
-
-    }
-  }, nullptr, true);
-}
-
-
-
-void timerStart() {
-
-  String number = sCmd.next();
-  String period_of_time = sCmd.next();
-  String type = sCmd.next();
-
-  if (period_of_time.indexOf("digit") != -1) {
-    period_of_time = add_set(period_of_time);
-    period_of_time = jsonRead(configJson, period_of_time);
-  }
-
-  if (type == "sec") period_of_time = period_of_time;
-  if (type == "min") period_of_time = String(period_of_time.toInt() * 60);
-  if (type == "hours") period_of_time = String(period_of_time.toInt() * 60 * 60);
-
-  addTimer(number, period_of_time);
-  jsonWrite(configJson, "timerSet" + number, "1");
-}
-void addTimer(String number, String time) {
-
-  String tmp = jsonRead(optionJson, "timers");   //1:60,2:120,
-  String new_timer = number + ":" + time;
-  int psn1 = tmp.indexOf(number + ":");          //0  ищем позицию таймера который надо заменить
-
-  if (psn1 != -1) {                              //если он есть
-
-    int psn2 = tmp.indexOf(",", psn1);           //4    от этой позиции находим позицию запятой
-
-    String timer = tmp.substring(psn1, psn2);    //1:60  выделяем таймер который надо заменить
-    ///tmp.replace(timer, new_timer);            //заменяем таймер на новый (во всей стороке)
-    tmp.replace(timer + ",", "");
-    tmp += new_timer + ",";
-
-  } else {                                       //если его нет
-    tmp += new_timer + ",";
-  }
-  jsonWrite(optionJson, "timers", tmp);
-  //Serial.println("ura");
-}
-
-
-void timerStop() {
-
-  String number = sCmd.next();
-  delTimer(number);
-
-}
-void delTimer (String number) {
-
-  String tmp = jsonRead(optionJson, "timers");       //1:60,2:120,
-  int psn1 = tmp.indexOf(number + ":");              //0  ищем позицию таймера который надо удалить
-
-  if (psn1 != -1) {                                  //если он есть
-    int psn2 = tmp.indexOf(",", psn1);               //4    от этой позиции находим позицию запятой
-    String timer = tmp.substring(psn1, psn2) + ",";  //1:60,  выделяем таймер который надо удалить
-    tmp.replace(timer, "");                          //удаляем таймер
-    jsonWrite(optionJson, "timers", tmp);
-  }
-}
-
-int readTimer(int number) {
-
-  String tmp = jsonRead(optionJson, "timers");       //1:60,2:120,
-
-  int psn1 = tmp.indexOf(String(number) + ":");              //0  ищем позицию таймера который надо прочитать
-
-  String timer;
-
-  if (psn1 != -1) {                                  //если он есть
-    int psn2 = tmp.indexOf(",", psn1);               //4    от этой позиции находим позицию запятой
-    timer = tmp.substring(psn1, psn2);               //1:60  выделяем таймер который надо прочитать
-    timer = deleteBeforeDelimiter(timer, ":");
-  }
-  return timer.toInt();
-}
-
-/*void timer() {
-
-  String seted_time = sCmd.next();
-  String order = sCmd.next();
-  order.replace("_", " ");
-  if (seted_time == current_time) {
-
-    order_loop += order + ",";
-
-  }
-}*/
-
-//------------------------------таймеры------------------------------------------------------
-void time() {
-
-  String time_number = sCmd.next();
-  String time = sCmd.next();
-
-  String time_to_add = time_number + "-" + time;
-
-  String replace_line = jsonRead(optionJson, "times") ;
-  int psn1 = replace_line.indexOf(time_number + "-") ;  //ищем позицию времени которое надо заменить
-
-  if (psn1 != -1) {                              //если оно есть
-
-    int psn2 = replace_line.indexOf(",", psn1);           //от этой позиции находим позицию запятой
-
-    String timer = replace_line.substring(psn1, psn2);    //выделяем таймер который надо заменить
-    ///tmp.replace(timer, new_timer);                     //заменяем таймер на новый (во всей стороке)
-    replace_line.replace(timer + ",", "");
-    replace_line += time_to_add + ",";
-
-  } else {                                              //если его нет
-    replace_line += time_to_add + ",";
-  }
-
-
-  jsonWrite(optionJson, "times", replace_line);
-
-  jsonWrite(configJson, "timeSet" + time_number, "1");
-
-  ts.add(TIMERS, 1000, [&](void*) {
-
-    current_time = GetTime();
-    Serial.println(current_time);
-
-    String seted_times = jsonRead(optionJson, "times");
-
-    while (seted_times.length() != 0) {
-      String tmp = selectToMarker (seted_times, ",");
-
-      String time_number = selectToMarker(tmp, "-");
-      String seted_time = deleteBeforeDelimiter(tmp, "-");
-
-      Serial.println(seted_time);
-
-      if (current_time == seted_time) {
-        jsonWrite(configJson, "timeSet" + time_number, "0");
-        eventGen ("timeSet", time_number);
-      }
-
-      seted_times = deleteBeforeDelimiter(seted_times, ",");
-    }
-  }, nullptr, true);
-}

Web_server.ino

@@ -1,221 +0,0 @@
-void Web_server_init() {
-
-  //========================================OTA============================================
-#ifdef OTA_enable
-  //Send OTA events to the browser
-  ArduinoOTA.onStart([]() {
-    events.send("Update Start", "ota");
-  });
-
-  ArduinoOTA.onEnd([]() {
-    events.send("Update End", "ota");
-  });
-
-  ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
-    char p[32];
-    sprintf(p, "Progress: %u%%\n", (progress / (total / 100)));
-    events.send(p, "ota");
-  });
-
-  ArduinoOTA.onError([](ota_error_t error) {
-    if (error == OTA_AUTH_ERROR) events.send("Auth Failed", "ota");
-    else if (error == OTA_BEGIN_ERROR) events.send("Begin Failed", "ota");
-    else if (error == OTA_CONNECT_ERROR) events.send("Connect Failed", "ota");
-    else if (error == OTA_RECEIVE_ERROR) events.send("Recieve Failed", "ota");
-    else if (error == OTA_END_ERROR) events.send("End Failed", "ota");
-  });
-  ArduinoOTA.setHostname(hostName);
-
-  ArduinoOTA.begin();
-#endif
-  //========================================MDNS============================================
-#ifdef MDNS_enable
-  MDNS.addService("http", "tcp", 80);
-#endif
-
-  //SPIFFS.begin();
-
-  //========================================WS============================================
-#ifdef WS_enable
-  ws.onEvent(onWsEvent);
-  server.addHandler(&ws);
-
-  events.onConnect([](AsyncEventSourceClient * client) {
-    client->send("hello!", NULL, millis(), 1000);
-  });
-
-  server.addHandler(&events);
-#endif
-  //======================================================================================
-
-#ifdef ESP32
-  server.addHandler(new SPIFFSEditor(SPIFFS, jsonRead(configSetup, "web_login").c_str(), jsonRead(configSetup, "web_pass").c_str()));
-#elif defined(ESP8266)
-  server.addHandler(new SPIFFSEditor(jsonRead(configSetup, "web_login").c_str(), jsonRead(configSetup, "web_pass").c_str()));
-#endif
-
-  server.on("/heap", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "text/plain", String(ESP.getFreeHeap()));
-  });
-
-
-  server.serveStatic("/css/", SPIFFS, "/css/").setCacheControl("max-age=31536000");
-  server.serveStatic("/js/", SPIFFS, "/js/").setCacheControl("max-age=31536000");
-  server.serveStatic("/", SPIFFS, "/favicon.ico").setCacheControl("max-age=31536000");
-
-  server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm")
-  .setAuthentication(jsonRead(configSetup, "web_login").c_str(), jsonRead(configSetup, "web_pass").c_str());
-
-
-  server.onNotFound([](AsyncWebServerRequest * request) {
-    Serial.printf("NOT_FOUND: ");
-    if (request->method() == HTTP_GET)
-      Serial.printf("GET");
-    else if (request->method() == HTTP_POST)
-      Serial.printf("POST");
-    else if (request->method() == HTTP_DELETE)
-      Serial.printf("DELETE");
-    else if (request->method() == HTTP_PUT)
-      Serial.printf("PUT");
-    else if (request->method() == HTTP_PATCH)
-      Serial.printf("PATCH");
-    else if (request->method() == HTTP_HEAD)
-      Serial.printf("HEAD");
-    else if (request->method() == HTTP_OPTIONS)
-      Serial.printf("OPTIONS");
-    else
-      Serial.printf("UNKNOWN");
-    Serial.printf(" http://%s%s\n", request->host().c_str(), request->url().c_str());
-
-    if (request->contentLength()) {
-      Serial.printf("_CONTENT_TYPE: %s\n", request->contentType().c_str());
-      Serial.printf("_CONTENT_LENGTH: %u\n", request->contentLength());
-    }
-
-    int headers = request->headers();
-    int i;
-    for (i = 0; i < headers; i++) {
-      AsyncWebHeader* h = request->getHeader(i);
-      Serial.printf("_HEADER[%s]: %s\n", h->name().c_str(), h->value().c_str());
-    }
-
-    int params = request->params();
-    for (i = 0; i < params; i++) {
-      AsyncWebParameter* p = request->getParam(i);
-      if (p->isFile()) {
-        Serial.printf("_FILE[%s]: %s, size: %u\n", p->name().c_str(), p->value().c_str(), p->size());
-      } else if (p->isPost()) {
-        Serial.printf("_POST[%s]: %s\n", p->name().c_str(), p->value().c_str());
-      } else {
-        Serial.printf("_GET[%s]: %s\n", p->name().c_str(), p->value().c_str());
-      }
-    }
-
-    request->send(404);
-  });
-  server.onFileUpload([](AsyncWebServerRequest * request, const String & filename, size_t index, uint8_t *data, size_t len, bool final) {
-    if (!index)
-      Serial.printf("UploadStart: %s\n", filename.c_str());
-    Serial.printf("%s", (const char*)data);
-    if (final)
-      Serial.printf("UploadEnd: %s (%u)\n", filename.c_str(), index + len);
-  });
-  server.onRequestBody([](AsyncWebServerRequest * request, uint8_t *data, size_t len, size_t index, size_t total) {
-    if (!index)
-      Serial.printf("BodyStart: %u\n", total);
-    Serial.printf("%s", (const char*)data);
-    if (index + len == total)
-      Serial.printf("BodyEnd: %u\n", total);
-  });
-
-  server.begin();
-
-  //=============================Устанавливаем реакции на запросы к серверу============================
-
-  // --------------------Выдаем данные configJson //config.live.json - динамические данные
-  server.on("/config.live.json", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "application/json", configJson);
-  });
-  // --------------------Выдаем данные optionJson //config.option.json - данные не являющиеся событиями
-  server.on("/config.option.json", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "application/json", optionJson);
-  });
-  // -------------------Выдаем данные configSetup //config.setup.json - для хранения постоянных данных
-  server.on("/config.setup.json", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "application/json", configSetup);
-  });
-}
-//========================================WS=========================================================================================
-#ifdef WS_enable
-void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len) {
-  if (type == WS_EVT_CONNECT) {
-    Serial.printf("ws[%s][%u] connect\n", server->url(), client->id());
-    client->printf(configJson.c_str(), client->id());
-    client->ping();
-  } else if (type == WS_EVT_DISCONNECT) {
-    Serial.printf("ws[%s][%u] disconnect\n", server->url(), client->id());
-  } else if (type == WS_EVT_ERROR) {
-    Serial.printf("ws[%s][%u] error(%u): %s\n", server->url(), client->id(), *((uint16_t*)arg), (char*)data);
-  } else if (type == WS_EVT_PONG) {
-    Serial.printf("ws[%s][%u] pong[%u]: %s\n", server->url(), client->id(), len, (len) ? (char*)data : "");
-  } else if (type == WS_EVT_DATA) {
-    AwsFrameInfo * info = (AwsFrameInfo*)arg;
-    String msg = "";
-    if (info->final && info->index == 0 && info->len == len) {
-      //the whole message is in a single frame and we got all of it's data
-      Serial.printf("ws[%s][%u] %s-message[%llu]: ", server->url(), client->id(), (info->opcode == WS_TEXT) ? "text" : "binary", info->len);
-
-      if (info->opcode == WS_TEXT) {
-        for (size_t i = 0; i < info->len; i++) {
-          msg += (char) data[i];
-        }
-      } else {
-        char buff[3];
-        for (size_t i = 0; i < info->len; i++) {
-          sprintf(buff, "%02x ", (uint8_t) data[i]);
-          msg += buff ;
-        }
-      }
-      Serial.printf("%s\n", msg.c_str());
-
-      if (info->opcode == WS_TEXT)
-        client->text("{}");
-      else
-        client->binary("{}");
-    } else {
-      //message is comprised of multiple frames or the frame is split into multiple packets
-      if (info->index == 0) {
-        if (info->num == 0)
-          Serial.printf("ws[%s][%u] %s-message start\n", server->url(), client->id(), (info->message_opcode == WS_TEXT) ? "text" : "binary");
-        Serial.printf("ws[%s][%u] frame[%u] start[%llu]\n", server->url(), client->id(), info->num, info->len);
-      }
-
-      Serial.printf("ws[%s][%u] frame[%u] %s[%llu - %llu]: ", server->url(), client->id(), info->num, (info->message_opcode == WS_TEXT) ? "text" : "binary", info->index, info->index + len);
-
-      if (info->opcode == WS_TEXT) {
-        for (size_t i = 0; i < len; i++) {
-          msg += (char) data[i];
-        }
-      } else {
-        char buff[3];
-        for (size_t i = 0; i < len; i++) {
-          sprintf(buff, "%02x ", (uint8_t) data[i]);
-          msg += buff ;
-        }
-      }
-      Serial.printf("%s\n", msg.c_str());
-
-      if ((info->index + len) == info->len) {
-        Serial.printf("ws[%s][%u] frame[%u] end[%llu]\n", server->url(), client->id(), info->num, info->len);
-        if (info->final) {
-          Serial.printf("ws[%s][%u] %s-message end\n", server->url(), client->id(), (info->message_opcode == WS_TEXT) ? "text" : "binary");
-          if (info->message_opcode == WS_TEXT)
-            client->text("I got your text message");
-          else
-            client->binary("I got your binary message");
-        }
-      }
-    }
-  }
-}
-#endif

WiFi.ino

@@ -1,162 +0,0 @@
-void WIFI_init() {
-
-  // --------------------Получаем ssid password со страницы
-  server.on("/ssid", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("ssid")) {
-      jsonWrite(configSetup, "ssid", request->getParam("ssid")->value());
-    }
-    if (request->hasArg("password")) {
-      jsonWrite(configSetup, "password", request->getParam("password")->value());
-    }
-    saveConfig();                 // Функция сохранения данных во Flash
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-  // --------------------Получаем ssidAP passwordAP со страницы
-  server.on("/ssidap", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("ssidAP")) {
-      jsonWrite(configSetup, "ssidAP", request->getParam("ssidAP")->value());
-    }
-    if (request->hasArg("passwordAP")) {
-      jsonWrite(configSetup, "passwordAP", request->getParam("passwordAP")->value());
-    }
-    saveConfig();                 // Функция сохранения данных во Flash
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-  // --------------------Получаем логин и пароль для web со страницы
-  server.on("/web", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("web_login")) {
-      jsonWrite(configSetup, "web_login", request->getParam("web_login")->value());
-    }
-    if (request->hasArg("web_pass")) {
-      jsonWrite(configSetup, "web_pass", request->getParam("web_pass")->value());
-    }
-    saveConfig();                 // Функция сохранения данных во Flash
-    //Web_server_init();
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-  server.on("/restart", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("device")) {
-      if (request->getParam("device")->value() == "ok") ESP.restart();
-    }
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-
-  // Попытка подключения к точке доступа
-
-  WiFi.mode(WIFI_STA);
-
-  byte tries = 20;
-  String _ssid = jsonRead(configSetup, "ssid");
-  String _password = jsonRead(configSetup, "password");
-  //WiFi.persistent(false);
-
-  if (_ssid == "" && _password == "") {
-    WiFi.begin();
-  }
-  else {
-    WiFi.begin(_ssid.c_str(), _password.c_str());
-  }
-  // Делаем проверку подключения до тех пор пока счетчик tries
-  // не станет равен нулю или не получим подключение
-  while (--tries && WiFi.status() != WL_CONNECTED)
-  {
-    if (WiFi.status() == WL_CONNECT_FAILED) {
-      Serial.println("[E] password is not correct");
-      tries = 1;
-      jsonWrite(optionJson, "pass_status", 1);
-    }
-    Serial.print(".");
-    delay(1000);
-  }
-
-  if (WiFi.status() != WL_CONNECTED)
-  {
-    // Если не удалось подключиться запускаем в режиме AP
-    Serial.println("");
-    // WiFi.disconnect(true);
-    StartAPMode();
-
-  }
-  else {
-    // Иначе удалось подключиться отправляем сообщение
-    // о подключении и выводим адрес IP
-    Serial.println("");
-    Serial.println("[V] WiFi connected");
-    Serial.print("[V] IP address: ");
-    Serial.print(WiFi.localIP());
-    Serial.println("");
-    jsonWrite(configJson, "ip", WiFi.localIP().toString());
-
-  }
-}
-
-bool StartAPMode() {
-  Serial.println("WiFi up AP");
-  WiFi.disconnect();
-
-  WiFi.mode(WIFI_AP);
-
-  String _ssidAP = jsonRead(configSetup, "ssidAP");
-  String _passwordAP = jsonRead(configSetup, "passwordAP");
-  WiFi.softAP(_ssidAP.c_str(), _passwordAP.c_str());
-  IPAddress myIP = WiFi.softAPIP();
-  Serial.print("AP IP address: ");
-  Serial.println(myIP);
-
-  if (jsonReadtoInt(optionJson, "pass_status") != 1) {
-    ts.add(ROUTER_SEARCHING, 10 * 1000, [&](void*) {
-      Serial.println("->try find router");
-      if (RouterFind(jsonRead(configSetup, "ssid"))) {
-        ts.remove(ROUTER_SEARCHING);
-        WIFI_init();
-        MQTT_init();
-      }
-    }, nullptr, true);
-  }
-  return true;
-}
-
-
-boolean RouterFind(String ssid) {
-  int n = WiFi.scanComplete ();
-  Serial.println("n = " + String(n));
-  if (n == -2) {                       //Сканирование не было запущено, запускаем
-    Serial.println("[WIFI][i] scanning has not been triggered, starting scanning");
-    WiFi.scanNetworks (true, false);   //async, show_hidden
-    return false;
-  }
-  if (n == -1) {                       //Сканирование все еще выполняется
-    Serial.println("[WIFI][i] scanning still in progress");
-    return false;
-  }
-  if (n == 0) {                       //Сканирование все еще выполняется
-    Serial.println("[WIFI][i] no any wifi sations, starting scanning");
-    WiFi.scanNetworks (true, false);
-    return false;
-  }
-  if (n > 0) {
-    for (int i = 0; i <= n; i++) {
-      if (WiFi.SSID (i) == ssid) {
-        WiFi.scanDelete();
-        return true;
-      } else {
-        Serial.print(i);
-        Serial.print(")");
-        Serial.print(ssid);
-        Serial.print("<=>");
-        if (i == n) {
-          Serial.print(WiFi.SSID(i));
-          Serial.println("; ");
-        } else {
-          Serial.print(WiFi.SSID(i));
-          Serial.print("; ");
-        }
-      }
-    }
-    WiFi.scanDelete();
-    return false;
-  }
-}

certificates.ino

@@ -1,72 +0,0 @@
-/*
-const char* local_root_ca1 = \
-                             "-----BEGIN CERTIFICATE-----\n" \
-                             "MIIFdDCCBFygAwIBAgIQJ2buVutJ846r13Ci/ITeIjANBgkqhkiG9w0BAQwFADBv\n" \
-                             "MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk\n" \
-                             "ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF\n" \
-                             "eHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFow\n" \
-                             "gYUxCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO\n" \
-                             "BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMSswKQYD\n" \
-                             "VQQDEyJDT01PRE8gUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkq\n" \
-                             "hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAkehUktIKVrGsDSTdxc9EZ3SZKzejfSNw\n" \
-                             "AHG8U9/E+ioSj0t/EFa9n3Byt2F/yUsPF6c947AEYe7/EZfH9IY+Cvo+XPmT5jR6\n" \
-                             "2RRr55yzhaCCenavcZDX7P0N+pxs+t+wgvQUfvm+xKYvT3+Zf7X8Z0NyvQwA1onr\n" \
-                             "ayzT7Y+YHBSrfuXjbvzYqOSSJNpDa2K4Vf3qwbxstovzDo2a5JtsaZn4eEgwRdWt\n" \
-                             "4Q08RWD8MpZRJ7xnw8outmvqRsfHIKCxH2XeSAi6pE6p8oNGN4Tr6MyBSENnTnIq\n" \
-                             "m1y9TBsoilwie7SrmNnu4FGDwwlGTm0+mfqVF9p8M1dBPI1R7Qu2XK8sYxrfV8g/\n" \
-                             "vOldxJuvRZnio1oktLqpVj3Pb6r/SVi+8Kj/9Lit6Tf7urj0Czr56ENCHonYhMsT\n" \
-                             "8dm74YlguIwoVqwUHZwK53Hrzw7dPamWoUi9PPevtQ0iTMARgexWO/bTouJbt7IE\n" \
-                             "IlKVgJNp6I5MZfGRAy1wdALqi2cVKWlSArvX31BqVUa/oKMoYX9w0MOiqiwhqkfO\n" \
-                             "KJwGRXa/ghgntNWutMtQ5mv0TIZxMOmm3xaG4Nj/QN370EKIf6MzOi5cHkERgWPO\n" \
-                             "GHFrK+ymircxXDpqR+DDeVnWIBqv8mqYqnK8V0rSS527EPywTEHl7R09XiidnMy/\n" \
-                             "s1Hap0flhFMCAwEAAaOB9DCB8TAfBgNVHSMEGDAWgBStvZh6NLQm9/rEJlTvA73g\n" \
-                             "JMtUGjAdBgNVHQ4EFgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQD\n" \
-                             "AgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAGBgRVHSAAMEQGA1UdHwQ9\n" \
-                             "MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9BZGRUcnVzdEV4dGVy\n" \
-                             "bmFsQ0FSb290LmNybDA1BggrBgEFBQcBAQQpMCcwJQYIKwYBBQUHMAGGGWh0dHA6\n" \
-                             "Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggEBAGS/g/FfmoXQ\n" \
-                             "zbihKVcN6Fr30ek+8nYEbvFScLsePP9NDXRqzIGCJdPDoCpdTPW6i6FtxFQJdcfj\n" \
-                             "Jw5dhHk3QBN39bSsHNA7qxcS1u80GH4r6XnTq1dFDK8o+tDb5VCViLvfhVdpfZLY\n" \
-                             "Uspzgb8c8+a4bmYRBbMelC1/kZWSWfFMzqORcUx8Rww7Cxn2obFshj5cqsQugsv5\n" \
-                             "B5a6SE2Q8pTIqXOi6wZ7I53eovNNVZ96YUWYGGjHXkBrI/V5eu+MtWuLt29G9Hvx\n" \
-                             "PUsE2JOAWVrgQSQdso8VYFhH2+9uRv0V9dlfmrPb2LjkQLPNlzmuhbsdjrzch5vR\n" \
-                             "pu/xO28QOG8=\n" \
-                             "-----END CERTIFICATE-----\n";
-
-const char* local_root_ca2 = \
-                             "-----BEGIN CERTIFICATE-----\n" \
-                             "MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB\n" \
-                             "hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G\n" \
-                             "A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV\n" \
-                             "BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTQwMjEy\n" \
-                             "MDAwMDAwWhcNMjkwMjExMjM1OTU5WjCBkDELMAkGA1UEBhMCR0IxGzAZBgNVBAgT\n" \
-                             "EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR\n" \
-                             "Q09NT0RPIENBIExpbWl0ZWQxNjA0BgNVBAMTLUNPTU9ETyBSU0EgRG9tYWluIFZh\n" \
-                             "bGlkYXRpb24gU2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP\n" \
-                             "ADCCAQoCggEBAI7CAhnhoFmk6zg1jSz9AdDTScBkxwtiBUUWOqigwAwCfx3M28Sh\n" \
-                             "bXcDow+G+eMGnD4LgYqbSRutA776S9uMIO3Vzl5ljj4Nr0zCsLdFXlIvNN5IJGS0\n" \
-                             "Qa4Al/e+Z96e0HqnU4A7fK31llVvl0cKfIWLIpeNs4TgllfQcBhglo/uLQeTnaG6\n" \
-                             "ytHNe+nEKpooIZFNb5JPJaXyejXdJtxGpdCsWTWM/06RQ1A/WZMebFEh7lgUq/51\n" \
-                             "UHg+TLAchhP6a5i84DuUHoVS3AOTJBhuyydRReZw3iVDpA3hSqXttn7IzW3uLh0n\n" \
-                             "c13cRTCAquOyQQuvvUSH2rnlG51/ruWFgqUCAwEAAaOCAWUwggFhMB8GA1UdIwQY\n" \
-                             "MBaAFLuvfgI9+qbxPISOre44mOzZMjLUMB0GA1UdDgQWBBSQr2o6lFoL2JDqElZz\n" \
-                             "30O0Oija5zAOBgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNV\n" \
-                             "HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGwYDVR0gBBQwEjAGBgRVHSAAMAgG\n" \
-                             "BmeBDAECATBMBgNVHR8ERTBDMEGgP6A9hjtodHRwOi8vY3JsLmNvbW9kb2NhLmNv\n" \
-                             "bS9DT01PRE9SU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDBxBggrBgEFBQcB\n" \
-                             "AQRlMGMwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9E\n" \
-                             "T1JTQUFkZFRydXN0Q0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v\n" \
-                             "ZG9jYS5jb20wDQYJKoZIhvcNAQEMBQADggIBAE4rdk+SHGI2ibp3wScF9BzWRJ2p\n" \
-                             "mj6q1WZmAT7qSeaiNbz69t2Vjpk1mA42GHWx3d1Qcnyu3HeIzg/3kCDKo2cuH1Z/\n" \
-                             "e+FE6kKVxF0NAVBGFfKBiVlsit2M8RKhjTpCipj4SzR7JzsItG8kO3KdY3RYPBps\n" \
-                             "P0/HEZrIqPW1N+8QRcZs2eBelSaz662jue5/DJpmNXMyYE7l3YphLG5SEXdoltMY\n" \
-                             "dVEVABt0iN3hxzgEQyjpFv3ZBdRdRydg1vs4O2xyopT4Qhrf7W8GjEXCBgCq5Ojc\n" \
-                             "2bXhc3js9iPc0d1sjhqPpepUfJa3w/5Vjo1JXvxku88+vZbrac2/4EjxYoIQ5QxG\n" \
-                             "V/Iz2tDIY+3GH5QFlkoakdH368+PUq4NCNk+qKBR6cGHdNXJ93SrLlP7u3r7l+L4\n" \
-                             "HyaPs9Kg4DdbKDsx5Q5XLVq4rXmsXiBmGqW5prU5wfWYQ//u+aen/e7KJD2AFsQX\n" \
-                             "j4rBYKEMrltDR5FL1ZoXX/nUh8HCjLfn4g8wGTeGrODcQgPmlKidrv0PJFGUzpII\n" \
-                             "0fxQ8ANAe4hZ7Q7drNJ3gjTcBpUC2JD5Leo31Rpg0Gcg19hCC0Wvgmje3WYkN5Ap\n" \
-                             "lBlGGSW4gNfL1IYoakRwJiNiqZ+Gb7+6kHDSVneFeO/qJakXzlByjAA6quPbYzSf\n" \
-                             "+AZxAeKCINT+b72x\n" \
-                             "-----END CERTIFICATE-----\n";
-*/

compilerProfile.json

@@ -0,0 +1,515 @@
+{
+    "iotmSettings": {
+        "name": "IoTmanagerVer4",
+        "apssid": "IoTmanager",
+        "appass": "",
+        "routerssid": "iot",
+        "routerpass": "hostel3333",
+        "timezone": 2,
+        "ntp": "pool.ntp.org",
+        "weblogin": "admin",
+        "webpass": "admin",
+        "mqttServer": "",
+        "mqttPort": 8021,
+        "mqttPrefix": "/risenew",
+        "mqttUser": "rise",
+        "mqttPass": "3hostel3",
+        "serverip": "http://iotmanager.org",
+        "log": 0,
+        "mqttin": 0,
+        "pinSCL": 0,
+        "pinSDA": 0,
+        "i2cFreq": 100000,
+        "wg": "group1"
+    },
+    "projectProp": {
+        "platformio": {
+            "default_envs": "esp8266_4mb",
+            "comments_default_envs": "choose from: esp8266_4mb or esp32_4mb or esp32cam_4mb or esp32s2_4mb or esp32_4mb3f or esp32s3_16mb or esp32c3m_4mb or esp8266_1mb or esp8266_1mb_ota or esp8285_1mb or esp8285_1mb_ota",
+            "envs": [
+                {
+                    "name": "esp8266_4mb",
+                    "firmware": "0x00000",
+                    "littlefs": "0x300000"
+                },
+                {
+                    "name": "esp8266_16mb",
+                    "firmware": "0x00000",
+                    "littlefs": "0x200000"
+                },
+                {
+                    "name": "esp32_4mb",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x290000"
+                },
+                {
+                    "name": "esp32_4mb3f",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x310000"
+                },
+                {
+                    "name": "esp32cam_4mb",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x310000"
+                },
+                {
+                    "name": "esp32_16mb",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x910000"
+                },
+                {
+                    "name": "esp8266_1mb",
+                    "firmware": "0x00000000",
+                    "littlefs": "0x000bb000"
+                },
+                {
+                    "name": "esp8266_1mb_ota",
+                    "firmware": "0x00000000",
+                    "littlefs": "0x000eb000"
+                },
+                {
+                    "name": "esp8266_2mb",
+                    "firmware": "0x00000000",
+                    "littlefs": "0x00100000"
+                },
+                {
+                    "name": "esp8266_2mb_ota",
+                    "firmware": "0x00000000",
+                    "littlefs": "0x001c0000"
+                },
+                {
+                    "name": "esp8285_1mb",
+                    "firmware": "0x00000000",
+                    "littlefs": "0x000bb000"
+                },
+                {
+                    "name": "esp8285_1mb_ota",
+                    "firmware": "0x00000000",
+                    "littlefs": "0x000eb000"
+                },
+                {
+                    "name": "esp32s2_4mb",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x290000"
+                },
+                {
+                    "name": "esp32c3m_4mb",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x310000"
+                },
+                {
+                    "name": "esp32s3_16mb",
+                    "boot_app0": "0xe000",
+                    "bootloader_qio_80m": "0x1000",
+                    "firmware": "0x10000",
+                    "partitions": "0x8000",
+                    "littlefs": "0x910000"
+                }
+            ]
+        }
+    },
+    "modules": {
+        "virtual_elments": [
+            {
+                "path": "src/modules/virtual/Benchmark",
+                "active": false
+            },
+            {
+                "path": "src/modules/virtual/Cron",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/GoogleSheet",
+                "active": false
+            },
+            {
+                "path": "src/modules/virtual/Loging",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/LogingDaily",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Math",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/owmWeather",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Ping",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Timer",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Variable",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/VButton",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Weather",
+                "active": false
+            }
+        ],
+        "sensors": [
+            {
+                "path": "src/modules/exec/Pcf8591",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/A02Distance",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Acs712",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ads1115",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/AhtXX",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/AnalogAdc",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/BH_1750",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/BL0937",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ble",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ble_part1",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ble_part2",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Bme280",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Bmp280",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Dht1122",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ds18b20",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/DS2401",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Emon",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/EnergyMon485",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/ExampleModule",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/ExternalMQTT",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/FreqMeter",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/GY21",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Hdc1080",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Hx710",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Hx711",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Impulse",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ina219",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ina226",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/IoTWiegand",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/ld2410",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Max6675",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Mhz19",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/MQgas",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ntc",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t_v2",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/RCswitch",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/RTC",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/S8",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Scd40",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Sds011",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Sgp30",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Sht20",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Sht30",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Sonar",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/UART",
+                "active": true
+            }
+        ],
+        "executive_devices": [
+            {
+                "path": "src/modules/exec/AnalogBtn",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/BrokerMQTT",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/ButtonIn",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/ButtonOut",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Buzzer",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Enconder",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/EspCam",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Ftp",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/HttpGet",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/IoTServo",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Mcp23008",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Mcp23017",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Mp3",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Multitouch",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/MySensors",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Pcf8574",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Pwm32",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Pwm8266",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/SDcard",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/SIM800",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/SmartBoiler",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/SysExt",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Telegram",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/TelegramLT",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Telegram_v2",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Thermostat",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ds2423",
+                "active": false
+            }
+        ],
+        "screens": [
+            {
+                "path": "src/modules/display/DwinI",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/Lcd2004",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/Nextion",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/NextionUpload",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/Oled128",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/Oled64",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/Smi2_m",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/TM16XX",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/Ws2812b",
+                "active": false
+            }
+        ]
+    }
+}

data/.exclude.files

@@ -1,2 +0,0 @@
-/*.js.gz
-/.exclude.files

data/config-my.json

@@ -1 +0,0 @@
-{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"rise","password":"hostel3333","timezone":3,"mqttServer":"m12.cloudmqtt.com","mqttPort":14053,"mqttUser":"lbscvzuj","mqttPass":"bLxlveOgaF8F","scenario":"1","timers":"0","pushingbox_id":"v7C133E426B0C69E","web_login":"admin","web_pass":"admin"}

data/config.json

@@ -1 +0,0 @@
-{"SSDP":"MODULES","chipID":"905542-1458415","ssidAP":"WiFi","passwordAP":"","ssid":"your_ssid","password":"your_pass","timezone":3,"mqttServer":"","mqttPort":0,"mqttUser":"","mqttPass":"","scenario":"1","timers":"0","pushingbox_id":"","web_login":"admin","web_pass":"admin"}

data/configuration.json

@@ -1,148 +0,0 @@
-{
- "configs": [
-
-  "/config.live.json",
-  "/config.setup.json",
-  "/config.option.json"
- ],
- "class":"col-sm-offset-1 col-sm-10",
- "content": [
-  {
-   "type": "h5",
-   "title": "{{SSDP}}",
-   "class":"alert-warning"
-  },
-{
-   "type": "h4",
-   "title": "Device ID: {{chipID}}"
-  },
-{
-   "type": "h4",
-   "title": "IP address: {{ip}}"
-  },
-{
-   "type": "h4",
-   "title": "Uptime: {{uptime}}"
-  },
- {
-   "type": "hr"
-  },
-{
-   "type": "h2",
-   "title": "Конфигурация устройства"
-  },
- {
-   "type":"file",
-   "state":"firmware.config.txt",
-   "style":"width:100%;height:400px",
-   "title": "Сохранить",
-   "action": "/all_modules_init",
-   "class":"btn btn-block btn-success"
-  },
- {
-   "type": "link",
-   "title": "Инструкция",
-   "action": "https://github.com/DmitryBorisenko33/esp8266_iot-manager_modules_firmware/wiki/Instruction",
-   "class": "btn btn-block btn-primary"
-  },
-{
-   "type": "h2",
-   "title": "Сценарии"
-  },
-{
-"type": "checkbox",
-"name":"scenario",
-"title": "Включить сценарии",
-"action": "/scenario?status=[[scenario]]",
-"state": "{{scenario}}"
-},
-{
-   "type": "h6",
-   "title": ""
-  },
-{
-   "type":"file",
-   "state":"firmware.scenario.txt",
-   "style":"width:100%;height:400px",
-   "title": "Сохранить и включить",
-   "action": "/scenario?status=1",
-   "class":"btn btn-block btn-success"
-  },
-{
-   "type": "h2",
-"title": "Данные модулей"
- },
-{
-   "type": "hr"
- },
-{
-   "type": "h4",
-   "title": "Модуль уровня воды (level)",
-"style": "width:100%"
-  },
-
- {
-   "type": "h6",
-   "title": "Расстояние от датчика до воды: {{level_in}} см"
-  },
-{
-   "type": "h6",
-   "title": " Заполнение бака: {{level}} %"
-  },
-{
-   "type": "hr"
- },
-{
-   "type": "h4",
-   "title": "Модуль аналогового входа (analog)",
-"style": "width:100%"
-  },
-{
-   "type": "h6",
-   "title": "Прочитанное значение: {{analog_in}}"
-  },
-{
-   "type": "h6",
-   "title": "Преобразованное значение: {{analog}}"
-  },
- {
-   "type": "hr"
- },
-{
-   "type": "h4",
-   "title": "Модуль температурного датчика (dallas)",
-"style": "width:100%"
-  },
-{
-   "type": "h6",
-   "title": "Текущее значение: {{dallas}} °C"
-  },
-{
-   "type": "hr"
- },
-{
-   "type": "h4",
-   "title": "Модуль pH сенсора от df robot (ph)",
-"style": "width:100%"
-  },
-{
-   "type": "h6",
-   "title": "Текущее значение: {{ph}}"
-  },
-{
-   "type": "hr"
- },
- {
-   "type": "link",
-   "title": "Очистить все логи",
-   "action": "/cleanlog",
-   "class": "btn btn-block btn-success"
-  },
-  {
-   "type": "link",
-   "title": "Главная",
-   "action": "/page.htm?index",
-   "class": "btn btn-block btn-danger btn-sm"
-  }
- ]
-}

data/edit.htm

@@ -1,572 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>ESP Editor</title>
-  <style type="text/css" media="screen">
-   .contextMenu{z-index:300;position:absolute;left:5px;border:1px solid #444;background-color:#f5f5f5;display:none;box-shadow:0 0 10px rgba(0,0,0,.4);font-size:12px;font-family:sans-serif;font-weight:bold}
-   .contextMenu ul{list-style:none;top:0;left:0;margin:0;padding:0}
-   .contextMenu li{position:relative;min-width:60px;cursor:pointer}
-   .contextMenu span{color:#444;display:inline-block;padding:6px}
-   .contextMenu li:hover{background:#444}
-   .contextMenu li:hover span{color:#EEE}
-   .css-treeview ul,.css-treeview li{padding:0;margin:0;list-style:none}
-   .css-treeview input{position:absolute;opacity:0}
-   .css-treeview{font:normal 11px Verdana,Arial,Sans-serif;-moz-user-select:none;-webkit-user-select:none;user-select:none}
-   .css-treeview span{color:#00f;cursor:pointer}
-   .css-treeview span:hover{text-decoration:underline}
-   .css-treeview input+label+ul{margin:0 0 0 22px}
-   .css-treeview input ~ ul{display:none}
-   .css-treeview label,.css-treeview label::before{cursor:pointer}
-   .css-treeview input:disabled+label{cursor:default;opacity:.6}
-   .css-treeview input:checked:not(:disabled) ~ ul{display:block}
-   .css-treeview label,.css-treeview label::before{background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAACgCAYAAAAFOewUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAApxJREFUeNrslM1u00AQgGdthyalFFOK+ClIIKQKyqUVQvTEE3DmAhLwAhU8QZoH4A2Q2gMSFace4MCtJ8SPBFwAkRuiHKpA6sRN/Lu7zG5i14kctaUqRGhGXnu9O/Pt7MzsMiklvF+9t2kWTDvyIrAsA0aKRRi1T0C/hJ4LUbt5/8rNpWVlp8RSr9J40b48fxFaTQ9+ft8EZ6MJYb0Ok+dnYGpmPgXwKIAvLx8vYXc5GdMAQJgQEkpjRTh36TS2U+DWW/D17WuYgm8pwJyY1npZsZKOxImOV1I/h4+O6vEg5GCZBpgmA6hX8wHKUHDRBXQYicQ4rlc3Tf0VMs8DHBS864F2YFspjgUYjKX/Az3gsdQd2eeBHwmdGWXHcgBGSkZXOXohcEXebRoQcAgjqediNY+AVyu3Z3sAKqfKoGMsewBeEIOPgQxxPJIjcGH6qtL/0AdADzKGnuuD+2tLK7Q8DhHHbOBW+KEzcHLuYc82MkEUekLiwuvVH+guQBQzOG4XdAb8EOcRcqQvDkY2iCLuxECJ43JobMXoutqGgDa2T7UqLKwt9KRyuxKVByqVXXqIoCCUCAqhUOioTWC7G4TQEOD0APy2/7G2Xpu1J4+lxeQ4TXBbITDpoVelRN/BVFbwu5oMMJUBhoXy5tmdRcMwymP2OLQaLjx9/vnBo6V3K6izATmSnMa0Dq7ferIohJhr1p01zrlz49rZF4OMs8JkX23vVQzYp+wbYGV/KpXKjvspl8tsIKCrMNAYFxj2GKS5ZWxg4ewKsJfaGMIY5KXqPz8LBBj6+yDvVP79+yDp/9F9oIx3OisHWwe7Oal0HxCAAAQgAAEIQAACEIAABCAAAQhAAAIQgAAEIAABCEAAAhCAAAQgwD8E/BZgAP0qhKj3rXO7AAAAAElFTkSuQmCC") no-repeat}
-   .css-treeview label,.css-treeview span,.css-treeview label::before{display:inline-block;height:16px;line-height:16px;vertical-align:middle}
-   .css-treeview label{background-position:18px 0}
-   .css-treeview label::before{content:"";width:16px;margin:0 22px 0 0;vertical-align:middle;background-position:0 -32px}
-   .css-treeview input:checked+label::before{background-position:0 -16px}
-   @media screen and (-webkit-min-device-pixel-ratio:0){.css-treeview{-webkit-animation:webkit-adjacent-element-selector-bugfix infinite 1s}@-webkit-keyframes webkit-adjacent-element-selector-bugfix{from{padding:0}to{padding:0}}}
-   #uploader{position:absolute;top:0;right:0;left:0;height:28px;line-height:24px;padding-left:10px;background-color:#444;color:#EEE}#tree{position:absolute;top:28px;bottom:0;left:0;width:200px;padding:8px}
-   #editor,#preview{position:absolute;top:28px;right:0;bottom:0;left:200px}
-   #preview{background-color:#EEE;padding:5px}
-  </style>
-  <script>
-
-   var urlXXX = 'http://192.168.211.181';//bolt
-   if (window.location.search.substring(1).split("=")[1]) {
-    urlXXX = 'http://'+window.location.search.substring(1).split("=")[1];
-   } else {
-    urlXXX = 'http://'+window.location.hostname;
-   }
-
-   function createFileUploader(element, tree, editor){
-    var xmlHttp;
-    var input = document.createElement("input");
-    input.type = "file";
-    input.multiple = false;
-    input.name = "data";
-    document.getElementById(element).appendChild(input);
-    var path = document.createElement("input");
-    path.id = "upload-path";
-    path.type = "text";
-    path.name = "path";
-    path.defaultValue = "/";
-    document.getElementById(element).appendChild(path);
-    var button = document.createElement("button");
-    button.innerHTML = 'Upload';
-    document.getElementById(element).appendChild(button);
-    var mkdir = document.createElement("button");
-    mkdir.innerHTML = 'MkDir';
-    document.getElementById(element).appendChild(mkdir);
-    var mkfile = document.createElement("button");
-    mkfile.innerHTML = 'MkFile';
-    document.getElementById(element).appendChild(mkfile);
-
-    function httpPostProcessRequest(){
-     if (xmlHttp.readyState == 4){
-      if(xmlHttp.status != 200) alert("ERROR["+xmlHttp.status+"]: "+xmlHttp.responseText);
-      else {
-       tree.refreshPath(path.value);
-      }
-     }
-    }
-    function createPath(p){
-     xmlHttp = new XMLHttpRequest();
-     xmlHttp.onreadystatechange = httpPostProcessRequest;
-     var formData = new FormData();
-     formData.append("path", p);
-     xmlHttp.open("PUT", urlXXX+"/edit");
-     xmlHttp.send(formData);
-    }
-
-    mkfile.onclick = function(e){
-     if(path.value.indexOf(".") === -1) return;
-     createPath(path.value);
-     editor.loadUrl(path.value);
-    };
-    mkdir.onclick = function(e){
-     if(path.value.length < 2) return;
-     var dir = path.value
-     if(dir.indexOf(".") !== -1){
-      if(dir.lastIndexOf("/") === 0) return;
-      dir = dir.substring(0, dir.lastIndexOf("/"));
-     }
-     createPath(dir);
-    };
-    button.onclick = function(e){
-     if(input.files.length === 0){
-      return;
-     }
-     xmlHttp = new XMLHttpRequest();
-     xmlHttp.onreadystatechange = httpPostProcessRequest;
-     var formData = new FormData();
-     formData.append("data", input.files[0], path.value);
-     xmlHttp.open("POST", urlXXX+"/edit");
-     xmlHttp.send(formData);
-    }
-    input.onchange = function(e){
-     if(input.files.length === 0) return;
-     var filename = input.files[0].name;
-     var ext = /(?:\.([^.]+))?$/.exec(filename)[1];
-     var name = /(.*)\.[^.]+$/.exec(filename)[1];
-     if(typeof name !== undefined){
-      //1197 bolt            if(name.length > 8) name = name.substring(0, 8);
-      filename = name;
-     }
-     if(typeof ext !== undefined){
-      if(ext === "html") ext = "htm";
-      else if(ext === "jpeg") ext = "jpg";
-      filename = filename + "." + ext;
-     }
-     if(path.value === "/" || path.value.lastIndexOf("/") === 0){
-      path.value = "/"+filename;
-     } else {
-      path.value = path.value.substring(0, path.value.lastIndexOf("/")+1)+filename;
-     }
-    }
-   }
-
-   function createTree(element, editor){
-    var preview = document.getElementById("preview");
-    var treeRoot = document.createElement("div");
-    treeRoot.className = "css-treeview";
-    document.getElementById(element).appendChild(treeRoot);
-
-    function loadDownload(path){
-     document.getElementById('download-frame').src = path+"?download=true";
-    }
-
-    function loadPreview(path){
-     document.getElementById("editor").style.display = "none";
-     preview.style.display = "block";
-     preview.innerHTML = '<img src="'+ urlXXX +path+'" style="max-width:100%; max-height:100%; margin:auto; display:block;" />';
-    }
-
-    function fillFolderMenu(el, path){
-     var list = document.createElement("ul");
-     el.appendChild(list);
-     var action = document.createElement("li");
-     list.appendChild(action);
-     var isChecked = document.getElementById(path).checked;
-     var expnd = document.createElement("li");
-     list.appendChild(expnd);
-     if(isChecked){
-      expnd.innerHTML = "<span>Collapse</span>";
-      expnd.onclick = function(e){
-       document.getElementById(path).checked = false;
-       if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-      };
-      var refrsh = document.createElement("li");
-      list.appendChild(refrsh);
-      refrsh.innerHTML = "<span>Refresh</span>";
-      refrsh.onclick = function(e){
-       var leaf = document.getElementById(path).parentNode;
-       if(leaf.childNodes.length == 3) leaf.removeChild(leaf.childNodes[2]);
-       httpGet(leaf, path);
-       if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-      };
-     } else {
-      expnd.innerHTML = "<span>Expand</span>";
-      expnd.onclick = function(e){
-       document.getElementById(path).checked = true;
-       var leaf = document.getElementById(path).parentNode;
-       if(leaf.childNodes.length == 3) leaf.removeChild(leaf.childNodes[2]);
-       httpGet(leaf, path);
-       if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-      };
-     }
-     var upload = document.createElement("li");
-     list.appendChild(upload);
-     upload.innerHTML = "<span>Upload</span>";
-     upload.onclick = function(e){
-      var pathEl = document.getElementById("upload-path");
-      if(pathEl){
-       var subPath = pathEl.value;
-       if(subPath.lastIndexOf("/") < 1) pathEl.value = path+subPath;
-       else pathEl.value = path.substring(subPath.lastIndexOf("/"))+subPath;
-      }
-      if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-     };
-     var delFile = document.createElement("li");
-     list.appendChild(delFile);
-     delFile.innerHTML = "<span>Delete</span>";
-     delFile.onclick = function(e){
-      httpDelete(path);
-      if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-     };
-    }
-
-    function fillFileMenu(el, path){
-     var list = document.createElement("ul");
-     el.appendChild(list);
-     var action = document.createElement("li");
-     list.appendChild(action);
-     if(isTextFile(path)){
-      action.innerHTML = "<span>Edit</span>";
-      action.onclick = function(e){
-       editor.loadUrl(path);
-       if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-      };
-     } else if(isImageFile(path)){
-      action.innerHTML = "<span>Preview</span>";
-      action.onclick = function(e){
-       loadPreview(path);
-       if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-      };
-     }
-     var download = document.createElement("li");
-     list.appendChild(download);
-     download.innerHTML = "<span>Download</span>";
-     download.onclick = function(e){
-      loadDownload(path);
-      if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-     };
-     var delFile = document.createElement("li");
-     list.appendChild(delFile);
-     delFile.innerHTML = "<span>Delete</span>";
-     delFile.onclick = function(e){
-      httpDelete(path);
-      if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(el);
-     };
-    }
-
-    function showContextMenu(e, path, isfile){
-     var divContext = document.createElement("div");
-     var scrollTop = document.body.scrollTop ? document.body.scrollTop : document.documentElement.scrollTop;
-     var scrollLeft = document.body.scrollLeft ? document.body.scrollLeft : document.documentElement.scrollLeft;
-     var left = e.clientX + scrollLeft;
-     var top = e.clientY + scrollTop;
-     divContext.className = 'contextMenu';
-     divContext.style.display = 'block';
-     divContext.style.left = left + 'px';
-     divContext.style.top = top + 'px';
-     if(isfile) fillFileMenu(divContext, path);
-     else fillFolderMenu(divContext, path);
-     document.body.appendChild(divContext);
-     var width = divContext.offsetWidth;
-     var height = divContext.offsetHeight;
-     divContext.onmouseout = function(e){
-      if(e.clientX < left || e.clientX > (left + width) || e.clientY < top || e.clientY > (top + height)){
-       if(document.body.getElementsByClassName('contextMenu').length > 0) document.body.removeChild(divContext);
-      }
-     };
-    }
-
-    function createTreeLeaf(path, name, size){
-     var leaf = document.createElement("li");
-     leaf.id = (((path == "/")?"":path)+"/"+name).toLowerCase();
-     var label = document.createElement("span");
-     label.textContent = name.toLowerCase();
-     leaf.appendChild(label);
-     leaf.onclick = function(e){
-      if(isTextFile(leaf.id)){
-       editor.loadUrl(leaf.id);
-      } else if(isImageFile(leaf.id)){
-       loadPreview(leaf.id);
-      }
-     };
-     leaf.oncontextmenu = function(e){
-      e.preventDefault();
-      e.stopPropagation();
-      showContextMenu(e, leaf.id, true);
-     };
-     return leaf;
-    }
-
-    function createTreeBranch(path, name, disabled){
-     var leaf = document.createElement("li");
-     var check = document.createElement("input");
-     check.type = "checkbox";
-     check.id = (((path == "/")?"":path)+"/"+name).toLowerCase();
-     if(typeof disabled !== "undefined" && disabled) check.disabled = "disabled";
-     leaf.appendChild(check);
-     var label = document.createElement("label");
-     label.for = check.id;
-     label.textContent = name.toLowerCase();
-     leaf.appendChild(label);
-     check.onchange = function(e){
-      if(check.checked){
-       if(leaf.childNodes.length == 3) leaf.removeChild(leaf.childNodes[2]);
-       httpGet(leaf, check.id);
-      }
-     };
-     label.onclick = function(e){
-      if(!check.checked){
-       check.checked = true;
-       if(leaf.childNodes.length == 3) leaf.removeChild(leaf.childNodes[2]);
-       httpGet(leaf, check.id);
-      } else {
-       check.checked = false;
-      }
-     };
-     leaf.oncontextmenu = function(e){
-      e.preventDefault();
-      e.stopPropagation();
-      showContextMenu(e, check.id, false);
-     }
-     return leaf;
-    }
-
-    function addList(parent, path, items){
-     var list = document.createElement("ul");
-     parent.appendChild(list);
-     var ll = items.length;
-     //Сортировка файлов
-     items.sort(function(a,b){return (a.name < b.name) ? 1 : ((b.name < a.name) ? -1 : 0);});
-     for(var i = 0; i < ll; i++){
-      var item = items[i];
-      var itemEl;
-      if(item.type === "file"){
-       itemEl = createTreeLeaf(path, item.name, item.size);
-      } else {
-       itemEl = createTreeBranch(path, item.name);
-      }
-      list.appendChild(itemEl);
-     }
-
-    }
-
-    function isTextFile(path){
-     var ext = /(?:\.([^.]+))?$/.exec(path)[1];
-     if(typeof ext !== undefined){
-      switch(ext){
-       case "txt":
-       case "htm":
-       case "html":
-       case "js":
-       case "json":
-       case "c":
-       case "h":
-       case "cpp":
-       case "css":
-       case "xml":
-        return true;
-      }
-     }
-     return false;
-    }
-
-    function isImageFile(path){
-     var ext = /(?:\.([^.]+))?$/.exec(path)[1];
-     if(typeof ext !== undefined){
-      switch(ext){
-       case "png":
-       case "jpg":
-       case "gif":
-       case "ico":
-        return true;
-      }
-     }
-     return false;
-    }
-
-    this.refreshPath = function(path){
-     if(path.lastIndexOf('/') < 1){
-      path = '/';
-      treeRoot.removeChild(treeRoot.childNodes[0]);
-      httpGet(treeRoot, "/");
-     } else {
-      path = path.substring(0, path.lastIndexOf('/'));
-      var leaf = document.getElementById(path).parentNode;
-      if(leaf.childNodes.length == 3) leaf.removeChild(leaf.childNodes[2]);
-      httpGet(leaf, path);
-     }
-    };
-
-    function delCb(path){
-     return function(){
-      if (xmlHttp.readyState == 4){
-       if(xmlHttp.status != 200){
-        alert("ERROR["+xmlHttp.status+"]: "+xmlHttp.responseText);
-       } else {
-        if(path.lastIndexOf('/') < 1){
-         path = '/';
-         treeRoot.removeChild(treeRoot.childNodes[0]);
-         httpGet(treeRoot, "/");
-        } else {
-         path = path.substring(0, path.lastIndexOf('/'));
-         var leaf = document.getElementById(path).parentNode;
-         if(leaf.childNodes.length == 3) leaf.removeChild(leaf.childNodes[2]);
-         httpGet(leaf, path);
-        }
-       }
-      }
-     }
-    }
-
-    function httpDelete(filename){
-     xmlHttp = new XMLHttpRequest();
-     xmlHttp.onreadystatechange = delCb(filename);
-     var formData = new FormData();
-     formData.append("path", filename);
-     xmlHttp.open("DELETE", urlXXX+"/edit");
-     xmlHttp.send(formData);
-    }
-
-    function getCb(parent, path){
-     return function(){
-      if (xmlHttp.readyState == 4){
-       //clear loading
-       if(xmlHttp.status == 200) addList(parent, path, JSON.parse(xmlHttp.responseText));
-      }
-     }
-    }
-
-    function httpGet(parent, path){
-     xmlHttp = new XMLHttpRequest(parent, path);
-     xmlHttp.onreadystatechange = getCb(parent, path);
-     //Для отключения кэша random() иначе будут старые данные
-     xmlHttp.open("GET", urlXXX+"/edit?list=" + path +"&rand="+Math.random(), true);
-     xmlHttp.send(null);
-     //start loading
-    }
-
-    httpGet(treeRoot, "/");
-    return this;
-   }
-
-   function createEditor(element, file, lang, theme, type){
-    function getLangFromFilename(filename){
-     var lang = "plain";
-     var ext = /(?:\.([^.]+))?$/.exec(filename)[1];
-     if(typeof ext !== undefined){
-      switch(ext){
-       case "txt": lang = "plain"; break;
-       case "htm": lang = "html"; break;
-       case "js": lang = "javascript"; break;
-       case "c": lang = "c_cpp"; break;
-       case "cpp": lang = "c_cpp"; break;
-       case "css":
-       case "scss":
-       case "php":
-       case "html":
-       case "json":
-       case "xml":
-        lang = ext;
-      }
-     }
-     return lang;
-    }
-
-    if(typeof file === "undefined") file = "/index.htm";
-
-    if(typeof lang === "undefined"){
-     lang = getLangFromFilename(file);
-    }
-
-    if(typeof theme === "undefined") theme = "textmate";
-
-    if(typeof type === "undefined"){
-     type = "text/"+lang;
-     if(lang === "c_cpp") type = "text/plain";
-    }
-
-    var xmlHttp = null;
-    var editor = ace.edit(element);
-
-    //post
-    function httpPostProcessRequest(){
-     if (xmlHttp.readyState == 4){
-      if(xmlHttp.status != 200) alert("ERROR["+xmlHttp.status+"]: "+xmlHttp.responseText);
-     }
-    }
-    function httpPost(filename, data, type){
-     xmlHttp = new XMLHttpRequest();
-     xmlHttp.onreadystatechange = httpPostProcessRequest;
-     var formData = new FormData();
-     formData.append("data", new Blob([data], { type: type }), filename);
-     xmlHttp.open("POST", urlXXX + "/edit");
-     xmlHttp.send(formData);
-    }
-    //get
-    function httpGetProcessRequest(){
-     if (xmlHttp.readyState == 4){
-      document.getElementById("preview").style.display = "none";
-      document.getElementById("editor").style.display = "block";
-      if(xmlHttp.status == 200) editor.setValue(xmlHttp.responseText);
-      else editor.setValue("");
-      editor.clearSelection();
-     }
-    }
-    function httpGet(theUrl){
-     xmlHttp = new XMLHttpRequest();
-     xmlHttp.onreadystatechange = httpGetProcessRequest;
-     if (theUrl.indexOf("/") == 0)
-      theUrl = urlXXX + theUrl;//bolt
-     xmlHttp.open("GET", theUrl+"?rand="+Math.random(), true);
-     xmlHttp.send(null);
-    }
-
-    if(lang !== "plain") editor.getSession().setMode("ace/mode/"+lang);
-    editor.setTheme("ace/theme/"+theme);
-    editor.$blockScrolling = Infinity;
-    editor.getSession().setUseSoftTabs(true);
-    editor.getSession().setTabSize(2);
-    editor.setHighlightActiveLine(true);
-    editor.setShowPrintMargin(false);
-    editor.commands.addCommand({
-     name: 'saveCommand',
-     bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
-     exec: function(editor) {
-      httpPost(file, editor.getValue()+"", type);
-     },
-     readOnly: false
-    });
-    editor.commands.addCommand({
-     name: 'undoCommand',
-     bindKey: {win: 'Ctrl-Z',  mac: 'Command-Z'},
-     exec: function(editor) {
-      editor.getSession().getUndoManager().undo(false);
-     },
-     readOnly: false
-    });
-    editor.commands.addCommand({
-     name: 'redoCommand',
-     bindKey: {win: 'Ctrl-Shift-Z',  mac: 'Command-Shift-Z'},
-     exec: function(editor) {
-      editor.getSession().getUndoManager().redo(false);
-     },
-     readOnly: false
-    });
-    httpGet(file);
-    editor.loadUrl = function(filename){
-     file = filename;
-     lang = getLangFromFilename(file);
-     type = "text/"+lang;
-     if(lang !== "plain") editor.getSession().setMode("ace/mode/"+lang);
-     httpGet(file);
-    }
-    return editor;
-   }
-   function onBodyLoad(){
-    var vars = {};
-    //        var s = "http://192.168.211.180/edit/index.htm";
-    var parts = window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { vars[key] = value; });
-    //        var parts = s.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) { vars[key] = value; });
-    if (typeof vars.url !== "undefined" && vars.url != "")
-     urlXXX = "http://" + vars.url;/**/
-    var editor = createEditor("editor", vars.file, vars.lang, vars.theme);
-    var tree = createTree("tree", editor);
-    createFileUploader("uploader", tree, editor);
-   };
-  </script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.6/ace.js" type="text/javascript" charset="utf-8"></script>
-  <script>
-   (function() {
-    window.require(["ace/ace"], function(a) {
-     a && a.config.init(true);
-     if (!window.ace)
-      window.ace = a;
-     for (var key in a) if (a.hasOwnProperty(key))
-      window.ace[key] = a[key];
-    });
-   })();
-  </script>
- </head>
- <body onload="onBodyLoad();">
-  <div id="uploader"></div>
-  <div id="tree"></div>
-  <div id="editor"></div>
-  <div id="preview" style="display:none;"></div>
-  <iframe id=download-frame style='display:none;'></iframe>
- </body>
-</html>

data/firmware.config.txt

@@ -1,29 +0,0 @@
-button 1 na Включить#все Реле 0 1
-button 2 13 Прихожая Реле 0 2
-button 3 14 Кухня Реле 0 3
-pwm 1 3 Яркость#коредор: Реле 1023 4
-pwm 2 4 Яркость#ванная: Реле 510 5
-//-------------------------------------------------------------------------------------------------
-//analog 0 Аналоговый#вход,#% Датчики progress-round 1 1024 1 1024 6
-inputDigit digit1 При#скольки#включить? Датчики 10 7
-inputDigit digit2 При#скольки#выключить? Датчики 0 8
-button 4 na Нагреватель Датчики 0 9
-//dallas 2 Водонагреватель,#t°C Датчики any-data 10
-dhtT DHT11 2 Температура#DHT,#t°C Датчики any-data 11
-dhtH DHT11 2 Влажность#DHT,#% Датчики any-data 12
-dhtComfort Степень#комфорта: Датчики 12
-dhtPerception Восприятие: Датчики 13
-//level Вода#в#баке,#% Датчики any-data 125 20 14
-//-------------------------------------------------------------------------------------------------
-button 5 na Вкл#обратный#таймер Таймеры 0 15
-inputDigit digit3 Через#сколько#секунд#включить? Таймеры 5 16
-button 6 na Включится#по#таймеру Таймеры 0 17
-inputTime time1 Во#сколько#включить? Таймеры 20.30 18
-button 7 5 Включится#по#таймеру Таймеры 0 19
-//-------------------------------------------------------------------------------------------------
-switch 1 0 20
-textSet 1 неопределено
-text 1 Квартира Двери 22
-//-------------------------------------------------------------------------------------------------
-button 8 scenario Вкл#выкл#все#сценарии Сценарии 1 23
-button 9 line1,line2, Вкл#выкл#выбранные#сценарии Сценарии 1 24

data/firmware.scenario.txt

@@ -1,32 +0,0 @@
-button1 = 1
-buttonSet 2 1
-buttonSet 3 1
-pwmSet 2 1024
-end
-button1 = 0
-buttonSet 2 0
-buttonSet 3 0
-pwmSet 2 0
-end
-analog > digit1
-buttonSet 4 1
-end
-analog < digit2
-buttonSet 4 0
-end
-button5 = 1
-timerStart 1 digit3 sec
-end
-timer1 = 0
-buttonSet 6 1
-end
-timenow = time1
-buttonSet 7 1
-end
-switch1 = 1
-textSet 1 закрыто-time
-push закрыто вход
-end
-switch1 = 0
-textSet 1 открыто-time
-end

data/index.htm

@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <!--
-Web Developer: Renats Kevrels (ex. Zozula)
-Site: http://www.onclick.lv
-Contact: info [at] onclick.lv
-Skype: renat2985
-Twitter: @Ramzies
-Facebook: http://www.facebook.com/renat2985
-GitHub: https://github.com/renat2985
-From: Latvia, Valmiera
--->
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-  <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-  <script defer src="js/build.chart.js?v07.04.2018" charset="utf-8"></script>
-  <!-- <link rel="stylesheet" type="text/css" href="css/chartist.min.css">
-<script src="js/chartist.min.js" charset="utf-8"></script>
-<script type="text/javascript" src="js/chart.js"></script> -->
-  <link rel="stylesheet" type="text/css" href="css/build.css?v07.04.2018">
-  <!-- <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="css/style.css"> -->
-  <script defer type="text/javascript" src="js/function.js?v07.04.2018"></script>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title></title>
-  <script type="text/javascript">
-   var jsonResponse;
-
-   //function selectTextareaLine(tarea,lineNum) {
-   // lineNum--;
-   // var lines = tarea.value.split("\n");
-   // var startPos = 0, endPos = tarea.value.length;
-   // for(var x = 0; x < lines.length; x++) {
-   //  if(x == lineNum) {break;}
-   //  startPos += (lines[x].length+1);
-   // }
-   // var endPos = lines[lineNum].length+startPos;
-   // if(typeof(tarea.selectionStart) != "undefined") {
-   //  tarea.focus();
-   //  tarea.selectionStart = startPos;
-   //  tarea.selectionEnd = endPos;
-   //  return true;
-   // }
-   // return false;
-   //}
-
-   window.onload = function() {
-    setContent('first');
-   }
-  </script>
- </head>
- <body>
-  <div class="container loader-bg">
-
-   <ul id="url-content" class="hidden" onclick="document.getElementById('content').style.zIndex=0;"></ul>
-   <div id="headers"></div>
-   <div class="row hidden" id="container_column">
-    <h1 id="title"></h1>
-    <div id="content" onclick="this.style.zIndex=10"></div>
-   </div>
-   <div id="footer"></div>
-   <div id="edit-content" class="hidden" onclick="document.getElementById('content').style.zIndex=0;">
-    <a target="_blank" style="position:fixed;right:0;color:#000;" href="https://github.com/tretyakovsa/Sonoff_WiFi_switch/wiki/%D0%92%D0%BE%D0%B7%D0%BC%D0%BE%D0%B6%D0%BD%D0%BE%D1%81%D1%82%D0%B8-page.htm%3F*" title="Github wiki"><i class="help-img"></i>wiki</a>
-    <textarea class="form-control" onkeyup="isValidJson(this.value,'edit-json')" spellcheck="false" id="edit-json"></textarea>
-    <div id="error-json"></div>
-    <div class="btn-group btn-block">
-     <input class="btn btn-success" style="width:40%" id="edit-view" onclick="setContent('edit');this.value='Loading...';html('url-content', ' ');" value="View" type="button">
-     <input class="btn btn-danger" style="width:40%" id="edit-save" onclick="var urlPages=window.location.search.substring(1).split('&')[0];httpDelete('/'+urlPages+'.json.gz');send_request_edit(this, val('edit-json'),(urlPages?urlPages:'index')+'.json');toggle('edit-content');toggle('url-content');" value="Save" type="button">
-     <a class="btn btn-info" style="width:20%" href="#" id="download-json" download="" title="Save to PC"><i class="download-img"></i></a>
-    </div>
-   </div>
-
-  </div>
- </body>
-</html>

data/index.json

@@ -1,62 +0,0 @@
-{
-	"configs": [
-		"/config.live.json",
-		"/config.setup.json"
-	],
-	"title": "Главная",
-	"class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
-	"content": [
-		{
-			"type": "h5",
-			"title": "{{SSDP}}",
-			"class": "alert-warning"
-		},
-		{
-			"type": "h4",
-			"title": "Device ID: {{chipID}}"
-		},
-		{
-			"type": "h4",
-			"title": "IP address: {{ip}}"
-		},
-		{
-			"type": "link",
-			"title": "Конфигурация устройства",
-			"action": "/page.htm?configuration",
-			"class": "btn btn-block btn-primary"
-		},
-		{
-			"type": "hr"
-		},
-		{
-			"type": "link",
-			"title": "Конфигурация WIFI",
-			"action": "/page.htm?setup",
-			"class": "btn btn-block btn-success"
-		},
-		{
-			"type": "link",
-			"title": "Конфигурация MQTT",
-			"action": "/page.htm?mqtt",
-			"class": "btn btn-block btn-success"
-		},
-		{
-			"type": "link",
-			"title": "Конфигурация push",
-			"action": "/page.htm?pushingbox",
-			"class": "btn btn-block btn-success"
-		},
-		{
-			"type": "link",
-			"title": "Скачать приложение IoT Manager для android",
-			"action": "https://play.google.com/store/apps/details?id=ru.esp8266.iotmanager",
-			"class": "btn btn-block btn-warning"
-		},
-		{
-			"type": "link",
-			"title": "Скачать приложение IoT Manager для iphone",
-			"action": "https://apps.apple.com/ru/app/iot-manager/id1155934877",
-			"class": "btn btn-block btn-warning"
-		}
-	]
-}

data/mqtt.json

@@ -1,79 +0,0 @@
-{
- "configs": [
-"/config.setup.json"
- ],
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
-  {
-   "type": "h5",
-   "title": "{{SSDP}}",
-   "class":"alert-warning"
-  },
- {
-   "type": "h4",
-   "title": "Server name:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"1",
-   "state": "{{mqttServer}}"
-  },
-{
-   "type": "h4",
-   "title": "Port:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"2",
-   "state": "{{mqttPort}}"
-  },
-{
-   "type": "h4",
-   "title": "User name:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"3",
-   "state": "{{mqttUser}}"
-  },
-{
-   "type": "h4",
-   "title": "Password:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"4",
-   "state": "{{mqttPass}}"
-  },
-{
-  "type":"h3",
-  "name":"my-block",
-"style":"position:fixed;top:30%;left:50%;width:400px;margin-left:-200px;text-align:center;",
-  "class":"hidden"
- },
-{
-   "type": "button",
-  "title":"Сохранить",
-    "action": "mqttSave?mqttServer=[[1]]&mqttPort=[[2]]&mqttUser=[[3]]&mqttPass=[[4]]",
-    "response":"[[my-block]]",
-   "class": "btn btn-block btn-success",
-   "style": "width:100%;display:inline"
-  },
-  {
-   "type": "link",
-   "title": "Перезагрузить устройство",
-   "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-   "class": "btn btn-block btn-warning"
-  },
-  {
-   "type": "link",
-   "title": "Главная",
-   "action": "/page.htm?index",
-   "class": "btn btn-block btn-danger btn-sm"
-  }
- ]
-}

data/push.json

@@ -1,92 +0,0 @@
-{
- "configs": [
-"/config.setup.json"
- ],
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
-  {
-   "type": "h5",
-   "title": "{{SSDP}}",
-   "class":"alert-warning"
-  },
- {
-   "type": "h4",
-   "title": "Host name:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"1",
-   "state": "{{pushHost}}"
-  },
-{
-   "type": "h4",
-   "title": "Port:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"2",
-   "state": "{{pushPort}}"
-  },
-{
-   "type": "h4",
-   "title": "Fingerprint:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"3",
-   "state": "{{pushFingerprint}}"
-  },
-{
-   "type": "h4",
-   "title": "Access Token:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"4",
-   "state": "{{pushAccessToken}}"
-  },
-{
-  "type":"h3",
-  "name":"my-block",
-"style":"position:fixed;top:30%;left:50%;width:400px;margin-left:-200px;text-align:center;",
-  "class":"hidden"
- },
-{
-   "type": "button",
-  "title":"Сохранить и проверить соединение",
-    "action": "pushDate?pushHost=[[1]]&pushPort=[[2]]&pushFingerprint=[[3]]&pushAccessToken=[[4]]",
-    "response":"[[my-block]]",
-   "class": "btn btn-block btn-success",
-   "style": "width:100%;display:inline"
-  },
-{
-   "type": "hr"
-  },
-{
-"type": "checkbox",
-"name":"start-push",
-"title": "Отправлять push при включении устройства",
-"action": "startPush?status=[[start-push]]",
-"state": "{{startPush}}"
-},
-{
-   "type": "hr"
-  },
- {
-   "type": "link",
-   "title": "Перезагрузить устройство",
-   "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-   "class": "btn btn-block btn-warning"
-  },
-  {
-   "type": "link",
-   "title": "Главная",
-   "action": "/page.htm?index",
-   "class": "btn btn-block btn-danger btn-sm"
-  }
- ]
-}

data/pushingbox.json

@@ -1,46 +0,0 @@
-{
- "configs": [
-"/config.setup.json"
- ],
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
-  {
-   "type": "h5",
-   "title": "{{SSDP}}",
-   "class":"alert-warning"
-  },
- {
-   "type": "h4",
-   "title": "Device id:"
-  },
-{
-   "type": "input",
-   "title": "",
-   "name":"1",
-   "state": "{{pushingbox_id}}"
-  },
-
-{
-   "type": "button",
-  "title":"Сохранить",
-    "action": "pushingboxDate?pushingbox_id=[[1]]",
-   "class": "btn btn-block btn-success",
-   "style": "width:100%;display:inline"
-  },
-{
-   "type": "hr"
-  },
- {
-   "type": "link",
-   "title": "Перезагрузить устройство",
-   "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-   "class": "btn btn-block btn-warning"
-  },
-  {
-   "type": "link",
-   "title": "Главная",
-   "action": "/page.htm?index",
-   "class": "btn btn-block btn-danger btn-sm"
-  }
- ]
-}

data/setup.json

@@ -1,149 +0,0 @@
-{
- "configs": [ 
-   "/config.setup.json"
- ],
- "title": "Конфигурация",
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
-  {
-   "type": "h5",
-   "title": "{{SSDP}}",
-   "class":"alert-warning"
-  },
-  {
-   "type": "link",
-   "title": "Главная",
-   "action": "/",
-   "class": "btn btn-block btn-danger"
-  },
-  {
-   "type": "hr"
-  },
-  {
-   "type": "h2",
-   "title": "Имя устройства"
-  },
-  {
-   "type": "input",
-   "title": "Имя устройства",
-   "name":"ssdp",
-   "state": "{{SSDP}}",
-   "pattern": "[0-9a-zA-Zа-яА-Я.\\- ]{1,20}"
-  },
-  {
-   "type": "button",
-   "title": "Сохранить",
-   "action": "ssdp?ssdp=[[ssdp]]",
-   "class": "btn btn-block btn-success"
-  },
-  {
-   "type": "hr"
-  },
-  {
-   "type": "h2",
-   "title": "Подключение к Wi-Fi роутеру"
-  },
-  {
-   "type": "input",
-   "title":"Сеть",
-   "name":"ssid",
-   "state": "{{ssid}}"
-  },
-  {
-   "type": "password",
-   "title": "Введите пароль",
-   "name":"ssidPass",
-   "state": "{{password}}",
-   "pattern": ".{8,20}"
-  },
-  {
-   "type": "button",
-   "title": "Сохранить",
-   "class": "btn btn-block btn-success",
-   "action": "ssid?ssid=[[ssid]]&password=[[ssidPass]]"
-  },
- {
-   "type": "hr"
-  },
-  {
-   "type": "h2",
-   "title": "Точка доступа"
-  },
-  {
-   "type": "input",
-   "title": "Имя WI-FI сети",
-   "name":"ssidap",
-   "state": "{{ssidAP}}",
-   "pattern": ".{1,20}"
-  },
-  {
-   "type": "password",
-   "title": "Пароль",
-   "name":"ssidApPass",
-   "state": "{{passwordAP}}",
-   "pattern": ".{8,20}"
-  },
-  {
-   "type": "button",
-   "title": "Сохранить",
-   "action": "ssidap?ssidAP=[[ssidap]]&passwordAP=[[ssidApPass]]",
-   "class": "btn btn-block btn-success"
-  },
-{
-   "type": "hr"
-  },
-  {
-   "type": "h2",
-   "title": "Логин и пароль web interface"
-  },
-  {
-   "type": "input",
-   "title": "Логин",
-   "name":"web-login",
-   "state": "{{web_login}}",
-   "pattern": ".{1,20}"
-  },
-  {
-   "type": "password",
-   "title": "Пароль",
-   "name":"web-pass",
-   "state": "{{web_pass}}",
-   "pattern": ".{1,20}"
-  },
-  {
-   "type": "button",
-   "title": "Сохранить",
-   "action": "web?web_login=[[web-login]]&web_pass=[[web-pass]]",
-   "class": "btn btn-block btn-success"
-  },
-{
-   "type": "hr"
-  },
-{
-   "type": "h2",
-   "title": "Временная зона"
-  },
-  {
-   "type": "input",
-   "title": "Логин",
-   "name":"time-zone",
-   "state": "{{timezone}}",
-   "pattern": ".{1,20}"
-  },
-  {
-   "type": "button",
-   "title": "Сохранить",
-   "action": "timeZone?timezone=[[time-zone]]",
-   "class": "btn btn-block btn-success"
-  },
-{
-   "type": "hr"
-  },
-  {
-   "type": "link",
-   "title": "Перезагрузить устройство",
-   "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-   "class": "btn btn-block btn-warning"
-  }
- ]
-}

data/soket.json

@@ -1,57 +0,0 @@
-{
- "configs": [
-
-  "/config.live.json",
-  "/config.option.json",
-  "/config.setup.json",
-  "/lang/lang.ru.json",
-   "socket {{ip}}:81/"
- 
- ],
- "title": "Главная",
- "class":"col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
- "content": [
-  {
-   "type": "h5",
-   "title": "{{SSDP}}",
-   "class":"alert-warning"
-  },
-{
-   "type": "h4",
-   "title": "Module tank level:",
-  "style": "width:80%;float:left;"
-  },
-{
-   "type": "h4",
-   "title": "{{module_tank_level_s}}",
-  "style": "width:20%;float:right;"
-  },
-{
-   "type": "h4",
-   "title": "Module analog:",
-  "style": "width:80%;float:left;"
-  },
-{
-   "type": "h4",
-   "title": "{{module_analog_s}}",
-  "style": "width:20%;float:right;"
-  },
-{
-   "type": "h4",
-   "title": "Module ds18b20:",
-  "style": "width:80%;float:left;"
-  },
-{
-   "type": "h4",
-   "title": "{{module_ds18b20_s}}",
-  "style": "width:20%;float:right;"
-  },
-{
-   "type": "link",
-   "title": "Главная",
-   "action": "/page.htm?index",
-   "class": "btn btn-block btn-danger btn-sm",
-"style": "width:100%;float:right;"
-  }
- ]
-}

data/vigets/viget.anydata.json

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

data/vigets/viget.inputNum.json

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

data/vigets/viget.inputText.json

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

data/vigets/viget.inputTime.json

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

data/vigets/viget.inputdate.json

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

data/vigets/viget.progressL.json

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

data/vigets/viget.progressR.json

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

data/vigets/viget.range.json

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

data/vigets/viget.select.json

@@ -1,7 +0,0 @@
-{
-  "widget" : "select",
-  "size"   : "small",
-  "fill"   : "outline",
-  "options" : "["Zero item", "First item", "Second item"]",
-  "status" : 2
-}

data/vigets/viget.toggle.json

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

data_full/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+
+    <title>IoT Manager 4.6.2</title>
+
+    <link rel="icon" type="image/png" href="/favicon.ico" />
+    <link rel="stylesheet" href="/build/bundle.css?4550" />
+
+    <script defer src="/build/bundle.js?4550"></script>
+  </head>
+
+  <body></body>
+</html>

data_lite/index.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+
+    <title>IoT Manager 4.4.3</title>
+    <link rel="icon" type="image/png" href="/favicon.ico" />
+    <link
+      rel="stylesheet"
+      href="https://iotmanager.org/esp01ota/build/bundle.css?450"
+    />
+  </head>
+
+  <body>
+    <script>
+      let script = document.createElement("script");
+      script.src = "https://iotmanager.org/esp01ota/build/bundle.js?450";
+      script.onload = execute;
+      document.head.append(script);
+      script.onerror = error;
+      function error() {
+        console.log("ошибка при загрузке ресурса");
+      }
+      function execute() {
+        console.log("скрипт загружен");
+        document.getElementById("my-form").style.display = "none";
+      }
+    </script>
+    <div style="display: flex; align-items: center; justify-content: center">
+      <form method="GET" action="http://192.168.4.1/set" id="my-form">
+        <br /><br />
+        <h1>Настройка WiFi</h1>
+        <br />
+        <div>
+          <input name="routerssid" type="text" placeholder="WIFI" />
+        </div>
+        <br />
+        <div>
+          <input name="routerpass" placeholder="Password" />
+        </div>
+        <br /><br />
+        <input type="submit" value="сохранить" />
+      </form>
+    </div>
+  </body>
+</html>

data_svelte/config.json

@@ -0,0 +1 @@
+[]

data_svelte/flashProfile.json

@@ -0,0 +1,393 @@
+{
+    "projectProp": {
+        "platformio": {
+            "default_envs": "esp8266_4mb"
+        }
+    },
+    "modules": {
+        "virtual_elments": [
+            {
+                "path": "src/modules/virtual/Benchmark",
+                "active": false
+            },
+            {
+                "path": "src/modules/virtual/Cron",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/GoogleSheet",
+                "active": false
+            },
+            {
+                "path": "src/modules/virtual/Loging",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/LogingDaily",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Math",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/owmWeather",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Ping",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Timer",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Variable",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/VButton",
+                "active": true
+            },
+            {
+                "path": "src/modules/virtual/Weather",
+                "active": false
+            }
+        ],
+        "sensors": [
+            {
+                "path": "src/modules/exec/Pcf8591",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/A02Distance",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Acs712",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ads1115",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/AhtXX",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/AnalogAdc",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/BH_1750",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/BL0937",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ble",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ble_part1",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ble_part2",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Bme280",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Bmp280",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Dht1122",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ds18b20",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/DS2401",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Emon",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/EnergyMon485",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/ExampleModule",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/ExternalMQTT",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/FreqMeter",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/GY21",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Hdc1080",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Hx710",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Hx711",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Impulse",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ina219",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ina226",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/IoTWiegand",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/ld2410",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Max6675",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Mhz19",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/MQgas",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Ntc",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Pzem004t_v2",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/RCswitch",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/RTC",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/S8",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Scd40",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Sds011",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Sgp30",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Sht20",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Sht30",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/Sonar",
+                "active": true
+            },
+            {
+                "path": "src/modules/sensors/UART",
+                "active": true
+            }
+        ],
+        "executive_devices": [
+            {
+                "path": "src/modules/exec/AnalogBtn",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/BrokerMQTT",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/ButtonIn",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/ButtonOut",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Buzzer",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Enconder",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/EspCam",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Ftp",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/HttpGet",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/IoTServo",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Mcp23008",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Mcp23017",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Mp3",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Multitouch",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/MySensors",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Pcf8574",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Pwm32",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Pwm8266",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/SDcard",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/SIM800",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/SmartBoiler",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/SysExt",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Telegram",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/TelegramLT",
+                "active": true
+            },
+            {
+                "path": "src/modules/exec/Telegram_v2",
+                "active": false
+            },
+            {
+                "path": "src/modules/exec/Thermostat",
+                "active": false
+            },
+            {
+                "path": "src/modules/sensors/Ds2423",
+                "active": false
+            }
+        ],
+        "screens": [
+            {
+                "path": "src/modules/display/DwinI",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/Lcd2004",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/Nextion",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/NextionUpload",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/Oled128",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/Oled64",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/Smi2_m",
+                "active": true
+            },
+            {
+                "path": "src/modules/display/TM16XX",
+                "active": false
+            },
+            {
+                "path": "src/modules/display/Ws2812b",
+                "active": false
+            }
+        ]
+    }
+}

data_svelte/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+
+    <title>IoT Manager 4.6.2</title>
+
+    <link rel="icon" type="image/png" href="/favicon.ico" />
+    <link rel="stylesheet" href="/build/bundle.css?4550" />
+
+    <script defer src="/build/bundle.js?4550"></script>
+  </head>
+
+  <body></body>
+</html>

data_svelte/layout.json

@@ -0,0 +1 @@
+[]

data_svelte/ota.json

@@ -0,0 +1 @@
+{}

data_svelte/settings.json

@@ -0,0 +1,28 @@
+{
+    "name": "IoTmanagerVer4",
+    "apssid": "IoTmanager",
+    "appass": "",
+    "routerssid": "iot",
+    "routerpass": "hostel3333",
+    "timezone": 2,
+    "ntp": "pool.ntp.org",
+    "weblogin": "admin",
+    "webpass": "admin",
+    "mqttServer": "",
+    "mqttPort": 8021,
+    "mqttPrefix": "/risenew",
+    "mqttUser": "rise",
+    "mqttPass": "3hostel3",
+    "serverip": "http://iotmanager.org",
+    "serverlocal": "http://192.168.1.2:5500",
+    "log": 0,
+    "mqttin": 0,
+    "i2c": 0,
+    "pinSCL": 0,
+    "pinSDA": 0,
+    "i2cFreq": 100000,
+    "wg": "group1",
+    "debugTraceMsgTlgrm": 1,
+    "udps": 1,
+    "settings_": ""
+}

data_svelte/values.json

@@ -0,0 +1,3 @@
+{
+
+}

data_svelte/widgets.json

@@ -0,0 +1,369 @@
+[
+    {
+        "name": "anydataRed",
+        "label": "Сообщение1",
+        "widget": "anydata",
+        "icon": "body",
+        "color": "red",
+        "descrColor": "red"
+    },
+    {
+        "name": "anydataDgr",
+        "label": "Сообщение2",
+        "widget": "anydata",
+        "after": "",
+        "color": "red",
+        "icon": "walk"
+    },
+    {
+        "name": "anydataDef",
+        "label": "Текст",
+        "widget": "anydata",
+        "after": "",
+        "icon": ""
+    },
+    {
+        "name": "anydataVlt",
+        "label": "Вольты",
+        "widget": "anydata",
+        "after": "V",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataAmp",
+        "label": "Амперы",
+        "widget": "anydata",
+        "after": "A",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataWt",
+        "label": "Ватты",
+        "widget": "anydata",
+        "after": "Wt",
+        "icon": "speedometer",
+        "color": [
+            {
+                "level": 0,
+                "value": ""
+            },
+            {
+                "level": 200,
+                "value": "#009933"
+            },
+            {
+                "level": 2000,
+                "value": "#FF9900"
+            },
+            {
+                "level": 4000,
+                "value": "red"
+            }
+        ]
+    },
+    {
+        "name": "anydataWth",
+        "label": "Энергия",
+        "widget": "anydata",
+        "after": "kWh",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataHtz",
+        "label": "Герцы",
+        "widget": "anydata",
+        "after": "Hz",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataTmp",
+        "label": "Температура",
+        "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"
+            }
+        ]
+    },
+    {
+        "name": "anydataMm",
+        "label": "Давление",
+        "widget": "anydata",
+        "after": "mm",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataHum",
+        "label": "Влажность",
+        "widget": "anydata",
+        "after": "%",
+        "icon": "water",
+        "color": "#88AADF"
+    },
+    {
+        "name": "anydataTm",
+        "label": "Время",
+        "widget": "anydata",
+        "after": "",
+        "icon": "speedometer"
+    },
+    {
+        "name": "button",
+        "label": "Кнопка",
+        "widget": "btn",
+        "size": "large",
+        "color": "green",
+        "send": "test"
+    },
+    {
+        "name": "toggle",
+        "label": "Переключатель",
+        "widget": "toggle",
+        "icon": "",
+        "iconOff": ""
+    },
+    {
+        "name": "chart1",
+        "label": "График без точек",
+        "widget": "chart",
+        "dateFormat": "HH:mm",
+        "maxCount": 86400,
+        "pointRadius": 0
+    },
+    {
+        "name": "chart2",
+        "label": "График с точками",
+        "widget": "chart",
+        "maxCount": 86400,
+        "dateFormat": "HH:mm"
+    },
+    {
+        "name": "chart3",
+        "label": "График Дневной",
+        "widget": "chart",
+        "dateFormat": "DD.MM.YYYY",
+        "maxCount": 86400,
+        "type": "bar"
+    },
+    {
+        "name": "chart4",
+        "label": "График Часовой",
+        "widget": "chart",
+        "dateFormat": "HH:mm",
+        "maxCount": 3600,
+        "type": "bar"
+    },
+    {
+        "name": "chart5",
+        "label": "График двойной",
+        "widget": "chart",
+        "series": [
+          "Температура, С",
+          "Влажность, %"
+          ],
+        "dateFormat": "HH:mm",
+        "maxCount": 86400,
+        "pointRadius": 0
+    },
+    {
+        "name": "chart6",
+        "label": "График тройной",
+        "widget": "chart",
+        "series": [
+          "Температура, С",
+          "Влажность, %",
+          "Давление, кПа"
+          ],
+        "dateFormat": "HH:mm",
+        "maxCount": 86400,
+        "pointRadius": 0
+    },
+    {
+        "name": "fillgauge",
+        "label": "Бочка",
+        "widget": "fillgauge",
+        "circleColor": "#00FFFF",
+        "textColor": "#FFFFFF",
+        "waveTextColor": "#000000",
+        "waveColor": "#00FFFF"
+    },
+    {
+        "name": "inputDate",
+        "label": "Ввод даты",
+        "widget": "input",
+        "size": "small",
+        "color": "orange",
+        "type": "date"
+    },
+    {
+        "name": "inputDgt",
+        "label": "Ввод числа",
+        "widget": "input",
+        "color": "blue",
+        "type": "number"
+    },
+    {
+        "name": "inputTxt",
+        "label": "Ввод текста",
+        "widget": "input",
+        "size": "small",
+        "color": "orange",
+        "type": "text"
+    },
+    {
+        "name": "inputTm",
+        "label": "Ввод времени",
+        "widget": "input",
+        "color": "blue",
+        "type": "time"
+    },
+    {
+        "name": "progressLine",
+        "label": "Статус линия",
+        "widget": "progress-line",
+        "icon": "sunny",
+        "max": "100",
+        "stroke": "10"
+    },
+    {
+        "name": "progressRound",
+        "label": "Статус круг",
+        "widget": "progress-round",
+        "max": "100",
+        "stroke": "20",
+        "color": "#45ccce",
+        "background": "#777",
+        "semicircle": "1"
+    },
+    {
+        "name": "range",
+        "label": "Ползунок",
+        "widget": "range",
+        "descrColor": "red",
+        "after": "%",
+        "k": 0.0977,
+        "min": 0,
+        "max": 100,
+        "debounce": 500
+    },
+    {
+        "name": "rangeServo",
+        "label": "Ползунок (Servo)",
+        "widget": "range",
+        "descrColor": "red",
+        "after": "°",
+        "k": 1,
+        "min": 0,
+        "max": 180,
+        "debounce": 500
+    },
+    {
+        "name": "select",
+        "label": "Выпадающий",
+        "widget": "select",
+        "options": [
+            "Выключен",
+            "Включен"
+        ],
+        "status": 0
+    },
+    {
+        "name": "anydataPpm",
+        "label": "PPM",
+        "widget": "anydata",
+        "after": "ppm",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydatamAmp",
+        "label": "миллиАмперы",
+        "widget": "anydata",
+        "after": "mAmp",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydatamVlt",
+        "label": "миллиВольты",
+        "widget": "anydata",
+        "after": "mVlt",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydatamWt",
+        "label": "миллиВатты",
+        "widget": "anydata",
+        "after": "mWt",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataCm",
+        "label": "Сантиметры",
+        "widget": "anydata",
+        "after": "cm",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataLiter",
+        "label": "Литры",
+        "widget": "anydata",
+        "after": "ltr",
+        "icon": "speedometer"
+    }, 
+    {
+        "name": "anydataSpeed",
+        "label": "мерты в секунду",
+        "widget": "anydata",
+        "after": "m/s",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataСorner",
+        "label": "угол градусов",
+        "widget": "anydata",
+        "after": "°",
+        "icon": "speedometer"
+    },
+    {
+        "name": "anydataBar",
+        "label": "давление Bar",
+        "widget": "anydata",
+        "after": "Kg/cm²",
+        "icon": "speedometer"
+    },  
+    {
+        "name": "nil",
+        "label": "Без виджета"
+    }
+]

dependencies/WiFiClientSecure/WiFiClientSecure.cpp

@@ -1,197 +0,0 @@
-/*
-  WiFiClientSecure.cpp - Client Secure class for ESP32
-  Copyright (c) 2016 Hristo Gochkov  All right reserved.
-  Additions Copyright (C) 2017 Evandro Luis Copercini.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "WiFiClientSecure.h"
-#include <lwip/sockets.h>
-#include <lwip/netdb.h>
-#include <errno.h>
-
-#undef connect
-#undef write
-#undef read
-
-
-WiFiClientSecure::WiFiClientSecure()
-{
-    _connected = false;
-
-    sslclient = new sslclient_context;
-    ssl_init(sslclient);
-    sslclient->socket = -1;
-
-    _CA_cert = NULL;
-    _cert = NULL;
-    _private_key = NULL;
-	next = NULL;			
-}
-
-
-WiFiClientSecure::WiFiClientSecure(int sock)
-{
-    _connected = false;
-
-    sslclient = new sslclient_context;
-    ssl_init(sslclient);
-    sslclient->socket = sock;
-
-    if (sock >= 0) {
-        _connected = true;
-    }
-
-    _CA_cert = NULL;
-    _cert = NULL;
-    _private_key = NULL;
-    next = NULL;				
-}
-
-WiFiClientSecure::~WiFiClientSecure()
-{
-    stop();
-}
-
-WiFiClientSecure &WiFiClientSecure::operator=(const WiFiClientSecure &other)
-{
-    stop();
-    sslclient->socket = other.sslclient->socket;
-    _connected = other._connected;
-    return *this;
-}
-
-void WiFiClientSecure::stop()
-{
-    if (sslclient->socket >= 0) {
-        close(sslclient->socket);
-        sslclient->socket = -1;
-        _connected = false;
-    }
-    stop_ssl_socket(sslclient, _CA_cert, _cert, _private_key);
-}
-
-int WiFiClientSecure::connect(IPAddress ip, uint16_t port)
-{
-    return connect(ip, port, _CA_cert, _cert, _private_key);
-}
-
-int WiFiClientSecure::connect(const char *host, uint16_t port)
-{
-    return connect(host, port, _CA_cert, _cert, _private_key);
-}
-
-int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *_CA_cert, const char *_cert, const char *_private_key)
-{
-    int ret = start_ssl_client(sslclient, ip, port, _CA_cert, _cert, _private_key);
-    if (ret < 0) {
-        log_e("lwip_connect_r: %d", errno);
-        stop();
-        return 0;
-    }
-    _connected = true;
-    return 1;
-}
-
-int WiFiClientSecure::connect(const char *host, uint16_t port, const char *_CA_cert, const char *_cert, const char *_private_key)
-{
-    struct hostent *server;
-    server = gethostbyname(host);
-    if (server == NULL) {
-        return 0;
-    }
-    IPAddress srv((const uint8_t *)(server->h_addr));
-    return connect(srv, port, _CA_cert, _cert, _private_key);
-}
-
-
-size_t WiFiClientSecure::write(uint8_t data)
-{
-    return write(&data, 1);
-}
-
-int WiFiClientSecure::read()
-{
-    uint8_t data = 0;
-    int res = read(&data, 1);
-    if (res < 0) {
-        return res;
-    }
-    return data;
-}
-
-size_t WiFiClientSecure::write(const uint8_t *buf, size_t size)
-{
-    if (!_connected) {
-        return 0;
-    }
-    int res = send_ssl_data(sslclient, buf, size);
-    if (res < 0) {
-						   
-        stop();
-        res = 0;
-    }
-    return res;
-}
-
-int WiFiClientSecure::read(uint8_t *buf, size_t size)
-{
-    if (!available()) {
-        return -1;
-    }
-    int res = get_ssl_receive(sslclient, buf, size);
-    if (res < 0) {
-							
-        stop();
-    }
-    return res;
-}
-
-int WiFiClientSecure::available()
-{
-    if (!_connected) {
-        return 0;
-    }
-    int res = data_to_read(sslclient);
-    if (res < 0 ) {
-        stop();
-    }	
-    return res;
-}
-
-uint8_t WiFiClientSecure::connected()
-{
-    uint8_t dummy = 0;
-    read(&dummy, 0);
-
-    return _connected;
-}
-
-void WiFiClientSecure::setCACert (const char *rootCA)
-{
-    _CA_cert = rootCA;
-}
-
-void WiFiClientSecure::setCertificate (const char *client_ca)
-{
-    _cert = client_ca;
-}
-
-void WiFiClientSecure::setPrivateKey (const char *private_key)
-{
-    _private_key = private_key;
-}
-

dependencies/WiFiClientSecure/WiFiClientSecure.h

@@ -1,92 +0,0 @@
-/*
-  WiFiClientSecure.h - Base class that provides Client SSL to ESP32
-  Copyright (c) 2011 Adrian McEwen.  All right reserved.
-  Additions Copyright (C) 2017 Evandro Luis Copercini.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef WiFiClientSecure_h
-#define WiFiClientSecure_h
-#include "Arduino.h"
-#include "IPAddress.h"
-#include <WiFi.h>
-#include "ssl_client.h"
-
-class WiFiClientSecure : public Client
-{
-protected:
-    bool _connected;
-    sslclient_context *sslclient;
-
-    const char *_CA_cert;
-    const char *_cert;
-    const char *_private_key;
-
-public:
-    WiFiClientSecure *next;
-    WiFiClientSecure();
-    WiFiClientSecure(int socket);
-    ~WiFiClientSecure();
-    int connect(IPAddress ip, uint16_t port);
-    int connect(const char *host, uint16_t port);
-    int connect(IPAddress ip, uint16_t port, const char *rootCABuff, const char *cli_cert, const char *cli_key);
-    int connect(const char *host, uint16_t port, const char *rootCABuff, const char *cli_cert, const char *cli_key);
-    size_t write(uint8_t data);
-    size_t write(const uint8_t *buf, size_t size);
-    int available();
-    int read();
-    int read(uint8_t *buf, size_t size);
-    int peek()
-    {
-        return 0;
-    }
-    void flush() {}
-    void stop();
-    uint8_t connected();
-
-    void setCACert(const char *rootCA);
-    void setCertificate(const char *client_ca);
-    void setPrivateKey (const char *private_key);
-
-    operator bool()
-    {
-        return connected();
-    }
-    WiFiClientSecure &operator=(const WiFiClientSecure &other);
-    bool operator==(const bool value)
-    {
-        return bool() == value;
-    }
-    bool operator!=(const bool value)
-    {
-        return bool() != value;
-    }
-    bool operator==(const WiFiClientSecure &);
-    bool operator!=(const WiFiClientSecure &rhs)
-    {
-        return !this->operator==(rhs);
-    };
-
-    int socket()
-    {
-        return sslclient->socket = -1;
-    }
-
-    //friend class WiFiServer;
-    using Print::write;
-};
-
-#endif /* _WIFICLIENT_H_ */

dependencies/WiFiClientSecure/ssl_client.cpp

@@ -1,261 +0,0 @@
-/* Provide SSL/TLS functions to ESP32 with Arduino IDE
-*
-* Adapted from the ssl_client1 example of mbedtls.
-*
-* Original Copyright (C) 2006-2015, ARM Limited, All Rights Reserved, Apache 2.0 License.
-* Additions Copyright (C) 2017 Evandro Luis Copercini, Apache 2.0 License.
-*/
-
-#include "Arduino.h"
-#include <esp32-hal-log.h>
-#include <lwip/sockets.h>
-#include <lwip/err.h>
-#include <lwip/sockets.h>
-#include <lwip/sys.h>
-#include <lwip/netdb.h>
-#include "ssl_client.h"
-
-const char *pers = "esp32-tls";
-
-static int handle_error(int err)
-{
-#ifdef MBEDTLS_ERROR_C
-    char error_buf[100];
-    mbedtls_strerror(err, error_buf, 100);
-    log_e("%s", error_buf);
-#endif
-    log_e("MbedTLS message code: %d", err);
-    return err;
-}
-
-
-void ssl_init(sslclient_context *ssl_client)
-{
-    mbedtls_ssl_init(&ssl_client->ssl_ctx);
-    mbedtls_ssl_config_init(&ssl_client->ssl_conf);
-    mbedtls_ctr_drbg_init(&ssl_client->drbg_ctx);
-}
-
-
-int start_ssl_client(sslclient_context *ssl_client, uint32_t ipAddress, uint32_t port, const char *rootCABuff, const char *cli_cert, const char *cli_key)
-{
-    char buf[512];
-    int ret, flags, timeout;
-    int enable = 1;
-    log_i("Free heap before TLS %u", xPortGetFreeHeapSize());
-
-    log_i("Starting socket");
-    ssl_client->socket = -1;
-
-    ssl_client->socket = lwip_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if (ssl_client->socket < 0) {
-        log_e("ERROR opening socket");
-        return ssl_client->socket;
-    }
-
-    struct sockaddr_in serv_addr;
-    memset(&serv_addr, 0, sizeof(serv_addr));
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_addr.s_addr = ipAddress;
-    serv_addr.sin_port = htons(port);
-
-    if (lwip_connect(ssl_client->socket, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == 0) {
-        timeout = 30000;
-        lwip_setsockopt(ssl_client->socket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
-        lwip_setsockopt(ssl_client->socket, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout));
-        lwip_setsockopt(ssl_client->socket, IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(enable));
-        lwip_setsockopt(ssl_client->socket, SOL_SOCKET, SO_KEEPALIVE, &enable, sizeof(enable));
-    } else {
-        log_e("Connect to Server failed!");
-        return -1;
-    }
-
-    fcntl( ssl_client->socket, F_SETFL, fcntl( ssl_client->socket, F_GETFL, 0 ) | O_NONBLOCK );
-
-    log_i("Seeding the random number generator");
-    mbedtls_entropy_init(&ssl_client->entropy_ctx);
-
-    ret = mbedtls_ctr_drbg_seed(&ssl_client->drbg_ctx, mbedtls_entropy_func,
-                                &ssl_client->entropy_ctx, (const unsigned char *) pers, strlen(pers));
-    if (ret < 0) {
-        return handle_error(ret);
-    }
-
-    log_i("Setting up the SSL/TLS structure...");
-
-    if ((ret = mbedtls_ssl_config_defaults(&ssl_client->ssl_conf,
-                                           MBEDTLS_SSL_IS_CLIENT,
-                                           MBEDTLS_SSL_TRANSPORT_STREAM,
-                                           MBEDTLS_SSL_PRESET_DEFAULT)) != 0) {
-        return handle_error(ret);
-    }
-
-    /* MBEDTLS_SSL_VERIFY_REQUIRED if a CA certificate is defined on Arduino IDE and
-        MBEDTLS_SSL_VERIFY_NONE if not.
-        */
-    if (rootCABuff != NULL) {
-        log_i("Loading CA cert");
-        mbedtls_x509_crt_init(&ssl_client->ca_cert);
-        mbedtls_ssl_conf_authmode(&ssl_client->ssl_conf, MBEDTLS_SSL_VERIFY_REQUIRED);
-        ret = mbedtls_x509_crt_parse(&ssl_client->ca_cert, (const unsigned char *)rootCABuff, strlen(rootCABuff) + 1);
-        mbedtls_ssl_conf_ca_chain(&ssl_client->ssl_conf, &ssl_client->ca_cert, NULL);
-        //mbedtls_ssl_conf_verify(&ssl_client->ssl_ctx, my_verify, NULL );
-        if (ret < 0) {
-            return handle_error(ret);
-        }
-    } else {
-        mbedtls_ssl_conf_authmode(&ssl_client->ssl_conf, MBEDTLS_SSL_VERIFY_NONE);
-        log_i("WARNING: Use certificates for a more secure communication!");
-    }
-
-    if (cli_cert != NULL && cli_key != NULL) {
-        mbedtls_x509_crt_init(&ssl_client->client_cert);
-        mbedtls_pk_init(&ssl_client->client_key);
-
-        log_i("Loading CRT cert");
-
-        ret = mbedtls_x509_crt_parse(&ssl_client->client_cert, (const unsigned char *)cli_cert, strlen(cli_cert) + 1);
-        if (ret < 0) {
-            return handle_error(ret);
-        }
-
-        log_i("Loading private key");
-        ret = mbedtls_pk_parse_key(&ssl_client->client_key, (const unsigned char *)cli_key, strlen(cli_key) + 1, NULL, 0);
-
-        if (ret != 0) {
-            return handle_error(ret);
-        }
-
-        mbedtls_ssl_conf_own_cert(&ssl_client->ssl_conf, &ssl_client->client_cert, &ssl_client->client_key);
-    }
-
-    /*
-        // TODO: implement match CN verification
-
-        log_i("Setting hostname for TLS session...");
-
-                // Hostname set here should match CN in server certificate
-        if((ret = mbedtls_ssl_set_hostname(&ssl_client->ssl_ctx, host)) != 0)
-        {
-            return handle_error(ret);
-
-        }
-    */
-
-    mbedtls_ssl_conf_rng(&ssl_client->ssl_conf, mbedtls_ctr_drbg_random, &ssl_client->drbg_ctx);
-
-    if ((ret = mbedtls_ssl_setup(&ssl_client->ssl_ctx, &ssl_client->ssl_conf)) != 0) {
-        return handle_error(ret);
-    }
-
-    mbedtls_ssl_set_bio(&ssl_client->ssl_ctx, &ssl_client->socket, mbedtls_net_send, mbedtls_net_recv, NULL );
-
-    log_i("Performing the SSL/TLS handshake...");
-
-    while ((ret = mbedtls_ssl_handshake(&ssl_client->ssl_ctx)) != 0) {
-        if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE && ret != -76) {  //workaround for bug: https://github.com/espressif/esp-idf/issues/434
-            return handle_error(ret);
-        }
-        delay(10);
-        vPortYield();
-    }
-
-
-    if (cli_cert != NULL && cli_key != NULL) {
-        log_i("Protocol is %s Ciphersuite is %s", mbedtls_ssl_get_version(&ssl_client->ssl_ctx), mbedtls_ssl_get_ciphersuite(&ssl_client->ssl_ctx));
-        if ((ret = mbedtls_ssl_get_record_expansion(&ssl_client->ssl_ctx)) >= 0) {
-            log_i("Record expansion is %d", ret);
-        } else {
-            log_i("Record expansion is unknown (compression)");
-        }
-    }
-
-    log_i("Verifying peer X.509 certificate...");
-
-    if ((flags = mbedtls_ssl_get_verify_result(&ssl_client->ssl_ctx)) != 0) {
-        log_e("Failed to verify peer certificate!");
-        bzero(buf, sizeof(buf));
-        mbedtls_x509_crt_verify_info(buf, sizeof(buf), "  ! ", flags);
-        log_e("verification info: %s", buf);
-        stop_ssl_socket(ssl_client, rootCABuff, cli_cert, cli_key);  //It's not safe continue.
-        return handle_error(ret);
-    } else {
-        log_i("Certificate verified.");
-    }
-
-    log_i("Free heap after TLS %u", xPortGetFreeHeapSize());
-
-    return ssl_client->socket;
-}
-
-
-void stop_ssl_socket(sslclient_context *ssl_client, const char *rootCABuff, const char *cli_cert, const char *cli_key)
-{
-    log_i("Cleaning SSL connection.");
-
-    if (ssl_client->socket >= 0) {
-        close(ssl_client->socket);
-        ssl_client->socket = -1;
-    }
-
-    mbedtls_ssl_free(&ssl_client->ssl_ctx);
-    mbedtls_ssl_config_free(&ssl_client->ssl_conf);
-    mbedtls_ctr_drbg_free(&ssl_client->drbg_ctx);
-    mbedtls_entropy_free(&ssl_client->entropy_ctx);
-
-    if (rootCABuff != NULL) {
-        mbedtls_x509_crt_free(&ssl_client->ca_cert);
-    }
-
-    if (cli_cert != NULL) {
-        mbedtls_x509_crt_free(&ssl_client->client_cert);
-    }
-
-    if (cli_key != NULL) {
-        mbedtls_pk_free(&ssl_client->client_key);
-    }
-}
-
-
-int data_to_read(sslclient_context *ssl_client)
-{
-    int ret, res;
-    ret = mbedtls_ssl_read(&ssl_client->ssl_ctx, NULL, 0);
-    //log_e("RET: %i",ret);   //for low level debug
-    res = mbedtls_ssl_get_bytes_avail(&ssl_client->ssl_ctx);
-    //log_e("RES: %i",res);
-    if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE && ret < 0 && ret != -76) {
-        return handle_error(ret);
-    }
-
-    return res;
-}
-
-
-int send_ssl_data(sslclient_context *ssl_client, const uint8_t *data, uint16_t len)
-{
-    //log_i("Writing HTTP request...");  //for low level debug
-    int ret = -1;
-
-    while ((ret = mbedtls_ssl_write(&ssl_client->ssl_ctx, data, len)) <= 0) {
-        if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE && ret != -76) {
-            return handle_error(ret);
-        }
-    }
-
-    len = ret;
-    //log_i("%d bytes written", len);  //for low level debug
-    return ret;
-}
-
-
-int get_ssl_receive(sslclient_context *ssl_client, uint8_t *data, int length)
-{
-    //log_i( "Reading HTTP response...");   //for low level debug
-    int ret = -1;
-
-    ret = mbedtls_ssl_read(&ssl_client->ssl_ctx, data, length);
-
-    //log_i( "%d bytes readed", ret);   //for low level debug
-    return ret;
-}

dependencies/WiFiClientSecure/ssl_client.h

@@ -1,37 +0,0 @@
-/* Provide SSL/TLS functions to ESP32 with Arduino IDE
- * by Evandro Copercini - 2017 - Apache 2.0 License
- */
-
-#ifndef ARD_SSL_H
-#define ARD_SSL_H
-#include "mbedtls/platform.h"
-#include "mbedtls/net.h"
-#include "mbedtls/debug.h"
-#include "mbedtls/ssl.h"
-#include "mbedtls/entropy.h"
-#include "mbedtls/ctr_drbg.h"
-#include "mbedtls/error.h"
-
-typedef struct sslclient_context {
-    int socket;
-    mbedtls_net_context net_ctx;
-    mbedtls_ssl_context ssl_ctx;
-    mbedtls_ssl_config ssl_conf;
-
-    mbedtls_ctr_drbg_context drbg_ctx;
-    mbedtls_entropy_context entropy_ctx;
-
-    mbedtls_x509_crt ca_cert;
-    mbedtls_x509_crt client_cert;
-    mbedtls_pk_context client_key;
-} sslclient_context;
-
-
-void ssl_init(sslclient_context *ssl_client);
-int start_ssl_client(sslclient_context *ssl_client, uint32_t ipAddress, uint32_t port, const char *rootCABuff, const char *cli_cert, const char *cli_key);
-void stop_ssl_socket(sslclient_context *ssl_client, const char *rootCABuff, const char *cli_cert, const char *cli_key);
-int data_to_read(sslclient_context *ssl_client);
-int send_ssl_data(sslclient_context *ssl_client, const uint8_t *data, uint16_t len);
-int get_ssl_receive(sslclient_context *ssl_client, uint8_t *data, int length);
-
-#endif

esp32-esp8266_iot-manager_modules_firmware.ino

@@ -1,81 +0,0 @@
-#include "set.h"
-
-void setup() {
-
-  Serial.begin(115200);
-  Serial.setDebugOutput(true);
-  Serial.println("--------------started----------------");
-  //--------------------------------------------------------------
-  SPIFFS.begin();
-  configSetup = readFile("config.json", 4096);
-  Serial.println(configSetup);
-  jsonWrite(configJson, "SSDP", jsonRead(configSetup, "SSDP"));
-  jsonWrite(configJson, "lang", jsonRead(configSetup, "lang"));
-  Serial.println("SPIFFS_init");
-
-#ifdef ESP32
-  uint32_t chipID_u = ESP.getEfuseMac();
-  chipID = String(chipID_u);
-  jsonWrite(configSetup, "chipID", chipID);
-#endif
-
-#ifdef ESP8266
-  chipID = String( ESP.getChipId() ) + "-" + String( ESP.getFlashChipId());
-  jsonWrite(configSetup, "chipID", chipID);
-  Serial.setDebugOutput(0);
-#endif
-
-  prex = prefix + "/" + chipID;
-  Serial.println(chipID);
-  //--------------------------------------------------------------
-  CMD_init();
-  Serial.println("[V] CMD_init");
-  //--------------------------------------------------------------
-  All_init();
-  Serial.println("[V] All_init");
-  //--------------------------------------------------------------
-  WIFI_init();
-  Serial.println("[V] WIFI_init");
-  //--------------------------------------------------------------
-  Web_server_init();
-  Serial.println("[V] Web_server_init");
-  //--------------------------------------------------------------
-  Time_Init();
-  Serial.println("[V] Time_Init");
-  //--------------------------------------------------------------
-  MQTT_init();
-  Serial.println("[V] MQTT_init");
-  //--------------------------------------------------------------
-  Push_init();
-  Serial.println("[V] Push_init");
-
-
-  getMemoryLoad("[i] After loading");
-
-
-  ts.add(TEST, 5000, [&](void*) {
-
-    up_time();
-
-  }, nullptr, true);
-
-}
-
-void loop() {
-
-#ifdef OTA_enable
-  ArduinoOTA.handle();
-#endif
-
-#ifdef WS_enable
-  ws.cleanupClients();
-#endif
-
-  handleMQTT();
-
-  handleCMD_loop();
-  handleButton();
-  handleScenario();
-
-  ts.update();
-}

include/AsyncWebServer.h

@@ -0,0 +1,12 @@
+#pragma once
+#include "Global.h"
+#ifdef ASYNC_WEB_SERVER
+void asyncWebServerInit();
+#endif
+
+#ifdef ASYNC_WEB_SOCKETS
+extern AsyncWebSocket ws;
+extern AsyncEventSource events;
+void asyncWebSocketsInit();
+void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventType type, void *arg, uint8_t *data, size_t len);
+#endif

include/Buffers.h

@@ -0,0 +1,7 @@
+//#pragma once
+//#include "Global.h"
+//#include "MqttClient.h"
+
+//void eventGen2(String eventName, String eventValue);
+//extern void spaceCmdExecute(String &cmdStr);
+//extern String getValueJson(String &key);

include/BuildTime.h

@@ -0,0 +1,80 @@
+/*
+    Парсинг и получение даты и времени компиляции из __DATE__ и __TIME__
+    Документация:
+    GitHub: https://github.com/GyverLibs/buildTime
+    Константы времени компиляции:
+    BUILD_YEAR	- год
+    BUILD_MONTH	- месяц
+    BUILD_DAY	- день
+    BUILD_HOUR	- час
+    BUILD_MIN	- минута
+    BUILD_SEC	- секунда
+
+    Исходник http://qaru.site/questions/186859/how-to-use-date-and-time-predefined-macros-in-as-two-integers-then-stringify
+    AlexGyver, alex@alexgyver.ru
+    https://alexgyver.ru/
+    MIT License
+
+    Версии:
+    v1.0 - релиз
+*/
+
+#ifndef buildTime_h
+#define buildTime_h
+// Example of __DATE__ string: "Jul 27 2012"
+//                              01234567890
+
+#define BUILD_YEAR_CH0 (__DATE__[7] - '0')
+#define BUILD_YEAR_CH1 (__DATE__[8] - '0')
+#define BUILD_YEAR_CH2 (__DATE__[9] - '0')
+#define BUILD_YEAR_CH3 (__DATE__[10] - '0')
+#define BUILD_YEAR (BUILD_YEAR_CH0 * 1000 + BUILD_YEAR_CH1 * 100 + BUILD_YEAR_CH2 * 10 + BUILD_YEAR_CH3)
+
+#define BUILD_MONTH_IS_JAN (__DATE__[0] == 'J' && __DATE__[1] == 'a' && __DATE__[2] == 'n')
+#define BUILD_MONTH_IS_FEB (__DATE__[0] == 'F')
+#define BUILD_MONTH_IS_MAR (__DATE__[0] == 'M' && __DATE__[1] == 'a' && __DATE__[2] == 'r')
+#define BUILD_MONTH_IS_APR (__DATE__[0] == 'A' && __DATE__[1] == 'p')
+#define BUILD_MONTH_IS_MAY (__DATE__[0] == 'M' && __DATE__[1] == 'a' && __DATE__[2] == 'y')
+#define BUILD_MONTH_IS_JUN (__DATE__[0] == 'J' && __DATE__[1] == 'u' && __DATE__[2] == 'n')
+#define BUILD_MONTH_IS_JUL (__DATE__[0] == 'J' && __DATE__[1] == 'u' && __DATE__[2] == 'l')
+#define BUILD_MONTH_IS_AUG (__DATE__[0] == 'A' && __DATE__[1] == 'u')
+#define BUILD_MONTH_IS_SEP (__DATE__[0] == 'S')
+#define BUILD_MONTH_IS_OCT (__DATE__[0] == 'O')
+#define BUILD_MONTH_IS_NOV (__DATE__[0] == 'N')
+#define BUILD_MONTH_IS_DEC (__DATE__[0] == 'D')
+
+#define BUILD_MONTH                                          \
+    (                                                        \
+        (BUILD_MONTH_IS_JAN) ? 1 : (BUILD_MONTH_IS_FEB) ? 2  \
+                               : (BUILD_MONTH_IS_MAR)   ? 3  \
+                               : (BUILD_MONTH_IS_APR)   ? 4  \
+                               : (BUILD_MONTH_IS_MAY)   ? 5  \
+                               : (BUILD_MONTH_IS_JUN)   ? 6  \
+                               : (BUILD_MONTH_IS_JUL)   ? 7  \
+                               : (BUILD_MONTH_IS_AUG)   ? 8  \
+                               : (BUILD_MONTH_IS_SEP)   ? 9  \
+                               : (BUILD_MONTH_IS_OCT)   ? 10 \
+                               : (BUILD_MONTH_IS_NOV)   ? 11 \
+                               : (BUILD_MONTH_IS_DEC)   ? 12 \
+                                                        : /* error default */ '?')
+
+#define BUILD_DAY_CH0 (((__DATE__[4] >= '0') ? (__DATE__[4]) : '0') - '0')
+#define BUILD_DAY_CH1 (__DATE__[5] - '0')
+#define BUILD_DAY (BUILD_DAY_CH0 * 10 + BUILD_DAY_CH1)
+
+// Example of __TIME__ string: "21:06:19"
+//                              01234567
+
+#define BUILD_HOUR_CH0 (__TIME__[0] - '0')
+#define BUILD_HOUR_CH1 (__TIME__[1] - '0')
+#define BUILD_HOUR (BUILD_HOUR_CH0 * 10 + BUILD_HOUR_CH1)
+
+#define BUILD_MIN_CH0 (__TIME__[3] - '0')
+#define BUILD_MIN_CH1 (__TIME__[4] - '0')
+#define BUILD_MIN (BUILD_MIN_CH0 * 10 + BUILD_MIN_CH1)
+
+#define BUILD_SEC_CH0 (__TIME__[6] - '0')
+#define BUILD_SEC_CH1 (__TIME__[7] - '0')
+#define BUILD_SEC (BUILD_SEC_CH0 * 10 + BUILD_SEC_CH1)
+
+#endif

include/Const.h

@@ -0,0 +1,153 @@
+#pragma once
+#include "BuildTime.h"
+
+// Версия прошивки
+
+#define FIRMWARE_VERSION 462
+
+#ifdef esp8266_1mb_ota
+#define FIRMWARE_NAME "esp8266_1mb_ota"
+#endif
+
+#ifdef esp8266_1mb
+#define FIRMWARE_NAME "esp8266_1mb"
+#endif
+
+#ifdef esp8266_2mb
+#define FIRMWARE_NAME "esp8266_2mb"
+#endif
+
+#ifdef esp8266_2mb_ota
+#define FIRMWARE_NAME "esp8266_2mb_ota"
+#endif
+
+#ifdef esp8266_4mb
+#define FIRMWARE_NAME "esp8266_4mb"
+#endif
+
+#ifdef esp8266_16mb
+#define FIRMWARE_NAME "esp8266_16mb"
+#endif
+
+#ifdef esp32_4mb
+#define FIRMWARE_NAME "esp32_4mb"
+#endif
+
+#ifdef esp32_4mb3f
+#define FIRMWARE_NAME "esp32_4mb3f"
+#endif
+
+#ifdef esp32cam_4mb
+#define FIRMWARE_NAME "esp32cam_4mb"
+#endif
+
+#ifdef esp32_16mb
+#define FIRMWARE_NAME "esp32_16mb"
+#endif
+
+#ifdef esp32s2_4mb
+#define FIRMWARE_NAME "esp32s2_4mb"
+#endif
+
+#ifdef esp32c3m_4mb
+#define FIRMWARE_NAME "esp32c3m_4mb"
+#endif
+
+#ifdef esp32s3_16mb
+#define FIRMWARE_NAME "esp32s3_16mb"
+#endif
+
+#ifdef bk7231n
+#define FIRMWARE_NAME "bk7231n"
+#endif
+
+#ifdef esp32c6_4mb
+#define FIRMWARE_NAME "esp32c6_4mb"
+#endif
+
+#ifdef esp32c6_8mb
+#define FIRMWARE_NAME "esp32c6_8mb"
+#endif
+
+#ifdef esp32_wifirep
+#define FIRMWARE_NAME "esp32_wifirep"
+#endif
+// Размер буфера json
+#define JSON_BUFFER_SIZE 4096  // держим 2 кб не меняем
+
+/*
+WEB_SOCKETS_FRAME_SIZE создан для того что бы не загружать оперативку.
+Эта технология передаёт в сокеты большие файлы по частям.
+Чем меньше этот фрейм тем теоретически лучше.
+Но и сильно малый он тоже быть не должен.
+Я опытным путём установил что размер 1024 является оптимальным. Можно так же поставить 2048
+*/
+#define WEB_SOCKETS_FRAME_SIZE 1024
+
+// #define LOOP_DEBUG
+
+// выбор сервера
+// #define ASYNC_WEB_SERVER
+// #define ASYNC_WEB_SOCKETS
+#define STANDARD_WEB_SERVER
+#define STANDARD_WEB_SOCKETS
+
+//#ifndef LIBRETINY
+#define UDP_ENABLED
+//#endif
+// #define REST_FILE_OPERATIONS
+
+#define MQTT_RECONNECT_INTERVAL 20000
+
+#define TELEMETRY_UPDATE_INTERVAL_MIN 60
+
+#define USE_LITTLEFS true
+
+#define START_DATETIME 1661990400  // 01.09.2022 00:00:00 константа для сокращения unix time
+
+#define MIN_DATETIME 1575158400
+#define LEAP_YEAR(Y) (((1970 + Y) > 0) && !((1970 + Y) % 4) && (((1970 + Y) % 100) || !((1970 + Y) % 400)))
+
+#ifdef LIBRETINY
+//#define WIFI_ASYNC
+#endif
+
+#if defined(ESP32) && !defined(esp32_wifirep)
+#define WIFI_ASYNC
+#endif
+
+// задачи таскера
+enum TimerTask_t {
+    WIFI_SCAN,
+    WIFI_MQTT_CONNECTION_CHECK,
+#ifdef WIFI_ASYNC    
+    WIFI_CONN,
+#endif    
+    TIME,
+    // TIME_SYNC, // не используется
+    // UPTIME, // не используется
+    UDPt,    // UDPP
+    TIMES,  // периодические секундные проверки
+    PTASK,
+    ST,
+    PiWS,
+    END
+};
+
+// задачи которые надо протащить через loop // не используется
+// enum NotAsyncActions {
+//     do_ZERO,
+//     do_MQTTPARAMSCHANGED,
+//     do_LAST,
+// };
+
+// состояния обновления
+enum UpdateStates { UPDATE_COMPLETED, UPDATE_FAILED, PATH_ERROR };
+
+enum distination {
+    TO_MQTT,
+    TO_WS,
+    TO_MQTT_WS
+};
+
+// #define WS_BROADCAST -1 // не используется

include/DebugTrace.h

@@ -0,0 +1,34 @@
+#pragma once
+
+// В папке toolchchain с которым собирались 
+// (Для esp32 например %%USERPROFILE%/.platformio/packages/toolchain-xtensa-esp32@8.4.0+2021r2-patch5/bin)
+// из командной строки Windows (cmd) запустить файл c параметрами:
+// xtensa-esp32-elf-addr2line.exe -pfiaC -e Путь_к_файлу/firmware.elf Стэк_адресов_из_сообщения
+// %%USERPROFILE%/.platformio/packages/toolchain-xtensa-esp32@8.4.0+2021r2-patch5/bin xtensa-esp32-elf-addr2line.exe -pfiaC -e .pio/build/esp32_4mb3f/firmware.elf Стэк_адресов
+#include "Global.h"
+#if defined(ESP32) && !defined(esp32c3m_4mb) && !defined(esp32c6_4mb) && !defined(esp32c6_8mb)
+#define RESTART_DEBUG_INFO
+#endif
+#if defined(RESTART_DEBUG_INFO)
+#define CONFIG_RESTART_DEBUG_STACK_DEPTH 15
+typedef struct {
+  size_t heap_total;
+  size_t heap_free;
+  size_t heap_free_min;
+  time_t heap_min_time;
+  uint32_t backtrace[CONFIG_RESTART_DEBUG_STACK_DEPTH];
+} re_restart_debug_t;
+__NOINIT_ATTR static int8_t bootloop_panic_count;
+
+void IRAM_ATTR debugUpdate();
+#endif // RESTART_DEBUG_INFO
+
+
+
+extern "C" void __real_esp_panic_handler(void*);
+void printDebugTrace();
+void sendDebugTraceAndFreeMemory(bool);
+
+void startWatchDog();
+//extern "C" bool verifyRollbackLater();
+void verifyFirmware();

include/DeviceList.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "Global.h"
+
+#if defined (ESP8266) || defined(LIBRETINY)
+// эта библиотека встроена в ядро
+#include "ESPAsyncUDP.h"
+#elif defined(ESP32)
+#include "AsyncUDP.h"
+#endif
+#ifndef LIBRETINY
+extern AsyncUDP asyncUdp;
+#endif
+
+extern const String getThisDevice();
+extern void addThisDeviceToList();
+extern void udpListningInit();
+extern void  udpBroadcastInit();
+extern String uint8tToString(uint8_t* data, size_t len);
+extern void udpPacketParse(String& data);
+extern void jsonMergeArrays(String& existJson, String& incJson);

include/ESPConfiguration.h

@@ -0,0 +1,9 @@
+#pragma once
+#include "Global.h"
+#include "classes/IoTItem.h"
+
+extern std::list<IoTItem*> IoTItems;  // вектор ссылок базового класса IoTItem - список всех запущенных сенсоров
+
+extern void configure(String path);
+void clearConfigure();
+// extern IoTItem* myIoTItem; // экономим память, используется в одном месте

include/EspFileSystem.h

@@ -0,0 +1,64 @@
+#pragma once
+#include "Global.h"
+#ifdef ESP32
+#include <rom/spi_flash.h>
+#if USE_LITTLEFS
+#include <LittleFS.h>
+#define FileFS LittleFS
+#define FS_NAME "LittleFS_32"
+#define CONFIG_LITTLEFS_SPIFFS_COMPAT 1
+#else
+#include <SPIFFS.h>
+extern FS* filesystem;
+#define FileFS SPIFFS
+#define FS_NAME "SPIFFS_32"
+#endif
+#endif
+
+#if defined(LIBRETINY)
+#include <FS.h>
+
+#include "LittleFS.h"
+
+#define FileFS LittleFS
+#define FS_NAME "LittleFS_LT"
+#define FILE_READ "r"
+#define FILE_WRITE "w"
+#define FILE_APPEND "a"
+#endif
+
+#ifdef ESP8266
+#if USE_LITTLEFS
+#include "LittleFS.h"
+extern FS LittleFS;
+using littlefs_impl::LittleFSConfig;
+extern FS* filesystem;
+#define FileFS LittleFS
+#define FS_NAME "LittleFS_8266"
+#define FILE_READ "r"
+#define FILE_WRITE "w"
+#define FILE_APPEND "a"
+#else
+extern FS* filesystem;
+#define FileFS SPIFFS
+#define FS_NAME "SPIFFS_8266"
+#endif
+#endif
+
+extern bool fileSystemInit();
+extern void globalVarsSync();
+
+// extern String getParamsJson();
+
+extern void syncSettingsFlashJson();
+void resetSettingsFlashByPanic();
+extern void syncValuesFlashJson();
+
+extern const String getChipId();
+extern void setChipId();
+extern const String getUniqueId(const char* name);
+extern uint32_t ESP_getChipId(void);
+extern uint32_t ESP_getFlashChipId(void);
+extern const String getMacAddress();
+extern const String getWebVersion();
+extern uint32_t getFlashChipIdNew();

include/EventsAndOrders.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "Global.h"
+
+extern void generateOrder(const String& id, const String& value);
+extern void handleOrder();
+
+extern void generateEvent(const String& id, const String& value);
+extern void handleEvent();

include/Global.h

@@ -0,0 +1,177 @@
+#pragma once
+// константы
+#include "Const.h"
+
+// внешние глобальные директории
+#include <Arduino.h>
+#include <ArduinoJson.h>
+#include <TickerScheduler.h>
+#include <PubSubClient.h>
+#include <list>
+
+#ifdef LIBRETINY
+#include <Update.h>
+#include <vector>
+#include <typedef.h>
+#ifdef STANDARD_WEB_SERVER
+#include <WebServer.h>
+#endif 
+#include <HTTPClient.h>
+#endif
+
+#ifdef ESP32
+#include "WiFi.h"
+#include <HTTPClient.h>
+#include <HTTPUpdate.h>
+#endif
+
+#ifdef ESP8266
+#include <ESP8266WiFi.h>
+#include <ESP8266httpUpdate.h>
+#endif
+
+#ifdef ASYNC_WEB_SERVER
+#include <ESPAsyncWebServer.h>
+#include "AsyncWebServer.h"
+#endif
+
+#ifdef STANDARD_WEB_SERVER
+#ifdef ESP8266
+#include <ESP8266WebServer.h>
+#include <ESP8266HTTPUpdateServer.h>
+#endif
+#ifdef ESP32
+#include <WebServer.h>
+#endif
+#endif
+
+#ifdef STANDARD_WEB_SOCKETS
+#include <WebSocketsServer.h>
+#ifdef ESP8266
+#include <Hash.h>
+#endif
+#endif
+
+#include <FS.h>
+
+// внутренние глобальные директории проекта
+#include "utils/FileUtils.h"
+#include "utils/JsonUtils.h"
+#include "utils/SerialPrint.h"
+#include "utils/StringUtils.h"
+#include "PeriodicTasks.h"
+#include "classes/IoTGpio.h"
+#include "classes/IoTDiscovery.h"   
+/*********************************************************************************************************************
+*****************************************глобальные объекты классов***************************************************
+**********************************************************************************************************************/
+extern IoTGpio IoTgpio;
+#ifdef mod_RtcDriver
+extern IoTItem* rtcItem;
+#endif
+//extern IoTItem* camItem;
+extern IoTItem* tlgrmItem;
+extern IoTBench* benchLoadItem;
+extern IoTBench* benchTaskItem;
+extern IoTDiscovery* HADiscovery;
+extern IoTDiscovery* HOMEdDiscovery;
+
+
+extern TickerScheduler ts;
+extern WiFiClient espClient;
+extern PubSubClient mqtt;
+
+#ifdef ASYNC_WEB_SERVER
+extern AsyncWebServer server;
+#endif
+
+#ifdef STANDARD_WEB_SERVER
+#ifdef ESP8266
+extern ESP8266WebServer HTTP;
+extern ESP8266HTTPUpdateServer httpUpdater;
+#endif
+#ifdef ESP32
+extern WebServer HTTP;
+#endif
+#ifdef LIBRETINY
+extern WebServer HTTP;
+#endif
+#endif
+
+#ifdef STANDARD_WEB_SOCKETS
+extern WebSocketsServer standWebSocket;
+#endif
+
+/*********************************************************************************************************************
+***********************************************глобальные переменные**************************************************
+**********************************************************************************************************************/
+extern String settingsFlashJson;
+extern String valuesFlashJson;
+extern String errorsHeapJson;
+extern bool needSaveValues;
+
+// buf
+extern String orderBuf;
+extern String eventBuf;
+extern String mysensorBuf;
+
+// wifi
+extern String ssidListHeapJson;
+
+extern String devListHeapJson;
+extern String thisDeviceJson;
+
+// Mqtt
+extern String mqttServer;
+extern int mqttPort;
+extern String mqttPrefix;
+extern String mqttUser;
+extern String mqttPass;
+extern String nameId;
+
+extern unsigned long mqttUptime;
+extern unsigned long flashWriteNumber;
+
+extern unsigned long wifiUptime;
+
+extern bool udpReceivingData;
+
+extern String mqttRootDevice;
+extern String chipId;
+extern String prex;
+extern String all_widgets;
+extern String scenario;
+
+// Time
+struct Time_t {
+    uint8_t second;
+    uint8_t minute;
+    uint8_t hour;
+    uint8_t day_of_week;
+    uint8_t day_of_month;
+    uint8_t month;
+    uint16_t day_of_year;
+    uint16_t year;
+    unsigned long days;
+    unsigned long valid;
+};
+
+extern unsigned long unixTime;
+extern unsigned long unixTimeShort;
+extern String prevDate;
+extern bool firstTimeInit;
+
+extern bool isTimeSynch;
+extern Time_t _time_local;
+extern Time_t _time_utc;
+extern bool _time_isTrust;
+
+#define WEBSOCKETS_CLIENT_MAX 5
+extern int8_t ws_clients[WEBSOCKETS_CLIENT_MAX];
+// extern unsigned long loopPeriod;
+
+// extern DynamicJsonDocument settingsFlashJsonDoc;
+// extern DynamicJsonDocument paramsFlashJsonDoc;
+// extern DynamicJsonDocument paramsHeapJsonDoc;
+
+void scanI2C();

include/Main.h

@@ -0,0 +1,16 @@
+#pragma once
+//
+#include "EspFileSystem.h"
+#include "Global.h"
+#include "utils/WiFiUtils.h"
+#include "AsyncWebServer.h"
+#include "StandWebServer.h"
+#include "classes/NotAsync.h"
+#include "ESPConfiguration.h"
+#include "MqttClient.h"
+#include "WsServer.h"
+#include "DeviceList.h"
+#include "PeriodicTasks.h"
+#include "classes/IoTScenario.h"
+#include "EventsAndOrders.h"
+#include "NTP.h"

include/MqttClient.h

@@ -0,0 +1,38 @@
+#pragma once
+#include "Const.h"
+#include "classes/NotAsync.h"
+#include "Global.h"
+#include "utils/WiFiUtils.h"
+#include "EventsAndOrders.h"
+
+void mqttInit();
+void selectBroker();
+void getMqttData();
+void getMqttData2();
+bool isSecondBrokerSet();
+boolean mqttConnect();
+void mqttReconnect();
+void mqttLoop();
+void mqttSubscribe();
+bool mqttIsConnect();
+
+boolean publish(const String& topic, const String& data);
+boolean publishData(const String& topic, const String& data);
+boolean publishChartMqtt(const String& topic, const String& data);
+boolean publishJsonMqtt(const String& topic, const String& json);
+boolean publishStatusMqtt(const String& topic, const String& data);
+boolean publishEvent(const String& topic, const String& data);
+void mqttSubscribeExternal(String topic, bool usePrefix = false);
+
+bool publishChartFileToMqtt(String path, String id, int maxCount);
+
+void publishWidgets();
+
+void mqttCallback(char* topic, uint8_t* payload, size_t length);
+//void handleMqttStatus(bool send);
+void handleMqttStatus(bool send, int state = -1);
+
+const String getStateStr(int e);
+
+void mqttUptimeCalc();
+void wifiUptimeCalc();

include/NTP.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "Arduino.h"
+#include "Global.h"
+
+static const uint8_t days_in_month[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+
+extern void breakEpochToTime(unsigned long epoch, Time_t& tm);
+extern void ntpInit();
+extern time_t getSystemTime();
+extern void synchTime();
+extern bool onDayChange();
+extern const String getTimeLocal_hhmm();
+extern const String getTimeLocal_hhmmss();
+extern const String getDateTimeDotFormated();
+extern const String getTodayDateDotFormated();
+extern unsigned long strDateToUnix(String date);
+extern const String getDateTimeDotFormatedFromUnix(unsigned long unixTime);
+extern const String getTimeDotFormatedFromUnix(unsigned long unixTime);
+extern unsigned long gmtTimeToLocal(unsigned long gmtTimestamp);
+extern const String getDateDotFormatedFromUnix(unsigned long unixTime);

include/PeriodicTasks.h

@@ -0,0 +1,14 @@
+#pragma once
+#include "Global.h"
+#include "WsServer.h"
+#include "utils/TimeUtils.h"
+
+#ifdef ESP32
+#include <rom/rtc.h>
+#endif
+
+extern void periodicTasksInit();
+extern void printGlobalVarSize();
+
+extern String ESP_getResetReason(void);
+extern String ESP32GetResetReason(uint32_t cpu_no);

include/StandWebServer.h

@@ -0,0 +1,24 @@
+#pragma once
+#include "Global.h"
+
+#ifdef STANDARD_WEB_SERVER
+extern void standWebServerInit();
+extern bool handleFileRead(String path);
+//extern String getContentType(String filename);
+//#ifdef REST_FILE_OPERATIONS
+extern void handleFileUpload();
+extern void handleFileDelete();
+extern void handleFileCreate();
+extern void handleLocalOTA();
+extern void handleUpdateOTA();
+extern void handleCors();
+extern void handleLocalOTA_Handler();
+extern void handleFileList();
+//void printDirectory(File dir, String& out);
+extern void handleStatus();
+extern void handleGetEdit();
+extern void replyOK ();
+extern void handleNotFound ();
+
+//#endif
+#endif

include/UpgradeFirm.h

@@ -0,0 +1,28 @@
+#pragma once
+#include "Global.h"
+// #include "Upgrade.h"
+#ifdef ESP8266
+// #include "ESP8266.h"
+#elif ESP32
+#include <HTTPUpdate.h>
+#endif
+
+struct updateFirm {
+    String settingsFlashJson;
+    String configJson;
+    String layoutJson;
+    String scenarioTxt;
+    String chartsData;
+};
+
+extern void upgradeInit();
+extern void getLastVersion();
+extern void upgrade_firmware(int type, String path);
+extern bool upgradeFS(String path);
+extern bool upgradeBuild(String path);
+extern void restartEsp();
+
+extern const String getBinPath();
+extern void putUserDataToRam();
+extern void saveUserDataToFlash();
+extern void saveUpdeteStatus(String key, int val);