Merge pull request #75 from IoTManagerProject/beta

ccs811 полная интеграция

.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

.gitignore

@@ -0,0 +1,7 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
+lib/libraies-master
+

.vscode/extensions.json

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

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");
-  }
-}

README.md

@@ -0,0 +1,6 @@
+# IoTManager
+Это модульная система беспроводной автоматизации на базе ESP32/ESP8266 микроконтроллеров и приложения IoT Manager.   
+Телеграм канал обсуждения приложения и системы автоматизации  https://t.me/IoTmanager
+# [Инструкция](https://github.com/IoTManagerProject/IoTManager/wiki)
+
+![](https://github.com/IoTManagerProject/IoTManager/blob/beta/doc/pictures/007%20iot%20manager.jpg)

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";
-*/

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 +1,37 @@
-{"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"}
+{
+    "name": "IoTmanager",
+    "chipID": "",
+    "apssid": "IoTmanager",
+    "appass": "",
+    "routerssid": "rise",
+    "routerpass": "hostel3333",
+    "timezone": 1,
+    "ntp": "pool.ntp.org",
+    "mqttServer": "91.204.228.124",
+    "mqttPort": 1883,
+    "mqttPrefix": "/iotTest",
+    "mqttUser": "rise",
+    "mqttPass": "23ri22se32",
+    "mqttServer2": "",
+    "mqttPort2": 1883,
+    "mqttPrefix2": "/iotTest",
+    "mqttUser2": "",
+    "mqttPass2": "",
+    "scen": "1",
+    "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo",
+    "telegonof": "0",
+    "teleginput": "0",
+    "autos": "1",
+    "weblogin": "admin",
+    "webpass": "admin",
+    "MqttIn": "0",
+    "MqttOut": "0",
+    "blink": "0",
+    "oneWirePin": "2",
+    "serverip": "http://206.189.49.244",
+    "uart": "0",
+    "uartS": "9600",
+    "uartTX": "12",
+    "uartRX": "13",
+    "grafmax": "0"
+}

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/items/items.txt

@@ -0,0 +1,27 @@
+0;button-out;btnid;toggle;Кнопки;Освещение;order;gpio*
+0;button-out;btnid;toggle;Кнопки;Освещение;order;gpio;inv[1]*
+0;button-out;btnid;toggle;Кнопки;Освещение;order*
+0;button-in;btnid;toggle;Кнопки;Освещение;order;gpio;db[20]*
+0;pwm-out;pwmid;range;Ползунки;Яркость;order;gpio*
+0;inoutput;dgtid;inputDigit;Ввод;Введите#цифру;order*
+0;inoutput;tmid;inputTime;Ввод;Введите#время;order*
+0;inoutput;txtid;anydata;Вывод;Сигнализация;order*
+0;analog-adc;adcid;fillgauge;Сенсоры;Аналоговый;order;pin[0];map[0,1024,0,100];c[1];int[10]*
+0;dallas-temp;tmpid;anydataTemp;Сенсоры;Температура;order;pin[2];index[0];int[10]*
+0;ultrasonic-cm;cmid;anydata;Сенсоры;Расстояние;order;pin[12,13];map[0,500,0,100];c[1];int[10]*
+0;dht;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
+0;dht;humid;anydataHum;Сенсоры;Влажность;2;c[1];pin[2];type[dht11];int[10]*
+0;dht;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
+0;dht;humid;anydataHum;Сенсоры;Влажность;2;c[1];pin[2];type[dht22];int[10]*
+0;bme280;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
+0;bme280;humid;anydataHum;Сенсоры;Влажность;2;c[1]
+0;bme280;prsid;anydataPress;Сенсоры;Давление;3;c[1];addr[0x76];int[10]*
+0;bmp280;tmpid;anydataTemp;Сенсоры;Температура;1;c[1]
+0;bmp280;prsid;anydataPress;Сенсоры;Давление;3;c[1];addr[0x76];int[10]*
+0;ccs811;ppmid;anydataPpm;Сенсоры;Содержание#CO2;1;c[1]
+0;ccs811;ppbid;anydataPpb;Сенсоры;Содержание#орг#соед;2;c[1];int[10]*
+0;impuls-out;impid;na;na;na;order;gpio*
+0;count-down;cntid;anydata;Таймер;Обратный#отчет;order*
+0;inoutput;txtid;anydata;Вывод;Вывод#uart;order*
+0;logging;crtid;chart;Графики;История;order;val[any];int[60];cnt[100]*
+0;uptime;uptid;anydataTime;Системные;%name%#uptime;order;int[60]*

data/lang/lang.ru.json

@@ -0,0 +1,39 @@
+{
+    "SetDevConf": "Конфигурация устройства",
+    "SetDevPreset": "Выберите из списка подходящий пресет кофигурации",
+
+    "ButSave":"Сохранить",
+    "ButMainPage":"Главная",
+
+
+    "SetUDPList": "Список других устройств в сети:",
+    "SetUDPWarn1": "После нажатия на кнопку <b>переформировать список устройств</b> ждите примерно минуту, а затем обновите страницу и список появится вновь",
+
+    "SetUDPUpdateList":"Переформировать список устройств",
+    "SetUDPUpdatePage":"Обновить страницу",
+    "SetUDPNameOfDev":"Имя этого устройства:",
+    "SetUDPDateExchange":"Включить обмен данными между устройствами",
+    "SetUDPWarn2":"Если обмен данными включен, то устройства будут обмениваться широковещательными пакетами udp для формирования списка устройств и для осуществления посылки настроек mqtt. Данный обмен создает дополнительную нагрузку на wifi сеть.",
+
+    "SetWiFiNameOfDev":"Имя устройства:",
+    "SetWiFiRouterConnect":"Подключение к WiFi роутеру:",
+    "SetWiFiAccessPoint":"Точка доступа:",
+    "SetWiFiWeb":"Логин и пароль web interface:",
+    "SetWiFiTimeZone":"Временная зона:",
+    "SetWiFiNTP":"Сервер NTP:",
+    "SetWiFiWarn1":"Имя устройства должно состоять из английских букв и иметь длинну от 6 до 12 символов",
+    "SetWiFiWarn2":"После того как вы введете логин пароль от вашего wifi роутера необходимо нажать кнопку сохранить, а затем обязательно нажать кнопку <b>перезагрузить устройство</b> внизу этой страницы",
+    "SetWiFiWarn3":"Устройство постоянно сканирует сеть на наличие wifi. Если роутер отключен, то устройство автоматически перейдет в режим точки доступа. Когда wifi появится устройство автоматически подключится к роутеру снова, и выключит точку доступа",
+    "SetWiFiWarn4":"После изменения поля <b>NTP сервер</b> необходимо перезагрузить устройство",
+    "SetWiFiWarn5":"Светодиод статуса подключения показывает четыре состояния подключения: <br><b>1. мигает редко</b> - идет подключение к wifi <br><b>2. мигает часто</b> - идет подключение к серверу mqtt <br><b>3. горит постоянно</b> - модуль в режиме точки доступа, <br><b>4. не горит</b> - модуль подключен к wifi и к mqtt. <br>Светодиод подключен к gpio2. Если галочка стоит - то использовать этот пин нельзя",
+
+    "SetMQTTServerName":"Имя сервера:",
+    "SetMQTTPort":"Номер порта:",
+    "SetMQTTPrefix":"Префикс:",
+    "SetMQTTUserName":"Имя пользователя:",
+    "SetMQTTPassword":"Пароль:",
+
+    "SetMQTTSendSettings":"Отправить настройки MQTT с этого устройства на все остальные",
+    "SetMQTTWarn1":"Обратите внимание что поле префикс может состоять только из одного слова и одного разделителя: <b>/prefix</b>, вариант вида: <b>/prefix1/prefix2</b> работать не будет. После изменения поля prefix необходимо перезагрузить устройство",
+    "SetMQTTWarn2":"Прежде чем нажимать на кнопку <b>Отправить настройки MQTT</b> сохрание их, если Вы их меняли. Настройки получат и перезапишут все устройства в локальной сети"
+}

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/presets/presets.c.txt

@@ -0,0 +1,47 @@
+0;dallas-temp;t1;anydataTemp;Термостат1;Температура;1;pin[2];index[0];int[10]
+0;logging;log1;chart;Термостат1;История;2;val[t1];int[60];cnt[100]
+0;inoutput;tUp1;inputDigit;Термостат1;Верхний#порог;3
+0;inoutput;tLow1;inputDigit;Термостат1;Нижний#порог;4
+0;button-out;btn1;toggle;Термостат1;Нагрев;5;pin[12]*
+0;dallas-temp;t2;anydataTemp;Термостат2;Температура;1;pin[2];index[0];int[10]
+0;logging;log2;chart;Термостат2;История;2;val[t2];int[10];cnt[100]
+0;inoutput;threshold;inputDigitTemp;Термостат2;Заданная#температура;3
+0;button-out;heater2;toggle;Термостат2;Нагреватель;7;pin[5]
+0;inoutput;time21;inputTimeClock;Расписание2;Утренний#период;8
+0;inoutput;threshold1;inputDigitTemp;Расписание2;Температура;9
+0;inoutput;time22;inputTimeClock;Расписание2;Дневной#период;10
+0;inoutput;threshold2;inputDigitTemp;Расписание2;Температура;11
+0;inoutput;time23;inputTimeClock;Расписание2;Вечерний#период;12
+0;inoutput;threshold3;inputDigitTemp;Расписание2;Температура;13
+0;inoutput;time24;inputTimeClock;Расписание2;Ночной#период;14
+0;inoutput;threshold4;inputDigitTemp;Расписание2;Температура;15*
+0;dht;t3;anydataTemp;Теплица3;Температура;1;c[1]
+0;dht;h3;anydataHum;Теплица3;Влажность;2;c[1];pin[2];type[dht11];int[10]
+0;logging;log3;chart;Теплица3;История;3;val[h3];int[60];cnt[100]
+0;inoutput;hUp3;inputDigit;Теплица3;Верхний#порог;4
+0;inoutput;hLow3;inputDigit;Теплица3;Нижний#порог;5
+0;button-out;hUp3;toggle;Теплица3;Полив;6;pin[12]*
+0;button-out;btn41;toggle;Реле4;Освещение;1;pin[12]
+0;button-out;btn42;toggle;Реле4;Освещение;2;pin[13]
+0;inoutput;time41;inputTime;Реле4;Введите#время#включения;3
+0;inoutput;time42;inputTime;Реле4;Введите#время#выключения;4*
+0;button-out;btn51;toggle;Свет5;Выключить#все;1
+0;button-out;btn52;toggle;Свет5;Гостинная;2;pin[12]
+0;button-out;btn53;toggle;Свет5;Спальня;3;pin[13]
+0;button-out;btn54;toggle;Свет5;Прихожая;4;pin[14]
+0;pwm-out;pwm51;range;Свет5;Яркость;5;pin[15]
+0;pwm-out;pwm52;range;Свет5;Яркость;6;pin[16]
+0;inoutput;txt5;anydata;Свет5;Статус;7*
+0;button-out;button;toggle;Таймер;Освещение;1;pin[12]
+0;count-down;count;anydata;Таймер;Обратный#отчет;2
+0;inoutput;input;inputDigit;Таймер;Введите#цифру;3*
+0;inoutput;text;anydataAlarm;Сигнализация;Движение:;1
+0;inoutput;time;anydataTime;Сигнализация;Время:;2
+0;button-in;sensor;na;na;na;3;pin[0];db[20]
+0;button-out;reset;toggle;Сигнализация;Сбросить;4*
+0;button-in;sensor;na;na;na;1;pin[0];db[20]
+0;button-out;light;toggle;Освещение;Освещение;2;pin[13]
+0;count-down;count;anydata;Освещение;Обратный#отчет;3
+0;inoutput;period;inputDigit;Освещение;Период#включения;4*
+0;button-out;light;toggle;Кнопки;Освещение;1;pin[13]
+0;button-in;switch;na;na;na;2;pin[0];db[20]*

data/presets/presets.s.txt

@@ -0,0 +1,84 @@
+t1 > tUp1
+btn1 0
+telegram Гостинная нагрев#выключен
+end
+t1 < tLow1
+btn1 1
+telegram Гостинная нагрев#включен
+end*
+t2 > threshold+-2
+heater2 0
+end
+t2 < threshold+-2
+heater2 1
+end
+timenow = time21
+threshold threshold1
+end
+timenow = time22
+threshold threshold2
+end
+timenow = time23
+threshold threshold3
+end
+timenow = time24
+threshold threshold4
+end*
+h3 > hUp3
+hUp3 0
+telegram Теплица полив#выключен
+end
+h3 < hLow3
+hUp3 1
+telegram Теплица полив#включен
+end*
+timenow = time41
+btn41 1
+btn42 0
+end
+timenow = time42
+btn41 0
+btn42 1
+end*
+btn51 = 1
+btn52 1
+btn53 1
+btn54 1
+pwm51 200
+pwm52 800
+txt5 включено
+end
+btn51 = 0
+btn52 0
+btn53 0
+btn54 0
+pwm51 800
+pwm52 200
+txt5 выключено
+end*
+button = 1
+count input
+end
+count = 0
+button 0
+end*
+sensor = 1
+text обнаружено
+time %date%
+telegram often Обнаружено#движение
+end
+reset = 1
+text не#обнаружено
+time %date%
+reset 0
+end*
+sensor = 1
+light 1
+count period
+end
+count = 0
+light 0
+end*
+switch = 1
+light change
+end*

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/s.conf.csv

@@ -0,0 +1 @@
+Удалить;Тип элемента;Id;Виджет;Имя вкладки;Имя виджета;Позиция виджета

data/s.scen.txt

@@ -0,0 +1 @@
+//

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.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.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/widgets/alarm.json

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

data/widgets/anydata.json

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

data/widgets/anydataAlarm.json

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

data/widgets/anydataHum.json

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

data/widgets/anydataPpb.json

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

data/widgets/anydataPpm.json

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

data/widgets/anydataPress.json

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

data/widgets/anydataTemp.json

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

data/widgets/anydataTime.json

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

data/widgets/btn.json

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

data/widgets/chart.json

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

data/widgets/chart2.json

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

data/widgets/fillgauge.json

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

data/widgets/inputDigitTemp.json

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

data/widgets/inputTimeClock.json

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

data/widgets/progress-line.json

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

data/widgets/progress-round.json

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

data/widgets/select.json

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

data/widgets/toggle.json

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

data/widgets/toggleSunMoon.json

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

data_ungzip/index.json

@@ -0,0 +1,64 @@
+{
+  "configs": [
+    "/config.live.json",
+    "/config.setup.json",
+    "/lang/lang.ru.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": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "Конфигурация устройства",
+      "action": "/?set.device",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Конфигурация WIFI",
+      "action": "/?set.wifi",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Конфигурация MQTT",
+      "action": "/?set.mqtt",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Конфигурация telegram",
+      "action": "/?set.telegram",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Утилиты",
+      "action": "/?set.utilities",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Настройки разработчика",
+      "action": "/?set.dev",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Скачать приложение IoT Manager для android",
+      "action": "https://play.google.com/store/apps/details?id=ru.esp8266.iotmanager",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Скачать приложение IoT Manager для iphone",
+      "action": "https://apps.apple.com/ru/app/iot-manager/id1155934877",
+      "class": "btn btn-block btn-default"
+    }
+  ]
+}

