версия 306 добавлено блокирование многократного повторения события в сценарии - *

Исправление опечатки и новая функция в песочнице

.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"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "array": "cpp"
+    }
+}

Cmd.ino

@@ -1,599 +0,0 @@
-void CMD_init() {
-
-  sCmd.addCommand("button",  button);
-  sCmd.addCommand("buttonSet",  buttonSet);
-  sCmd.addCommand("buttonChange",  buttonChange);
-
-  sCmd.addCommand("pinSet",  pinSet);
-  sCmd.addCommand("pinChange",  pinChange);
-
-  sCmd.addCommand("pwm",  pwm);
-  sCmd.addCommand("pwmSet",  pwmSet);
-
-  sCmd.addCommand("switch",  switch_);
-
-#ifdef analog_enable
-  sCmd.addCommand("analog",  analog);
-#endif
-#ifdef level_enable
-  sCmd.addCommand("level",  level);
-#endif
-#ifdef dallas_enable
-  sCmd.addCommand("dallas",  dallas);
-#endif
-#ifdef dht_enable
-  sCmd.addCommand("dhtT",  dhtT);
-  sCmd.addCommand("dhtH",  dhtH);
-  sCmd.addCommand("dhtPerception",  dhtP);
-  sCmd.addCommand("dhtComfort",  dhtC);
-  sCmd.addCommand("dhtDewpoint",  dhtD);
-#endif
-
-#ifdef bmp_enable
-  sCmd.addCommand("bmp280T",  bmp280T);
-  sCmd.addCommand("bmp280P",  bmp280P);
-#endif
-
-#ifdef bme_enable
-  sCmd.addCommand("bme280T",  bme280T);
-  sCmd.addCommand("bme280P",  bme280P);
-  sCmd.addCommand("bme280H",  bme280H);
-  sCmd.addCommand("bme280A",  bme280A);
-#endif
-
-#ifdef stepper_enable
-  sCmd.addCommand("stepper",  stepper);
-  sCmd.addCommand("stepperSet",  stepperSet);
-#endif
-
-#ifdef servo_enable
-  sCmd.addCommand("servo",  servo_);
-  sCmd.addCommand("servoSet",  servoSet);
-#endif
-
-#ifdef serial_enable
-  sCmd.addCommand("serialBegin",  serialBegin);
-  sCmd.addCommand("serialWrite",  serialWrite);
-#endif
-
-#ifdef logging_enable
-  sCmd.addCommand("logging",  logging);
-#endif
-
-  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);
-
-#ifdef push_enable
-  sCmd.addCommand("push",  pushControl);
-#endif
-
-  sCmd.addCommand("update",  update_firmware);
-  sCmd.addCommand("firmware",  firmware);
-
-
-  handle_time_init();
-}
-
-
-
-//==========================================================================================================
-//==========================================Модуль кнопок===================================================
-void button() {
-
-  String button_number = sCmd.next();
-  String button_param = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-
-  jsonWriteStr(optionJson, "button_param" + button_number, button_param);
-  jsonWriteStr(configJson, "button" + button_number, start_state);
-
-  if (isDigitStr (button_param)) {
-    pinMode(button_param.toInt(), OUTPUT);
-    digitalWrite(button_param.toInt(), start_state.toInt());
-  }
-
-  if  (button_param == "scenario") {
-    jsonWriteStr(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, ",");
-    }
-  }
-  createWidget (widget_name, page_name, page_number, "widgets/widget.toggle.json", "button" + button_number);
-}
-
-void buttonSet() {
-
-  String button_number = sCmd.next();
-  String button_state = sCmd.next();
-  String button_param = jsonReadStr(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") {
-    jsonWriteStr(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 ("button", button_number);
-
-  jsonWriteStr(configJson, "button" + button_number, button_state);
-  sendSTATUS("button" + button_number, button_state);
-}
-
-void buttonChange() {
-  String button_number = sCmd.next();
-  String current_state = jsonReadStr(configJson, "button" + button_number);
-  if (current_state == "1") {
-    current_state = "0";
-  } else if (current_state == "0") {
-    current_state = "1";
-  }
-  order_loop += "buttonSet " + button_number + " " + current_state + ",";
-  jsonWriteStr(configJson, "button" + button_number, current_state);
-  sendSTATUS("button" + button_number, current_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 pinChange() {
-  String pin_number = sCmd.next();
-  pinMode(pin_number.toInt(), OUTPUT);
-  digitalWrite(pin_number.toInt(), !digitalRead(pin_number.toInt()));
-}
-//==================================================================================================================
-//==========================================Модуль управления ШИМ===================================================
-void pwm() {
-
-  static boolean flag = true;
-  String pwm_number = sCmd.next();
-  String pwm_pin = sCmd.next();
-  String widget_name = sCmd.next();
-  widget_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();
-  jsonWriteStr(optionJson, "pwm_pin" + pwm_number, pwm_pin);
-  pinMode(pwm_pin_int, INPUT);
-  analogWrite(pwm_pin_int, start_state.toInt());
-  //analogWriteFreq(32000);
-  jsonWriteStr(configJson, "pwm" + pwm_number, start_state);
-
-  createWidget (widget_name, page_name, page_number, "widgets/widget.range.json", "pwm" + pwm_number);
-}
-
-void pwmSet() {
-
-  String pwm_number = sCmd.next();
-  String pwm_state = sCmd.next();
-  int pwm_state_int = pwm_state.toInt();
-
-  int pin = jsonReadInt(optionJson, "pwm_pin" + pwm_number);
-  analogWrite(pin, pwm_state_int);
-
-  eventGen ("pwm", pwm_number);
-
-  jsonWriteStr(configJson, "pwm" + pwm_number, pwm_state);
-  sendSTATUS("pwm" + 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 ("switch", String(switch_number));
-
-      jsonWriteStr(configJson, "switch" + String(switch_number), "1");
-    }
-    if (buttons[switch_number].rose()) {
-
-      eventGen ("switch", String(switch_number));
-
-      jsonWriteStr(configJson, "switch" + 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 widget_name = sCmd.next();
-  widget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWriteStr(configJson, "digit" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputNum.json", "digit" + number);
-}
-void digitSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWriteStr(configJson, "digit" + number, value);
-  sendSTATUS("digit" + number, value);
-}
-//=====================================================================================================================================
-//=========================================Добавление окна ввода времени===============================================================
-void inputTime() {
-  String value_name = sCmd.next();
-  String number = value_name.substring(4);
-  String widget_name = sCmd.next();
-  widget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
-  String start_state = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWriteStr(configJson, "time" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputTime.json", "time" + number);
-}
-void timeSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWriteStr(configJson, "time" + number, value);
-  sendSTATUS("time" + number, value);
-}
-
-void handle_time_init() {
-  ts.add(TIME, 1000, [&](void*) {
-
-    String tmp = GetTime();
-    jsonWriteStr(configJson, "time", tmp);
-    tmp.replace(":", "-");
-    jsonWriteStr(configJson, "timenow", tmp);
-    eventGen ("timenow", "");
-
-  }, nullptr, true);
-}
-
-//=====================================================================================================================================
-//=========================================Добавление текстового виджета============================================================
-void text() {
-
-  String number = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-
-  createWidget (widget_name, page_name, page_number, "widgets/widget.anyData.json", "text" + number);
-}
-
-
-void textSet() {
-
-  String number = sCmd.next();
-  String text = sCmd.next();
-  text.replace("_", " ");
-
-  if (text.indexOf("-time") >= 0) {
-    text.replace("-time", "");
-    text.replace("#", " ");
-    String time = GetTime();
-    time.replace(":", ".");
-    text = text + " " + GetDataDigital() + " " + time;
-  }
-
-  jsonWriteStr(configJson, "text" + number, text);
-  sendSTATUS("text" + number, text);
-}
-//=====================================================================================================================================
-//=========================================Модуль шагового мотора======================================================================
-#ifdef stepper_enable
-//stepper 1 12 13
-void stepper() {
-  String stepper_number = sCmd.next();
-  String pin_step = sCmd.next();
-  String pin_dir = sCmd.next();
-
-  jsonWriteStr(optionJson, "stepper" + stepper_number, pin_step + " " + pin_dir);
-  pinMode(pin_step.toInt(), OUTPUT);
-  pinMode(pin_dir.toInt(), OUTPUT);
-}
-
-//stepperSet 1 100 5
-void stepperSet() {
-  String stepper_number = sCmd.next();
-  String steps = sCmd.next();
-  jsonWriteStr(optionJson, "steps" + stepper_number, steps);
-  String stepper_speed = sCmd.next();
-  String pin_step = selectToMarker (jsonReadStr(optionJson, "stepper" + stepper_number), " ");
-  String pin_dir =  deleteBeforeDelimiter (jsonReadStr(optionJson, "stepper" + stepper_number), " ");
-  Serial.println(pin_step);
-  Serial.println(pin_dir);
-  if (steps.toInt() > 0) digitalWrite(pin_dir.toInt(), HIGH);
-  if (steps.toInt() < 0) digitalWrite(pin_dir.toInt(), LOW);
-  if (stepper_number == "1") {
-    ts.add(STEPPER1, stepper_speed.toInt(), [&](void*) {
-      int steps_int = abs(jsonReadInt(optionJson, "steps1") * 2);
-      static int count;
-      count++;
-      String pin_step = selectToMarker (jsonReadStr(optionJson, "stepper1"), " ");
-      digitalWrite(pin_step.toInt(), !digitalRead(pin_step.toInt()));
-      yield();
-      if (count > steps_int) {
-        digitalWrite(pin_step.toInt(), LOW);
-        ts.remove(STEPPER1);
-        count = 0;
-      }
-    }, nullptr, true);
-  }
-  if (stepper_number == "2") {
-    ts.add(STEPPER2, stepper_speed.toInt(), [&](void*) {
-      int steps_int = abs(jsonReadInt(optionJson, "steps2") * 2);
-      static int count;
-      count++;
-      String pin_step = selectToMarker (jsonReadStr(optionJson, "stepper2"), " ");
-      digitalWrite(pin_step.toInt(), !digitalRead(pin_step.toInt()));
-      yield();
-      if (count > steps_int) {
-        digitalWrite(pin_step.toInt(), LOW);
-        ts.remove(STEPPER2);
-        count = 0;
-      }
-    }, nullptr, true);
-  }
-}
-#endif
-//====================================================================================================================================================
-//=================================================================Сервоприводы=======================================================================
-#ifdef servo_enable
-//servo 1 13 50 Мой#сервопривод Сервоприводы 0 100 0 180 2
-void servo_() {
-  String servo_number = sCmd.next();
-  String servo_pin = sCmd.next();
-  String start_state = sCmd.next();
-  int start_state_int = start_state.toInt();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-
-  String min_value = sCmd.next();
-  String max_value = sCmd.next();
-
-  String min_deg = sCmd.next();
-  String max_deg = sCmd.next();
-
-  String page_number = sCmd.next();
-
-  jsonWriteStr(optionJson, "servo_pin" + servo_number, servo_pin);
-  start_state_int = map(start_state_int, min_value.toInt(), max_value.toInt(), min_deg.toInt(), max_deg.toInt());
-
-  if (servo_number == "1") {
-#ifdef ESP8266
-    myServo1.attach(servo_pin.toInt());
-    myServo1.write(start_state_int);
-#endif
-#ifdef ESP32
-    myServo1.attach(servo_pin.toInt(), 500, 2400);
-    myServo1.write(start_state_int);
-#endif
-  }
-
-  if (servo_number == "2") {
-#ifdef ESP8266
-    myServo2.attach(servo_pin.toInt());
-    myServo2.write(start_state_int);
-#endif
-#ifdef ESP32
-    myServo2.attach(servo_pin.toInt(), 500, 2400);
-    myServo2.write(start_state_int);
-#endif
-  }
-
-  jsonWriteStr(optionJson, "s_min_val" + servo_number, min_value);
-  jsonWriteStr(optionJson, "s_max_val" + servo_number, max_value);
-  jsonWriteStr(optionJson, "s_min_deg" + servo_number, min_deg);
-  jsonWriteStr(optionJson, "s_max_deg" + servo_number, max_deg);
-
-  jsonWriteStr(configJson, "servo" + servo_number, start_state);
-
-  createWidgetParam (widget_name, page_name, page_number, "widgets/widget.range.json", "servo" + servo_number, "min", min_value, "max", max_value, "k", "1");
-}
-
-void servoSet() {
-  String servo_number = sCmd.next();
-  String servo_state = sCmd.next();
-  int servo_state_int = servo_state.toInt();
-
-  int pin = jsonReadInt(optionJson, "servo_pin" + servo_number);
-
-  servo_state_int = map(servo_state_int,
-                        jsonReadInt(optionJson, "s_min_val" + servo_number),
-                        jsonReadInt(optionJson, "s_max_val" + servo_number),
-                        jsonReadInt(optionJson, "s_min_deg" + servo_number),
-                        jsonReadInt(optionJson, "s_max_deg" + servo_number));
-
-  if (servo_number == "1") {
-#ifdef ESP8266
-    myServo1.write(servo_state_int);
-#endif
-#ifdef ESP32
-    myServo1.write(servo_state_int);
-#endif
-  }
-
-  if (servo_number == "2") {
-#ifdef ESP8266
-    myServo2.write(servo_state_int);
-#endif
-#ifdef ESP32
-    myServo2.write(servo_state_int);
-#endif
-  }
-
-  //Serial.println(servo_state_int);
-
-  eventGen ("servo", servo_number);
-
-  jsonWriteStr(configJson, "servo" + servo_number, servo_state);
-  sendSTATUS("servo" + servo_number, servo_state);
-}
-#endif
-//====================================================================================================================================================
-//===================================================================================serial===========================================================
-#ifdef serial_enable
-void serialBegin() {
-  //String s_speed = sCmd.next();
-  //String rxPin = sCmd.next();
-  //String txPin = sCmd.next();
-  //SoftwareSerial mySerial(rxPin.toInt(), txPin.toInt());
-  //mySerial.begin(s_speed.toInt());
-}
-
-void serialWrite() {
-  //String text = sCmd.next();
-  //mySerial.println(text);
-}
-#endif
-//====================================================================================================================================================
-//=================================================Глобальные команды удаленного управления===========================================================
-
-void mqttOrderSend() {
-
-  String id = sCmd.next();
-  String order = sCmd.next();
-
-  String  all_line = jsonReadStr(configSetup, "mqttPrefix") + "/" + id + "/order";
-  //Serial.print(all_line);
-  //Serial.print("->");
-  //Serial.println(order);
-  int send_status = client_mqtt.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);
-}
-
-void update_firmware() {
-  upgrade = true;
-}
-
-void firmware() {
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  jsonWriteStr(configJson, "firm1", firmware_version);
-  choose_widget_and_create(widget_name, page_name, page_number, "any-data", "firm1");
-}
-
-//==============================================================================================================================
-//============================выполнение команд (в лупе) по очереди из строки 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, ",");         //осекаем выполненную команду
-  }
-}
-
-//=======================================================================================================================================
-//=======================================================================================================================================
-void txtExecution(String file) {
-
-  String command_all = readFile(file, 2048) + "\r\n";
-
-  command_all.replace("\r\n", "\n");
-  command_all.replace("\r", "\n");
-
-  while (command_all.length() != 0) {
-
-    String tmp = selectToMarker (command_all, "\n");
-    sCmd.readStr(tmp);
-    command_all = deleteBeforeDelimiter(command_all, "\n");
-  }
-  command_all = "";
-}
-
-void stringExecution(String str) {
-
-  str = str + "\r\n";
-
-  str.replace("\r\n", "\n");
-  str.replace("\r", "\n");
-
-  while (str.length() != 0) {
-
-    String tmp = selectToMarker (str, "\n");
-    sCmd.readStr(tmp);
-
-    str = deleteBeforeDelimiter(str, "\n");
-  }
-}

FS.ino

@@ -1,38 +0,0 @@
-void File_system_init() {
-  
-  Serial.begin(115200);
-  //Serial.setDebugOutput(true);
-  Serial.println("--------------started----------------");
-  //--------------------------------------------------------------
-  SPIFFS.begin();
-  configSetup = readFile("config.json", 4096);
-  configSetup.replace(" ", "");
-  configSetup.replace("\r\n", "");
-  Serial.println(configSetup);
-  jsonWriteStr(configJson, "name", jsonReadStr(configSetup, "name"));
-  jsonWriteStr(configJson, "lang", jsonReadStr(configSetup, "lang"));
-  
-
-#ifdef ESP32
-  uint32_t chipID_u = ESP.getEfuseMac();
-  chipID = String(chipID_u);
-  jsonWriteStr(configSetup, "chipID", chipID);
-#endif
-
-#ifdef ESP8266
-  chipID = String( ESP.getChipId() ) + "-" + String(ESP.getFlashChipId());
-  jsonWriteStr(configSetup, "chipID", chipID);
-  Serial.setDebugOutput(0);
-#endif
-
-  jsonWriteStr(configSetup, "firmware_version", firmware_version);
-
-  prex = jsonReadStr(configSetup, "mqttPrefix") + "/" + chipID;
-  Serial.println(chipID);
-  
-}
-
-void get_esp_info() {
-
-  
-}

Init.ino

@@ -1,246 +0,0 @@
-void All_init() {
-
-  server.on("/init", HTTP_GET, [](AsyncWebServerRequest * request) {
-    String value;
-    if (request->hasArg("arg")) {
-      value = request->getParam("arg")->value();
-    }
-    if (value == "0") {  //выкл сценариев
-      jsonWriteStr(configSetup, "scenario", value);
-      saveConfig();
-      Scenario_init();
-      request->send(200, "text/text", "OK");
-    }
-    if (value == "1") {   //вкл сценариев
-      jsonWriteStr(configSetup, "scenario", value);
-      saveConfig();
-      Scenario_init();
-      request->send(200, "text/text", "OK");
-    }
-    if (value == "2") {    //инициализация
-      Device_init();
-      request->send(200, "text/text", "OK");
-    }
-    if (value == "3") {
-#ifdef logging_enable
-      clean_log_date();
-#endif
-      request->send(200, "text/text", "OK");
-    }
-    if (value == "4") {
-      Scenario_init();
-      request->send(200, "text/text", "OK");
-    }
-    if (value == "5") {
-      i2c_scanning = true;
-      request->redirect("/?utilities");
-    }
-  });
-
-  prsets_init();
-  Device_init();
-  Scenario_init();
-  Timer_countdown_init();
-}
-
-void Device_init() {
-
-  logging_value_names_list = "";
-  enter_to_logging_counter = LOG1 - 1;
-
-  analog_value_names_list = "";
-  enter_to_analog_counter = 0;
-
-  level_value_name = "";
-
-  dhtT_value_name = "";
-  dhtH_value_name = "";
-
-  bmp280T_value_name = "";
-  bmp280P_value_name = "";
-
-  bme280T_value_name = "";
-  bme280P_value_name = "";
-  bme280H_value_name = "";
-  bme280A_value_name = "";
-
-  int array_sz = sizeof(sensors_reading_map) / sizeof(sensors_reading_map[0]);
-
-  for (int i = 0; i <= array_sz; i++) {
-    sensors_reading_map[i] = 0;
-  }
-
-  for (int i = LOG1; i <= LOG5; i++) {
-    ts.remove(i);
-  }
-
-#ifdef layout_in_ram
-  all_widgets = "";
-#else
-  SPIFFS.remove("/layout.txt");
-#endif
-
-  txtExecution("firmware.c.txt");
-  //outcoming_date();
-}
-//-------------------------------сценарии-----------------------------------------------------
-
-void Scenario_init() {
-  if (jsonReadStr(configSetup, "scenario") == "1") {
-    scenario = readFile("firmware.s.txt", 2048);
-  }
-}
-
-void prsets_init() {
-  server.on("/preset", HTTP_GET, [](AsyncWebServerRequest * request) {
-    String value;
-    if (request->hasArg("arg")) {
-      value = request->getParam("arg")->value();
-    }
-    if (value == "1") {
-      writeFile("firmware.c.txt", readFile("configs/relay.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay.s.txt", 2048));
-    }
-    if (value == "2") {
-      writeFile("firmware.c.txt", readFile("configs/relay_t.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay_t.s.txt", 2048));
-    }
-    if (value == "3") {
-      writeFile("firmware.c.txt", readFile("configs/relay_c.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay_c.s.txt", 2048));
-    }
-    if (value == "4") {
-      writeFile("firmware.c.txt", readFile("configs/relay_s.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay_s.s.txt", 2048));
-    }
-    if (value == "5") {
-      writeFile("firmware.c.txt", readFile("configs/relay_sw.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay_sw.s.txt", 2048));
-    }
-    if (value == "6") {
-      writeFile("firmware.c.txt", readFile("configs/relay_br.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay_br.s.txt", 2048));
-    }
-    if (value == "7") {
-      writeFile("firmware.c.txt", readFile("configs/relay_sr.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/relay_sr.s.txt", 2048));
-    }
-    if (value == "8") {
-      writeFile("firmware.c.txt", readFile("configs/pwm.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/pwm.s.txt", 2048));
-    }
-    if (value == "9") {
-      writeFile("firmware.c.txt", readFile("configs/dht11.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/dht11.s.txt", 2048));
-    }
-    if (value == "10") {
-      writeFile("firmware.c.txt", readFile("configs/dht22.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/dht22.s.txt", 2048));
-    }
-    if (value == "11") {
-      writeFile("firmware.c.txt", readFile("configs/analog.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/analog.s.txt", 2048));
-    }
-    if (value == "12") {
-      writeFile("firmware.c.txt", readFile("configs/dallas.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/dallas.s.txt", 2048));
-    }
-    if (value == "13") {
-      writeFile("firmware.c.txt", readFile("configs/termostat.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/termostat.s.txt", 2048));
-    }
-    if (value == "14") {
-      writeFile("firmware.c.txt", readFile("configs/level.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/level.s.txt", 2048));
-    }
-    if (value == "15") {
-      writeFile("firmware.c.txt", readFile("configs/moution_r.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/moution_r.s.txt", 2048));
-    }
-    if (value == "16") {
-      writeFile("firmware.c.txt", readFile("configs/moution_s.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/moution_s.s.txt", 2048));
-    }
-    if (value == "17") {
-      writeFile("firmware.c.txt", readFile("configs/stepper.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/stepper.s.txt", 2048));
-    }
-    if (value == "18") {
-      writeFile("firmware.c.txt", readFile("configs/servo.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/servo.s.txt", 2048));
-    }
-    if (value == "19") {
-      writeFile("firmware.c.txt", readFile("configs/firmware.c.txt", 2048));
-      writeFile("firmware.s.txt", readFile("configs/firmware.s.txt", 2048));
-    }
-    Device_init();
-    Scenario_init();
-    request->redirect("/?configuration");
-  });
-}
-
-void up_time() {
-  uint32_t ss = millis() / 1000;
-  uint32_t mm = ss / 60;
-  uint32_t hh = mm / 60;
-  uint32_t dd = hh / 24;
-
-  String out = "";
-
-  if (ss != 0) {
-    out = "[i] uptime = " + String(ss) + " sec";
-    jsonWriteStr(configJson, "uptime", String(ss) + " sec");
-  }
-  if (mm != 0) {
-    out = "[i] uptime = " + String(mm) + " min";
-    jsonWriteStr(configJson, "uptime", String(mm) + " min");
-  }
-  if (hh != 0) {
-    out = "[i] uptime = " + String(hh) + " hours";
-    jsonWriteStr(configJson, "uptime", String(hh) + " hours");
-  }
-  if (dd != 0) {
-    out = "[i] uptime = " + String(dd) + " days";
-    jsonWriteStr(configJson, "uptime", String(dd) + " days");
-  }
-  Serial.println(out + ", mqtt_lost_error: " + String(mqtt_lost_error) + ", wifi_lost_error: " + String(wifi_lost_error));
-}
-
-void statistics_init() {
-  ts.add(STATISTICS, statistics_update, [&](void*) {
-
-    statistics();
-
-  }, nullptr, true);
-}
-
-void statistics() {
-  if (WiFi.status() == WL_CONNECTED) {
-    String urls = "http://backup.privet.lv/visitors/?";
-    //-----------------------------------------------------------------
-    urls += WiFi.macAddress().c_str();
-    urls += "&";
-    //-----------------------------------------------------------------
-#ifdef ESP8266
-    urls += "iot-manager_esp8266";
-#endif
-#ifdef ESP32
-    urls += "iot-manager_esp32";
-#endif
-    urls += "&";
-    //-----------------------------------------------------------------
-#ifdef ESP8266
-    urls += ESP.getResetReason();
-    //Serial.println(ESP.getResetReason());
-#endif
-#ifdef ESP32
-    urls += "Power on";
-#endif
-    urls += "&";
-    //-----------------------------------------------------------------
-    urls += "ver: " + firmware_version;
-    //-----------------------------------------------------------------
-    String stat = getURL(urls);
-    //Serial.println(stat);
-  }
-}

LICENSE

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

Logging.ino

@@ -1,153 +0,0 @@
-#ifdef logging_enable
-//===============================================Логирование============================================================
-//logging temp1 1 10 Температура Датчики 2
-void logging() {
-  String value_name = sCmd.next();
-  String period_min = sCmd.next();
-  String maxCount = sCmd.next();
-  String widget_name = sCmd.next();
-  widget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  logging_value_names_list += value_name + ",";
-  enter_to_logging_counter++; //считаем количество входов в эту функцию
-  jsonWriteStr(optionJson, value_name + "_c", maxCount); //создаем в файловой системе переменную количества точек на графике с отметкой _c что значит count
-  createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", value_name + "_ch", maxCount); //создаем график в приложении с топиком _ch /prefix/3234045-1589487/value_name_ch
-  if (enter_to_logging_counter == LOG1) {
-    ts.add(LOG1, period_min.toInt() * 1000 * 60, [&](void*) {
-      String tmp_buf_1 = selectFromMarkerToMarker(logging_value_names_list, ",", 0);
-      deleteOldDate("log." + tmp_buf_1 + ".txt",  jsonReadInt(optionJson, tmp_buf_1 + "_c"), jsonReadStr(configJson, tmp_buf_1));
-      Serial.println("[i] LOGGING for sensor '" + tmp_buf_1 + "' done");
-    }, nullptr, false);
-  }
-  if (enter_to_logging_counter == LOG2) {
-    ts.add(LOG2, period_min.toInt() * 1000 * 60, [&](void*) {
-      String tmp_buf_2 = selectFromMarkerToMarker(logging_value_names_list, ",", 1);
-      deleteOldDate("log." + tmp_buf_2 + ".txt",  jsonReadInt(optionJson, tmp_buf_2 + "_c"), jsonReadStr(configJson, tmp_buf_2));
-      Serial.println("[i] LOGGING for sensor '" + tmp_buf_2 + "' done");
-    }, nullptr, false);
-  }
-  if (enter_to_logging_counter == LOG3) {
-    ts.add(LOG3, period_min.toInt() * 1000 * 60, [&](void*) {
-      String tmp_buf_3 = selectFromMarkerToMarker(logging_value_names_list, ",", 2);
-      deleteOldDate("log." + tmp_buf_3 + ".txt",  jsonReadInt(optionJson, tmp_buf_3 + "_c"), jsonReadStr(configJson, tmp_buf_3));
-      Serial.println("[i] LOGGING for sensor '" + tmp_buf_3 + "' done");
-    }, nullptr, false);
-  }
-  if (enter_to_logging_counter == LOG4) {
-    ts.add(LOG4, period_min.toInt() * 1000 * 60, [&](void*) {
-      String tmp_buf_4 = selectFromMarkerToMarker(logging_value_names_list, ",", 3);
-      deleteOldDate("log." + tmp_buf_4 + ".txt",  jsonReadInt(optionJson, tmp_buf_4 + "_c"), jsonReadStr(configJson, tmp_buf_4));
-      Serial.println("[i] LOGGING for sensor '" + tmp_buf_4 + "' done");
-    }, nullptr, false);
-  }
-  if (enter_to_logging_counter == LOG5) {
-    ts.add(LOG5, period_min.toInt() * 1000 * 60, [&](void*) {
-      String tmp_buf_5 = selectFromMarkerToMarker(logging_value_names_list, ",", 4);
-      deleteOldDate("log." + tmp_buf_5 + ".txt",  jsonReadInt(optionJson, tmp_buf_5 + "_c"), jsonReadStr(configJson, tmp_buf_5));
-      Serial.println("[i] LOGGING for sensor '" + tmp_buf_5 + "' done");
-    }, nullptr, false);
-  }
-}
-
-//=========================================Удаление стрых данных и запись новых==================================================================
-void deleteOldDate(String file, int seted_number_of_lines, String date_to_add) {
-  String log_date = readFile(file, 5000);
-  int current_number_of_lines = count(log_date, "\r\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, "\r\n");
-    if (GetTimeUnix() != "failed") {
-      log_date += GetTimeUnix() + " " +  date_to_add + "\r\n";
-      writeFile(file, log_date);
-    }
-  } else {
-    if (GetTimeUnix() != "failed") {
-      addFile(file, GetTimeUnix() + " " +  date_to_add);
-    }
-  }
-  log_date = "";
-}
-
-//=========================================Выбор какие данные отправлять==================================================================
-void choose_log_date_and_send() {
-  String all_line = logging_value_names_list;
-  while (all_line.length() != 0) {
-    String tmp = selectToMarker (all_line, ",");
-    sendLogData("log." + tmp + ".txt", tmp + "_ch");
-    all_line = deleteBeforeDelimiter(all_line, ",");
-  }
-  all_line = "";
-}
-//=========================================Отправка данных===================================================================================
-void sendLogData(String file, String topic) {
-  String log_date = readFile(file, 5000);
-  if (log_date != "Failed") {
-    log_date.replace("\r\n", "\n");
-    log_date.replace("\r", "\n");
-    String buf = "{}";
-    String json_array;
-    String unix_time;
-    String value;
-    while (log_date.length() != 0) {
-      String tmp = selectToMarker (log_date, "\n");
-      log_date = deleteBeforeDelimiter(log_date, "\n");
-      unix_time = selectToMarker (tmp, " ");
-      jsonWriteInt(buf, "x", unix_time.toInt());
-      value = deleteBeforeDelimiter(tmp, " ");
-      jsonWriteFloat(buf, "y1", value.toFloat());
-      if (log_date.length() < 3) {
-        json_array += buf;
-      } else {
-        json_array += buf + ",";
-      }
-      buf = "{}";
-    }
-    unix_time = "";
-    value = "";
-    log_date = "";
-    json_array = "{\"status\":[" + json_array + "]}";
-    Serial.println(json_array);
-    sendCHART(topic, json_array);
-    json_array = "";
-    getMemoryLoad("[i] after send log date");
-  }
-}
-
-/*
-  //----------------------------------------------
-    File configFile = SPIFFS.open("/" + file, "r");
-    if (!configFile) {
-      return;
-    }
-    configFile.seek(0, SeekSet); //поставим курсор в начало файла
-    while (configFile.position() != configFile.size()) {
-      String tmp = configFile.readStringUntil('\r\n');
-      String unix_time = selectToMarker (tmp, " ");
-      String value = deleteBeforeDelimiter(tmp, " ");
-      String final_line = "{\"status\":{\"x\":" + unix_time + ",\"y1\":" + value + "}}";
-      //Serial.println(final_line);
-      sendCHART(topic, final_line);
-    }
-    getMemoryLoad("[i] after send log date");
-*/
-//=========================================Очистка данных===================================================================================
-void clean_log_date() {
-  String all_line = logging_value_names_list;
-  while (all_line.length() != 0) {
-    String tmp = selectToMarker (all_line, ",");
-    SPIFFS.remove("/log." + tmp + ".txt");
-    all_line = deleteBeforeDelimiter(all_line, ",");
-  }
-  all_line = "";
-}
-#endif

README.md

@@ -1,37 +1,6 @@
-# esp32-esp8266_iot-manager_modules_firmware
-
-It is based on esp8266 and esp32 automation system. Each module has a web interface for its initial configuration. The modules are managed using the "iot manager" application. This application is released for both android and ios platform. The application connects to a MQTT broker, you can add several brokers and switch between them. All modules also connect to same broker. All esp8266 esp32 are combined and appear in the application as widgets.
-
-There are two configuration options in the web interface of the modules:
-
-1. Select a ready-made preset. 
-
-The following presets are available:
-
-- On off relay   
-- On off relay according to the schedule specified in the application   
-- On off the relay after a period of time specified in the application   
-- On off relay groups on different devices with one button in the application   
-- Light switch module   
-- PWM controlled by the slider in the application   
-- Reading and logging analog input into graph with scaling function   
-- Reading and logging in the graph of the following sensors:   
-
-DHT22, DHT33, DHT44, AM2302, RHT03
-DS18B20
-JSN-SR04T, HC-SR04, HY-SRF05
-BME280 BMP280 and other i2c sensors
-
--ds18b20 termostat controlled from application with graph (you can use any sensor for termostat any other supported).
-
-2. Configure with special scripts. A simple programming language was invented which can very flexibly configure the module.
-
-People who do not know how to program can use ready-made presets (option 1), and people who want to play with the system can use scripts (option 2).
-
-Scenarios:
-
-The web interface has the ability to configure Scenarios. An event occurs on one esp, and a reaction to this event can setup to occurs on another.
-
-Logging of sensors data in this project made with out any server. All data for graf storring in esp flash. You can look any time your sensor history for 2 - 3 days or week in mobile app in graf.  And for this option needed only esp.
-
+# 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,94 +0,0 @@
-void handleScenario() {
-
-  if (jsonReadStr(configSetup, "scenario") == "1") {
-    if ((jsonReadStr(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);
-          String order = jsonReadStr(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 = jsonReadStr(configJson, value);
-            }
-            if (value.indexOf("time") != -1) {
-              //  value = add_set(value);
-              value = jsonReadStr(configJson, value);
-            }
-            boolean flag = false;                                                 //если одно из значений совпало то только тогда начинаем выполнять комнады
-            if (sign == "=") {
-              if (jsonReadStr(configJson, param_name) == value) flag = true;
-            }
-            if (sign == "!=") {
-              if (jsonReadStr(configJson, param_name) != value) flag = true;
-            }
-            if (sign == "<") {
-              if (jsonReadStr(configJson, param_name).toInt() < value.toInt()) flag = true;
-            }
-            if (sign == ">") {
-              if (jsonReadStr(configJson, param_name).toInt() > value.toInt()) flag = true;
-            }
-            if (sign == ">=") {
-              if (jsonReadStr(configJson, param_name).toInt() >= value.toInt()) flag = true;
-            }
-            if (sign == "<=") {
-              if (jsonReadStr(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 = jsonReadStr(optionJson, "scenario_status");                           //читаем файл событий
-      tmp2 = deleteBeforeDelimiter(tmp2, ",");                                         //удаляем выполненное событие
-      jsonWriteStr(optionJson, "scenario_status", tmp2);                                  //записываем обновленный файл событий
-      i = 0;
-    }
-  }
-}
-
-void eventGen (String event_name, String number) {   //событие выглядит как имя плюс set плюс номер: button+Set+1
-
-  if (jsonReadStr(configSetup, "scenario") == "1") {
-    String tmp = jsonReadStr(optionJson, "scenario_status") ;    //генерирование события
-    //Serial.println(event_name);
-    jsonWriteStr(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,556 +0,0 @@
-void sensors_init() {
-  ts.add(SENSORS, 1000, [&](void*) {
-    static int counter;
-    counter++;
-
-#ifdef level_enable
-    if (sensors_reading_map[0] == 1) level_reading();
-#endif
-
-    if (counter > 10) {
-      counter = 0;
-
-#ifdef analog_enable
-      if (sensors_reading_map[1] == 1) analog_reading1();
-      if (sensors_reading_map[2] == 1) analog_reading2();
-#endif
-
-#ifdef dallas_enable
-      if (sensors_reading_map[3] == 1) dallas_reading();
-#endif
-
-#ifdef dht_enable
-      if (sensors_reading_map[4] == 1) dhtT_reading();
-      if (sensors_reading_map[5] == 1) dhtH_reading();
-      if (sensors_reading_map[6] == 1) dhtP_reading();
-      if (sensors_reading_map[7] == 1) dhtC_reading();
-      if (sensors_reading_map[8] == 1) dhtD_reading();
-#endif
-
-#ifdef bmp_enable
-      if (sensors_reading_map[9] == 1) bmp280T_rading();
-      if (sensors_reading_map[10] == 1) bmp280P_reading();
-#endif     
-
-#ifdef bme_enable
-      if (sensors_reading_map[11] == 1) bme280T_reading();
-      if (sensors_reading_map[12] == 1) bme280P_reading();
-      if (sensors_reading_map[13] == 1) bme280H_reading();
-      if (sensors_reading_map[14] == 1) bme280A_reading();
-#endif 
-    }
-  }, nullptr, true);
-}
-
-//=========================================================================================================================================
-//=========================================Модуль измерения уровня в баке==================================================================
-#ifdef level_enable
-//level L 14 12 Вода#в#баке,#% Датчики fill-gauge 125 20 1
-void level() {
-  String value_name = sCmd.next();
-  String trig = sCmd.next();
-  String echo = sCmd.next();
-  String widget_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();
-  level_value_name = value_name;
-  jsonWriteStr(optionJson, "e_lev", empty_level);
-  jsonWriteStr(optionJson, "f_lev", full_level);
-  jsonWriteStr(optionJson, "trig", trig);
-  jsonWriteStr(optionJson, "echo", echo);
-  pinMode(trig.toInt(), OUTPUT);
-  pinMode(echo.toInt(), INPUT);
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  sensors_reading_map[0] = 1;
-}
-
-void level_reading() {
-  long duration_;
-  int distance_cm;
-  int level;
-  static int counter;
-  int trig = jsonReadInt(optionJson, "trig");
-  int echo = jsonReadInt(optionJson, "echo");
-  digitalWrite(trig, LOW);
-  delayMicroseconds(2);
-  digitalWrite(trig, HIGH);
-  delayMicroseconds(10);
-  digitalWrite(trig, LOW);
-  duration_ = pulseIn(echo, 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;
-    level = map(distance_cm,
-                jsonReadInt(optionJson, "e_lev"),
-                jsonReadInt(optionJson, "f_lev"), 0, 100);
-    jsonWriteInt(configJson, level_value_name, level);
-    eventGen (level_value_name, "");
-    sendSTATUS(level_value_name, String(level));
-    Serial.println("[i] sensor '" + level_value_name + "' data: " + String(level));
-  }
-}
-#endif
-//=========================================================================================================================================
-//=========================================Модуль аналогового сенсора======================================================================
-#ifdef analog_enable
-//analog adc 0 Аналоговый#вход,#% Датчики any-data 1 1023 1 100 1
-void analog() {
-  String value_name = sCmd.next();
-  String pin = sCmd.next();
-  String widget_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();
-  analog_value_names_list += value_name + ",";
-  enter_to_analog_counter++;
-  jsonWriteStr(optionJson, value_name + "_st", analog_start);
-  jsonWriteStr(optionJson, value_name + "_end", analog_end);
-  jsonWriteStr(optionJson, value_name + "_st_out", analog_start_out);
-  jsonWriteStr(optionJson, value_name + "_end_out", analog_end_out);
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  if (enter_to_analog_counter == 1) {
-    sensors_reading_map[1] = 1;
-  }
-  if (enter_to_analog_counter == 2) {
-    sensors_reading_map[2] = 1;
-  }
-}
-
-void analog_reading1() {
-  String value_name = selectFromMarkerToMarker(analog_value_names_list, ",", 0);
-#ifdef ESP32
-  int analog_in = analogRead(34);
-#endif
-#ifdef ESP8266
-  int analog_in = analogRead(A0);
-#endif
-  int analog = map(analog_in,
-                   jsonReadInt(optionJson, value_name + "_st") ,
-                   jsonReadInt(optionJson, value_name + "_end"),
-                   jsonReadInt(optionJson, value_name + "_st_out"),
-                   jsonReadInt(optionJson, value_name + "_end_out"));
-  jsonWriteInt(configJson, value_name, analog);
-  eventGen (value_name, "");
-  sendSTATUS(value_name, String(analog));
-  Serial.println("[i] sensor '" + value_name + "' data: " + String(analog));
-}
-
-void analog_reading2() {
-  String value_name = selectFromMarkerToMarker(analog_value_names_list, ",", 1);
-#ifdef ESP32
-  int analog_in = analogRead(35);
-#endif
-#ifdef ESP8266
-  int analog_in = analogRead(A0);
-#endif
-  int analog = map(analog_in,
-                   jsonReadInt(optionJson, value_name + "_st") ,
-                   jsonReadInt(optionJson, value_name + "_end"),
-                   jsonReadInt(optionJson, value_name + "_st_out"),
-                   jsonReadInt(optionJson, value_name + "_end_out"));
-  jsonWriteInt(configJson, value_name, analog);
-  eventGen (value_name, "");
-  sendSTATUS(value_name, String(analog));
-  Serial.println("[i] sensor '" + value_name + "' data: " + String(analog));
-}
-#endif
-//=========================================================================================================================================
-//=========================================Модуль температурного сенсора ds18b20===========================================================
-#ifdef dallas_enable
-void dallas() {
-  String value_name = sCmd.next();
-  String pin = sCmd.next();
-  String address = sCmd.next();
-  String widget_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_widget_and_create(widget_name, page_name, page_number, type, "dallas");
-  sensors_reading_map[3] = 1;
-}
-
-void dallas_reading() {
-  float temp = 0;
-  sensors.requestTemperatures();
-  temp = sensors.getTempCByIndex(0);
-  jsonWriteStr(configJson, "dallas", String(temp));
-  eventGen ("dallas", "");
-  sendSTATUS("dallas", String(temp));
-  Serial.println("[i] sensor 'dallas' send date " + String(temp));
-}
-#endif
-//=========================================================================================================================================
-//=========================================Модуль сенсоров DHT=============================================================================
-#ifdef dht_enable
-//dhtT t 2 dht11 Температура#DHT,#t°C Датчики any-data 1
-void dhtT() {
-  String value_name = sCmd.next();
-  String pin = sCmd.next();
-  String sensor_type = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  dhtT_value_name = value_name;
-  if (sensor_type == "dht11") {
-    dht.setup(pin.toInt(), DHTesp::DHT11);
-  }
-  if (sensor_type == "dht22") {
-    dht.setup(pin.toInt(), DHTesp::DHT22);
-  }
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  sensors_reading_map[4] = 1;
-}
-
-void dhtT_reading() {
-  float value = 0;
-  static int counter;
-  if (dht.getStatus() != 0 && counter < 5) {
-    sendSTATUS(dhtT_value_name, String(dht.getStatusString()));
-    counter++;
-  } else {
-    counter = 0;
-    value = dht.getTemperature();
-    if (String(value) != "nan") {
-      eventGen (dhtT_value_name, "");
-      jsonWriteStr(configJson, dhtT_value_name, String(value));
-      sendSTATUS(dhtT_value_name, String(value));
-      Serial.println("[i] sensor '" + dhtT_value_name + "' data: " + String(value));
-    }
-  }
-}
-
-//dhtH h 2 dht11 Влажность#DHT,#t°C Датчики any-data 1
-void dhtH() {
-  String value_name = sCmd.next();
-  String pin = sCmd.next();
-  String sensor_type = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  dhtH_value_name = value_name;
-  if (sensor_type == "dht11") {
-    dht.setup(pin.toInt(), DHTesp::DHT11);
-  }
-  if (sensor_type == "dht22") {
-    dht.setup(pin.toInt(), DHTesp::DHT22);
-  }
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  sensors_reading_map[5] = 1;
-}
-
-void dhtH_reading() {
-  float value = 0;
-  static int counter;
-  if (dht.getStatus() != 0 && counter < 5) {
-    sendSTATUS(dhtH_value_name, String(dht.getStatusString()));
-    counter++;
-  } else {
-    counter = 0;
-    value = dht.getHumidity();
-    if (String(value) != "nan") {
-      eventGen (dhtH_value_name, "");
-      jsonWriteStr(configJson, dhtH_value_name, String(value));
-      sendSTATUS(dhtH_value_name, String(value));
-      Serial.println("[i] sensor '" + dhtH_value_name + "' data: " + String(value));
-    }
-  }
-}
-
-//dhtPerception Восприятие: Датчики 4
-void dhtP() {
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  choose_widget_and_create(widget_name, page_name, page_number, "any-data", "dhtPerception");
-  sensors_reading_map[6] = 1;
-}
-
-void dhtP_reading() {
-  byte value;
-  if (dht.getStatus() != 0) {
-    sendSTATUS("dhtPerception", String(dht.getStatusString()));
-  } else {
-    value = dht.computePerception(jsonReadStr(configJson, dhtT_value_name).toFloat(), jsonReadStr(configJson, dhtH_value_name).toFloat(), false);
-    String final_line = perception(value);
-    jsonWriteStr(configJson, "dhtPerception", final_line);
-    eventGen ("dhtPerception", "");
-    sendSTATUS("dhtPerception", final_line);
-    if (client_mqtt.connected()) {
-      Serial.println("[i] sensor 'dhtPerception' data: " + final_line);
-    }
-  }
-}
-
-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 "Сильно неудобно, полный звиздец";
-}
-
-//dhtComfort Степень#комфорта: Датчики 3
-void dhtC() {
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  choose_widget_and_create(widget_name, page_name, page_number, "any-data", "dhtComfort");
-  sensors_reading_map[7] = 1;
-}
-
-void dhtC_reading() {
-  float value;
-  ComfortState cf;
-  if (dht.getStatus() != 0) {
-    sendSTATUS("dhtComfort", String(dht.getStatusString()));
-  } else {
-    value = dht.getComfortRatio(cf, jsonReadStr(configJson, dhtT_value_name).toFloat(), jsonReadStr(configJson, dhtH_value_name).toFloat(), false);
-    String final_line = get_comfort_status(cf);
-    jsonWriteStr(configJson, "dhtComfort", final_line);
-    eventGen ("dhtComfort", "");
-    sendSTATUS("dhtComfort", final_line);
-    Serial.println("[i] sensor 'dhtComfort' send date " + final_line);
-  }
-}
-
-String get_comfort_status(ComfortState cf) {
-  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;
-  };
-  return comfortStatus;
-}
-
-
-//dhtDewpoint Точка#росы: Датчики 5
-void dhtD() {
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String page_number = sCmd.next();
-  choose_widget_and_create(widget_name, page_name, page_number, "any-data", "dhtDewpoint");
-  sensors_reading_map[8] = 1;
-}
-
-void dhtD_reading() {
-  float value;
-  if (dht.getStatus() != 0) {
-    sendSTATUS("dhtDewpoint", String(dht.getStatusString()));
-  } else {
-    value = dht.computeDewPoint(jsonReadStr(configJson, dhtT_value_name).toFloat(), jsonReadStr(configJson, dhtH_value_name).toFloat(), false);
-    jsonWriteInt(configJson, "dhtDewpoint", value);
-    eventGen ("dhtDewpoint", "");
-    sendSTATUS("dhtDewpoint", String(value));
-    Serial.println("[i] sensor 'dhtDewpoint' data: " + String(value));
-  }
-}
-#endif
-//=========================================i2c bus esp8266 scl-4 sda-5 ====================================================================
-//=========================================================================================================================================
-//=========================================Модуль сенсоров bmp280==========================================================================
-#ifdef bmp_enable
-//bmp280T temp1 0x76 Температура#bmp280 Датчики any-data 1
-void bmp280T() {
-  String value_name = sCmd.next();
-  String address = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  bmp280T_value_name = value_name;
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  bmp.begin(hexStringToUint8(address));
-  bmp.setSampling(Adafruit_BMP280::MODE_NORMAL,     /* Operating Mode. */
-                  Adafruit_BMP280::SAMPLING_X2,     /* Temp. oversampling */
-                  Adafruit_BMP280::SAMPLING_X16,    /* Pressure oversampling */
-                  Adafruit_BMP280::FILTER_X16,      /* Filtering. */
-                  Adafruit_BMP280::STANDBY_MS_500); /* Standby time. */
-  //bmp_temp->printSensorDetails();
-  sensors_reading_map[9] = 1;
-}
-
-void bmp280T_rading() {
-  float value = 0;
-  sensors_event_t temp_event, pressure_event;
-  bmp_temp->getEvent(&temp_event);
-  value = temp_event.temperature;
-  jsonWriteStr(configJson, bmp280T_value_name, String(value));
-  eventGen(bmp280T_value_name, "");
-  sendSTATUS(bmp280T_value_name, String(value));
-  Serial.println("[i] sensor '" + bmp280T_value_name + "' data: " + String(value));
-}
-
-//bmp280P press1 0x76 Давление#bmp280 Датчики any-data 2
-void bmp280P() {
-  String value_name = sCmd.next();
-  String address = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  bmp280P_value_name = value_name;
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  bmp.begin(hexStringToUint8(address));
-  bmp.setSampling(Adafruit_BMP280::MODE_NORMAL,     /* Operating Mode. */
-                  Adafruit_BMP280::SAMPLING_X2,     /* Temp. oversampling */
-                  Adafruit_BMP280::SAMPLING_X16,    /* Pressure oversampling */
-                  Adafruit_BMP280::FILTER_X16,      /* Filtering. */
-                  Adafruit_BMP280::STANDBY_MS_500); /* Standby time. */
-  //bmp_temp->printSensorDetails();
-  sensors_reading_map[10] = 1;
-}
-
-void bmp280P_reading() {
-  float value = 0;
-  sensors_event_t temp_event, pressure_event;
-  bmp_pressure->getEvent(&pressure_event);
-  value = pressure_event.pressure;
-  value = value / 1.333224;
-  jsonWriteStr(configJson, bmp280P_value_name, String(value));
-  eventGen(bmp280P_value_name, "");
-  sendSTATUS(bmp280P_value_name, String(value));
-  Serial.println("[i] sensor '" + bmp280P_value_name + "' data: " + String(value));
-}
-#endif
-//=========================================================================================================================================
-//=============================================Модуль сенсоров bme280======================================================================
-#ifdef bme_enable
-//bme280T temp1 0x76 Температура#bmp280 Датчики any-data 1
-void bme280T() {
-  String value_name = sCmd.next();
-  String address = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  bme280T_value_name = value_name;
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  bme.begin(hexStringToUint8(address));
-  sensors_reading_map[11] = 1;
-}
-
-void bme280T_reading() {
-  float value = 0;
-  value = bme.readTemperature();
-  jsonWriteStr(configJson, bme280T_value_name, String(value));
-  eventGen(bme280T_value_name, "");
-  sendSTATUS(bme280T_value_name, String(value));
-  Serial.println("[i] sensor '" + bme280T_value_name + "' data: " + String(value));
-}
-
-//bme280P pres1 0x76 Давление#bmp280 Датчики any-data 1
-void bme280P() {
-  String value_name = sCmd.next();
-  String address = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  bme280P_value_name = value_name;
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  bme.begin(hexStringToUint8(address));
-  sensors_reading_map[12] = 1;
-}
-
-void bme280P_reading() {
-  float value = 0;
-  value = bme.readPressure();
-  value = value / 1.333224;
-  jsonWriteStr(configJson, bme280P_value_name, String(value));
-  eventGen(bme280P_value_name, "");
-  sendSTATUS(bme280P_value_name, String(value));
-  Serial.println("[i] sensor '" + bme280P_value_name + "' data: " + String(value));
-}
-
-//bme280H hum1 0x76 Влажность#bmp280 Датчики any-data 1
-void bme280H() {
-  String value_name = sCmd.next();
-  String address = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  bme280H_value_name = value_name;
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  bme.begin(hexStringToUint8(address));
-  sensors_reading_map[13] = 1;
-}
-
-void bme280H_reading() {
-  float value = 0;
-  value = bme.readHumidity();
-  jsonWriteStr(configJson, bme280H_value_name, String(value));
-  eventGen(bme280H_value_name, "");
-  sendSTATUS(bme280H_value_name, String(value));
-  Serial.println("[i] sensor '" + bme280H_value_name + "' data: " + String(value));
-}
-
-//bme280A altit1 0x76 Высота#bmp280 Датчики any-data 1
-void bme280A() {
-  String value_name = sCmd.next();
-  String address = sCmd.next();
-  String widget_name = sCmd.next();
-  String page_name = sCmd.next();
-  String type = sCmd.next();
-  String page_number = sCmd.next();
-  bme280A_value_name = value_name;
-  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
-  bme.begin(hexStringToUint8(address));
-  sensors_reading_map[14] = 1;
-}
-
-void bme280A_reading() {
-  float value = 0;
-  value = bme.readAltitude(1013.25);
-  jsonWriteStr(configJson, bme280A_value_name, String(value));
-  eventGen(bme280A_value_name, "");
-  sendSTATUS(bme280A_value_name, String(value));
-  Serial.println("[i] sensor '" + bme280A_value_name + "' data: " + String(value));
-}
-#endif

Ticker_for_TickerScheduler/Ticker/Ticker.cpp

@@ -1,87 +0,0 @@
-/* 
-  Ticker.cpp - esp8266 library that calls functions periodically
-
-  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
- 
-  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 <stddef.h>
-#include <stdint.h>
-
-#include "c_types.h"
-#include "eagle_soc.h"
-#include "ets_sys.h"
-#include "osapi.h"
-
-static const int ONCE   = 0;
-static const int REPEAT = 1;
-
-#include "Ticker.h"
-
-Ticker::Ticker()
-: _timer(nullptr)
-{
-}
-
-Ticker::~Ticker()
-{
-	detach();
-}
-
-void Ticker::_attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, uint32_t arg)
-{
-	if (_timer)
-	{
-		os_timer_disarm(_timer);
-	}
-	else
-	{
-		_timer = new ETSTimer;
-	}
-
-	os_timer_setfn(_timer, reinterpret_cast<ETSTimerFunc*>(callback), reinterpret_cast<void*>(arg));
-	os_timer_arm(_timer, milliseconds, (repeat)?REPEAT:ONCE);
-}
-
-void Ticker::detach()
-{
-	if (!_timer)
-		return;
-
-	os_timer_disarm(_timer);
-	delete _timer;
-	_timer = nullptr;
-	_callback_function = nullptr;
-}
-
-bool Ticker::active() const
-{
-	return (bool)_timer;
-}
-
-void Ticker::_static_callback(void* arg)
-{
-	Ticker* _this = (Ticker*)arg;
-	if (_this == nullptr)
-	{
-		return;
-	}
-	if (_this->_callback_function)
-	{
-		_this->_callback_function();
-	}
-}

Ticker_for_TickerScheduler/Ticker/Ticker.h

@@ -1,136 +0,0 @@
-/* 
-  Ticker.h - esp8266 library that calls functions periodically
-
-  Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
-  This file is part of the esp8266 core for Arduino environment.
- 
-  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 TICKER_H
-#define TICKER_H
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <functional>
-#include <Schedule.h>
-
-extern "C" {
-	typedef struct _ETSTIMER_ ETSTimer;
-}
-
-class Ticker
-{
-public:
-	Ticker();
-	~Ticker();
-	typedef void (*callback_t)(void);
-	typedef void (*callback_with_arg_t)(void*);
-	typedef std::function<void(void)> callback_function_t;
-
-	void attach_scheduled(float seconds, callback_function_t callback)
-	{
-		attach(seconds,std::bind(schedule_function, callback));
-	}
-
-	void attach(float seconds, callback_function_t callback)
-	{
-		_callback_function = callback;
-		attach(seconds, _static_callback, (void*)this);
-	}
-
-	void attach_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
-	{
-		attach_ms(milliseconds, std::bind(schedule_function, callback));
-	}
-
-	void attach_ms(uint32_t milliseconds, callback_function_t callback)
-	{
-		_callback_function = callback;
-		attach_ms(milliseconds, _static_callback, (void*)this);
-	}
-
-	template<typename TArg>
-	void attach(float seconds, void (*callback)(TArg), TArg arg)
-	{
-		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach() callback argument size must be <= 4 bytes");
-		// C-cast serves two purposes:
-		// static_cast for smaller integer types,
-		// reinterpret_cast + const_cast for pointer types
-		uint32_t arg32 = (uint32_t)arg;
-		_attach_ms(seconds * 1000, true, reinterpret_cast<callback_with_arg_t>(callback), arg32);
-	}
-
-	template<typename TArg>
-	void attach_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
-	{
-		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach_ms() callback argument size must be <= 4 bytes");
-		uint32_t arg32 = (uint32_t)arg;
-		_attach_ms(milliseconds, true, reinterpret_cast<callback_with_arg_t>(callback), arg32);
-	}
-
-	void once_scheduled(float seconds, callback_function_t callback)
-	{
-		once(seconds, std::bind(schedule_function, callback));
-	}
-
-	void once(float seconds, callback_function_t callback)
-	{
-		_callback_function = callback;
-		once(seconds, _static_callback, (void*)this);
-	}
-
-	void once_ms_scheduled(uint32_t milliseconds, callback_function_t callback)
-	{
-		once_ms(milliseconds, std::bind(schedule_function, callback));
-	}
-
-	void once_ms(uint32_t milliseconds, callback_function_t callback)
-	{
-		_callback_function = callback;
-		once_ms(milliseconds, _static_callback, (void*)this);
-	}
-
-	template<typename TArg>
-	void once(float seconds, void (*callback)(TArg), TArg arg)
-	{
-		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach() callback argument size must be <= 4 bytes");
-		uint32_t arg32 = (uint32_t)(arg);
-		_attach_ms(seconds * 1000, false, reinterpret_cast<callback_with_arg_t>(callback), arg32);
-	}
-
-	template<typename TArg>
-	void once_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
-	{
-		static_assert(sizeof(TArg) <= sizeof(uint32_t), "attach_ms() callback argument size must be <= 4 bytes");
-		uint32_t arg32 = (uint32_t)(arg);
-		_attach_ms(milliseconds, false, reinterpret_cast<callback_with_arg_t>(callback), arg32);
-	}
-
-	void detach();
-	bool active() const;
-
-protected:	
-	void _attach_ms(uint32_t milliseconds, bool repeat, callback_with_arg_t callback, uint32_t arg);
-	static void _static_callback (void* arg);
-
-protected:
-	ETSTimer* _timer;
-	callback_function_t _callback_function = nullptr;
-};
-
-
-#endif//TICKER_H

Ticker_for_TickerScheduler/Ticker/examples/TickerBasic/TickerBasic.ino

@@ -1,45 +0,0 @@
-/*
-  Basic Ticker usage
-
-  Ticker is an object that will call a given function with a certain period.
-  Each Ticker calls one function. You can have as many Tickers as you like,
-  memory being the only limitation.
-
-  A function may be attached to a ticker and detached from the ticker.
-  There are two variants of the attach function: attach and attach_ms.
-  The first one takes period in seconds, the second one in milliseconds.
-
-  The built-in LED will be blinking.
-*/
-
-#include <Ticker.h>
-
-Ticker flipper;
-
-int count = 0;
-
-void flip() {
-  int state = digitalRead(LED_BUILTIN);  // get the current state of GPIO1 pin
-  digitalWrite(LED_BUILTIN, !state);     // set pin to the opposite state
-
-  ++count;
-  // when the counter reaches a certain value, start blinking like crazy
-  if (count == 20) {
-    flipper.attach(0.1, flip);
-  }
-  // when the counter reaches yet another value, stop blinking
-  else if (count == 120) {
-    flipper.detach();
-  }
-}
-
-void setup() {
-  pinMode(LED_BUILTIN, OUTPUT);
-  digitalWrite(LED_BUILTIN, LOW);
-
-  // flip the pin every 0.3s
-  flipper.attach(0.3, flip);
-}
-
-void loop() {
-}

Ticker_for_TickerScheduler/Ticker/examples/TickerFunctional/TickerFunctional.ino

@@ -1,64 +0,0 @@
-#include "Arduino.h"
-#include "Ticker.h"
-
-#define LED1  2
-#define LED2  4
-#define LED3  12
-#define LED4  14
-#define LED5  15
-
-
-class ExampleClass {
-  public:
-    ExampleClass(int pin, int duration) : _pin(pin), _duration(duration) {
-      pinMode(_pin, OUTPUT);
-      _myTicker.attach_ms(_duration, std::bind(&ExampleClass::classBlink, this));
-    }
-    ~ExampleClass() {};
-
-    int _pin, _duration;
-    Ticker _myTicker;
-
-    void classBlink() {
-      digitalWrite(_pin, !digitalRead(_pin));
-    }
-};
-
-void staticBlink() {
-  digitalWrite(LED2, !digitalRead(LED2));
-}
-
-void scheduledBlink() {
-  digitalWrite(LED3, !digitalRead(LED2));
-}
-
-void parameterBlink(int p) {
-  digitalWrite(p, !digitalRead(p));
-}
-
-Ticker staticTicker;
-Ticker scheduledTicker;
-Ticker parameterTicker;
-Ticker lambdaTicker;
-
-ExampleClass example(LED1, 100);
-
-
-void setup() {
-  pinMode(LED2, OUTPUT);
-  staticTicker.attach_ms(100, staticBlink);
-
-  pinMode(LED3, OUTPUT);
-  scheduledTicker.attach_ms_scheduled(100, scheduledBlink);
-
-  pinMode(LED4, OUTPUT);
-  parameterTicker.attach_ms(100, std::bind(parameterBlink, LED4));
-
-  pinMode(LED5, OUTPUT);
-  lambdaTicker.attach_ms(100, []() {
-    digitalWrite(LED5, !digitalRead(LED5));
-  });
-}
-
-void loop() {
-}

Ticker_for_TickerScheduler/Ticker/examples/TickerParameter/TickerParameter.ino

@@ -1,35 +0,0 @@
-/*
-  Passing paramters to Ticker callbacks
-
-  Apart from void(void) functions, the Ticker library supports
-  functions taking one argument. This argument's size has to be less or
-  equal to 4 bytes (so char, short, int, float, void*, char* types will do).
-
-  This sample runs two tickers that both call one callback function,
-  but with different arguments.
-
-  The built-in LED will be pulsing.
-*/
-
-#include <Ticker.h>
-
-Ticker tickerSetHigh;
-Ticker tickerSetLow;
-
-void setPin(int state) {
-  digitalWrite(LED_BUILTIN, state);
-}
-
-void setup() {
-  pinMode(LED_BUILTIN, OUTPUT);
-  digitalWrite(1, LOW);
-
-  // every 25 ms, call setPin(0)
-  tickerSetLow.attach_ms(25, setPin, 0);
-
-  // every 26 ms, call setPin(1)
-  tickerSetHigh.attach_ms(26, setPin, 1);
-}
-
-void loop() {
-}

Ticker_for_TickerScheduler/Ticker/library.properties

@@ -1,10 +0,0 @@
-name=Ticker
-version=1.0
-author=Ivan Grokhtokov <ivan@esp8266.com>
-maintainer=Ivan Grokhtokov <ivan@esp8266.com>
-sentence=Allows to call functions with a given interval.
-paragraph=
-category=Timing
-url=
-architectures=esp8266
-dot_a_linkage=true

Time.ino

@@ -1,143 +0,0 @@
-void Time_Init() {
-  server.on("/time", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("timezone")) {
-      jsonWriteStr(configSetup, "timezone", request->getParam("timezone")->value());
-    }
-    if (request->hasArg("ntp")) {
-      jsonWriteStr(configSetup, "ntp", request->getParam("ntp")->value());
-    }
-    saveConfig();
-    reconfigTime();
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-  ts.add(TIME_SYNC, 30000, [&](void*) {
-    time_check();
-  }, nullptr, true);
-}
-
-void time_check() {
-  if (GetTimeUnix() == "failed") {
-    Serial.println("[i] Time is not synchronized, start synchronization");
-    reconfigTime();
-  }
-}
-
-void reconfigTime() {
-  if (WiFi.status() == WL_CONNECTED) { 
-    String ntp = jsonReadStr(configSetup, "ntp");
-    configTime(0, 0, ntp.c_str()); 
-    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
-    if (GetTimeUnix() != "failed") {
-      Serial.print("[V] Time synchronized = ");
-      Serial.print(GetDataDigital());
-      Serial.print(" ");
-      Serial.println(GetTime());
-    } else {
-      Serial.println("[E] Time server or internet connection error, will try again in 30 sec");
-    }
-  } else {
-    Serial.println("[E] Get time impossible, no wifi connection");
-  }
-}
-
-//Получаем время в формате linux gmt
-String GetTimeUnix() {
-  time_t now = time(nullptr);
-  if (now < 30000) {
-    return "failed";
-  } else {
-    return String(now);
-  }
-}
-// Получение текущего времени
-String GetTime() {
-  time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  int zone = 3600 * jsonReadStr(configSetup, "timezone").toInt();
-  now = now + zone;
-  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
-  int zone = 3600 * jsonReadStr(configSetup, "timezone").toInt();
-  now = now + zone;
-  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
-  int zone = 3600 * jsonReadStr(configSetup, "timezone").toInt();
-  now = now + zone;
-  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;
-}
-
-int timeToMin(String Time) {
-  //"00:00:00"  время в секунды
-  long  min = selectToMarker(Time, ":").toInt() * 60; //общее количество секунд в полных часах
-  Time = deleteBeforeDelimiter (Time, ":"); // Теперь здесь минуты секунды
-  min += selectToMarker(Time, ":").toInt(); // Добавим секунды из полных минут
-  return min;
-}

Timers.ino

@@ -1,89 +0,0 @@
-//================================================================================================================
-//=========================================Таймеры=================================================================
-void Timer_countdown_init() {
-  
-  ts.add(TIMER_COUNTDOWN, 1000, [&](void*) {
-    
-    String old_line = jsonReadStr(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));
-          jsonWriteStr(configJson, "timer" + String(number), "0");
-          eventGen ("timer", 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 = jsonReadStr(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);
-  jsonWriteStr(configJson, "timer" + number, "1");
-}
-void addTimer(String number, String time) {
-  String tmp = jsonReadStr(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 + ",";
-  }
-  jsonWriteStr(optionJson, "timers", tmp);
-  //Serial.println("ura");
-}
-
-void timerStop() {
-  String number = sCmd.next();
-  delTimer(number);
-}
-
-void delTimer (String number) {
-  String tmp = jsonReadStr(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, "");                          //удаляем таймер
-    jsonWriteStr(optionJson, "timers", tmp);
-  }
-}
-
-int readTimer(int number) {
-  String tmp = jsonReadStr(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();
-}

Upgrade.ino

@@ -1,277 +0,0 @@
-void initUpgrade() {
-
-#ifdef ESP8266
-  if (WiFi.status() == WL_CONNECTED) last_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt");
-#endif
-#ifdef ESP32
-  if (WiFi.status() == WL_CONNECTED) last_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt");
-#endif
-  jsonWriteStr(configSetup, "last_version", last_version);
-  Serial.print("[i] Last firmware version: ");
-  Serial.println(last_version);
-
-  server.on("/check", HTTP_GET, [](AsyncWebServerRequest * request) {
-    upgrade_url = true;
-    Serial.print("[i] Last firmware version: ");
-    Serial.println(last_version);
-    String tmp = "{}";
-    if (WiFi.status() == WL_CONNECTED) {
-      if (mb_4_of_memory) {
-        if (last_version != "") {
-          if (last_version != "error") {
-            if (last_version == firmware_version) {
-              jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Последняя версия прошивки уже установлена.");
-              jsonWriteStr(tmp, "class", "pop-up");
-            } else {
-              jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Имеется новая версия прошивки<a href=\"#\" class=\"btn btn-block btn-danger\" onclick=\"send_request(this, '/upgrade');setTimeout(function(){ location.href='/'; }, 120000);html('my-block','<span class=loader></span>Идет обновление прошивки, после обновления страница  перезагрузится автоматически...')\">Установить</a>");
-              jsonWriteStr(tmp, "class", "pop-up");
-            }
-          } else {
-            jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Ошибка... Cервер не найден. Попробуйте позже...");
-            jsonWriteStr(tmp, "class", "pop-up");
-          }
-        } else {
-          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Нажмите на кнопку \"обновить прошивку\" повторно...");
-          jsonWriteStr(tmp, "class", "pop-up");
-        }
-      } else {
-        jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Обновление по воздуху не поддерживается, модуль имеет меньше 4 мб памяти...");
-        jsonWriteStr(tmp, "class", "pop-up");
-      }
-    } else {
-      jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Устройство не подключен к роутеру...");
-      jsonWriteStr(tmp, "class", "pop-up");
-    }
-    request->send(200, "text/text", tmp);
-  });
-
-  server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest * request) {
-    upgrade = true;
-    String tmp = "{}";
-    request->send(200, "text/text", "ok");
-  });
-}
-
-void do_upgrade_url() {
-  if (upgrade_url) {
-    upgrade_url = false;
-#ifdef ESP32
-    last_version = getURL("http://91.204.228.124:1100/update/esp32/version.txt");
-    jsonWriteStr(configSetup, "last_version", last_version);
-#endif
-#ifdef ESP8266
-    last_version = getURL("http://91.204.228.124:1100/update/esp8266/version.txt");
-    jsonWriteStr(configSetup, "last_version", last_version);
-#endif
-  }
-}
-
-void upgrade_firmware() {
-
-  String scenario_for_update;
-  String config_for_update;
-  String configSetup_for_update;
-  scenario_for_update = readFile("firmware.s.txt", 4000);
-  config_for_update = readFile("firmware.c.txt", 4000);
-  configSetup_for_update = configSetup;
-
-  Serial.println("Start upgrade SPIFFS, please wait...");
-
-  WiFiClient client_for_upgrade;
-
-#ifdef ESP32
-  httpUpdate.rebootOnUpdate(false);
-  t_httpUpdate_return ret = httpUpdate.updateSpiffs(client_for_upgrade, "http://91.204.228.124:1100/update/esp32/esp32-esp8266_iot-manager_modules_firmware.spiffs.bin");
-#endif
-#ifdef ESP8266
-  ESPhttpUpdate.rebootOnUpdate(false);
-  t_httpUpdate_return ret = ESPhttpUpdate.updateSpiffs(client_for_upgrade, "http://91.204.228.124:1100/update/esp8266/esp32-esp8266_iot-manager_modules_firmware.spiffs.bin");
-#endif
-
-  if (ret == HTTP_UPDATE_OK) {
-
-    writeFile("firmware.s.txt", scenario_for_update);
-    writeFile("firmware.c.txt", config_for_update);
-    writeFile("config.json", configSetup_for_update);
-    saveConfig();
-
-    Serial.println("SPIFFS upgrade done!");
-    Serial.println("Start upgrade BUILD, please wait...");
-
-#ifdef ESP32
-    //httpUpdate.rebootOnUpdate(true);
-    t_httpUpdate_return ret = httpUpdate.update(client_for_upgrade, "http://91.204.228.124:1100/update/esp32/esp32-esp8266_iot-manager_modules_firmware.ino.bin");
-#endif
-#ifdef ESP8266
-    //ESPhttpUpdate.rebootOnUpdate(true);
-    t_httpUpdate_return ret = ESPhttpUpdate.update(client_for_upgrade, "http://91.204.228.124:1100/update/esp8266/esp32-esp8266_iot-manager_modules_firmware.ino.bin");
-#endif
-
-    if (ret == HTTP_UPDATE_OK) {
-      
-      Serial.println("BUILD upgrade done!");
-      Serial.println("Restart ESP....");
-      ESP.restart();
-    } else {
-      Serial.println("!!!!BUILD upgrade ERROR");
-    }
-  } else {
-    Serial.println("!!!!SPIFFS upgrade ERROR");
-  }
-}
-
-void do_upgrade() {
-  if (upgrade) {
-    upgrade = false;
-    upgrade_firmware();
-  }
-}
-
-/*
-  void upgrade_status(t_httpUpdate_return set) {
-  switch (set) {
-    case HTTP_UPDATE_FAILED:
-      Serial.printf("UPDATE_FAILED Error (%d): %s", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str());
-      break;
-
-    case HTTP_UPDATE_NO_UPDATES:
-      Serial.println("NO_UPDATES");
-      break;
-
-    case HTTP_UPDATE_OK:
-      Serial.println("HTTP_UPDATE_OK");
-      break;
-  }
-  }
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*
-  // ----------------------- Обновление с сайта
-  void webUpgrade() {
-
-  #ifdef ESP8266
-  String spiffsData = "http://91.204.228.124:1100/update/esp8266/esp32-esp8266_iot-manager_modules_firmware.spiffs.bin";
-  String buildData = "http://91.204.228.124:1100/update/esp8266/esp32-esp8266_iot-manager_modules_firmware.ino.bin";
-  #endif
-
-  #ifdef ESP32
-  String spiffsData = "http://91.204.228.124:1100/update/esp32/esp32-esp8266_iot-manager_modules_firmware.spiffs.bin";
-  String buildData = "http://91.204.228.124:1100/update/esp32/esp32-esp8266_iot-manager_modules_firmware.ino.bin";
-  #endif
-
-  if (spiffsData != "") { // Если нужно прошить FS
-    String scenario_for_update;
-    String config_for_update;
-    String configSetup_for_update;
-    Serial.println(spiffsData);
-    scenario_for_update = readFile("firmware.s.txt", 2048);
-    config_for_update = readFile("config.all.txt", 2048);
-    configSetup_for_update = configSetup;
-    ESPhttpUpdate.rebootOnUpdate(false); // Отключим перезагрузку после обновления
-    updateHTTP(spiffsData, true);
-    writeFile("firmware.s.txt", scenario_for_update);
-    writeFile("config.all.txt", config_for_update);
-    writeFile("config.json", configSetup_for_update);
-    saveConfig();
-  }
-
-  if (buildData != "") { // Если нужно прошить build
-    Serial.println(buildData);
-    ESPhttpUpdate.rebootOnUpdate(true); // Включим перезагрузку после обновления
-    updateHTTP(buildData, false);
-  }
-  }
-  // ------------------ Обновление по url
-  void updateHTTP(String url, boolean mode) {
-  if (url == "") return;
-  ESPhttpUpdate.setLedPin(LED_BUILTIN, LOW);
-  if (mode) {
-    Serial.println("Update Spiffs...");
-    t_httpUpdate_return ret = ESPhttpUpdate.updateSpiffs(url);
-    UpdateStatus(ret , "Spiffs");
-  } else {
-    Serial.println("Update Build...");
-    t_httpUpdate_return ret = ESPhttpUpdate.update(url);
-    UpdateStatus(ret , "build");
-  }
-  }
-  void UpdateStatus(t_httpUpdate_return set, String mode) {
-
-  switch (set) {
-
-    case HTTP_UPDATE_FAILED:
-      Serial.println(mode + "_FAILED");
-      var = "{}";
-      jsonWriteStr(var, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>_FAILED");
-      jsonWriteStr(var, "class", "pop-up");
-      //request->send(200, "text/text", var);
-      break;
-
-    case HTTP_UPDATE_NO_UPDATES:
-      Serial.println(mode + "_NO_UPDATES");
-      var = "{}";
-      jsonWriteStr(var, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>_NO_UPDATES");
-      jsonWriteStr(var, "class", "pop-up");
-      //request->send(200, "text/text", var);
-      break;
-
-    case HTTP_UPDATE_OK:
-      Serial.println(mode + "_UPDATE_OK");
-      var = "{}";
-      jsonWriteStr(var, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>_UPDATE_OK");
-      jsonWriteStr(var, "class", "pop-up");
-      //request->send(200, "text/text", var);
-      break;
-  }
-  }
-*/

Web_server.ino

@@ -1,231 +0,0 @@
-void Web_server_init() {
-  /*********************************************************************************
-  ***************************************OTA****************************************
-  *********************************************************************************/
-#ifdef OTA_enable
-  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
-  /*********************************************************************************
-   **************************************WEB****************************************
-   *********************************************************************************/
-#ifdef ESP32
-  server.addHandler(new SPIFFSEditor(SPIFFS, jsonReadStr(configSetup, "web_login").c_str(), jsonReadStr(configSetup, "web_pass").c_str()));
-#elif defined(ESP8266)
-  server.addHandler(new SPIFFSEditor(jsonReadStr(configSetup, "web_login").c_str(), jsonReadStr(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("/favicon.ico", SPIFFS, "/favicon.ico").setCacheControl("max-age=31536000");
-
-  server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm")
-  .setAuthentication(jsonReadStr(configSetup, "web_login").c_str(), jsonReadStr(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);
-  });
-
-  // ------------------Выполнение команды из запроса
-  //http://192.168.88.45/cmd?command=rel%201%201
-  server.on("/cmd", HTTP_GET, [](AsyncWebServerRequest * request) {
-    String com = request->getParam("command")->value();
-    Serial.println(com);
-    order_loop += com + ",";
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-}
-/*********************************************************************************************************************************
- *********************************************************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(json.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,213 +0,0 @@
-void WIFI_init() {
-
-  // --------------------Получаем ssid password со страницы
-  server.on("/ssid", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("ssid")) {
-      jsonWriteStr(configSetup, "ssid", request->getParam("ssid")->value());
-    }
-    if (request->hasArg("password")) {
-      jsonWriteStr(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")) {
-      jsonWriteStr(configSetup, "ssidAP", request->getParam("ssidAP")->value());
-    }
-    if (request->hasArg("passwordAP")) {
-      jsonWriteStr(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")) {
-      jsonWriteStr(configSetup, "web_login", request->getParam("web_login")->value());
-    }
-    if (request->hasArg("web_pass")) {
-      jsonWriteStr(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"); // отправляем ответ о выполнении
-  });
-  ROUTER_Connecting();
-}
-
-void ROUTER_Connecting() {
-
-  led_blink("slow");
-  
-  WiFi.mode(WIFI_STA);
-
-  byte tries = 20;
-  String _ssid = jsonReadStr(configSetup, "ssid");
-  String _password = jsonReadStr(configSetup, "password");
-  //WiFi.persistent(false);
-
-  if (_ssid == "" && _password == "") {
-    WiFi.begin();
-  }
-  else {
-    WiFi.begin(_ssid.c_str(), _password.c_str());
-    Serial.print("ssid: ");
-    Serial.println(_ssid);
-  }
-  // Делаем проверку подключения до тех пор пока счетчик tries
-  // не станет равен нулю или не получим подключение
-  while (--tries && WiFi.status() != WL_CONNECTED)
-  {
-    if (WiFi.status() == WL_CONNECT_FAILED) {
-      Serial.println("[E] password is not correct");
-      tries = 1;
-      jsonWriteInt(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: http://");
-    Serial.print(WiFi.localIP());
-    Serial.println("");
-    jsonWriteStr(configJson, "ip", WiFi.localIP().toString());
-
-    led_blink("off");
-    
-    //add_dev_in_list("dev.txt", chipID, WiFi.localIP().toString());
-
-  }
-}
-
-bool StartAPMode() {
-  Serial.println("WiFi up AP");
-  WiFi.disconnect();
-
-  WiFi.mode(WIFI_AP);
-
-  String _ssidAP = jsonReadStr(configSetup, "ssidAP");
-  String _passwordAP = jsonReadStr(configSetup, "passwordAP");
-  WiFi.softAP(_ssidAP.c_str(), _passwordAP.c_str());
-  IPAddress myIP = WiFi.softAPIP();
-  led_blink("on");
-  Serial.print("AP IP address: ");
-  Serial.println(myIP);
-  jsonWriteStr(configJson, "ip", myIP.toString());
-
-  if (jsonReadInt(optionJson, "pass_status") != 1) {
-    ts.add(ROUTER_SEARCHING, 10 * 1000, [&](void*) {
-      Serial.println("->try find router");
-      if (RouterFind(jsonReadStr(configSetup, "ssid"))) {
-        ts.remove(ROUTER_SEARCHING);
-        WiFi.scanDelete();
-        ROUTER_Connecting();
-        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.println("; ");
-        }
-      }
-    }
-    WiFi.scanDelete();
-    return false;
-  }
-}
-
-/*
-  String scanWIFI() {
-  uint8_t n = WiFi.scanNetworks();
-  DynamicJsonBuffer jsonBuffer;
-  JsonObject& json = jsonBuffer.createObject();
-  JsonArray& networks = json.createNestedArray("networks");
-  for (uint8_t i = 0; i < n; i++) {
-    JsonObject& data = networks.createNestedObject();
-    String ssidMy = WiFi.SSID(i);
-    data["ssid"] = ssidMy;
-    data["pass"] = (WiFi.encryptionType(i) == ENC_TYPE_NONE) ? "" : "*";
-    int8_t dbm = WiFi.RSSI(i);
-    data["dbm"] = dbm;
-    if (ssidMy == jsonReadStr(configSetup, "ssid")) {
-      jsonWriteStr(configJson, "dbm", dbm);
-    }
-  }
-  String root;
-  json.printTo(root);
-  return root;
-  }
-*/
-/*
-  {
-   "type":"wifi",
-   "title":"{{LangWiFi1}}",
-   "name":"ssid",
-   "state":"{{ssid}}",
-   "pattern":".{1,}"
-  },
-  {
-   "type":"password",
-   "title":"{{LangPass}}",
-   "name":"ssidPass",
-   "state":"{{ssidPass}}",
-   "pattern":".{8,}"
-  },
-*/

Widgets.ino

@@ -1,88 +0,0 @@
-//======================================================================================================================
-//===============================================Создание виджетов=======================================================
-void createWidget (String widget_name, String  page_name, String page_number, String file, String topic) {
-
-  String widget;
-  widget = readFile(file, 1024);
-
-  if (widget == "Failed") return;
-  if (widget == "Large") return;
-
-  widget_name.replace("#", " ");
-  page_name.replace("#", " ");
-
-  jsonWriteStr(widget, "page", page_name);
-  jsonWriteStr(widget, "order", page_number);
-  jsonWriteStr(widget, "descr", widget_name);
-  jsonWriteStr(widget, "topic", prex + "/" + topic);
-
-#ifdef layout_in_ram
-  all_widgets += widget + "\r\n";
-#else
-  addFile("layout.txt", widget);
-#endif
-  widget = "";
-}
-
-void createWidgetParam (String widget_name, String  page_name, String page_number, String file, String topic, String name1, String param1, String name2, String param2, String name3, String param3) {
-
-  String widget;
-  widget = readFile(file, 1024);
-
-  if (widget == "Failed") return;
-  if (widget == "Large") return;
-
-  widget_name.replace("#", " ");
-  page_name.replace("#", " ");
-
-  jsonWriteStr(widget, "page", page_name);
-  jsonWriteStr(widget, "order", page_number);
-  jsonWriteStr(widget, "descr", widget_name);
-  jsonWriteStr(widget, "topic", prex + "/" + topic);
-
-  if (name1 != "") jsonWriteStr(widget, name1, param1);
-  if (name2 != "") jsonWriteStr(widget, name2, param2);
-  if (name3 != "") jsonWriteStr(widget, name3, param3);
-
-#ifdef layout_in_ram
-  all_widgets += widget + "\r\n";
-#else
-  addFile("layout.txt", widget);
-#endif
-  widget = "";
-}
-
-void createChart (String widget_name, String  page_name, String page_number, String file, String topic, String maxCount) {
-
-  String widget;
-  widget = readFile(file, 1024);
-
-  if (widget == "Failed") return;
-  if (widget == "Large") return;
-
-  widget_name.replace("#", " ");
-  page_name.replace("#", " ");
-
-  jsonWriteStr(widget, "page", page_name);
-  jsonWriteStr(widget, "order", page_number);
-  //jsonWriteStr(widget, "descr", widget_name);
-  jsonWriteStr(widget, "series", widget_name);
-  jsonWriteStr(widget, "maxCount", maxCount);
-  jsonWriteStr(widget, "topic", prex + "/" + topic);
-
-#ifdef layout_in_ram
-  all_widgets += widget + "\r\n";
-#else
-  addFile("layout.txt", widget);
-#endif
-  widget = "";
-}
-
-void choose_widget_and_create(String widget_name, String page_name, String page_number, String type, String topik) {
-
-  if (type == "any-data") createWidget (widget_name, page_name, page_number, "widgets/widget.anyData.json", topik);
-  if (type == "progress-line") createWidget (widget_name, page_name, page_number, "widgets/widget.progLine.json", topik);
-  if (type == "progress-round") createWidget (widget_name, page_name, page_number, "widgets/widget.progRound.json", topik);
-  if (type == "fill-gauge") createWidget (widget_name, page_name, page_number, "widgets/widget.fillGauge.json", topik);
-
-}

bus.ino

@@ -1,33 +0,0 @@
-void do_i2c_scanning() {
-  if (i2c_scanning) {
-    i2c_scanning = false;
-    String tmp = i2c_scan();
-    if (tmp == "error") {
-      tmp = i2c_scan();
-      Serial.println(tmp);
-      jsonWriteStr(configJson, "i2c", tmp);
-    } else {
-      Serial.println(tmp);
-      jsonWriteStr(configJson, "i2c", tmp);
-    }
-  }
-}
-
-String i2c_scan() {
-  String out;
-  byte count = 0;
-  Wire.begin();
-  for (byte i = 8; i < 120; i++) {
-    Wire.beginTransmission(i);
-    if (Wire.endTransmission() == 0) {
-      count++;
-      out += String(count) + ". 0x" + String(i, HEX) + "; ";
-      delay(1);
-    }
-  }
-  if (count == 0) {
-    return "error";
-  } else {
-    return out;
-  }
-}

data/config.json

@@ -1,20 +0,0 @@
-{
-    "name": "IoTmanager",
-    "chipID": "",
-    "ssidAP": "WiFi2",
-    "passwordAP": "",
-    "ssid": "rise",
-    "password": "hostel3333",
-    "timezone": 2,
-    "ntp": "pool.ntp.org",
-    "mqttServer": "91.204.228.124",
-    "mqttPort": 1883,
-    "mqttPrefix": "/rise",
-    "mqttUser": "test",
-    "mqttPass": "test",
-    "scenario": "1",
-    "pushingbox_id": "v7C133E426B0C69E",
-    "web_login": "admin",
-    "web_pass": "admin",
-    "udponoff": "1"
-}

data/configs/analog.c.txt

@@ -1,8 +0,0 @@
-analog adc 0 Аналоговый#вход,#% Датчики progress-round 310 620 1 100 1
-logging adc 5 100 Аналоговый#вход Датчики 2
-
-//если датчик углекислого газа выдает напряжение от 1 вольта до 2 вольт, то значит 
-//значение чтения аналогового входа будут примерно равным 
-//при 1 вольте - 310, а при 2 вольтах - 620 (считаем по пропорции)
-//данная строка переведет диапазон 310-620 в диапазон 1-100 и отобразит в приложении
-//варианты отображения: any-data, progress-round, progress-line, fill-gauge

data/configs/analog.s.txt

@@ -1 +0,0 @@
-

data/configs/dallas.c.txt

@@ -1,5 +0,0 @@
-dallas 2 Водонагреватель,#t°C Датчики any-data 1
-logging dallas 1 100 Температура Датчики 2
-
-//2 - номер пина датчика
-//варианты отображения: any-data, progress-round, progress-line, fill-gauge

data/configs/dallas.s.txt

@@ -1 +0,0 @@
-

data/configs/dht11.c.txt

@@ -1,7 +0,0 @@
-dhtT t 2 dht11 Температура#DHT,#t°C Датчики any-data 1
-dhtH h 2 dht11 Влажность#DHT,#t°C Датчики any-data 2
-dhtComfort Степень#комфорта: Датчики 3
-dhtPerception Восприятие: Датчики 4
-dhtDewpoint Точка#росы: Датчики 5
-logging t 1 50 Температура Датчики  6
-logging h 1 50 Влажность Датчики  7

data/configs/dht11.s.txt

@@ -1 +0,0 @@
-

data/configs/dht22.c.txt

@@ -1,7 +0,0 @@
-dhtT t 2 dht22 Температура#DHT,#t°C Датчики any-data 1
-dhtH h 2 dht22 Влажность#DHT,#t°C Датчики any-data 2
-dhtComfort Степень#комфорта: Датчики 3
-dhtPerception Восприятие: Датчики 4
-dhtDewpoint Точка#росы: Датчики 5
-logging t 1 50 Температура Датчики  6
-logging h 1 50 Влажность Датчики  7

data/configs/dht22.s.txt

@@ -1 +0,0 @@
-

data/configs/firmware.c.txt

@@ -1,12 +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 adc 0 Аналоговый#вход Датчики fill-gauge 1 1023 1 1023 6
-logging adc 1 100 Аналоговый#вход Датчики 7
-
-//Это демо конфигурация. В ней показано как связать кнопки c помощью сценариев
-//Кнопка номер 1 связана с кнопкой 2, 3 и с pwm 2
-//Так же продемонстрированна система логгирования данных строкой logging
-//1 - это интервал между точками в минутах, 100 это количество точек 

data/configs/firmware.s.txt

@@ -1,13 +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
-adc > 50
-buttonSet 2 1
-end

data/configs/level.c.txt

@@ -1,11 +0,0 @@
-level lev 14 12 Вода#в#баке,#% Датчики fill-gauge 125 20 1
-inputDigit digit1 При#скольки#выключить? Датчики 95 2
-inputDigit digit2 При#скольки#включить? Датчики 10 3
-button 1 5 Насос Датчики 0 4
-button 2 line1,line2, Автоматический#режим Датчики 1 5
-logging lev 1 100 Вода#в#баке Датчики 6
-
-//125 - это расстояние от датчика до дна бака в сантиметрах
-//20 - это расстояние от датчика до поверхности воды когда бак полный в сантиметрах
-//вывод данных будет в процентах заполнения бака
-//варианты отображения: any-data, progress-round, progress-line, fill-gauge

data/configs/level.s.txt

@@ -1,6 +0,0 @@
-lev > digit1
-buttonSet 1 0
-end
-lev < digit2
-buttonSet 1 1
-end

data/configs/moution_r.c.txt

@@ -1,11 +0,0 @@
-button 1 5 Прихожая Освещение 0 1
-inputDigit digit1 Задержка#выключения Освещение 30 2
-switch 1 0 10
-
-//0 - номер пина датчика движения
-//5 - номер пина реле
-//при срабатывании датчика движения включится реле и обратный таймер на 30 сек
-//если движение не будет обнаружено повтороно в течении 30 секунд - свет выключится
-//если движение повторится в течении 30 секунд то таймер продлится опять на 30 сек
-//свет выключится только в том случае если в комнате все замрет на 30 сек
-//задержку выключения можно будет настраивать в приложении

data/configs/moution_r.s.txt

@@ -1,7 +0,0 @@
-switch1 = 1
-timerStart 1 digit1 sec
-buttonSet 1 1
-end
-timer1 = 0
-buttonSet 1 0
-end

data/configs/moution_s.c.txt

@@ -1,12 +0,0 @@
-switch 1 0 20
-text 1 Вход: Охрана 1
-textSet 1 не#обнаружено-time
-button 1 na Сбросить Охрана 0 2
-button 2 line3, Включить#push Охрана 1 3
-
-//0 - номер пина датчика
-//при срабатывании датчика движения устройство пошлет пуш и в приложении будет
-//написано в текстовом поле, что движение было обнаружено
-//так же будет зафиксирован момент времени срабатывания датчика
-//в приложении можно отключать отправку пуш сообщений на тот случай если дома хозяин
-//перевести датчик снова в режим ожидания движения можно нажав кнопку сброса в приложении

data/configs/moution_s.s.txt

@@ -1,10 +0,0 @@
-switch1 = 1
-textSet 1 обнаружено#движение-time
-end
-button1 = 1
-textSet 1 не#обнаружено-time
-buttonSet 1 0
-end
-switch1 = 1
-push Внимание обнаружено#движение!
-end

data/configs/pwm.c.txt

@@ -1,6 +0,0 @@
-pwm 1 3 Яркость#коредор: Реле 1023 1
-pwm 2 4 Яркость#ванная: Реле 510 2
-
-//в приложении появятся ползунки, соответствующее значение pwm 
-//будет установленно на пинах 3 и 4
-//1023 и 510 это начальные значения после загрузки модуля

data/configs/pwm.s.txt

@@ -1 +0,0 @@
-

data/configs/relay.c.txt

@@ -1,3 +0,0 @@
-button 1 5 Включить#реле Реле 0 1
-
-//это простая кнопка номер 1 управляющая пином 5 имеющая начальное состояние 0

data/configs/relay.s.txt

@@ -1 +0,0 @@
-

data/configs/relay_br.c.txt

@@ -1,6 +0,0 @@
-button 1 5 Включить#все Реле 0 1
-
-
-//что бы использовать эту конфигурацию на другой esp необходимо активировать пресет
-//"Вкл. выкл. локального реле", затем в сценарии данного модуля подставить Device ID
-//того esp, кнопка на этом девайсе будет выключать другие устройства по воздуху

data/configs/relay_br.s.txt

@@ -1,8 +0,0 @@
-button1 = 1
-mqtt 3233662-1589485 buttonSet_1_1
-mqtt 2233662-1589486 buttonSet_1_1
-end
-button1 = 0
-mqtt 3233662-1589485 buttonSet_1_0
-mqtt 2233662-1589486 buttonSet_1_0
-end

data/configs/relay_c.c.txt

@@ -1,4 +0,0 @@
-button 1 5 Вкл#на#время Таймеры 0 1
-inputDigit digit1 Через#сколько#секунд#выключить? Таймеры 5 2
-
-//в сценариях можно поменять на sec, min или hours если нужны другие размерности времени

data/configs/relay_c.s.txt

@@ -1,6 +0,0 @@
-button1 = 1
-timerStart 1 digit1 sec
-end
-timer1 = 0
-buttonSet 1 0
-end

data/configs/relay_rm.c.txt

@@ -1,3 +0,0 @@
-switch 1 0 10
-
-//физическая кнопка номер 1 подключенная к пину 0, задержка от дребезга 10 мс

data/configs/relay_rm.s.txt

@@ -1,3 +0,0 @@
-switch1 = 1
-mqtt 3233662-1589489 buttonChange_1
-end

data/configs/relay_s.c.txt

@@ -1,3 +0,0 @@
-button 1 na Включить#все Освещение 0 1
-
-//при нажатии на эту кнопку пины номер 5 и 13 поведут себя как установленно в сценариях

data/configs/relay_s.s.txt

@@ -1,8 +0,0 @@
-button1 = 1
-pinSet 5 1
-pinSet 13 0
-end
-button1 = 0
-pinSet 5 0
-pinSet 13 1
-end

data/configs/relay_sr.c.txt

@@ -1,6 +0,0 @@
-switch 1 0 10
-
-//что бы использовать эту конфигурацию на другой esp необходимо активировать пресет
-//"Вкл. выкл. локального реле", затем в сценарии данного модуля подставить Device ID
-//того esp, к данному модулю нужно подключить кнопку к пину 0 и тогда 
-//один девайс будет управлять другим по воздуху

data/configs/relay_sr.s.txt

@@ -1,4 +0,0 @@
-switch1 = 1
-mqtt 3233662-1589485 buttonChange_1
-mqtt 2233662-1589486 buttonChange_1
-end

data/configs/relay_sw.c.txt

@@ -1,4 +0,0 @@
-button 1 13 Включить#реле Реле 0 1
-switch 1 0 10
-
-//можно управлять реле на пине 13 кнопкой на пине 0 или кнопкой в приложении

data/configs/relay_sw.s.txt

@@ -1,3 +0,0 @@
-switch1 = 1
-buttonChange 1
-end

data/configs/relay_t.c.txt

@@ -1,6 +0,0 @@
-inputTime time1 Во#сколько#включить? Таймеры 20-30-00 1
-inputTime time2 Во#сколько#выключить? Таймеры 20-35-00 2
-button 1 5 Кнопка#(по#таймеру) Таймеры 0 3
-
-//время в приложение необходимо вводить в строгом формате: ЧЧ-ММ-СС
-//можно создавать любое количество таймеров, копируя строку inputTime...

data/configs/relay_t.s.txt

@@ -1,6 +0,0 @@
-timenow = time1
-buttonSet 1 1
-end
-timenow = time2
-buttonSet 1 0
-end

data/configs/servo.c.txt

@@ -1,17 +0,0 @@
-servo 1 12 50 Мой#сервопривод Сервоприводы 0 100 0 180 1
-servo 2 13 50 Мой#сервопривод Сервоприводы 0 100 0 180 2
-button 1 na Открыть1 Сервоприводы 0 3
-button 2 na Открыть2 Сервоприводы 0 4
-
-//Можно создавать не более двух сервоприводов на одном устройстве. 
-//1 - номер привода
-//12 - номер пина
-//50 - начальное значение в процентах
-
-//0 - 100 диапазон ползунка
-//0 - 180 диапазон угла
-
-//Представим ситуацию когда есть некая заслонка и при угле в 30 градусов она закрыта,
-//а при угле в 90 градусов открыта. В этом случае необходимо написать
-//0 100 30 90 и тогда поставив ползунок в 0 % серва встанет в положение 30 градусов, 
-//а если поставить ползунок в 100 % серва встанет в положение 90 градусов. 

data/configs/servo.s.txt

@@ -1,12 +0,0 @@
-button1 = 1
-servoSet 1 100
-end
-button1 = 0
-servoSet 1 0
-end
-button2 = 1
-servoSet 2 100
-end
-button2 = 0
-servoSet 2 0
-end

data/configs/stepper.c.txt

@@ -1,17 +0,0 @@
-stepper 1 12 4
-stepper 2 13 5
-button 1 na Открыть#штору#1 Шторы 0 1
-button 2 na Открыть#штору#2 Шторы 0 2
-
-//для подключения необходим драйвер шагового двигателя A4988
-
-//stepper 1 12 4 шаговый двигатель с параметрами: 1 - номер шагового двигателя, 
-//12 - номер пина количества шагов, 4 - номер пина направления
-
-//stepper 2 13 5 шаговый двигатель с параметрами: 2 - номер шагового двигателя, 
-//13 - номер пина количества шагов, 5 - номер пина направления
-
-//stepperSet 1 200 5 - прокрутить шаговик номер 1 на 200 шагов по часовой стрелке 
-//с задержкой между шагами 5 милисекунд (чем меньше задержка тем больше скорость)
-//если поставить -200 то будет вращаться против часовой стрелки
-//можно подключить не более двух шаговиков

data/configs/stepper.s.txt

@@ -1,12 +0,0 @@
-button1 = 1
-stepperSet 1 200 1
-end
-button1 = 0
-stepperSet 1 -200 1
-end
-button2 = 1
-stepperSet 2 200 1
-end
-button2 = 0
-stepperSet 2 -200 1
-end

data/configs/termostat.c.txt

@@ -1,12 +0,0 @@
-dallas 2 Водонагреватель,#t°C Термостат any-data 1
-logging dallas 5 100 Температура Термостат 2
-inputDigit digit1 При#скольки#выключить? Термостат 40 3
-inputDigit digit2 При#скольки#включить? Термостат 20 4
-button 1 5 Нагреватель Термостат 0 5
-button 2 line1,line2, Автоматический#режим Термостат 1 6
-
-//2 - номер пина датчика
-//5 - номер пина реле
-//это термостат который будет держать температуру между двумя 
-//установленными в приложении значениями, так же можно выключить 
-//автоматический режим, и тогда нагреватель будет управляться в ручную

data/configs/termostat.s.txt

@@ -1,6 +0,0 @@
-dallas > digit1
-buttonSet 1 0
-end
-dallas < digit2
-buttonSet 1 1
-end

data/configuration.json

@@ -1,118 +0,0 @@
-{
-  "configs": [
-    "/config.live.json",
-    "/config.setup.json",
-    "/config.option.json"
-  ],
-  "class": "col-sm-offset-1 col-sm-10",
-  "content": [
-    {
-      "type": "h5",
-      "title": "{{name}}",
-      "class": "alert-warning"
-    },
-    {
-      "type": "h4",
-      "title": "Device ID: {{chipID}}"
-    },
-    {
-      "type": "h4",
-      "title": "IP address: {{ip}}"
-    },
-    {
-      "type": "h4",
-      "title": "Uptime: {{uptime}}"
-    },
-    {
-      "type": "h4",
-      "title": "Time: {{time}}"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "dropdown",
-      "name": "help-url",
-      "class": "btn btn-warning btn-lg",
-      "style": "display:inline",
-      "title": {
-        "#": "Выбирите то, во что Вы хотите превратить это устройство <span class=\"caret\"></span>",
-        "/preset?arg=1": "1.Вкл. выкл. локального реле",
-        "/preset?arg=2": "2.Вкл. выкл. локального реле в определенное время",
-        "/preset?arg=3": "3.Вкл. выкл. локального реле на определенный период времени",
-        "/preset?arg=4": "4.Вкл. выкл. нескольких локальных реле кнопкой в приложении",
-        "/preset?arg=5": "5.Вкл. выкл. локального реле физической кнопкой и кнопкой в приложении параллельно (для выключателя света)",
-        "/preset?arg=6": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)",
-        "/preset?arg=7": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)",
-        "/preset?arg=8": "8.Широтно импульсная модуляция",
-        "/preset?arg=9": "9.Сенсор DHT11 и логгирование",
-        "/preset?arg=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 и логгирование",
-        "/preset?arg=11": "11.Аналоговый сенсор и логгирование",
-        "/preset?arg=12": "12.Сенсор DS18B20 и логгирование",
-        "/preset?arg=13": "13.Термостат на DS18B20 с переключением в ручной режим и логгированием",
-        "/preset?arg=14": "14.Контроль уровня в баке на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование (управление насосом)",
-        "/preset?arg=15": "15.Датчик движения включающий свет",
-        "/preset?arg=16": "16.Охранный датчик движения",
-        "/preset?arg=17": "17.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)",
-        "/preset?arg=18": "18.Система управления сервоприводами",
-        "/preset?arg=19": "Настройки по умолчанию"
-      }
-    },
-    {
-      "type": "h2",
-      "title": "Конфигурация устройства"
-    },
-    {
-      "type": "file",
-      "state": "firmware.c.txt",
-      "style": "width:100%;height:400px",
-      "title": "Сохранить",
-      "action": "/init?arg=2",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Подробная инструкция",
-      "action": "https://github.com/DmitryBorisenko33/esp32-esp8266_iot-manager_modules_firmware/wiki/Instruction",
-      "class": "btn btn-block btn-primary"
-    },
-    {
-      "type": "h2",
-      "title": "Сценарии"
-    },
-    {
-      "type": "checkbox",
-      "name": "scenario",
-      "title": "Включить сценарии",
-      "action": "/init?arg=[[scenario]]",
-      "state": "{{scenario}}"
-    },
-    {
-      "type": "h6",
-      "title": ""
-    },
-    {
-      "type": "file",
-      "state": "firmware.s.txt",
-      "style": "width:100%;height:400px",
-      "title": "Сохранить",
-      "action": "/init?arg=4",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Очистить логи сенсоров",
-      "action": "/init?arg=3",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Главная",
-      "action": "/",
-      "class": "btn btn-block btn-danger btn-sm"
-    }
-  ]
-}

data/dev.json

@@ -1,92 +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": "{{name}}",
-      "class": "alert-warning"
-    },
-    {
-      "type": "h3",
-      "title": "Список других устройств в сети:"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "csv",
-      "title": [
-        "html",
-        "html",
-        "html"
-      ],
-      "state": "dev.csv",
-      "style": "width:100%;",
-      "class": "nan"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Переформировать список устройств",
-      "action": "udp?arg=3",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Обновить страницу",
-      "action": "udp?arg=4",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "text",
-      "class": "alert alert-warning",
-      "title": "После нажатия на кнопку 'Переформировать список устройств' ждите примерно минуту, а затем обновите страницу и список появится вновь"
-    },
-    {
-      "type": "h3",
-      "title": "Имя этого устройства:"
-    },
-    {
-      "type": "input",
-      "title": "Имя устройства",
-      "name": "dev_name",
-      "state": "{{name}}",
-      "pattern": "[A-Za-z0-9]{6,12}"
-    },
-    {
-      "type": "button",
-      "title": "Сохранить",
-      "action": "name?arg=[[dev_name]]",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "checkbox",
-      "name": "udponoff",
-      "title": "Включить обмен данными между устройствами",
-      "action": "/udp?arg=[[udponoff]]",
-      "state": "{{udponoff}}"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Главная",
-      "action": "/",
-      "class": "btn btn-block btn-danger"
-    }
-  ]
-}

data/firmware.c.txt

@@ -1,12 +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 adc 0 Аналоговый#вход Датчики fill-gauge 1 1023 1 1023 6
-logging adc 1 100 Аналоговый#вход Датчики 7
-
-//Это демо конфигурация. В ней показано как связать кнопки c помощью сценариев
-//Кнопка номер 1 связана с кнопкой 2, 3 и с pwm 2
-//Так же продемонстрированна система логгирования данных строкой logging
-//1 - это интервал между точками в минутах, 100 это количество точек 

data/firmware.s.txt

@@ -1,13 +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
-adc > 50
-buttonSet 2 1
-end

data/index.json

@@ -1,112 +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": "{{name}}",
-      "class": "alert-warning"
-    },
-    {
-      "type": "h4",
-      "title": "Device ID: {{chipID}}"
-    },
-    {
-      "type": "h4",
-      "title": "IP address: {{ip}}"
-    },
-    {
-      "type": "h4",
-      "title": "Uptime: {{uptime}}"
-    },
-    {
-      "type": "h4",
-      "title": "Time: {{time}}"
-    },
-    {
-      "type": "h4",
-      "title": "Build version: {{firmware_version}}"
-    },
-    {
-      "type": "h4",
-      "title": "SPIFFS version: 2.3.3"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Конфигурация устройства",
-      "action": "/?configuration",
-      "class": "btn btn-block btn-primary"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Список других устройств в сети",
-      "action": "/?dev",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Конфигурация WIFI",
-      "action": "/?setup",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Конфигурация MQTT",
-      "action": "/?mqtt",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Конфигурация push",
-      "action": "/?pushingbox",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Утилиты",
-      "action": "/?utilities",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "h3",
-      "name": "my-block",
-      "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
-      "class": "hidden"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "button",
-      "title": "Обновить прошивку",
-      "action": "/check",
-      "response": "[[my-block]]",
-      "class": "btn btn-block btn-danger"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Скачать приложение IoT Manager для android",
-      "action": "https://play.google.com/store/apps/details?id=ru.esp8266.iotmanager",
-      "class": "btn btn-block btn-warning"
-    },
-    {
-      "type": "link",
-      "title": "Скачать приложение IoT Manager для iphone",
-      "action": "https://apps.apple.com/ru/app/iot-manager/id1155934877",
-      "class": "btn btn-block btn-warning"
-    }
-  ]
-}

data/mqtt.json

@@ -1,111 +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": "{{name}}",
-      "class": "alert-warning"
-    },
-    {
-      "type": "text",
-      "class": "alert alert-warning",
-      "title": "Обратите внимание что поле prefix может состоять только из одного слова и одного разделителя: <b>/prefix</b>, вариант вида: <b>/prefix1/prefix2</b> работать не будет. После изменения поля prefix необходимо перезагрузить устройство"
-    },
-    {
-      "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": "Prefix:"
-    },
-    {
-      "type": "input",
-      "title": "",
-      "name": "3",
-      "state": "{{mqttPrefix}}"
-    },
-    {
-      "type": "h4",
-      "title": "User name:"
-    },
-    {
-      "type": "input",
-      "title": "",
-      "name": "4",
-      "state": "{{mqttUser}}"
-    },
-    {
-      "type": "h4",
-      "title": "Password:"
-    },
-    {
-      "type": "input",
-      "title": "",
-      "name": "5",
-      "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": "text",
-      "class": "alert alert-warning",
-      "title": "Прежде чем нажимать на кнопку <b>'Отправить настройки MQTT'</b> сохрание их, если Вы их меняли. Настройки получат и перезапишут все устройства в локальной сети"
-    },
-    {
-      "type": "button",
-      "title": "Сохранить",
-      "action": "mqttSave?mqttServer=[[1]]&mqttPort=[[2]]&mqttPrefix=[[3]]&mqttUser=[[4]]&mqttPass=[[5]]",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "button",
-      "title": "Отправить настройки MQTT с этого устройства на все остальные",
-      "action": "udp?arg=2",
-      "class": "btn btn-block btn-success"
-    },
-    
-    {
-      "type": "button",
-      "title": "Проверить соединение с MQTT",
-      "action": "mqttCheck",
-      "response": "[[my-block]]",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Перезагрузить устройство",
-      "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Главная",
-      "action": "/",
-      "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": "{{name}}",
-   "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": "/",
-   "class": "btn btn-block btn-danger btn-sm"
-  }
- ]
-}

