diff --git a/Cmd.ino b/Cmd.ino index c152d5d3..596cdfcd 100644 --- a/Cmd.ino +++ b/Cmd.ino @@ -474,16 +474,16 @@ void servoSet() { } void serialBegin() { - String s_speed = sCmd.next(); + //String s_speed = sCmd.next(); //String rxPin = sCmd.next(); //String txPin = sCmd.next(); //SoftwareSerial mySerial(rxPin.toInt(), txPin.toInt()); - mySerial.begin(s_speed.toInt()); + //mySerial.begin(s_speed.toInt()); } void serialWrite() { - String text = sCmd.next(); - mySerial.println(text); + //String text = sCmd.next(); + //mySerial.println(text); } //==================================================================================================================================================== /* diff --git a/Init.ino b/Init.ino index 7f8d6421..e4d986e0 100644 --- a/Init.ino +++ b/Init.ino @@ -62,9 +62,9 @@ void Device_init() { bme280H_value_name = ""; bme280A_value_name = ""; - //int array_sz = sizeof(sensors_reading_map) / sizeof(sensors_reading_map[0]); + int array_sz = sizeof(sensors_reading_map) / sizeof(sensors_reading_map[0]); - for (int i = 0; i <= 14; i++) { + for (int i = 0; i <= array_sz; i++) { sensors_reading_map[i] = 0; } diff --git a/Logging.ino b/Logging.ino index 292c47a7..331e9949 100644 --- a/Logging.ino +++ b/Logging.ino @@ -1,5 +1,5 @@ //===============================================Логирование============================================================ -//logging temp1 1 10 fast Температура Датчики 2 +//logging temp1 1 10 Температура Датчики 2 void logging() { String value_name = sCmd.next(); String period_min = sCmd.next(); diff --git a/Sensors.ino b/Sensors.ino index 058f3f94..6f1cb8fb 100644 --- a/Sensors.ino +++ b/Sensors.ino @@ -375,7 +375,7 @@ void dhtD_reading() { Serial.println("[i] sensor 'dhtDewpoint' data: " + String(value)); } } - +//=========================================i2c bus esp8266 scl-4 sda-5 ==================================================================== //========================================================================================================================================= //=========================================Модуль сенсоров bmp280========================================================================== //bmp280T temp1 0x76 Температура#bmp280 Датчики any-data 1 diff --git a/Time.ino b/Time.ino index 2eab1b07..f262fe9c 100644 --- a/Time.ino +++ b/Time.ino @@ -11,7 +11,6 @@ void Time_Init() { request->send(200, "text/text", "OK"); // отправляем ответ о выполнении }); - ts.add(TIME_SYNC, 30000, [&](void*) { time_check(); }, nullptr, true); @@ -25,11 +24,11 @@ void time_check() { } void reconfigTime() { - if (WiFi.status() == WL_CONNECTED) { + if (WiFi.status() == WL_CONNECTED) { String ntp = jsonRead(configSetup, "ntp"); - configTime(0, 0, ntp.c_str()); + configTime(0, 0, ntp.c_str()); int i = 0; - Serial.println("[i] Awaiting for time "); + Serial.println("[i] Awaiting for time "); #ifdef ESP32 struct tm timeinfo; while (!getLocalTime(&timeinfo) && i <= 4) { @@ -39,11 +38,11 @@ void reconfigTime() { } #endif #ifdef ESP8266 - // while (!time(nullptr) && i < 4) { - // Serial.print("."); - // i++; - delay(2000); - // } + //while (!time(nullptr) && i < 4) { + // Serial.print("."); + // i++; + delay(2000); + //} #endif if (GetTimeUnix() != "failed") { Serial.print("[V] Time synchronized = "); diff --git a/data/css/build.css.gz b/data/css/build.css.gz index ad0b46d2..fc58d776 100644 Binary files a/data/css/build.css.gz and b/data/css/build.css.gz differ diff --git a/data/index.htm.gz b/data/index.htm.gz index 6aba3a8c..0e9eb070 100644 Binary files a/data/index.htm.gz and b/data/index.htm.gz differ diff --git a/data/js/build.chart.js.gz b/data/js/build.chart.js.gz index 68e9791c..bb94fbc9 100644 Binary files a/data/js/build.chart.js.gz and b/data/js/build.chart.js.gz differ diff --git a/data/js/function.js.gz b/data/js/function.js.gz index 2c3d7bbf..7e661ff6 100644 Binary files a/data/js/function.js.gz and b/data/js/function.js.gz differ diff --git a/set.h b/set.h index 0970649b..aac7f511 100644 --- a/set.h +++ b/set.h @@ -1,5 +1,5 @@ //===============FIRMWARE SETTINGS===================================== -String firmware_version = "2.3.3g"; +String firmware_version = "2.3.3"; boolean mb_4_of_memory = true; //#define OTA_enable //#define MDNS_enable @@ -116,8 +116,8 @@ Adafruit_Sensor *bme_temp = bme.getTemperatureSensor(); Adafruit_Sensor *bme_pressure = bme.getPressureSensor(); Adafruit_Sensor *bme_humidity = bme.getHumiditySensor(); -#include -SoftwareSerial mySerial(14, 12); +//#include +//SoftwareSerial mySerial(14, 12); //===============FIRMWARE VARS======================== boolean just_load = true; const char* hostName = "IoT Manager"; diff --git a/udp.ino b/udp.ino index e2c12744..9cc7b2aa 100644 --- a/udp.ino +++ b/udp.ino @@ -87,7 +87,6 @@ void handleUdp() { if (received_udp_line.indexOf("mqttServer") >= 0) { udp_data_parse = true; } - } } }