data_ungzip/set.dev.json

@@ -0,0 +1,75 @@
+{
+    "configs": [
+      "/config.setup.json",
+      "/lang/lang.ru.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": "{{name}}",
+        "class": "alert-default"
+      },
+      {
+        "type": "link",
+        "title": "{{ButMainPage}}",
+        "action": "/",
+        "class": "btn btn-block btn-default"
+      },
+      {
+        "type": "hr"
+      },
+      {
+        "type": "h3",
+        "title": "Адрес сервера обновлений"
+      },
+      {
+        "type": "input",
+        "title": "ip address",
+        "name": "serverip-arg",
+        "state": "{{serverip}}"
+      },
+      {
+        "type": "button",
+        "title": "{{ButSave}}",
+        "action": "set?serverip=[[serverip-arg]]",
+        "class": "btn btn-block btn-default"
+      },
+      {
+        "type": "hr"
+      },
+      {
+        "type": "h3",
+        "title": "Количество точек графика выгружаемое за раз"
+      },
+      {
+        "type": "input",
+        "title": "ip address",
+        "name": "graf-arg",
+        "state": "{{grafmax}}"
+      },
+      {
+        "type": "button",
+        "title": "{{ButSave}}",
+        "action": "set?grafmax=[[graf-arg]]",
+        "class": "btn btn-block btn-default"
+      },
+      {
+        "type": "hr"
+      },
+      {
+        "type": "h3",
+        "name": "reset-block",
+        "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+        "class": "hidden"
+      },
+      {
+        "type": "button",
+        "title": "Перезагрузить устройство",
+        "action": "/set?reqReset",
+        "response": "[[reset-block]]",
+        "class": "btn btn-block btn-danger"
+      }
+    ]
+  }