data/setup.json

@@ -1,162 +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": "{{name}}",
-      "class": "alert-warning"
-    },
-    {
-      "type": "link",
-      "title": "Главная",
-      "action": "/",
-      "class": "btn btn-block btn-danger"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "h2",
-      "title": "Имя устройства"
-    },
-    {
-      "type": "input",
-      "title": "Имя устройства",
-      "name": "dev_name",
-      "state": "{{name}}",
-      "pattern": "[A-Za-z0-9]{6,12}"
-    },
-    {
-      "type": "button",
-      "title": "Сохранить",
-      "action": "name?arg=[[dev_name]]",
-      "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}}"
-    },
-    {
-      "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": "1",
-      "state": "{{timezone}}",
-      "pattern": ".{1,20}"
-    },
-    {
-      "type": "input",
-      "title": "Название ntp сервера",
-      "name": "2",
-      "state": "{{ntp}}"
-    },
-    {
-      "type": "button",
-      "title": "Сохранить",
-      "action": "time?timezone=[[1]]&ntp=[[2]]",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "text",
-      "class": "alert alert-warning",
-      "title": "После изменения поля <b>'NTP сервер'</b> необходимо перезагрузить устройство"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Перезагрузить устройство",
-      "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-      "class": "btn btn-block btn-warning"
-    }
-  ]
-}

