Merge pull request #5 from DmitryBorisenko33/development

Pressure calculation changed

Cmd.ino

@@ -12,20 +12,53 @@ void CMD_init() {
 
   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",  dhtPerception);
-  sCmd.addCommand("dhtComfort",  dhtComfort);
-  sCmd.addCommand("dhtDewpoint",  dhtDewpoint);
+  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);
@@ -39,10 +72,15 @@ void CMD_init() {
   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();
@@ -61,16 +99,16 @@ void button() {
   String start_state = sCmd.next();
   String page_number = sCmd.next();
 
-  jsonWriteStr(optionJson, "button_param" + button_number, button_param);
-  jsonWriteStr(configJson, "buttonSet" + button_number, start_state);
+  jsonWriteStr(configOptionJson, "button_param" + button_number, button_param);
+  jsonWriteStr(configLiveJson, "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);
+  if  (button_param == "scen") {
+    jsonWriteStr(configSetupJson, "scen", start_state);
     Scenario_init();
     saveConfig();
   }
@@ -88,21 +126,21 @@ void button() {
       str = deleteBeforeDelimiter(str, ",");
     }
   }
-  createWidget (widget_name, page_name, page_number, "widgets/widget.toggle.json", "buttonSet" + button_number);
+  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 = jsonRead(optionJson, "button_param" + button_number);
+  String button_param = jsonReadStr(configOptionJson, "button_param" + button_number);
 
-  if (button_param != "na" || button_param != "scenario" || button_param.indexOf("line") != -1) {
+  if (button_param != "na" || button_param != "scen" || button_param.indexOf("line") != -1) {
     digitalWrite(button_param.toInt(), button_state.toInt());
   }
 
-  if  (button_param == "scenario") {
-    jsonWriteStr(configSetup, "scenario", button_state);
+  if  (button_param == "scen") {
+    jsonWriteStr(configSetupJson, "scen", button_state);
     Scenario_init();
     saveConfig();
   }
@@ -121,23 +159,23 @@ void buttonSet() {
     }
   }
 
-  eventGen ("buttonSet", button_number);
+  eventGen ("button", button_number);
 
-  jsonWriteStr(configJson, "buttonSet" + button_number, button_state);
-  sendSTATUS("buttonSet" + button_number, button_state);
+  jsonWriteStr(configLiveJson, "button" + button_number, button_state);
+  sendSTATUS("button" + button_number, button_state);
 }
 
 void buttonChange() {
   String button_number = sCmd.next();
-  String current_state = jsonRead(configJson, "buttonSet" + button_number);
+  String current_state = jsonReadStr(configLiveJson, "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, "buttonSet" + button_number, current_state);
-  sendSTATUS("buttonSet" + button_number, current_state);
+  jsonWriteStr(configLiveJson, "button" + button_number, current_state);
+  sendSTATUS("button" + button_number, current_state);
 }
 
 void pinSet() {
@@ -167,13 +205,13 @@ void pwm() {
 
 
   uint8_t pwm_pin_int = pwm_pin.toInt();
-  jsonWriteStr(optionJson, "pwm_pin" + pwm_number, pwm_pin);
+  jsonWriteStr(configOptionJson, "pwm_pin" + pwm_number, pwm_pin);
   pinMode(pwm_pin_int, INPUT);
   analogWrite(pwm_pin_int, start_state.toInt());
   //analogWriteFreq(32000);
-  jsonWriteStr(configJson, "pwmSet" + pwm_number, start_state);
+  jsonWriteStr(configLiveJson, "pwm" + pwm_number, start_state);
 
-  createWidget (widget_name, page_name, page_number, "widgets/widget.range.json", "pwmSet" + pwm_number);
+  createWidget (widget_name, page_name, page_number, "widgets/widget.range.json", "pwm" + pwm_number);
 }
 
 void pwmSet() {
@@ -182,13 +220,13 @@ void pwmSet() {
   String pwm_state = sCmd.next();
   int pwm_state_int = pwm_state.toInt();
 
-  int pin = jsonReadtoInt(optionJson, "pwm_pin" + pwm_number);
+  int pin = jsonReadInt(configOptionJson, "pwm_pin" + pwm_number);
   analogWrite(pin, pwm_state_int);
 
-  eventGen ("pwmSet", pwm_number);
+  eventGen ("pwm", pwm_number);
 
-  jsonWriteStr(configJson, "pwmSet" + pwm_number, pwm_state);
-  sendSTATUS("pwmSet" + pwm_number, pwm_state);
+  jsonWriteStr(configLiveJson, "pwm" + pwm_number, pwm_state);
+  sendSTATUS("pwm" + pwm_number, pwm_state);
 }
 //==================================================================================================================
 //==========================================Модуль физической кнопки================================================
@@ -211,15 +249,15 @@ void handleButton()  {
     buttons[switch_number].update();
     if (buttons[switch_number].fell()) {
 
-      eventGen ("switchSet", String(switch_number));
+      eventGen ("switch", String(switch_number));
 
-      jsonWriteStr(configJson, "switchSet" + String(switch_number), "1");
+      jsonWriteStr(configLiveJson, "switch" + String(switch_number), "1");
     }
     if (buttons[switch_number].rose()) {
 
-      eventGen ("switchSet", String(switch_number));
+      eventGen ("switch", String(switch_number));
 
-      jsonWriteStr(configJson, "switchSet" + String(switch_number), "0");
+      jsonWriteStr(configLiveJson, "switch" + String(switch_number), "0");
     }
   }
   switch_number++;
@@ -237,14 +275,14 @@ void inputDigit() {
   page_name.replace("#", " ");
   String start_state = sCmd.next();
   String page_number = sCmd.next();
-  jsonWriteStr(configJson, "digitSet" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputNum.json", "digitSet" + number);
+  jsonWriteStr(configLiveJson, "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, "digitSet" + number, value);
-  sendSTATUS("digitSet" + number, value);
+  jsonWriteStr(configLiveJson, "digit" + number, value);
+  sendSTATUS("digit" + number, value);
 }
 //=====================================================================================================================================
 //=========================================Добавление окна ввода времени===============================================================
@@ -257,23 +295,24 @@ void inputTime() {
   page_name.replace("#", " ");
   String start_state = sCmd.next();
   String page_number = sCmd.next();
-  jsonWriteStr(configJson, "timeSet" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputTime.json", "timeSet" + number);
+  jsonWriteStr(configLiveJson, "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, "timeSet" + number, value);
-  sendSTATUS("timeSet" + number, value);
+  jsonWriteStr(configLiveJson, "time" + number, value);
+  sendSTATUS("time" + number, value);
 }
 
 void handle_time_init() {
   ts.add(TIME, 1000, [&](void*) {
 
     String tmp = GetTime();
+    jsonWriteStr(configLiveJson, "time", tmp);
     tmp.replace(":", "-");
-    jsonWriteStr(configJson, "timenowSet", tmp);
-    eventGen ("timenowSet", "");
+    jsonWriteStr(configLiveJson, "timenow", tmp);
+    eventGen ("timenow", "");
 
   }, nullptr, true);
 }
@@ -287,7 +326,7 @@ void text() {
   String page_name = sCmd.next();
   String page_number = sCmd.next();
 
-  createWidget (widget_name, page_name, page_number, "widgets/widget.anyData.json", "textSet" + number);
+  createWidget (widget_name, page_name, page_number, "widgets/widget.anyData.json", "text" + number);
 }
 
 
@@ -305,20 +344,19 @@ void textSet() {
     text = text + " " + GetDataDigital() + " " + time;
   }
 
-  jsonWriteStr(configJson, "textSet" + number, text);
-  sendSTATUS("textSet" + number, text);
+  jsonWriteStr(configLiveJson, "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);
+  jsonWriteStr(configOptionJson, "stepper" + stepper_number, pin_step + " " + pin_dir);
   pinMode(pin_step.toInt(), OUTPUT);
   pinMode(pin_dir.toInt(), OUTPUT);
 }
@@ -327,21 +365,22 @@ void stepper() {
 void stepperSet() {
   String stepper_number = sCmd.next();
   String steps = sCmd.next();
-  jsonWriteStr(optionJson, "steps" + stepper_number, steps);
+  jsonWriteStr(configOptionJson, "steps" + stepper_number, steps);
   String stepper_speed = sCmd.next();
-  String pin_step = selectToMarker (jsonRead(optionJson, "stepper" + stepper_number), " ");
-  String pin_dir =  deleteBeforeDelimiter (jsonRead(optionJson, "stepper" + stepper_number), " ");
+  String pin_step = selectToMarker (jsonReadStr(configOptionJson, "stepper" + stepper_number), " ");
+  String pin_dir =  deleteBeforeDelimiter (jsonReadStr(configOptionJson, "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(jsonReadtoInt(optionJson, "steps1") * 2);
+      int steps_int = abs(jsonReadInt(configOptionJson, "steps1") * 2);
       static int count;
       count++;
-      String pin_step = selectToMarker (jsonRead(optionJson, "stepper1"), " ");
+      String pin_step = selectToMarker (jsonReadStr(configOptionJson, "stepper1"), " ");
       digitalWrite(pin_step.toInt(), !digitalRead(pin_step.toInt()));
+      yield();
       if (count > steps_int) {
         digitalWrite(pin_step.toInt(), LOW);
         ts.remove(STEPPER1);
@@ -351,11 +390,12 @@ void stepperSet() {
   }
   if (stepper_number == "2") {
     ts.add(STEPPER2, stepper_speed.toInt(), [&](void*) {
-      int steps_int = abs(jsonReadtoInt(optionJson, "steps2") * 2);
+      int steps_int = abs(jsonReadInt(configOptionJson, "steps2") * 2);
       static int count;
       count++;
-      String pin_step = selectToMarker (jsonRead(optionJson, "stepper2"), " ");
+      String pin_step = selectToMarker (jsonReadStr(configOptionJson, "stepper2"), " ");
       digitalWrite(pin_step.toInt(), !digitalRead(pin_step.toInt()));
+      yield();
       if (count > steps_int) {
         digitalWrite(pin_step.toInt(), LOW);
         ts.remove(STEPPER2);
@@ -364,67 +404,118 @@ void stepperSet() {
     }, nullptr, true);
   }
 }
-
-
+#endif
 //====================================================================================================================================================
-/*
-  void inputText() {
-  String number = sCmd.next();
-  String widget_name = sCmd.next();
-  widget_name.replace("#", " ");
-  String page_name = sCmd.next();
-  page_name.replace("#", " ");
+//=================================================================Сервоприводы=======================================================================
+#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(configJson, "inputTextSet" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputText.json", "inputTextSet" + number);
-  }
-  void inputTextSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWriteStr(configJson, "inputTextSet" + number, value);
-  sendSTATUS("inputTextSet" + number, value);
+
+  jsonWriteStr(configOptionJson, "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
   }
 
-  void inputTime() {
-  String number = sCmd.next();
-  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, "inputTimeSet" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputTime.json", "inputTimeSet" + number);
-  }
-  void inputTimeSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  value.replace(":", ".");
-  jsonWriteStr(configJson, "inputTimeSet" + number, value);
-  value.replace(".", ":");
-  sendSTATUS("inputTimeSet" + number, value);
+  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(configOptionJson, "s_min_val" + servo_number, min_value);
+  jsonWriteStr(configOptionJson, "s_max_val" + servo_number, max_value);
+  jsonWriteStr(configOptionJson, "s_min_deg" + servo_number, min_deg);
+  jsonWriteStr(configOptionJson, "s_max_deg" + servo_number, max_deg);
 
-  void inputDate() {
-  String number = sCmd.next();
-  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, "inputDateSet" + number, start_state);
-  createWidget (widget_name, page_name, page_number, "widgets/widget.inputDate.json", "inputDateSet" + number);
+  jsonWriteStr(configLiveJson, "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(configOptionJson, "servo_pin" + servo_number);
+
+  servo_state_int = map(servo_state_int,
+                        jsonReadInt(configOptionJson, "s_min_val" + servo_number),
+                        jsonReadInt(configOptionJson, "s_max_val" + servo_number),
+                        jsonReadInt(configOptionJson, "s_min_deg" + servo_number),
+                        jsonReadInt(configOptionJson, "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
   }
-  void inputDateSet() {
-  String number = sCmd.next();
-  String value = sCmd.next();
-  jsonWriteStr(configJson, "inputDateSet" + number, value);
-  sendSTATUS("inputDateSet" + number, value);
+
+  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(configLiveJson, "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() {
@@ -432,11 +523,11 @@ void mqttOrderSend() {
   String id = sCmd.next();
   String order = sCmd.next();
 
-  String  all_line = jsonRead(configSetup, "mqttPrefix") + "/" + id + "/order";
+  String  all_line = jsonReadStr(configSetupJson, "mqttPrefix") + "/" + id + "/order";
   //Serial.print(all_line);
   //Serial.print("->");
   //Serial.println(order);
-  int send_status = client.publish (all_line.c_str(), order.c_str(), false);
+  int send_status = client_mqtt.publish (all_line.c_str(), order.c_str(), false);
 }
 
 void httpOrderSend() {
@@ -448,7 +539,17 @@ void httpOrderSend() {
   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(configLiveJson, "firm1", firmware_version);
+  choose_widget_and_create(widget_name, page_name, page_number, "any-data", "firm1");
+}
 
 //==============================================================================================================================
 //============================выполнение команд (в лупе) по очереди из строки order=============================================
@@ -467,7 +568,7 @@ void handleCMD_loop() {
 //=======================================================================================================================================
 void txtExecution(String file) {
 
-  String command_all = readFile(file, 2048) + "\r\n";  
+  String command_all = readFile(file, 2048) + "\r\n";
 
   command_all.replace("\r\n", "\n");
   command_all.replace("\r", "\n");
@@ -492,6 +593,7 @@ void stringExecution(String str) {
 
     String tmp = selectToMarker (str, "\n");
     sCmd.readStr(tmp);
+
     str = deleteBeforeDelimiter(str, "\n");
   }
 }

FS.ino

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

Init.ino

@@ -1,33 +1,4 @@
 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();
-    }
-    if (value == "1") {
-      jsonWriteStr(configSetup, "scenario", value);
-      saveConfig();
-      Scenario_init();
-    }
-    if (value == "2") {
-      Device_init();
-    }
-    if (value == "3") {
-      clean_log_date();
-    }
-    if (value == "4") {
-      Scenario_init();
-    }
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
-  prsets_init();
   Device_init();
   Scenario_init();
   Timer_countdown_init();
@@ -35,16 +6,34 @@ void All_init() {
 
 void Device_init() {
 
-  ts.remove(ANALOG_);
-  ts.remove(LEVEL);
-  ts.remove(DALLAS);
-  ts.remove(DHTT);
-  ts.remove(DHTH);
-  ts.remove(DHTC);
-  ts.remove(DHTP);
-  ts.remove(DHTD);
-  ts.remove(STEPPER1);
-  ts.remove(STEPPER2);
+  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 = "";
@@ -58,131 +47,27 @@ void Device_init() {
 //-------------------------------сценарии-----------------------------------------------------
 
 void Scenario_init() {
-  if (jsonRead(configSetup, "scenario") == "1") {
+  if (jsonReadStr(configSetupJson, "scen") == "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/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() {
+void uptime_init() {
+  ts.add(UPTIME, 5000, [&](void*) {
+    handle_uptime();
+  }, nullptr, true);
   ts.add(STATISTICS, statistics_update, [&](void*) {
-
-    statistics();
-
+    handle_statistics();
   }, nullptr, true);
 }
 
-void statistics() {
+void handle_uptime() {
+  if (myUpTime.check()) {
+    jsonWriteStr(configSetupJson, "uptime", uptime_as_string());
+  }
+}
+
+void handle_statistics() {
   if (WiFi.status() == WL_CONNECTED) {
     String urls = "http://backup.privet.lv/visitors/?";
     //-----------------------------------------------------------------
@@ -199,13 +84,14 @@ void statistics() {
     //-----------------------------------------------------------------
 #ifdef ESP8266
     urls += ESP.getResetReason();
+    //Serial.println(ESP.getResetReason());
 #endif
 #ifdef ESP32
-    urls += "Unknown";
+    urls += "Power on";
 #endif
     urls += "&";
     //-----------------------------------------------------------------
-    urls += "firm version: " + firmware_version + " " + DATE_COMPILING + " " + TIME_COMPILING;
+    urls += "ver: " + firmware_version;
     //-----------------------------------------------------------------
     String stat = getURL(urls);
     //Serial.println(stat);

Logging.ino

@@ -1,72 +1,52 @@
+#ifdef logging_enable
 //===============================================Логирование============================================================
+//logging temp1 1 10 Температура Датчики 2
 void logging() {
-
-  static boolean flag = true;
-
-  String sensor_name = sCmd.next();
+  String value_name = sCmd.next();
   String period_min = sCmd.next();
   String maxCount = sCmd.next();
-
-  String optimozation = sCmd.next();
-
   String widget_name = sCmd.next();
   widget_name.replace("#", " ");
   String page_name = sCmd.next();
   String page_number = sCmd.next();
-
-  if (optimozation == "fast") chart_data_in_solid_array = true;
-  if (optimozation == "slow") chart_data_in_solid_array = false;
-
-  if (sensor_name == "analog") jsonWriteStr(optionJson, "analog_logging_count", maxCount);
-  if (sensor_name == "level") jsonWriteStr(optionJson, "level_logging_count", maxCount);
-  if (sensor_name == "dallas") jsonWriteStr(optionJson, "dallas_logging_count", maxCount);
-  if (sensor_name == "dhtT") jsonWriteStr(optionJson, "dhtT_logging_count", maxCount);
-  if (sensor_name == "dhtH") jsonWriteStr(optionJson, "dhtH_logging_count", maxCount);
-
-  if (sensor_name == "analog") createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", "loganalog", maxCount);
-  if (sensor_name == "level") createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", "loglevel", maxCount);
-  if (sensor_name == "dallas") createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", "logdallas", maxCount);
-  if (sensor_name == "dhtT") createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", "logdhtT", maxCount);
-  if (sensor_name == "dhtH") createChart (widget_name, page_name, page_number, "widgets/widget.chart.json", "logdhtH", maxCount);
-
-  if (sensor_name == "analog") {
-    flagLoggingAnalog = true;
-    ts.remove(ANALOG_LOG);
-    ts.add(ANALOG_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.analog.txt",  jsonReadtoInt(optionJson, "analog_logging_count"), jsonRead(configJson, "analog"));
-    }, nullptr, true);
+  logging_value_names_list += value_name + ",";
+  enter_to_logging_counter++; //считаем количество входов в эту функцию
+  jsonWriteStr(configOptionJson, 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(configOptionJson, tmp_buf_1 + "_c"), jsonReadStr(configLiveJson, tmp_buf_1));
+      Serial.println("[i] LOGGING for sensor '" + tmp_buf_1 + "' done");
+    }, nullptr, false);
   }
-
-  if (sensor_name == "level") {
-    flagLoggingLevel = true;
-    ts.remove(LEVEL_LOG);
-    ts.add(LEVEL_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.level.txt", jsonReadtoInt(optionJson, "level_logging_count"), jsonRead(configJson, "level"));
-    }, nullptr, true);
+  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(configOptionJson, tmp_buf_2 + "_c"), jsonReadStr(configLiveJson, tmp_buf_2));
+      Serial.println("[i] LOGGING for sensor '" + tmp_buf_2 + "' done");
+    }, nullptr, false);
   }
-
-  if (sensor_name == "dallas") {
-    flagLoggingDallas = true;
-    ts.remove(DALLAS_LOG);
-    ts.add(DALLAS_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.dallas.txt",  jsonReadtoInt(optionJson, "dallas_logging_count"), jsonRead(configJson, "dallas"));
-    }, nullptr, true);
+  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(configOptionJson, tmp_buf_3 + "_c"), jsonReadStr(configLiveJson, tmp_buf_3));
+      Serial.println("[i] LOGGING for sensor '" + tmp_buf_3 + "' done");
+    }, nullptr, false);
   }
-
-  if (sensor_name == "dhtT") {
-    flagLoggingdhtT = true;
-    ts.remove(dhtT_LOG);
-    ts.add(dhtT_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.dhtT.txt",  jsonReadtoInt(optionJson, "dhtT_logging_count"), jsonRead(configJson, "dhtT"));
-    }, nullptr, true);
+  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(configOptionJson, tmp_buf_4 + "_c"), jsonReadStr(configLiveJson, tmp_buf_4));
+      Serial.println("[i] LOGGING for sensor '" + tmp_buf_4 + "' done");
+    }, nullptr, false);
   }
-
-  if (sensor_name == "dhtH") {
-    flagLoggingdhtH = true;
-    ts.remove(dhtH_LOG);
-    ts.add(dhtH_LOG, period_min.toInt() * 1000 * 60, [&](void*) {
-      deleteOldDate("log.dhtH.txt",  jsonReadtoInt(optionJson, "dhtH_logging_count"), jsonRead(configJson, "dhtH"));
-    }, nullptr, true);
+  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(configOptionJson, tmp_buf_5 + "_c"), jsonReadStr(configLiveJson, tmp_buf_5));
+      Serial.println("[i] LOGGING for sensor '" + tmp_buf_5 + "' done");
+    }, nullptr, false);
   }
 }
 
@@ -100,19 +80,18 @@ void deleteOldDate(String file, int seted_number_of_lines, String date_to_add) {
 
 //=========================================Выбор какие данные отправлять==================================================================
 void choose_log_date_and_send() {
-
-  if (flagLoggingAnalog) sendLogData("log.analog.txt", "loganalog", chart_data_in_solid_array);
-  if (flagLoggingLevel) sendLogData("log.level.txt", "loglevel", chart_data_in_solid_array);
-  if (flagLoggingDallas) sendLogData("log.dallas.txt", "logdallas", chart_data_in_solid_array);
-  if (flagLoggingdhtT) sendLogData("log.dhtT.txt", "logdhtT", chart_data_in_solid_array);
-  if (flagLoggingdhtH) sendLogData("log.dhtH.txt", "logdhtH", chart_data_in_solid_array);
+  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, boolean type) {
-  if (type) {
-    //----------------------------------------------
-    String log_date = readFile(file, 5000);
+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 = "{}";
@@ -141,9 +120,11 @@ void sendLogData(String file, String topic, boolean type) {
     sendCHART(topic, json_array);
     json_array = "";
     getMemoryLoad("[i] after send log date");
-    //----------------------------------------------
-  } else {
-    //----------------------------------------------
+  }
+}
+
+/*
+  //----------------------------------------------
     File configFile = SPIFFS.open("/" + file, "r");
     if (!configFile) {
       return;
@@ -158,14 +139,15 @@ void sendLogData(String file, String topic, boolean type) {
       sendCHART(topic, final_line);
     }
     getMemoryLoad("[i] after send log date");
-  }
-  //----------------------------------------------
-}
+*/
 //=========================================Очистка данных===================================================================================
 void clean_log_date() {
-  SPIFFS.remove("/log.analog.txt");
-  SPIFFS.remove("/log.level.txt");
-  SPIFFS.remove("/log.dallas.txt");
-  SPIFFS.remove("/log.dhtT.txt");
-  SPIFFS.remove("/log.dhtH.txt");
+  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

@@ -0,0 +1,37 @@
+# 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.
+
+

Scenario.ino

@@ -1,7 +1,7 @@
 void handleScenario() {
 
-  if (jsonRead(configSetup, "scenario") == "1") {
-    if ((jsonRead(optionJson, "scenario_status") != "")) {
+  if (jsonReadStr(configSetupJson, "scen") == "1") {
+    if ((jsonReadStr(configOptionJson, "scenario_status") != "")) {
       int i = 0;
       String str = scenario;                                                   //читаем переменную с сценариями (то что из файла на странице)
       str += "\n";
@@ -17,42 +17,38 @@ void handleScenario() {
           //Serial.println(i);
           String condition = selectToMarker (tmp, "\n");                        //выделяем первую строку самого сценария  button1 = 1 (условие)
           String param_name = selectFromMarkerToMarker(condition, " " , 0);
-          param_name = add_set(param_name);                                      //из первой страки берем имя параметра button1 и вставляем в него Set и получаем buttonSet1
-          if (param_name.indexOf("timenow") != -1){
-            param_name = param_name + "Set";
-          }
-          String order = jsonRead(optionJson, "scenario_status");                //читаем весь файл событий
+          String order = jsonReadStr(configOptionJson, "scenario_status");                //читаем весь файл событий
           String param = selectToMarker (order, ",");                            //читаем первое событие из файла событий
           if (param_name == param) {                                             //если поступившее событие равно событию заданному buttonSet1 в файле начинаем его обработку
 
             String sign = selectFromMarkerToMarker(condition, " " , 1);          //читаем знак  (=)
             String value = selectFromMarkerToMarker(condition, " " , 2);         //читаем значение (1)
             if (value.indexOf("digit") != -1) {
-              value = add_set(value);
-              value = jsonRead(configJson, value);
+              //  value = add_set(value);
+              value = jsonReadStr(configLiveJson, value);
             }
             if (value.indexOf("time") != -1) {
-              value = add_set(value);
-              value = jsonRead(configJson, value);
+              //  value = add_set(value);
+              value = jsonReadStr(configLiveJson, value);
             }
             boolean flag = false;                                                 //если одно из значений совпало то только тогда начинаем выполнять комнады
             if (sign == "=") {
-              if (jsonRead(configJson, param_name) == value) flag = true;
+              if (jsonReadStr(configLiveJson, param_name) == value) flag = true;
             }
             if (sign == "!=") {
-              if (jsonRead(configJson, param_name) != value) flag = true;
+              if (jsonReadStr(configLiveJson, param_name) != value) flag = true;
             }
             if (sign == "<") {
-              if (jsonRead(configJson, param_name).toInt() < value.toInt()) flag = true;
+              if (jsonReadStr(configLiveJson, param_name).toInt() < value.toInt()) flag = true;
             }
             if (sign == ">") {
-              if (jsonRead(configJson, param_name).toInt() > value.toInt()) flag = true;
+              if (jsonReadStr(configLiveJson, param_name).toInt() > value.toInt()) flag = true;
             }
             if (sign == ">=") {
-              if (jsonRead(configJson, param_name).toInt() >= value.toInt()) flag = true;
+              if (jsonReadStr(configLiveJson, param_name).toInt() >= value.toInt()) flag = true;
             }
             if (sign == "<=") {
-              if (jsonRead(configJson, param_name).toInt() <= value.toInt()) flag = true;
+              if (jsonReadStr(configLiveJson, param_name).toInt() <= value.toInt()) flag = true;
             }
 
             if (flag) {
@@ -67,9 +63,9 @@ void handleScenario() {
         str = deleteBeforeDelimiter(str, "end\n");                                     //удаляем первый сценарий
         //-----------------------------------------------------------------------------------------------------------------------
       }
-      String tmp2 = jsonRead(optionJson, "scenario_status");                           //читаем файл событий
+      String tmp2 = jsonReadStr(configOptionJson, "scenario_status");                           //читаем файл событий
       tmp2 = deleteBeforeDelimiter(tmp2, ",");                                         //удаляем выполненное событие
-      jsonWriteStr(optionJson, "scenario_status", tmp2);                                  //записываем обновленный файл событий
+      jsonWriteStr(configOptionJson, "scenario_status", tmp2);                                  //записываем обновленный файл событий
       i = 0;
     }
   }
@@ -77,10 +73,10 @@ void handleScenario() {
 
 void eventGen (String event_name, String number) {   //событие выглядит как имя плюс set плюс номер: button+Set+1
 
-  if (jsonRead(configSetup, "scenario") == "1") {
-    String tmp = jsonRead(optionJson, "scenario_status") ;    //генерирование события
+  if (jsonReadStr(configSetupJson, "scen") == "1") {
+    String tmp = jsonReadStr(configOptionJson, "scenario_status") ;    //генерирование события
     //Serial.println(event_name);
-    jsonWriteStr(optionJson, "scenario_status", tmp + event_name + number + ",");
+    jsonWriteStr(configOptionJson, "scenario_status", tmp + event_name + number + ",");
   }
 }
 

Sensors.ino

@@ -1,6 +1,106 @@
-//===============================================================================================================================
-//=========================================Модуль аналогового сенсора============================================================
+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(configOptionJson, "e_lev", empty_level);
+  jsonWriteStr(configOptionJson, "f_lev", full_level);
+  jsonWriteStr(configOptionJson, "trig", trig);
+  jsonWriteStr(configOptionJson, "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(configOptionJson, "trig");
+  int echo = jsonReadInt(configOptionJson, "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(configOptionJson, "e_lev"),
+                jsonReadInt(configOptionJson, "f_lev"), 0, 100);
+    jsonWriteInt(configLiveJson, 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();
@@ -10,90 +110,66 @@ void analog() {
   String analog_start_out = sCmd.next();
   String analog_end_out = sCmd.next();
   String page_number = sCmd.next();
-  jsonWriteStr(optionJson, "analog_start", analog_start);
-  jsonWriteStr(optionJson, "analog_end", analog_end);
-  jsonWriteStr(optionJson, "analog_start_out", analog_start_out);
-  jsonWriteStr(optionJson, "analog_end_out", analog_end_out);
-  choose_widget_and_create(widget_name, page_name, page_number, type, "analog");
-  ts.add(ANALOG_, analog_update_int, [&](void*) {
-    static int analog_old;
+  analog_value_names_list += value_name + ",";
+  enter_to_analog_counter++;
+  jsonWriteStr(configOptionJson, value_name + "_st", analog_start);
+  jsonWriteStr(configOptionJson, value_name + "_end", analog_end);
+  jsonWriteStr(configOptionJson, value_name + "_st_out", analog_start_out);
+  jsonWriteStr(configOptionJson, 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 pin_int = pin.toInt();
-    int analog_in = analogRead(34);
+  int analog_in = analogRead(34);
 #endif
 #ifdef ESP8266
-    int analog_in = analogRead(A0);
+  int analog_in = analogRead(A0);
 #endif
-    jsonWriteInt(configJson, "analog_in", analog_in);
-    int analog = map(analog_in,
-                     jsonReadtoInt(optionJson, "analog_start") ,
-                     jsonReadtoInt(optionJson, "analog_end"),
-                     jsonReadtoInt(optionJson, "analog_start_out"),
-                     jsonReadtoInt(optionJson, "analog_end_out"));
-    jsonWriteInt(configJson, "analog", analog);
-    // if (analog_old != analog) {
-    eventGen ("analog", "");
-    sendSTATUS("analog", String(analog));
-    if (client.connected()) {
-      Serial.println("[i] sensor 'analog' send date " + String(analog));
-    }
-    // }
-    analog_old = analog;
-  }, nullptr, true);
+  int analog = map(analog_in,
+                   jsonReadInt(configOptionJson, value_name + "_st") ,
+                   jsonReadInt(configOptionJson, value_name + "_end"),
+                   jsonReadInt(configOptionJson, value_name + "_st_out"),
+                   jsonReadInt(configOptionJson, value_name + "_end_out"));
+  jsonWriteInt(configLiveJson, value_name, analog);
+  eventGen (value_name, "");
+  sendSTATUS(value_name, String(analog));
+  Serial.println("[i] sensor '" + value_name + "' data: " + String(analog));
 }
 
-//===================================================================================================================================
-//=========================================Модуль измерения уровня в баке============================================================
-void level() {
-  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();
-  jsonWriteStr(optionJson, "empty_level", empty_level);
-  jsonWriteStr(optionJson, "full_level", full_level);
-  pinMode(14, OUTPUT);
-  pinMode(12, INPUT);
-  choose_widget_and_create(widget_name, page_name, page_number, type, "level");
-  ts.add(LEVEL, tank_level_shooting_interval, [&](void*) {
-    long duration_;
-    int distance_cm;
-    int level;
-    static int level_old; //переменная static сохраняет свое значение между вызовами функции
-    static int counter;
-    digitalWrite(14, LOW);
-    delayMicroseconds(2);
-    digitalWrite(14, HIGH);
-    delayMicroseconds(10);
-    digitalWrite(14, LOW);
-    duration_ = pulseIn(12, HIGH, 30000); // 3000 µs = 50cm // 30000 µs = 5 m
-    distance_cm = duration_ / 29 / 2;
-    distance_cm = medianFilter.filtered(distance_cm);//отсечение промахов медианным фильтром
-    counter++;
-    if (counter > tank_level_times_to_send) {
-      counter = 0;
-      jsonWriteInt(configJson, "level_in", distance_cm);
-      level = map(distance_cm,
-                  jsonReadtoInt(optionJson, "empty_level"),
-                  jsonReadtoInt(optionJson, "full_level"), 0, 100);
-      jsonWriteInt(configJson, "level", level);
-      //if (level_old != level) {
-      eventGen ("level", "");
-      sendSTATUS("level", String(level));
-      if (client.connected()) {
-        Serial.println("[i] sensor tank 'level' send date " + String(level));
-      }
-      //}
-      level_old = level;
-    }
-  }, nullptr, true);
+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(configOptionJson, value_name + "_st") ,
+                   jsonReadInt(configOptionJson, value_name + "_end"),
+                   jsonReadInt(configOptionJson, value_name + "_st_out"),
+                   jsonReadInt(configOptionJson, value_name + "_end_out"));
+  jsonWriteInt(configLiveJson, value_name, analog);
+  eventGen (value_name, "");
+  sendSTATUS(value_name, String(analog));
+  Serial.println("[i] sensor '" + value_name + "' data: " + String(analog));
 }
-
-//==========================================================================================================================================
-//=========================================Модуль температурного сенсора ds18b20============================================================
+#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();
@@ -103,125 +179,121 @@ void dallas() {
   sensors.begin();
   sensors.setResolution(12);
   choose_widget_and_create(widget_name, page_name, page_number, type, "dallas");
-  ts.add(DALLAS, temp_update_int, [&](void*) {
-    float temp = 0;
-    static float temp_old;
-    sensors.requestTemperatures();
-    temp = sensors.getTempCByIndex(0);
-    jsonWriteStr(configJson, "dallas", String(temp));
-    //if (temp_old != temp) {
-    eventGen ("dallas", "");
-    sendSTATUS("dallas", String(temp));
-    if (client.connected()) {
-      Serial.println("[i] sensor 'dallas' send date " + String(temp));
-    }
-    //}
-    temp_old = temp;
-  }, nullptr, true);
+  sensors_reading_map[3] = 1;
 }
 
-
-//======================================================================================================================
-//=========================================Модуль сенсоров DHT==========================================================
+void dallas_reading() {
+  float temp = 0;
+  sensors.requestTemperatures();
+  temp = sensors.getTempCByIndex(0);
+  jsonWriteStr(configLiveJson, "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 sensor_type = sCmd.next();
+  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();
-  if (sensor_type == "DHT11") {
+  dhtT_value_name = value_name;
+  if (sensor_type == "dht11") {
     dht.setup(pin.toInt(), DHTesp::DHT11);
   }
-  if (sensor_type == "DHT22") {
+  if (sensor_type == "dht22") {
     dht.setup(pin.toInt(), DHTesp::DHT22);
   }
-  choose_widget_and_create(widget_name, page_name, page_number, type, "dhtT");
-  ts.add(DHTT, dhtT_update_int, [&](void*) { //dht.getMinimumSamplingPeriod()
-    float value = 0;
-    static float value_old;
-    static int counter;
-    if (dht.getStatus() != 0 && counter < 5) {
-      sendSTATUS("dhtT", String(dht.getStatusString()));
-      counter++;
-    } else {
-      counter = 0;
-      value = dht.getTemperature();
-      //if (value_old != value) {
-      if (String(value) != "nan") {
-        eventGen ("dhtT", "");
-        jsonWriteStr(configJson, "dhtT", String(value));
-        sendSTATUS("dhtT", String(value));
-        if (client.connected()) {
-          Serial.println("[i] sensor 'dhtT' send date " + String(value));
-        }
-        //}
-      }
-      value_old = value;
-    }
-  }, nullptr, true);
+  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(configLiveJson, 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 sensor_type = sCmd.next();
+  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();
-  if (sensor_type == "DHT11") {
+  dhtH_value_name = value_name;
+  if (sensor_type == "dht11") {
     dht.setup(pin.toInt(), DHTesp::DHT11);
   }
-  if (sensor_type == "DHT22") {
+  if (sensor_type == "dht22") {
     dht.setup(pin.toInt(), DHTesp::DHT22);
   }
-  choose_widget_and_create(widget_name, page_name, page_number, type, "dhtH");
-  ts.add(DHTH, dhtH_update_int , [&](void*) {  //dht.getMinimumSamplingPeriod()
-    int value = 0;
-    static int value_old;
-    static int counter;
-    if (dht.getStatus() != 0 && counter < 5) {
-      sendSTATUS("dhtH", String(dht.getStatusString()));
-      counter++;
-    } else {
-      counter = 0;
-      value = dht.getHumidity();
-      if (String(value) != "nan" || value <= 100 || value >= 0) {
-        //if (value_old != value) {
-        eventGen ("dhtH", "");
-        jsonWriteStr(configJson, "dhtH", String(value));
-        sendSTATUS("dhtH", String(value));
-        if (client.connected()) {
-          Serial.println("[i] sensor 'dhtH' send date " + String(value));
-        }
-        //}
-      }
-      value_old = value;
-    }
-  }, nullptr, true);
+  choose_widget_and_create(widget_name, page_name, page_number, type, value_name);
+  sensors_reading_map[5] = 1;
 }
 
-void dhtPerception() {
+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(configLiveJson, 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");
-  ts.add(DHTP, dht_calculation_update_int, [&](void*) {
-    byte value;
-    if (dht.getStatus() != 0) {
-      sendSTATUS("dhtPerception", String(dht.getStatusString()));
-    } else {
-      value = dht.computePerception(jsonRead(configJson, "dhtT").toFloat(), jsonRead(configJson, "dhtH").toFloat(), false);
-      String final_line = perception(value);
-      jsonWriteStr(configJson, "dhtPerception", final_line);
-      eventGen ("dhtPerception", "");
-      sendSTATUS("dhtPerception", final_line);
-      if (client.connected()) {
-        Serial.println("[i] sensor 'dhtPerception' send date " + final_line);
-      }
+  sensors_reading_map[6] = 1;
+}
+
+void dhtP_reading() {
+  byte value;
+  if (dht.getStatus() != 0) {
+    sendSTATUS("dhtPerception", String(dht.getStatusString()));
+  } else {
+    value = dht.computePerception(jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false);
+    String final_line = perception(value);
+    jsonWriteStr(configLiveJson, "dhtPerception", final_line);
+    eventGen ("dhtPerception", "");
+    sendSTATUS("dhtPerception", final_line);
+    if (client_mqtt.connected()) {
+      Serial.println("[i] sensor 'dhtPerception' data: " + final_line);
     }
-  }, nullptr, true);
+  }
 }
 
 String perception(byte value) {
@@ -235,89 +307,250 @@ String perception(byte value) {
   if (value == 7) return "Сильно неудобно, полный звиздец";
 }
 
-void dhtComfort() {
+//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");
-  ts.add(DHTC, dht_calculation_update_int, [&](void*) {
-    float value;
-    ComfortState cf;
-    if (dht.getStatus() != 0) {
-      sendSTATUS("dhtComfort", String(dht.getStatusString()));
-    } else {
-      value = dht.getComfortRatio(cf, jsonRead(configJson, "dhtT").toFloat(), jsonRead(configJson, "dhtH").toFloat(), false);
-      String comfortStatus;
-      switch (cf) {
-        case Comfort_OK:
-          comfortStatus = "Отлично";
-          break;
-        case Comfort_TooHot:
-          comfortStatus = "Очень жарко";
-          break;
-        case Comfort_TooCold:
-          comfortStatus = "Очень холодно";
-          break;
-        case Comfort_TooDry:
-          comfortStatus = "Очень сухо";
-          break;
-        case Comfort_TooHumid:
-          comfortStatus = "Очень влажно";
-          break;
-        case Comfort_HotAndHumid:
-          comfortStatus = "Жарко и влажно";
-          break;
-        case Comfort_HotAndDry:
-          comfortStatus = "Жарко и сухо";
-          break;
-        case Comfort_ColdAndHumid:
-          comfortStatus = "Холодно и влажно";
-          break;
-        case Comfort_ColdAndDry:
-          comfortStatus = "Холодно и сухо";
-          break;
-        default:
-          comfortStatus = "Неизвестно";
-          break;
-      };
-      String final_line = comfortStatus;
-      jsonWriteStr(configJson, "dhtComfort", final_line);
-      eventGen ("dhtComfort", "");
-      sendSTATUS("dhtComfort", final_line);
-      if (client.connected()) {
-        Serial.println("[i] sensor 'dhtComfort' send date " + final_line);
-      }
-    }
-  }, nullptr, true);
+  sensors_reading_map[7] = 1;
 }
 
-void dhtDewpoint() {
+void dhtC_reading() {
+  float value;
+  ComfortState cf;
+  if (dht.getStatus() != 0) {
+    sendSTATUS("dhtComfort", String(dht.getStatusString()));
+  } else {
+    value = dht.getComfortRatio(cf, jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false);
+    String final_line = get_comfort_status(cf);
+    jsonWriteStr(configLiveJson, "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");
-  ts.add(DHTD, dht_calculation_update_int, [&](void*) {
-    float value;
-    if (dht.getStatus() != 0) {
-      sendSTATUS("dhtDewpoint", String(dht.getStatusString()));
-    } else {
-      value = dht.computeDewPoint(jsonRead(configJson, "dhtT").toFloat(), jsonRead(configJson, "dhtH").toFloat(), false);
-      jsonWriteInt(configJson, "dhtDewpoint", value);
-      eventGen ("dhtDewpoint", "");
-      sendSTATUS("dhtDewpoint", String(value));
-      if (client.connected()) {
-        Serial.println("[i] sensor 'dhtDewpoint' send date " + String(value));
-      }
-    }
-  }, nullptr, true);
+  sensors_reading_map[8] = 1;
 }
 
-
-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);
-
+void dhtD_reading() {
+  float value;
+  if (dht.getStatus() != 0) {
+    sendSTATUS("dhtDewpoint", String(dht.getStatusString()));
+  } else {
+    value = dht.computeDewPoint(jsonReadStr(configLiveJson, dhtT_value_name).toFloat(), jsonReadStr(configLiveJson, dhtH_value_name).toFloat(), false);
+    jsonWriteInt(configLiveJson, "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(configLiveJson, 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(configLiveJson, 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(configLiveJson, 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(configLiveJson, 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(configLiveJson, 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(configLiveJson, 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

Time.ino

@@ -1,24 +1,20 @@
 void Time_Init() {
-  server.on("/timeZone", HTTP_GET, [](AsyncWebServerRequest * request) {
-    if (request->hasArg("timezone")) {
-      jsonWriteStr(configSetup, "timezone", request->getParam("timezone")->value());
-    }
-    saveConfig();
-    reconfigTime();
-    request->send(200, "text/text", "OK"); // отправляем ответ о выполнении
-  });
-
   ts.add(TIME_SYNC, 30000, [&](void*) {
-    if (GetTimeUnix() == "failed") {
-      Serial.println("[i] Time is not synchronized, start synchronization");
-      reconfigTime();
-    }
+    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) {
-    configTime(0, 0, ntpServer);
+    String ntp = jsonReadStr(configSetupJson, "ntp");
+    configTime(0, 0, ntp.c_str());
     int i = 0;
     Serial.println("[i] Awaiting for time ");
 #ifdef ESP32
@@ -30,11 +26,11 @@ void reconfigTime() {
     }
 #endif
 #ifdef ESP8266
-    // while (!time(nullptr) && i < 4) {
-    //   Serial.print(".");
-    //   i++;
+    //while (!time(nullptr) && i < 4) {
+    //  Serial.print(".");
+    //  i++;
     delay(2000);
-    // }
+    //}
 #endif
     if (GetTimeUnix() != "failed") {
       Serial.print("[V] Time synchronized = ");
@@ -61,7 +57,7 @@ String GetTimeUnix() {
 // Получение текущего времени
 String GetTime() {
   time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  int zone = 3600 * jsonRead(configSetup, "timezone").toInt();
+  int zone = 3600 * jsonReadStr(configSetupJson, "timezone").toInt();
   now = now + zone;
   String Time = ""; // Строка для результатов времени
   Time += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017
@@ -72,7 +68,7 @@ String GetTime() {
 
 String GetTimeWOsec() {
   time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  int zone = 3600 * jsonRead(configSetup, "timezone").toInt();
+  int zone = 3600 * jsonReadStr(configSetupJson, "timezone").toInt();
   now = now + zone;
   String Time = ""; // Строка для результатов времени
   Time += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017
@@ -84,7 +80,7 @@ String GetTimeWOsec() {
 // Получение даты
 String GetDate() {
   time_t now = time(nullptr); // получаем время с помощью библиотеки time.h
-  int zone = 3600 * jsonRead(configSetup, "timezone").toInt();
+  int zone = 3600 * jsonReadStr(configSetupJson, "timezone").toInt();
   now = now + zone;
   String Data = ""; // Строка для результатов времени
   Data += ctime(&now); // Преобразуем время в строку формата Thu Jan 19 00:55:35 2017
@@ -126,7 +122,7 @@ String GetDataDigital() {
   return out;
 }
 
-int  timeToMin(String Time) {
+int timeToMin(String Time) {
   //"00:00:00"  время в секунды
   long  min = selectToMarker(Time, ":").toInt() * 60; //общее количество секунд в полных часах
   Time = deleteBeforeDelimiter (Time, ":"); // Теперь здесь минуты секунды

Timers.ino

@@ -1,115 +1,85 @@
 //================================================================================================================
-//=========================================Таймера=================================================================
+//=========================================Таймеры=================================================================
 void Timer_countdown_init() {
-
+  
   ts.add(TIMER_COUNTDOWN, 1000, [&](void*) {
-
-    String old_line = jsonRead(optionJson, "timers");
-
-
+    
+    String old_line = jsonReadStr(configOptionJson, "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);
+        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, "timerSet" + String(number), "0");
-
-          eventGen ("timerSet", String(number));
-
+          jsonWriteStr(configLiveJson, "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 = jsonRead(configJson, period_of_time);
+    //period_of_time = add_set(period_of_time);
+    period_of_time = jsonReadStr(configLiveJson, 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, "timerSet" + number, "1");
+  jsonWriteStr(configLiveJson, "timer" + number, "1");
 }
 void addTimer(String number, String time) {
-
-  String tmp = jsonRead(optionJson, "timers");   //1:60,2:120,
+  String tmp = jsonReadStr(configOptionJson, "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);
+  jsonWriteStr(configOptionJson, "timers", tmp);
   //Serial.println("ura");
 }
 
-
 void timerStop() {
-
   String number = sCmd.next();
   delTimer(number);
-
 }
+
 void delTimer (String number) {
-
-  String tmp = jsonRead(optionJson, "timers");       //1:60,2:120,
+  String tmp = jsonReadStr(configOptionJson, "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);
+    jsonWriteStr(configOptionJson, "timers", tmp);
   }
 }
 
 int readTimer(int number) {
-
-  String tmp = jsonRead(optionJson, "timers");       //1:60,2:120,
-
+  String tmp = jsonReadStr(configOptionJson, "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  выделяем таймер который надо прочитать
@@ -117,72 +87,3 @@ int readTimer(int number) {
   }
   return timer.toInt();
 }
-
-/*void timer() {
-
-  String seted_time = sCmd.next();
-  String order = sCmd.next();
-  order.replace("_", " ");
-  if (seted_time == current_time) {
-
-    order_loop += order + ",";
-
-  }
-}*/
-
-//------------------------------таймеры------------------------------------------------------
-
-/*
-void time() {
-
-  String time_number = sCmd.next();
-  String time = sCmd.next();
-
-  String time_to_add = time_number + "-" + time;
-
-  String replace_line = jsonRead(optionJson, "times") ;
-  int psn1 = replace_line.indexOf(time_number + "-") ;  //ищем позицию времени которое надо заменить
-
-  if (psn1 != -1) {                              //если оно есть
-
-    int psn2 = replace_line.indexOf(",", psn1);           //от этой позиции находим позицию запятой
-
-    String timer = replace_line.substring(psn1, psn2);    //выделяем таймер который надо заменить
-    ///tmp.replace(timer, new_timer);                     //заменяем таймер на новый (во всей стороке)
-    replace_line.replace(timer + ",", "");
-    replace_line += time_to_add + ",";
-
-  } else {                                              //если его нет
-    replace_line += time_to_add + ",";
-  }
-
-
-  jsonWriteStr(optionJson, "times", replace_line);
-
-  jsonWriteStr(configJson, "timeSet" + time_number, "1");
-
-  ts.add(TIMERS, 1000, [&](void*) {
-
-    current_time = GetTime();
-    Serial.println(current_time);
-
-    String seted_times = jsonRead(optionJson, "times");
-
-    while (seted_times.length() != 0) {
-      String tmp = selectToMarker (seted_times, ",");
-
-      String time_number = selectToMarker(tmp, "-");
-      String seted_time = deleteBeforeDelimiter(tmp, "-");
-
-      Serial.println(seted_time);
-
-      if (current_time == seted_time) {
-        jsonWriteStr(configJson, "timeSet" + time_number, "0");
-        eventGen ("timeSet", time_number);
-      }
-
-      seted_times = deleteBeforeDelimiter(seted_times, ",");
-    }
-  }, nullptr, true);
-}
-*/

Upgrade.ino

@@ -1,56 +1,13 @@
 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);
+  jsonWriteStr(configSetupJson, "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='/'; }, 30000);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 = "{}";  
-     //jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Есть новая версия <a href=\"#\" onclick=\"setTimeout(function(){ location.href='/'; }, 5000);}\">Установить?</a>");
-     request->send(200, "text/text", "ok");
-  });
 }
 
 void do_upgrade_url() {
@@ -58,12 +15,11 @@ void do_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
+    jsonWriteStr(configSetupJson, "last_version", last_version);
   }
 }
 
@@ -72,9 +28,9 @@ void upgrade_firmware() {
   String scenario_for_update;
   String config_for_update;
   String configSetup_for_update;
-  scenario_for_update = readFile("firmware.s.txt", 3072);
-  config_for_update = readFile("firmware.c.txt", 3072);
-  configSetup_for_update = configSetup;
+  scenario_for_update = readFile("firmware.s.txt", 4000);
+  config_for_update = readFile("firmware.c.txt", 4000);
+  configSetup_for_update = configSetupJson;
 
   Serial.println("Start upgrade SPIFFS, please wait...");
 
@@ -109,10 +65,15 @@ void upgrade_firmware() {
 #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");
   }
 }
 

Web.ino

@@ -0,0 +1,352 @@
+void web_init() {
+  server.on("/set", HTTP_GET, [](AsyncWebServerRequest * request) {
+    String value;
+    //============================device settings=====================================
+    if (request->hasArg("preset")) {
+      //--------------------------------------------------------------------------------
+      String value;
+      value = request->getParam("preset")->value();
+      if (value == "1") {
+        writeFile("firmware.c.txt", readFile("configs/1-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/1-relay.s.txt", 2048));
+      }
+      if (value == "2") {
+        writeFile("firmware.c.txt", readFile("configs/2-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/2-relay.s.txt", 2048));
+      }
+      if (value == "3") {
+        writeFile("firmware.c.txt", readFile("configs/3-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/3-relay.s.txt", 2048));
+      }
+      if (value == "4") {
+        writeFile("firmware.c.txt", readFile("configs/4-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/4-relay.s.txt", 2048));
+      }
+      if (value == "5") {
+        writeFile("firmware.c.txt", readFile("configs/5-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/5-relay.s.txt", 2048));
+      }
+      if (value == "6") {
+        writeFile("firmware.c.txt", readFile("configs/6-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/6-relay.s.txt", 2048));
+      }
+      if (value == "7") {
+        writeFile("firmware.c.txt", readFile("configs/7-relay.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/7-relay.s.txt", 2048));
+      }
+      if (value == "8") {
+        writeFile("firmware.c.txt", readFile("configs/8-pwm.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/8-pwm.s.txt", 2048));
+      }
+      if (value == "9") {
+        writeFile("firmware.c.txt", readFile("configs/9-dht11.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/9-dht11.s.txt", 2048));
+      }
+      if (value == "10") {
+        writeFile("firmware.c.txt", readFile("configs/10-dht22.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/10-dht22.s.txt", 2048));
+      }
+      if (value == "11") {
+        writeFile("firmware.c.txt", readFile("configs/11-analog.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/11-analog.s.txt", 2048));
+      }
+      if (value == "12") {
+        writeFile("firmware.c.txt", readFile("configs/12-bmp280.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/12-bmp280.s.txt", 2048));
+      }
+      if (value == "13") {
+        writeFile("firmware.c.txt", readFile("configs/13-bme280.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/13-bme280.s.txt", 2048));
+      }
+      if (value == "14") {
+        writeFile("firmware.c.txt", readFile("configs/14-dallas.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/14-dallas.s.txt", 2048));
+      }
+      if (value == "15") {
+        writeFile("firmware.c.txt", readFile("configs/15-termostat.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/15-termostat.s.txt", 2048));
+      }
+      if (value == "16") {
+        writeFile("firmware.c.txt", readFile("configs/16-level.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/16-level.s.txt", 2048));
+      }
+      if (value == "17") {
+        writeFile("firmware.c.txt", readFile("configs/17-moution.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/17-moution.s.txt", 2048));
+      }
+      if (value == "18") {
+        writeFile("firmware.c.txt", readFile("configs/18-moution.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/18-moution.s.txt", 2048));
+      }
+      if (value == "19") {
+        writeFile("firmware.c.txt", readFile("configs/19-stepper.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/19-stepper.s.txt", 2048));
+      }
+      if (value == "20") {
+        writeFile("firmware.c.txt", readFile("configs/20-servo.c.txt", 2048));
+        writeFile("firmware.s.txt", readFile("configs/20-servo.s.txt", 2048));
+      }
+      if (value == "21") {
+        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("/?set.device");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("devinit")) {
+      Device_init();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("scen")) {
+      value = request->getParam("scen")->value();
+      if (value == "0") {
+        jsonWriteStr(configSetupJson, "scen", value);
+        saveConfig();
+        Scenario_init();
+      }
+      if (value == "1") {
+        jsonWriteStr(configSetupJson, "scen", value);
+        saveConfig();
+        Scenario_init();
+      }
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("sceninit")) {
+      Scenario_init();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+#ifdef logging_enable
+    if (request->hasArg("cleanlog")) {
+      clean_log_date();
+      request->send(200, "text/text", "OK");
+    }
+#endif
+    //==============================udp settings=============================================
+    if (request->hasArg("udponoff")) {
+      value = request->getParam("udponoff")->value();
+      if (value == "0") {
+        jsonWriteStr(configSetupJson, "udponoff", value);
+        saveConfig();
+        Scenario_init();
+      }
+      if (value == "1") {
+        jsonWriteStr(configSetupJson, "udponoff", value);
+        saveConfig();
+        Scenario_init();
+      }
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("updatelist")) {
+      SPIFFS.remove("/dev.csv");
+      addFile("dev.csv", "device id;device name;ip address");
+      request->redirect("/?set.udp");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("updatepage")) {
+      request->redirect("/?set.udp");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("devname")) {
+      jsonWriteStr(configSetupJson, "name", request->getParam("devname")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    //==============================wifi settings=============================================
+    if (request->hasArg("routerssid")) {
+      jsonWriteStr(configSetupJson, "routerssid", request->getParam("routerssid")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    if (request->hasArg("routerpass")) {
+      jsonWriteStr(configSetupJson, "routerpass", request->getParam("routerpass")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("apssid")) {
+      jsonWriteStr(configSetupJson, "apssid", request->getParam("apssid")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    if (request->hasArg("appass")) {
+      jsonWriteStr(configSetupJson, "appass", request->getParam("appass")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("weblogin")) {
+      jsonWriteStr(configSetupJson, "weblogin", request->getParam("weblogin")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    if (request->hasArg("webpass")) {
+      jsonWriteStr(configSetupJson, "webpass", request->getParam("webpass")->value());
+      saveConfig();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("timezone")) {
+      jsonWriteStr(configSetupJson, "timezone", request->getParam("timezone")->value());
+      saveConfig();
+      reconfigTime();
+      request->send(200, "text/text", "OK");
+    }
+    if (request->hasArg("ntp")) {
+      jsonWriteStr(configSetupJson, "ntp", request->getParam("ntp")->value());
+      saveConfig();
+      reconfigTime();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("device")) {
+      if (request->getParam("device")->value() == "ok") ESP.restart();
+      request->send(200, "text/text", "OK");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("blink")) {
+      value = request->getParam("blink")->value();
+      if (value == "0") {
+        jsonWriteStr(configSetupJson, "blink", value);
+        saveConfig();
+      }
+      if (value == "1") {
+        jsonWriteStr(configSetupJson, "blink", value);
+        saveConfig();
+      }
+      request->send(200, "text/text", "OK");
+    }
+    //==============================mqtt settings=============================================
+    if (request->hasArg("mqttServer")) {
+      jsonWriteStr(configSetupJson, "mqttServer", request->getParam("mqttServer")->value());
+      saveConfig();
+      mqtt_connection = true;
+      request->send(200, "text/text", "ok");
+    }
+    if (request->hasArg("mqttPort")) {
+      int port = (request->getParam("mqttPort")->value()).toInt();
+      jsonWriteInt(configSetupJson, "mqttPort", port);
+      saveConfig();
+      mqtt_connection = true;
+      request->send(200, "text/text", "ok");
+    }
+    if (request->hasArg("mqttPrefix")) {
+      jsonWriteStr(configSetupJson, "mqttPrefix", request->getParam("mqttPrefix")->value());
+      saveConfig();
+      mqtt_connection = true;
+      request->send(200, "text/text", "ok");
+    }
+    if (request->hasArg("mqttUser")) {
+      jsonWriteStr(configSetupJson, "mqttUser", request->getParam("mqttUser")->value());
+      saveConfig();
+      mqtt_connection = true;
+      request->send(200, "text/text", "ok");
+    }
+    if (request->hasArg("mqttPass")) {
+      jsonWriteStr(configSetupJson, "mqttPass", request->getParam("mqttPass")->value());
+      saveConfig();
+      mqtt_connection = true;
+      request->send(200, "text/text", "ok");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("mqttsend")) {
+      mqtt_send_settings_to_udp = true;
+      request->send(200, "text/text", "ok");
+    }
+    //--------------------------------------------------------------------------------
+    if (request->hasArg("mqttcheck")) {
+      String tmp = "{}";
+      jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>" + stateMQTT());
+      jsonWriteStr(tmp, "class", "pop-up");
+      request->send(200, "text/text", tmp);
+    }
+    //==============================push settings=============================================
+#ifdef push_enable
+    if (request->hasArg("pushingboxid")) {
+      jsonWriteStr(configSetupJson, "pushingboxid", request->getParam("pushingboxid")->value());
+      saveConfig();
+      request->send(200, "text/text", "ok");
+    }
+#endif
+    //==============================utilities settings=============================================
+    if (request->hasArg("itoc")) {
+      i2c_scanning = true;
+      request->redirect("/?set.utilities");
+    }
+  });
+  //==============================upgrade settings=============================================
+  server.on("/check", HTTP_GET, [](AsyncWebServerRequest * request) {
+    upgrade_url = true;
+    Serial.print("[i] Last firmware version: ");
+    Serial.println(last_version);
+    String tmp = "{}";
+    int case_of_update;
+
+    if (WiFi.status() != WL_CONNECTED) last_version = "nowifi";
+    if (!mb_4_of_memory) last_version = "less";
+
+    if (last_version == firmware_version) case_of_update = 1;
+    if (last_version != firmware_version) case_of_update = 2;
+    if (last_version == "error") case_of_update = 3;
+    if (last_version == "") case_of_update = 4;
+    if (last_version == "less") case_of_update = 5;
+    if (last_version == "nowifi") case_of_update = 6;
+    if (last_version == "notsupported") case_of_update = 7;
+
+    switch (case_of_update) {
+      case 1: {
+          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Последняя версия прошивки уже установлена.");
+          jsonWriteStr(tmp, "class", "pop-up");
+        }
+        break;
+
+      case 2: {
+          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");
+        }
+        break;
+
+      case 3: {
+          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Ошибка... Cервер не найден. Попробуйте позже...");
+          jsonWriteStr(tmp, "class", "pop-up");
+        }
+        break;
+
+      case 4: {
+          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Нажмите на кнопку \"обновить прошивку\" повторно...");
+          jsonWriteStr(tmp, "class", "pop-up");
+          break;
+        }
+
+      case 5: {
+          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Обновление по воздуху не поддерживается, модуль имеет меньше 4 мб памяти...");
+          jsonWriteStr(tmp, "class", "pop-up");
+          break;
+        }
+
+      case 6: {
+          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Устройство не подключено к роутеру...");
+          jsonWriteStr(tmp, "class", "pop-up");
+          break;
+        }
+
+      case 7: {
+          jsonWriteStr(tmp, "title", "<button class=\"close\" onclick=\"toggle('my-block')\">×</button>Обновление на новую версию возможно только через usb...");
+          jsonWriteStr(tmp, "class", "pop-up");
+          break;
+        }
+    }
+    request->send(200, "text/text", tmp);
+  });
+
+  server.on("/upgrade", HTTP_GET, [](AsyncWebServerRequest * request) {
+    upgrade = true;
+    String tmp = "{}";
+    request->send(200, "text/text", "ok");
+  });
+}

Web_server.ino

@@ -1,22 +1,19 @@
 void Web_server_init() {
-
-  //========================================OTA============================================
+  /*********************************************************************************
+  ***************************************OTA****************************************
+  *********************************************************************************/
 #ifdef OTA_enable
-  //Send OTA events to the browser
   ArduinoOTA.onStart([]() {
     events.send("Update Start", "ota");
   });
-
   ArduinoOTA.onEnd([]() {
     events.send("Update End", "ota");
   });
-
   ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
     char p[32];
     sprintf(p, "Progress: %u%%\n", (progress / (total / 100)));
     events.send(p, "ota");
   });
-
   ArduinoOTA.onError([](ota_error_t error) {
     if (error == OTA_AUTH_ERROR) events.send("Auth Failed", "ota");
     else if (error == OTA_BEGIN_ERROR) events.send("Begin Failed", "ota");
@@ -25,17 +22,18 @@ void Web_server_init() {
     else if (error == OTA_END_ERROR) events.send("End Failed", "ota");
   });
   ArduinoOTA.setHostname(hostName);
-
   ArduinoOTA.begin();
 #endif
-  //========================================MDNS============================================
+  /*********************************************************************************
+  **************************************MDNS****************************************
+  *********************************************************************************/
 #ifdef MDNS_enable
   MDNS.addService("http", "tcp", 80);
 #endif
-
   //SPIFFS.begin();
-
-  //========================================WS============================================
+  /*********************************************************************************
+  **************************************WS******************************************
+  *********************************************************************************/
 #ifdef WS_enable
   ws.onEvent(onWsEvent);
   server.addHandler(&ws);
@@ -46,26 +44,26 @@ void Web_server_init() {
 
   server.addHandler(&events);
 #endif
-  //======================================================================================
-
+  /*********************************************************************************
+   **************************************WEB****************************************
+   *********************************************************************************/
 #ifdef ESP32
-  server.addHandler(new SPIFFSEditor(SPIFFS, jsonRead(configSetup, "web_login").c_str(), jsonRead(configSetup, "web_pass").c_str()));
+  server.addHandler(new SPIFFSEditor(SPIFFS, jsonReadStr(configSetupJson, "web_login").c_str(), jsonReadStr(configSetupJson, "web_pass").c_str()));
 #elif defined(ESP8266)
-  server.addHandler(new SPIFFSEditor(jsonRead(configSetup, "web_login").c_str(), jsonRead(configSetup, "web_pass").c_str()));
+  server.addHandler(new SPIFFSEditor(jsonReadStr(configSetupJson, "web_login").c_str(), jsonReadStr(configSetupJson, "web_pass").c_str()));
 #endif
 
-  server.on("/heap", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "text/plain", String(ESP.getFreeHeap()));
-  });
-
+  /*  server.on("/heap", HTTP_GET, [](AsyncWebServerRequest * request) {
+      request->send(200, "text/plain", String(ESP.getFreeHeap()));
+    });*/
 
   server.serveStatic("/css/", SPIFFS, "/css/").setCacheControl("max-age=31536000");
   server.serveStatic("/js/", SPIFFS, "/js/").setCacheControl("max-age=31536000");
-  server.serveStatic("/", SPIFFS, "/favicon.ico").setCacheControl("max-age=31536000");
+  server.serveStatic("/favicon.ico", SPIFFS, "/favicon.ico").setCacheControl("max-age=31536000");
+  server.serveStatic("/icon.jpeg", SPIFFS, "/icon.jpeg").setCacheControl("max-age=31536000");
 
   server.serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm")
-  .setAuthentication(jsonRead(configSetup, "web_login").c_str(), jsonRead(configSetup, "web_pass").c_str());
-
+  .setAuthentication(jsonReadStr(configSetupJson, "web_login").c_str(), jsonReadStr(configSetupJson, "web_pass").c_str());
 
   server.onNotFound([](AsyncWebServerRequest * request) {
     Serial.printf("NOT_FOUND: ");
@@ -113,7 +111,8 @@ void Web_server_init() {
 
     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());
@@ -121,7 +120,8 @@ void Web_server_init() {
     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);
@@ -132,30 +132,31 @@ void Web_server_init() {
 
   server.begin();
 
-  //=============================Устанавливаем реакции на запросы к серверу============================
-
   // --------------------Выдаем данные configJson //config.live.json - динамические данные
   server.on("/config.live.json", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "application/json", configJson);
+    request->send(200, "application/json", configLiveJson);
   });
   // --------------------Выдаем данные optionJson //config.option.json - данные не являющиеся событиями
   server.on("/config.option.json", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "application/json", optionJson);
+    request->send(200, "application/json", configOptionJson);
   });
   // -------------------Выдаем данные configSetup //config.setup.json - для хранения постоянных данных
   server.on("/config.setup.json", HTTP_GET, [](AsyncWebServerRequest * request) {
-    request->send(200, "application/json", configSetup);
+    request->send(200, "application/json", configSetupJson);
   });
 
   // ------------------Выполнение команды из запроса
-  server.on("/cmd", HTTP_GET, [](AsyncWebServerRequest * request) {             //http://192.168.88.45/cmd?command=rel%201%201
+  //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=========================================================================================
+/*********************************************************************************************************************************
+ *********************************************************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) {

WiFi.ino

@@ -1,57 +1,12 @@
-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 = jsonRead(configSetup, "ssid");
-  String _password = jsonRead(configSetup, "password");
+  String _ssid = jsonReadStr(configSetupJson, "routerssid");
+  String _password = jsonReadStr(configSetupJson, "routerpass");
   //WiFi.persistent(false);
 
   if (_ssid == "" && _password == "") {
@@ -64,12 +19,11 @@ void ROUTER_Connecting() {
   }
   // Делаем проверку подключения до тех пор пока счетчик tries
   // не станет равен нулю или не получим подключение
-  while (--tries && WiFi.status() != WL_CONNECTED)
-  {
+  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);
+      jsonWriteInt(configOptionJson, "pass_status", 1);
     }
     Serial.print(".");
     delay(1000);
@@ -91,10 +45,10 @@ void ROUTER_Connecting() {
     Serial.print("[V] IP address: http://");
     Serial.print(WiFi.localIP());
     Serial.println("");
-    jsonWriteStr(configJson, "ip", WiFi.localIP().toString());
-    
+    jsonWriteStr(configSetupJson, "ip", WiFi.localIP().toString());
+    led_blink("off");
     //add_dev_in_list("dev.txt", chipID, WiFi.localIP().toString());
-
+    MQTT_init();
   }
 }
 
@@ -104,24 +58,25 @@ bool StartAPMode() {
 
   WiFi.mode(WIFI_AP);
 
-  String _ssidAP = jsonRead(configSetup, "ssidAP");
-  String _passwordAP = jsonRead(configSetup, "passwordAP");
+  String _ssidAP = jsonReadStr(configSetupJson, "apssid");
+  String _passwordAP = jsonReadStr(configSetupJson, "appass");
   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());
+  jsonWriteStr(configSetupJson, "ip", myIP.toString());
 
-  if (jsonReadtoInt(optionJson, "pass_status") != 1) {
+  //if (jsonReadInt(configOptionJson, "pass_status") != 1) {
     ts.add(ROUTER_SEARCHING, 10 * 1000, [&](void*) {
       Serial.println("->try find router");
-      if (RouterFind(jsonRead(configSetup, "ssid"))) {
+      if (RouterFind(jsonReadStr(configSetupJson, "routerssid"))) {
         ts.remove(ROUTER_SEARCHING);
+        WiFi.scanDelete();
         ROUTER_Connecting();
-        MQTT_Connecting();
       }
     }, nullptr, true);
-  }
+  //}
   return true;
 }
 
@@ -138,7 +93,7 @@ boolean RouterFind(String ssid) {
     Serial.println("[WIFI][i] scanning still in progress");
     return false;
   }
-  if (n == 0) {                       //Сканирование все еще выполняется
+  if (n == 0) {                       //ни одна сеть не найдена
     Serial.println("[WIFI][i] no any wifi sations, starting scanning");
     WiFi.scanNetworks (true, false);
     return false;
@@ -176,12 +131,12 @@ boolean RouterFind(String ssid) {
   for (uint8_t i = 0; i < n; i++) {
     JsonObject& data = networks.createNestedObject();
     String ssidMy = WiFi.SSID(i);
-    data["ssid"] = ssidMy;
+    data["routerssid"] = ssidMy;
     data["pass"] = (WiFi.encryptionType(i) == ENC_TYPE_NONE) ? "" : "*";
     int8_t dbm = WiFi.RSSI(i);
     data["dbm"] = dbm;
-    if (ssidMy == jsonRead(configSetup, "ssid")) {
-      jsonWriteStr(configJson, "dbm", dbm);
+    if (ssidMy == jsonReadStr(configSetupJson, "routerssid")) {
+      jsonWriteStr(configLiveJson, "dbm", dbm);
     }
   }
   String root;
@@ -193,14 +148,14 @@ boolean RouterFind(String ssid) {
   {
    "type":"wifi",
    "title":"{{LangWiFi1}}",
-   "name":"ssid",
+   "name":"routerssid",
    "state":"{{ssid}}",
    "pattern":".{1,}"
   },
   {
-   "type":"password",
+   "type":"routerpass",
    "title":"{{LangPass}}",
-   "name":"ssidPass",
+   "name":"routerpass",
    "state":"{{ssidPass}}",
    "pattern":".{8,}"
   },

Widgets.ino

@@ -15,11 +15,40 @@ void createWidget (String widget_name, String  page_name, String page_number, St
   jsonWriteStr(widget, "order", page_number);
   jsonWriteStr(widget, "descr", widget_name);
   jsonWriteStr(widget, "topic", prex + "/" + topic);
-  #ifdef layout_in_ram
+
+#ifdef layout_in_ram
   all_widgets += widget + "\r\n";
-  #else
+#else
   addFile("layout.txt", widget);
-  #endif
+#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 = "";
 }
 
@@ -40,10 +69,20 @@ void createChart (String widget_name, String  page_name, String page_number, Str
   jsonWriteStr(widget, "series", widget_name);
   jsonWriteStr(widget, "maxCount", maxCount);
   jsonWriteStr(widget, "topic", prex + "/" + topic);
-  #ifdef layout_in_ram
+
+#ifdef layout_in_ram
   all_widgets += widget + "\r\n";
-  #else
+#else
   addFile("layout.txt", widget);
-  #endif
+#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

@@ -0,0 +1,33 @@
+void do_i2c_scanning() {
+  if (i2c_scanning) {
+    i2c_scanning = false;
+    String tmp = i2c_scan();
+    if (tmp == "error") {
+      tmp = i2c_scan();
+      Serial.println(tmp);
+      jsonWriteStr(configLiveJson, "i2c", tmp);
+    } else {
+      Serial.println(tmp);
+      jsonWriteStr(configLiveJson, "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;
+  }
+}

certificates.ino

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

data/config.json

@@ -1,18 +1,21 @@
 {
     "name": "IoTmanager",
     "chipID": "",
-    "ssidAP": "WiFi",
-    "passwordAP": "",
-    "ssid": "rise",
-    "password": "hostel3333",
+    "apssid": "IoTmanager",
+    "appass": "",
+    "routerssid": "rise",
+    "routerpass": "hostel3333",
     "timezone": 2,
-    "mqttServer": "mqtt.ioty.ru",
+    "ntp": "pool.ntp.org",
+    "mqttServer": "91.204.228.124",
     "mqttPort": 1883,
     "mqttPrefix": "/rise",
     "mqttUser": "test",
     "mqttPass": "test",
-    "scenario": "1",
-    "pushingbox_id": "",
-    "web_login": "admin",
-    "web_pass": "admin"
+    "scen": "1",
+    "pushingboxid": "v7C133E426B0C69E",
+    "weblogin": "admin",
+    "webpass": "admin",
+    "udponoff": "1",
+    "blink":"1"
 }

data/configs/10-dht22.c.txt

@@ -0,0 +1,7 @@
+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/11-analog.c.txt

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

data/configs/12-bmp280.c.txt

@@ -0,0 +1,6 @@
+bmp280T temp1 0x76 Температура#bmp280 Датчики any-data 1
+bmp280P press1 0x76 Давление#bmp280 Датчики any-data 2
+logging temp1 1 100 Температура Датчики 3
+logging press1 1 100 Давление Датчики 4
+
+//Чтение и логгирование датчика bmp280. Датчик подключается к шине i2c (esp8266 - gpio 5, 4)

data/configs/13-bme280.c.txt

@@ -0,0 +1,9 @@
+bme280T temp1 0x76 Температура#bmp280 Датчики any-data 1
+bme280P pres1 0x76 Давление#bmp280 Датчики any-data 2
+bme280H hum1 0x76 Влажность#bmp280 Датчики any-data 3
+bme280A altit1 0x76 Высота#bmp280 Датчики any-data 4
+logging temp1 1 100 Температура Датчики 5
+logging press1 1 100 Давление Датчики 6
+logging hum1 1 100 Влажность Датчики 7
+
+//Чтение и логгирование датчика bme280. Датчик подключается к шине i2c (esp8266 - gpio 5, 4)

data/configs/14-dallas.c.txt

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

data/configs/15-termostat.c.txt

@@ -1,5 +1,5 @@
 dallas 2 Водонагреватель,#t°C Термостат any-data 1
-logging dallas 5 100 slow Температура Термостат 2
+logging dallas 5 100 Температура Термостат 2
 inputDigit digit1 При#скольки#выключить? Термостат 40 3
 inputDigit digit2 При#скольки#включить? Термостат 20 4
 button 1 5 Нагреватель Термостат 0 5

data/configs/16-level.c.txt

@@ -1,9 +1,9 @@
-level Вода#в#баке,#% Датчики fill-gauge 125 20 1
+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 level 1 100 slow Вода#в#баке Датчики 6
+logging lev 1 100 Вода#в#баке Датчики 6
 
 //125 - это расстояние от датчика до дна бака в сантиметрах
 //20 - это расстояние от датчика до поверхности воды когда бак полный в сантиметрах

data/configs/16-level.s.txt

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

data/configs/20-servo.c.txt

@@ -0,0 +1,17 @@
+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/20-servo.s.txt

@@ -0,0 +1,12 @@
+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/8-pwm.s.txt

@@ -0,0 +1 @@
+

data/configs/9-dht11.c.txt

@@ -0,0 +1,7 @@
+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/9-dht11.s.txt

@@ -0,0 +1 @@
+

data/configs/dht11.c.txt

@@ -1,10 +0,0 @@
-dhtT DHT11 2 Температура#DHT,#t°C Датчики any-data 1
-dhtH DHT11 2 Влажность#DHT,#% Датчики any-data 2
-dhtComfort Степень#комфорта: Датчики 3
-dhtPerception Восприятие: Датчики 4
-dhtDewpoint Точка#росы: Датчики 5
-logging dhtT 5 50 slow Температура Датчики  6
-logging dhtH 5 50 slow Влажность Датчики  7
-
-//2 - номер пина датчика
-//варианты отображения: any-data, progress-round, progress-line, fill-gauge

data/configs/dht22.c.txt

@@ -1,10 +0,0 @@
-dhtT DHT22 2 Температура#DHT,#t°C Датчики any-data 1
-dhtH DHT22 2 Влажность#DHT,#% Датчики any-data 2
-dhtComfort Степень#комфорта: Датчики 3
-dhtPerception Восприятие: Датчики 4
-dhtDewpoint Точка#росы: Датчики 5
-logging dhtT 5 50 slow Температура Датчики  6
-logging dhtH 5 50 slow Влажность Датчики  7
-
-//2 - номер пина датчика
-//варианты отображения: any-data, progress-round, progress-line, fill-gauge

data/configs/firmware.c.txt

@@ -3,12 +3,10 @@ button 2 13 Прихожая Реле 0 2
 button 3 14 Кухня Реле 0 3
 pwm 1 3 Яркость#коредор: Реле 1023 4
 pwm 2 4 Яркость#ванная: Реле 510 5
-analog 0 Аналоговый#вход Датчики fill-gauge 1 1023 1 1023 6
-logging analog 1 100 slow Аналоговый#вход Датчики 7
+analog adc 0 Аналоговый#вход Датчики fill-gauge 1 1023 1 1023 6
+logging adc 1 100 Аналоговый#вход Датчики 7
 
-//Это демо конфигурация. В ней показано как связать кнопки c мощью сценариев
+//Это демо конфигурация. В ней показано как связать кнопки c помощью сценариев
 //Кнопка номер 1 связана с кнопкой 2, 3 и с pwm 2
 //Так же продемонстрированна система логгирования данных строкой logging
-//1 - это интервал между точками в минутах, 100 это количество точек 
-//slow или fast это два варианта выгрузки графика, slow более экономичный режим
-//больше подходит для esp8266
+//1 - это интервал между точками в минутах, 100 это количество точек 

data/configs/firmware.s.txt

@@ -7,4 +7,7 @@ button1 = 0
 buttonSet 2 0
 buttonSet 3 0
 pwmSet 2 0
+end
+adc > 50
+buttonSet 2 1
 end

data/configs/level.s.txt

@@ -1,6 +0,0 @@
-level > digit1
-buttonSet 1 0
-end
-level < digit2
-buttonSet 1 1
-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/configuration.json

@@ -1,113 +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": "hr"
-    },
-    {
-      "type": "dropdown",
-      "name": "help-url",
-      "class": "btn btn-warning btn-lg",
-      "style": "display:inline",
-      "title": {
-        "#": "Выбирите то, во что Вы хотите превратить ESP <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": "Настройки по умолчанию"
-      }
-    },
-    {
-      "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,65 +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=2",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "link",
-      "title": "Обновить страницу",
-      "action": "udp?arg=3",
-      "class": "btn btn-block btn-success"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "text",
-      "class": "alert alert-warning",
-      "title": "После нажатия на кнопку 'Переформировать список устройств' ждите примерно минуту, а затем обновите страницу и список появится вновь"
-    },
-    {
-      "type": "hr"
-    },
-    {
-      "type": "link",
-      "title": "Главная",
-      "action": "/",
-      "class": "btn btn-block btn-danger"
-    }
-  ]
-}

data/firmware.c.txt

@@ -3,12 +3,10 @@ button 2 13 Прихожая Реле 0 2
 button 3 14 Кухня Реле 0 3
 pwm 1 3 Яркость#коредор: Реле 1023 4
 pwm 2 4 Яркость#ванная: Реле 510 5
-analog 0 Аналоговый#вход Датчики fill-gauge 1 1023 1 1023 6
-logging analog 1 100 slow Аналоговый#вход Датчики 7
+analog adc 0 Аналоговый#вход Датчики fill-gauge 1 1023 1 1023 6
+logging adc 1 100 Аналоговый#вход Датчики 7
 
-//Это демо конфигурация. В ней показано как связать кнопки c мощью сценариев
+//Это демо конфигурация. В ней показано как связать кнопки c помощью сценариев
 //Кнопка номер 1 связана с кнопкой 2, 3 и с pwm 2
 //Так же продемонстрированна система логгирования данных строкой logging
-//1 - это интервал между точками в минутах, 100 это количество точек 
-//slow или fast это два варианта выгрузки графика, slow более экономичный режим
-//больше подходит для esp8266
+//1 - это интервал между точками в минутах, 100 это количество точек 

data/firmware.s.txt

@@ -7,4 +7,7 @@ button1 = 0
 buttonSet 2 0
 buttonSet 3 0
 pwmSet 2 0
+end
+adc > 50
+buttonSet 2 1
 end

data/index.json

@@ -1,7 +1,8 @@
 {
   "configs": [
     "/config.live.json",
-    "/config.setup.json"
+    "/config.setup.json",
+    "/lang/lang.ru.json"
   ],
   "title": "Главная",
   "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
@@ -9,94 +10,60 @@
     {
       "type": "h5",
       "title": "{{name}}",
-      "class": "alert-warning"
+      "class": "alert-default"
     },
     {
-      "type": "h4",
-      "title": "Device ID: {{chipID}}"
-    },
-    {
-      "type": "h4",
-      "title": "IP address: {{ip}}"
-    },
-    {
-      "type": "h4",
-      "title": "Uptime: {{uptime}}"
-    },
-    {
-      "type": "h4",
-      "title": "Build version: {{firmware_version}}"
-    },
-    {
-      "type": "h4",
-      "title": "SPIFFS version: 2.3.2"
-    },
-    {
-      "type": "hr"
-    },
+			"type": "text",
+			"class": "alert alert-light",
+			"title": "<center><img src='/icon.jpeg' alt='IoT Manager'></center>"
+		},
     {
       "type": "link",
       "title": "Конфигурация устройства",
-      "action": "/?configuration",
-      "class": "btn btn-block btn-primary"
-    },
-    {
-      "type": "hr"
+      "action": "/?set.device",
+      "class": "btn btn-block btn-default"
     },
     {
       "type": "link",
       "title": "Список других устройств в сети",
-      "action": "/?dev",
-      "class": "btn btn-block btn-success"
+      "action": "/?set.udp",
+      "class": "btn btn-block btn-default"
     },
     {
       "type": "link",
       "title": "Конфигурация WIFI",
-      "action": "/?setup",
-      "class": "btn btn-block btn-success"
+      "action": "/?set.wifi",
+      "class": "btn btn-block btn-default"
     },
     {
       "type": "link",
       "title": "Конфигурация MQTT",
-      "action": "/?mqtt",
-      "class": "btn btn-block btn-success"
+      "action": "/?set.mqtt",
+      "class": "btn btn-block btn-default"
     },
     {
       "type": "link",
       "title": "Конфигурация push",
-      "action": "/?pushingbox",
-      "class": "btn btn-block btn-success"
+      "action": "/?set.push",
+      "class": "btn btn-block btn-default"
     },
     {
-      "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": "Утилиты",
+      "action": "/?set.utilities",
+      "class": "btn btn-block btn-default"
     },
     {
       "type": "link",
       "title": "Скачать приложение IoT Manager для android",
       "action": "https://play.google.com/store/apps/details?id=ru.esp8266.iotmanager",
-      "class": "btn btn-block btn-warning"
+      "class": "btn btn-block btn-default"
     },
     {
       "type": "link",
       "title": "Скачать приложение IoT Manager для iphone",
       "action": "https://apps.apple.com/ru/app/iot-manager/id1155934877",
-      "class": "btn btn-block btn-warning"
+      "class": "btn btn-block btn-default"
     }
   ]
 }

data/lang/lang.ru.json

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

data/mqtt.json

@@ -1,106 +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": "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": "Прежде чем нажимать на кнопку 'Отправить настройки MQTT' сохрание их, если Вы их меняли. Настройки получат и перезапишут все устройства в локальной сети"
-    },
-    {
-      "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=1",
-      "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/set.device.json

@@ -0,0 +1,143 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/config.option.json",
+    "/config.live.json",
+    "/lang/lang.ru.json"
+  ],
+  "class": "col-sm-offset-1 col-sm-10",
+  "content": [
+    {
+      "type": "h5",
+      "title": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h4",
+      "title": "Device ID: {{chipID}}"
+    },
+    {
+      "type": "h4",
+      "title": "IP address: {{ip}}"
+    },
+    {
+      "type": "h4",
+      "title": "Time: {{time}}"
+    },
+    {
+      "type": "h4",
+      "title": "Uptime: {{uptime}}"
+    },
+    {
+      "type": "h4",
+      "title": "Build version: {{firmware_version}}"
+    },
+    {
+      "type": "h4",
+      "title": "SPIFFS version: 2.3.3"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "dropdown",
+      "name": "help-url",
+      "class": "btn btn-default",
+      "style": "display:inline",
+      "title": {
+        "#": "{{SetDevPreset}}<span class=\"caret\"></span>",
+        "/set?preset=1": "1.Вкл. выкл. локального реле",
+        "/set?preset=2": "2.Вкл. выкл. локального реле в определенное время",
+        "/set?preset=3": "3.Вкл. выкл. локального реле на определенный период времени",
+        "/set?preset=4": "4.Вкл. выкл. нескольких локальных реле кнопкой в приложении",
+        "/set?preset=5": "5.Вкл. выкл. локального реле физической кнопкой и кнопкой в приложении параллельно (для выключателя света)",
+        "/set?preset=6": "6.Вкл. выкл. нескольких удаленных реле кнопкой в приложении (нужно указать Device ID)",
+        "/set?preset=7": "7.Вкл. выкл. нескольких удаленных реле физической кнопкой (нужно указать Device ID)",
+        "/set?preset=8": "8.Широтно импульсная модуляция",
+        "/set?preset=9": "9.Сенсор DHT11 (темп, влажность) и логгирование",
+        "/set?preset=10": "10.Сенсор DHT22, DHT33, DHT44, AM2302, RHT03 (темп, влажность) и логгирование",
+        "/set?preset=11": "11.Аналоговый сенсор и логгирование",
+        "/set?preset=12": "12.Cенсор bmp280 (темп, давление) и логгирование",
+        "/set?preset=13": "13.Cенсор bme280 (темп, давление, влажность, высота) и логгирование",
+        "/set?preset=14": "12.Сенсор DS18B20 (темп) и логгирование",
+        "/set?preset=15": "13.Термостат на DS18B20 с переключением в ручной режим и логгированием",
+        "/set?preset=16": "14.Котроль уровня в баке (датчик расстояния) на сенсорах: JSN-SR04T, HC-SR04, HY-SRF05 и логгирование",
+        "/set?preset=17": "15.Датчик движения включающий свет",
+        "/set?preset=18": "16.Охранный датчик движения",
+        "/set?preset=19": "17.Система управления шаговыми двигателями на основе драйвера A4988 (открытие закрытие штор)",
+        "/set?preset=20": "18.Система управления сервоприводами",
+        "/set?preset=21": "Настройки по умолчанию"
+      }
+    },
+    {
+      "type": "h2",
+      "title": "{{SetDevConf}}"
+    },
+    {
+      "type": "file",
+      "state": "firmware.c.txt",
+      "style": "width:100%;height:350px",
+      "title": "Сохранить",
+      "action": "/set?devinit",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "h2",
+      "title": "Сценарии"
+    },
+    {
+      "type": "checkbox",
+      "name": "scen",
+      "title": "Включить сценарии",
+      "action": "/set?scen=[[scen]]",
+      "state": "{{scen}}"
+    },
+    {
+      "type": "file",
+      "state": "firmware.s.txt",
+      "style": "width:100%;height:350px",
+      "title": "Сохранить",
+      "action": "/set?sceninit",
+      "class": "btn btn-block btn-default"
+    },
+    
+    {
+      "type": "link",
+      "title": "Инструкция к системе автоматизации",
+      "action": "https://github.com/DmitryBorisenko33/esp32-esp8266_iot-manager_modules_firmware/wiki/Instruction",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "link",
+      "title": "Очистить логи сенсоров",
+      "action": "/set?cleanlog",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "name": "my-block",
+      "style": "position:fixed;top:50%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+      "class": "hidden"
+    },
+   
+    {
+      "type": "button",
+      "title": "Обновить прошивку устройства",
+      "action": "/check",
+      "response": "[[my-block]]",
+      "class": "btn btn-block btn-default"
+    }
+  ]
+}

data/set.mqtt.json

@@ -0,0 +1,133 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.json"
+  ],
+  "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
+  "content": [
+    {
+      "type": "h5",
+      "title": "{{name}}",
+      "class": "alert-default"
+      
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+   
+    {
+      "type": "h4",
+      "title": "{{SetMQTTServerName}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttServer-arg",
+      "state": "{{mqttServer}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPort}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPort-arg",
+      "state": "{{mqttPort}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPrefix}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPrefix-arg",
+      "state": "{{mqttPrefix}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTUserName}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttUser-arg",
+      "state": "{{mqttUser}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h4",
+      "title": "{{SetMQTTPassword}}",
+      "style": "width:60%;float:left;"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "mqttPass-arg",
+      "state": "{{mqttPass}}",
+      "style": "width:40%;float:right"
+    },
+    {
+      "type": "h3",
+      "name": "my-block",
+      "style": "position:fixed;top:30%;left:50%;width:400px;margin-left:-200px;text-align:center;",
+      "class": "hidden"
+    },
+    
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "style": "width:100%;float:left;",
+      "action": "set?mqttServer=[[mqttServer-arg]]&mqttPort=[[mqttPort-arg]]&mqttPrefix=[[mqttPrefix-arg]]&mqttUser=[[mqttUser-arg]]&mqttPass=[[mqttPass-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "button",
+      "style": "width:100%;float:left;",
+      "title": "{{SetMQTTSendSettings}}",
+      "action": "set?mqttsend",
+      "class": "btn btn-block btn-default"
+    },
+    
+    {
+      "type": "button",
+      "style": "width:100%;float:left;",
+      "title": "Проверить соединение с MQTT",
+      "action": "set?mqttcheck",
+      "response": "[[my-block]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "style": "width:100%;float:left;",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetMQTTWarn1}}</p></font></div>"
+     
+    },
+    {
+      "type": "text",
+      "style": "width:100%;float:left;",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetMQTTWarn2}}</p></font></div>"
+    },
+    {
+      "type": "link",
+      "style": "width:100%;float:left;",
+      "title": "Перезагрузить устройство",
+      "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
+      "class": "btn btn-block btn-danger"
+    }
+  ]
+}

data/set.push.json

@@ -0,0 +1,51 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.json"
+  ],
+  "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
+  "content": [
+    {
+      "type": "h5",
+      "title": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h4",
+      "style": "width:60%;float:left;",
+      "title": "Device id:"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "push-arg",
+      "style": "width:40%;float:right",
+      "state": "{{pushingboxid}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?pushingboxid=[[push-arg]]",
+      "class": "btn btn-block btn-default",
+      "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-danger"
+    }
+  ]
+}

data/set.udp.json

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

data/set.utilities.json

@@ -0,0 +1,39 @@
+{
+  "configs": [
+    "/config.live.json",
+    "/config.setup.json",
+    "/lang/lang.ru.json"
+  ],
+  "title": "Главная",
+  "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
+  "content": [
+    {
+      "type": "h5",
+      "title": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "Сканирование адресов шины i2c"
+    },
+    {
+      "type": "h4",
+      "title": "{{i2c}}"
+    },
+    {
+      "type": "link",
+      "title": "Сканировать",
+      "action": "/set?itoc",
+      "class": "btn btn-block btn-default"
+    }
+  ]
+}

data/set.wifi.json

@@ -0,0 +1,185 @@
+{
+  "configs": [
+    "/config.setup.json",
+    "/lang/lang.ru.json"
+  ],
+  "title": "Конфигурация",
+  "class": "col-sm-offset-1 col-sm-10 col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6",
+  "content": [
+    {
+      "type": "h5",
+      "title": "{{name}}",
+      "class": "alert-default"
+    },
+    {
+      "type": "link",
+      "title": "{{ButMainPage}}",
+      "action": "/",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiNameOfDev}}"
+    },
+    {
+      "type": "input",
+      "title": "{{SetWiFiNameOfDev}}",
+      "name": "devname-arg",
+      "state": "{{name}}",
+      "pattern": "[A-Za-z0-9]{6,12}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?devname=[[devname-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn1}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiRouterConnect}}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "routerssid-arg",
+      "state": "{{routerssid}}"
+    },
+    {
+      "type": "password",
+      "title": "",
+      "name": "routerpass-arg",
+      "state": "{{routerpass}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "class": "btn btn-block btn-default",
+      "action": "set?routerssid=[[routerssid-arg]]&routerpass=[[routerpass-arg]]"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn2}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "checkbox",
+      "name": "blink",
+      "title": "Включить светодиод статуса подключения",
+      "action": "/set?blink=[[blink]]",
+      "state": "{{blink}}"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn5}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiAccessPoint}}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "apssid-arg",
+      "state": "{{apssid}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "password",
+      "title": "",
+      "name": "appass-arg",
+      "state": "{{appass}}",
+      "pattern": ".{8,20}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?apssid=[[apssid-arg]]&appass=[[appass-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn3}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiWeb}}"
+    },
+    {
+      "type": "input",
+      "title": "Логин",
+      "name": "weblogin-arg",
+      "state": "{{weblogin}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "password",
+      "title": "Пароль",
+      "name": "webpass-arg",
+      "state": "{{webpass}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?weblogin=[[weblogin-arg]]&webpass=[[webpass-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "h3",
+      "title": "{{SetWiFiTimeZone}}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "timezone-arg",
+      "state": "{{timezone}}",
+      "pattern": ".{1,20}"
+    },
+    {
+      "type": "input",
+      "title": "",
+      "name": "ntp-arg",
+      "state": "{{ntp}}"
+    },
+    {
+      "type": "button",
+      "title": "{{ButSave}}",
+      "action": "set?timezone=[[timezone-arg]]&ntp=[[ntp-arg]]",
+      "class": "btn btn-block btn-default"
+    },
+    {
+      "type": "text",
+      "title": "<div style='margin-top:10px;margin-bottom:10px;'><font color='black'><p style='border: 1px solid #DCDCDC; border-radius: 3px; background-color: #F5F5F5; padding: 10px;'>{{SetWiFiWarn4}}</p></font></div>"
+    },
+    {
+      "type": "hr"
+    },
+    {
+      "type": "link",
+      "title": "Перезагрузить устройство",
+      "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/set?device=ok');}",
+      "class": "btn btn-block btn-danger"
+    }
+  ]
+}

data/setup.json

@@ -1,148 +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": "[0-9a-zA-Zа-яА-Я.\\- ]{1,20}"
-  },
-  {
-   "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":"time-zone",
-   "state": "{{timezone}}",
-   "pattern": ".{1,20}"
-  },
-  {
-   "type": "button",
-   "title": "Сохранить",
-   "action": "timeZone?timezone=[[time-zone]]",
-   "class": "btn btn-block btn-success"
-  },
-{
-   "type": "hr"
-  },
-  {
-   "type": "link",
-   "title": "Перезагрузить устройство",
-   "action": "javascript:if(confirm(renameBlock(jsonResponse,'Перезагрузить?'))){send_request(this,'/restart?device=ok');}",
-   "class": "btn btn-block btn-warning"
-  }
- ]
-}

data_excess/.exclude.files

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

data_excess/config-all.json

@@ -6,6 +6,7 @@
     "ssid": "your_ssid",
     "password": "your_password",
     "timezone": 3,
+    "ntp": "pool.ntp.org",
     "mqttServer": "",
     "mqttPort": 0,
     "mqttPrefix": "/IoTmanager",
@@ -14,5 +15,6 @@
     "scenario": "1",
     "pushingbox_id": "",
     "web_login": "admin",
-    "web_pass": "admin"
+    "web_pass": "admin",
+    "udponoff": "1"
 }