data_ungzip/set.device.json

@@ -0,0 +1,262 @@
+{
+    "configs": [
+        "/config.setup.json",
+        "/config.option.json",
+        "/config.live.json",
+        "/lang/lang.ru.json"
+    ],
+    "class": "col-sm-offset-1 col-sm-10",
+    "content": [
+        {
+            "type": "h5",
+            "title": "{{name}}",
+            "class": "alert-default"
+        },
+        {
+            "type": "link",
+            "title": "{{ButMainPage}}",
+            "action": "/",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "h4",
+            "title": "ID устройства: {{chipID}}"
+        },
+        {
+            "type": "h4",
+            "title": "IP адрес: {{ip}}"
+        },
+        {
+            "type": "h4",
+            "title": "Время: {{timenow}}"
+        },
+        {
+            "type": "h4",
+            "title": "Uptime: {{uptime}}"
+        },
+        {
+            "type": "h4",
+            "title": "Версия прошивки: {{firmware_version}}"
+        },
+        {
+            "type": "h4",
+            "title": "Версия файловой системы: 275"
+        },
+        {
+            "type": "h4",
+            "title": "{{signal}}"
+        },
+        {
+            "type": "h4",
+            "title": "Остаток памяти: {{freeBytes}}"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "text",
+            "title": "{{warning1}}"
+        },
+        {
+            "type": "text",
+            "title": "{{warning2}}"
+        },
+        {
+            "type": "text",
+            "title": "{{warning3}}"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "dropdown",
+            "name": "help-url1",
+            "class": "btn btn-default",
+            "style": "display:inline",
+            "title": {
+                "#": "Выберите элемент из списка<span class=\"caret\"></span>",
+                "/set?addItem=1": "1.Кнопка управляющая пином",
+                "/set?addItem=2": "2.Кнопка управляющая пином (с инверсией)",
+                "/set?addItem=3": "3.Кнопка виртуальная (не привязанная к пину, для использования в сценариях)",
+                "/set?addItem=4": "4.Кнопка физическая, чтение состояния пина (подключается провдами к устройству)",
+                "/set?addItem=5": "5.Широтно импульсная модуляция pwm",
+                "/set?addItem=6": "6.Окно ввода цифровых значений",
+                "/set?addItem=7": "7.Окно ввода времени",
+                "/set?addItem=8": "8.Окно вывода любого текста, предупреждения, цифры",
+                "/set?addItem=9": "9.Датчик аналоговый, чтение аналогового входа",
+                "/set?addItem=10": "10.Датчик температуры ds18b20",
+                "/set?addItem=11": "11.Датчик расстояния ультрозвуковой JSN-SR04T, HC-SR04, HY-SRF05",
+                "/set?addItem=12": "12.Датчик температуры и влажности DHT11",
+                "/set?addItem=13": "13.Датчик температуры и влажности DHT22, DHT33, DHT44, AM2302, RHT03",
+                "/set?addItem=14": "14.Датчик температуры, влажности и давления bme280",
+                "/set?addItem=15": "15.Датчик температуры и давления bmp280",
+                "/set?addItem=16": "16.Датчик качества воздуха ccs811",
+                "/set?addItem=17": "17.Создать импульсы через заданный промежуток времени (управление шд)",
+                "/set?addItem=18": "18.Таймер обратного отчета",
+                "/set?addItem=19": "19.Виджет для отображения информации полученной из uart, get-запроса, или по udp",
+                "/set?addItem=20": "20.Логгирование и вывод в график любой величины",
+                "/set?addItem=21": "21.Отобразить время работы устройства"
+            }
+        },
+        {
+            "type": "dropdown",
+            "name": "help-url2",
+            "class": "btn btn-default",
+            "style": "display:inline",
+            "title": {
+                "#": "Выберите пресет из списка<span class=\"caret\"></span>",
+                "/set?addPreset=1": "1.Термостат на основе ds18b20 с оповещением в телеграм",
+                "/set?addPreset=2": "2.Гистерезис термостат на основе ds18b20 с суточным расписанием",
+                "/set?addPreset=3": "3.Контроль влажности на основе DHT с оповещением в телеграм",
+                "/set?addPreset=4": "4.Включение выключение реле в заданное время",
+                "/set?addPreset=5": "5.Выключить все (пример работы сценариев)",
+                "/set?addPreset=6": "6.Включить кнопку на определенное время (пример работы таймера обратного отчета)",
+                "/set?addPreset=7": "7.Охранный датчик движения",
+                "/set?addPreset=8": "8.Датчик движения включающий свет с настраиваемой задержкой",
+                "/set?addPreset=9": "9.Управление светом с помощью выключателя и приложения"
+            }
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "csv",
+            "title": [
+                "checkbox",
+                "html",
+                "text",
+                "text",
+                "text",
+                "text",
+                "text"
+            ],
+            "state": "s.conf.csv",
+            "style": "width:100%;",
+            "action": "/set?saveItems",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "link",
+            "title": "Удалить выбранные элементы",
+            "action": "javascript:{send_request(this,'/set?delChoosingItems');setTimeout(function(){location.href='/?set.device' ; }, 1000);}",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "link",
+            "title": "Удалить все",
+            "action": "/set?delAllItems",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "text",
+            "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>После любого изменения таблицы элементов, включая удаление/добавление строк, необходимо нажать кнопку <b>СОХРАНИТЬ ТАБЛИЦУ</b>. Иногда, для корректной работы необходимо перезагрузить устройство после финального завершения его настройки</p></font></div>"
+        },
+        {
+            "type": "h2",
+            "title": "Сценарии"
+        },
+        {
+            "type": "checkbox",
+            "name": "scen",
+            "title": "Включить сценарии",
+            "action": "/set?scen=[[scen]]",
+            "state": "{{scen}}"
+        },
+        {
+            "type": "file",
+            "state": "s.scen.txt",
+            "style": "width:100%;height:350px",
+            "title": "Сохранить",
+            "action": "/set?sceninit",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "checkbox",
+            "name": "MqttOut",
+            "title": "Передавать события другим устройствам",
+            "action": "/set?MqttOut=[[MqttOut]]",
+            "state": "{{MqttOut}}"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "checkbox",
+            "name": "MqttIn",
+            "title": "Принимать события с других устройств",
+            "action": "/set?MqttIn=[[MqttIn]]",
+            "state": "{{MqttIn}}"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "button",
+            "title": "Синхронизировать сценарии на всех устройствах",
+            "action": "/set?scenMqtt",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "button",
+            "title": "Очистить графики и введенные данные",
+            "action": "/set?cleanlog",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "link",
+            "title": "Ручная настройка",
+            "action": "/?set.manual",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "link",
+            "title": "Инструкция к системе автоматизации",
+            "action": "https://github.com/IoTManagerProject/IoTManager/wiki",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "h3",
+            "name": "my-block",
+            "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+            "class": "hidden"
+        },
+        {
+            "type": "button",
+            "title": "Обновить прошивку устройства",
+            "action": "/check",
+            "response": "[[my-block]]",
+            "class": "btn btn-block btn-default"
+        },
+        {
+            "type": "hr"
+        },
+        {
+            "type": "h3",
+            "name": "reset-block",
+            "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+            "class": "hidden"
+        },
+        {
+            "type": "button",
+            "title": "Перезагрузить устройство",
+            "action": "/set?reqReset",
+            "response": "[[reset-block]]",
+            "class": "btn btn-block btn-danger"
+        }
+    ]
+}