data/utilities.json

@@ -1,41 +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": "{{name}}",
-      "class": "alert-warning"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "h3",
-      "title": "Сканирование адресов шины i2c"
-    },
-    {
-      "type": "h4",
-      "title": "{{i2c}}"
-    },
-    {
-      "type": "link",
-      "title": "Сканировать",
-      "action": "/init?arg=5",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Главная",
-      "action": "/",
-      "class": "btn btn-block btn-danger"
-    }
-  ]
-}

data/widgets/outstanding/widget.select.json

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

data/widgets/widget.anyData.json

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

data/widgets/widget.progLine.json

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

data/widgets/widget.progRound.json

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

data/widgets/widget.toggle.json

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

data_esp/config.json

@@ -0,0 +1,37 @@
+{
+  "name": "IoTmanager",
+  "chipID": "",
+  "apssid": "IoTmanager",
+  "appass": "",
+  "routerssid": "rise",
+  "routerpass": "hostel3333",
+  "timezone": 3,
+  "ntp": "pool.ntp.org",
+  "mqttServer": "live-control.ru",
+  "mqttPort": 1883,
+  "mqttPrefix": "/IotManager",
+  "mqttUser": "IotManager:guest",
+  "mqttPass": "guest",
+  "mqttServer2": "",
+  "mqttPort2": 0,
+  "mqttPrefix2": "",
+  "mqttUser2": "",
+  "mqttPass2": "",
+  "scen": "1",
+  "telegramApi": "",
+  "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_esp/dashboard/global.css

@@ -0,0 +1,63 @@
+html, body {
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+
+body {
+	color: #333;
+	margin: 0;
+	padding: 8px;
+	box-sizing: border-box;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+}
+
+a {
+	color: rgb(0,100,200);
+	text-decoration: none;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+a:visited {
+	color: rgb(0,80,160);
+}
+
+label {
+	display: block;
+}
+
+input, button, select, textarea {
+	font-family: inherit;
+	font-size: inherit;
+	-webkit-padding: 0.4em 0;
+	padding: 0.4em;
+	margin: 0 0 0.5em 0;
+	box-sizing: border-box;
+	border: 1px solid #ccc;
+	border-radius: 2px;
+}
+
+input:disabled {
+	color: #ccc;
+}
+
+button {
+	color: #333;
+	background-color: #f4f4f4;
+	outline: none;
+}
+
+button:disabled {
+	color: #999;
+}
+
+button:not(:disabled):active {
+	background-color: #ddd;
+}
+
+button:focus {
+	border-color: #666;
+}

data_esp/dashboard/index.html

@@ -0,0 +1,104 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+
+    <title>LiveControl v 0.3.2</title>
+
+    <link rel="icon" type="image/png" href="/favicon.ico" />
+    <link rel="stylesheet" href="/dashboard/global.css" />
+    <link rel="stylesheet" href="/dashboard/build/bundle.css" />
+
+    <script defer src="/dashboard/build/bundle.js" onload="loadPage()"></script>
+    <script>
+         function get_cookie ( cookie_name ){
+              var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)' );
+              if ( results )
+              return ( unescape ( results[2] ) );
+              else
+              return null;
+              }
+             
+               if (get_cookie("darktheme") == "true"){
+                var myColor = "#1d3040";
+    document.write('\
+        <style>\
+            body{\
+                background-color: '+myColor+';\
+            }\
+        </style>\
+    ');
+               }
+            
+      function loadPage() {
+        document.getElementById("status").style.display = "none";
+      }
+      
+    </script>
+
+
+    <style>
+      
+       .rotate-shadows {
+        width: 220px;
+        height: 220px;
+        margin:0 auto;
+        position: relative;
+      }
+      .rotate-shadows:after,
+      .rotate-shadows:before {
+        content: "";
+        border-radius: 150%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        transform-origin: center center;
+      }
+      .rotate-shadows:before {
+        box-shadow: inset 0 20px 0 rgba(0, 250, 250, 0.2),
+          inset 20px 0 0 rgba(0, 200, 200, 0.2),
+          inset 0 -20px 0 rgba(0, 150, 200, 0.2),
+          inset -20px 0 0 rgba(0, 200, 250, 0.2);
+        animation: rotate-before 9s -0.5s linear infinite;
+      }
+      .rotate-shadows:after {
+        box-shadow: inset 0 20px 0 rgba(250, 250, 0, 0.2),
+          inset 20px 0 0 rgba(250, 200, 0, 0.2),
+          inset 0 -20px 0 rgba(250, 150, 0, 0.2),
+          inset -20px 0 0 rgba(250, 100, 0, 0.2);
+        animation: rotate-after 9s -0.5s linear infinite;
+      }
+      @keyframes rotate-after {
+        0% {
+          transform: rotateZ(0deg) scaleX(1) scaleY(1);
+        }
+        50% {
+          transform: rotateZ(180deg) scaleX(0.82) scaleY(0.95);
+        }
+        100% {
+          transform: rotateZ(360deg) scaleX(1) scaleY(1);
+        }
+      }
+      @keyframes rotate-before {
+        0% {
+          transform: rotateZ(0deg) scaleX(1) scaleY(1);
+        }
+        50% {
+          transform: rotateZ(-180deg) scaleX(0.95) scaleY(0.85);
+        }
+        100% {
+          transform: rotateZ(-360deg) scaleX(1) scaleY(1);
+        }
+      }
+    </style>
+  </head>
+
+  <body>
+  
+    <p><div id="status" class="rotate-shadows"></div></p>
+    
+  </body>
+</html>