data_ungzip/set.manual.json

@@ -0,0 +1,38 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/config.option.json",
+    "/config.live.json",
+    "/lang/lang.ru.json"
+  ],
+  "class": "col-sm-offset-1 col-sm-10",
+  "content": [
+    {
+      "type": "h5",
+      "title": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "file",
+      "state": "s.conf.csv",
+      "style": "width:100%;height:350px",
+      "title": "Сохранить",
+      "action": "/set?saveItems",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "file",
+      "state": "s.scen.txt",
+      "style": "width:100%;height:350px",
+      "title": "Сохранить",
+      "action": "/set?sceninit",
+      "class": "btn btn-block btn-default"
+    }
+  ]
+}

data_ungzip/set.mqtt.json

@@ -0,0 +1,217 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.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": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "Основной брокер",
+      "style": "width:100%;float:left;"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTServerName}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttServer-arg",
+      "state": "{{mqttServer}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPort}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPort-arg",
+      "state": "{{mqttPort}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPrefix}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPrefix-arg",
+      "state": "{{mqttPrefix}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTUserName}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttUser-arg",
+      "state": "{{mqttUser}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPassword}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPass-arg",
+      "state": "{{mqttPass}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "Резервный брокер",
+      "style": "width:100%;float:left;"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTServerName}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttServer2-arg",
+      "state": "{{mqttServer2}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPort}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPort2-arg",
+      "state": "{{mqttPort2}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPrefix}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPrefix2-arg",
+      "state": "{{mqttPrefix2}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTUserName}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttUser2-arg",
+      "state": "{{mqttUser2}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPassword}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPass2-arg",
+      "state": "{{mqttPass2}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "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": "{{ButSave}}",
+      "style": "width:100%;float:left;",
+      "action": "set?mqttServer=[[mqttServer-arg]]&mqttPort=[[mqttPort-arg]]&mqttPrefix=[[mqttPrefix-arg]]&mqttUser=[[mqttUser-arg]]&mqttPass=[[mqttPass-arg]]&mqttServer2=[[mqttServer2-arg]]&mqttPort2=[[mqttPort2-arg]]&mqttPrefix2=[[mqttPrefix2-arg]]&mqttUser2=[[mqttUser2-arg]]&mqttPass2=[[mqttPass2-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+
+    {
+      "type": "button",
+      "style": "width:100%;float:left;",
+      "title": "{{SetMQTTSendSettings}}",
+      "action": "set?mqttsend",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "button",
+      "style": "width:100%;float:left;",
+      "title": "Проверить соединение с MQTT",
+      "action": "set?mqttcheck",
+      "response": "[[my-block]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "style": "width:100%;float:left;",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetMQTTWarn1}}</p></font></div>"
+    },
+    {
+      "type": "text",
+      "style": "width:100%;float:left;",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetMQTTWarn2}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "name": "reset-block",
+      "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+      "class": "hidden"
+    },
+    {
+      "type": "button",
+      "title": "Перезагрузить устройство",
+      "action": "/set?reqReset",
+      "response": "[[reset-block]]",
+      "class": "btn btn-block btn-danger"
+    }
+  ]
+}

data_ungzip/set.telegram.json

@@ -0,0 +1,103 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.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": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "telegonof",
+      "title": "Включить телеграм",
+      "action": "/set?telegonof=[[telegonof]]",
+      "state": "{{telegonof}}"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "teleginput",
+      "title": "Включить прием входящих сообщений",
+      "action": "/set?teleginput=[[teleginput]]",
+      "state": "{{teleginput}}"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "autos",
+      "title": "Автоматически брать chat ID из входящих сообщений",
+      "action": "/set?autos=[[autos]]",
+      "state": "{{autos}}"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h4",
+      "title": "Telegram chat ID"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "chatId-arg",
+      "state": "{{chatId}}"
+    },
+    {
+      "type": "h4",
+      "title": "Telegram API token"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "telegramApi-arg",
+      "state": "{{telegramApi}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?telegramApi=[[telegramApi-arg]]&chatId=[[chatId-arg]]",
+      "class": "btn btn-block btn-default",
+      "style": "width:100%;display:inline"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>После настройки telegram перезагрузите устройство что бы изменения вступили в силу</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "name": "reset-block",
+      "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+      "class": "hidden"
+    },
+    {
+      "type": "button",
+      "title": "Перезагрузить устройство",
+      "action": "/set?reqReset",
+      "response": "[[reset-block]]",
+      "class": "btn btn-block btn-danger"
+    }
+  ]
+}

data_ungzip/set.udp.json

@@ -0,0 +1,96 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.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": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetUDPList}}"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "csv",
+      "title": [
+        "html",
+        "html",
+        "html"
+      ],
+      "state": "dev.csv",
+      "style": "width:100%;",
+      "class": "nan"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "link",
+      "title": "{{SetUDPUpdateList}}",
+      "action": "/set?updatelist",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "{{SetUDPUpdatePage}}",
+      "action": "/set?updatepage",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetUDPWarn1}}</p></font></div>",
+      "style": "width:100%;float:left;"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetUDPNameOfDev}}"
+    },
+    {
+      "type": "input",
+      "title": "{{SetUDPNameOfDev}}",
+      "name": "devname-arg",
+      "state": "{{name}}",
+      "pattern": "[A-Za-z0-9]{6,12}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "/set?devname=[[devname-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "udponoff",
+      "title": "{{SetUDPDateExchange}}",
+      "action": "/set?udponoff=[[udponoff]]",
+      "state": "{{udponoff}}"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetUDPWarn2}}</p></font></div>"
+    }
+  ]
+}

data_ungzip/set.utilities.json

@@ -0,0 +1,109 @@
+{
+  "configs": [
+    "/config.live.json",
+    "/config.setup.json",
+    "/lang/lang.ru.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": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "Сканирование шины i2c"
+    },
+    {
+      "type": "h4",
+      "title": "{{i2c}}"
+    },
+    {
+      "type": "link",
+      "title": "Сканировать",
+      "action": "/set?i2c",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "UART"
+    },
+    {
+      "type": "checkbox",
+      "name": "uart",
+      "title": "Включить UART",
+      "action": "/set?uart=[[uart]]",
+      "state": "{{uart}}"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "uartEvents",
+      "title": "Включить отправку всех событий в UART",
+      "action": "/set?uartEvents=[[uartEvents]]",
+      "state": "{{uartEvents}}"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h4",
+      "title": "Скорость",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "uartS-arg",
+      "state": "{{uartS}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "Пин TX",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "uartTX-arg",
+      "state": "{{uartTX}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "Пин RX",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "uartRX-arg",
+      "state": "{{uartRX}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "style": "width:100%;float:left;",
+      "action": "set?uartS=[[uartS-arg]]&uartTX=[[uartTX-arg]]&uartRX=[[uartRX-arg]]",
+      "class": "btn btn-block btn-default"
+    }
+  ]
+}

data_ungzip/set.wifi.json

@@ -0,0 +1,191 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.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": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiNameOfDev}}"
+    },
+    {
+      "type": "input",
+      "title": "{{SetWiFiNameOfDev}}",
+      "name": "devname-arg",
+      "state": "{{name}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?devname=[[devname-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn1}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiRouterConnect}}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "routerssid-arg",
+      "state": "{{routerssid}}"
+    },
+    {
+      "type": "password",
+      "title": "",
+      "name": "routerpass-arg",
+      "state": "{{routerpass}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "class": "btn btn-block btn-default",
+      "action": "set?routerssid=[[routerssid-arg]]&routerpass=[[routerpass-arg]]"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn2}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "blink",
+      "title": "Включить светодиод статуса подключения",
+      "action": "/set?blink=[[blink]]",
+      "state": "{{blink}}"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn5}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiAccessPoint}}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "apssid-arg",
+      "state": "{{apssid}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "password",
+      "title": "",
+      "name": "appass-arg",
+      "state": "{{appass}}",
+      "pattern": ".{8,20}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?apssid=[[apssid-arg]]&appass=[[appass-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn3}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiWeb}}"
+    },
+    {
+      "type": "input",
+      "title": "Логин",
+      "name": "weblogin-arg",
+      "state": "{{weblogin}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "password",
+      "title": "Пароль",
+      "name": "webpass-arg",
+      "state": "{{webpass}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?weblogin=[[weblogin-arg]]&webpass=[[webpass-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiTimeZone}}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "timezone-arg",
+      "state": "{{timezone}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "ntp-arg",
+      "state": "{{ntp}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?timezone=[[timezone-arg]]&ntp=[[ntp-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn4}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "name": "reset-block",
+      "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+      "class": "hidden"
+    },
+    {
+      "type": "button",
+      "title": "Перезагрузить устройство",
+      "action": "/set?reqReset",
+      "response": "[[reset-block]]",
+      "class": "btn btn-block btn-danger"
+    }
+  ]
+}

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

doc/eagle.txt

@@ -0,0 +1,24 @@
+eagle.flash.512k0.ld 512K (no SPIFFS)
+eagle.flash.512k64.ld 512K (64K SPIFFS)
+eagle.flash.512k128.ld 512K (128K SPIFFS)
+eagle.flash.1m0.ld 1M (no SPIFFS)
+eagle.flash.1m64.ld 1M (64K SPIFFS)
+eagle.flash.1m128.ld 1M (128K SPIFFS)
+eagle.flash.1m144.ld 1M (144K SPIFFS)
+eagle.flash.1m160.ld 1M (160K SPIFFS)
+eagle.flash.1m192.ld 1M (192K SPIFFS)
+eagle.flash.1m256.ld 1M (256K SPIFFS)
+eagle.flash.1m512.ld 1M (512K SPIFFS)
+eagle.flash.2m.ld 2M (1M SPIFFS)
+eagle.flash.4m1m.ld 4M (1M SPIFFS)
+eagle.flash.4m2m.ld 4M (2M SPIFFS)
+eagle.flash.4m.ld 4M (3M SPIFFS)
+eagle.flash.8m.ld 8M (7M SPIFFS)
+eagle.flash.16m.ld 16M (15M SPIFFS)
+
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x1F0000,
+app1,     app,  ota_1,   0x200000, 0x1F0000,
+spiffs,   data, spiffs,  0x3F0000,0x10000,