diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | include/tablo_ws2812.h | 239 | ||||
| -rw-r--r-- | platformio.ini | 30 | ||||
| -rw-r--r-- | src/main.cpp | 667 |
4 files changed, 938 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..968a41b --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.pio/ +.vscode/ diff --git a/include/tablo_ws2812.h b/include/tablo_ws2812.h new file mode 100644 index 0000000..31ce6dc --- /dev/null +++ b/include/tablo_ws2812.h @@ -0,0 +1,239 @@ +/*========================================================= + Tablo ws2812 + = vlapa = v.509 + 2021.02.01 - 2023.11.14 +=========================================================*/ +#pragma once + +#define PIXEL_PIN 3 // D2 +#define PIXEL_COUNT 210 +#define RAZR_PIXEL 42 +#define BRIGHT_DAY 100 +#define BRIGHT_NIGHT 5 + +#include <Adafruit_NeoPixel.h> +Adafruit_NeoPixel strip(PIXEL_COUNT, PIXEL_PIN, NEO_GRB + NEO_KHZ800); + +const uint8_t digit = 5; // кол-во разрядов табло + +//******************************************************************** +// плата +void visibleWork(String visData, uint32_t color, uint8_t bright) +{ // данные, цвет + strip.setBrightness(bright); + + for (uint8_t razr = 0; razr < digit; ++razr) + { + uint8_t x; + if (visData.charAt(razr) == 'A') + { + x = 10; + } + else if (visData.charAt(razr) == 'B') + { + x = 11; + } + else if (visData.charAt(razr) == 'C') + { + x = 12; + } + else if (visData.charAt(razr) == 'D') + { + x = 13; + } + else if (visData.charAt(razr) == 'E') + { + x = 14; + } + else + { + x = visData.substring(razr, razr + 1).toInt(); + } + + switch (x) + { + case 0: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if (i >= 0 && i < 36) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 1: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if (i > 11 && i < 24) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 2: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if ((i > 5 && i < 18) || (i > 23 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 3: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if ((i > 5 && i < 30) || (i > 36 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 4: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if ((i >= 0 && i < 6) || (i > 11 && i < 24) || (i > 35 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 5: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if ((i >= 0 && i < 12) || (i > 17 && i < 30) || (i > 35 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 6: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if ((i >= 0 && i < 12) || (i > 17 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 7: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if (i > 5 && i < 24) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 8: + for (int i = 0; i < RAZR_PIXEL; ++i) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + break; + case 9: + for (int i = 0; i < RAZR_PIXEL; i++) + { + if ((i >= 0 && i < 30) || (i > 35 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 10: // градус ( A ) + for (int i = 0; i < RAZR_PIXEL; i++) + { + if ((i >= 0 && i < 18) || (i > 35 && i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 11: // минус ( B ) + for (int i = 0; i < RAZR_PIXEL; i++) + { + if ((i > 35) && (i < 42)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 12: // двоеточие ( C ) + for (int i = 0; i < RAZR_PIXEL; i++) + { + if ((i == 36) || (i == 37) || (i == 40) || (i == 41)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + case 13: // null (пусто) ( D ) + for (int i = 0; i < RAZR_PIXEL; ++i) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + break; + case 14: // точка ( E ) + for (int i = 0; i < RAZR_PIXEL; ++i) + { + if ((i == 26) || (i == 27)) + { + strip.setPixelColor(i + razr * RAZR_PIXEL, color); + } + else + { + strip.setPixelColor(i + razr * RAZR_PIXEL, strip.Color(0, 0, 0)); + } + } + break; + } + } + strip.show(); +}
\ No newline at end of file diff --git a/platformio.ini b/platformio.ini new file mode 100644 index 0000000..a39793b --- /dev/null +++ b/platformio.ini @@ -0,0 +1,30 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.htmlipass + +[env:esp32-c3-devkitm-1] +platform = espressif32 +board = esp32-c3-devkitm-1 + +; [env:d1_mini] +; platform = espressif8266 +; board = d1_mini + + +framework = arduino +upload_speed = 921600 +monitor_speed = 115200 + +lib_deps = + adafruit/Adafruit NeoPixel + arduino-libraries/NTPClient + knolleary/PubSubClient + + +
\ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..51adf2d --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,667 @@ +//******************************************************************** +//* +//* Tablo na WS2812b + mqtt + bme280 (2) +//* 2021.02.01 - 2026.02.18 +//* +//* A - градус +//* В - минус +//* С - двоеточие +//* D - пусто +//* E - точка +//* F - +//******************************************************************** +#include <Arduino.h> +#include <WiFi.h> +#include <NTPClient.h> +#include <WiFiUdp.h> +#include <PubSubClient.h> +#include "tablo_ws2812.h" + +#include <WiFiClient.h> +#include <WebServer.h> +#include <ESPmDNS.h> +#include <Update.h> +const char *host = "esp32"; + +WebServer server(80); + +const uint8_t TIME_DAY = 8; +const uint8_t TIME_NIGHT = 19; +// const uint8_t PIN_VCC_bme280 = 14; // Wemos D1mini = D5, + +// const char ssid[] = "link"; +const char ssid[] = "MikroTik-2"; +const char pass[] = "dkfgf#*12091997"; + +const uint32_t utcOffsetInSeconds = 10800; +const uint32_t utcPeriodMseconds = 86400000; // 3сутки-259200000 // 1сутки-86400000; +WiFiUDP ntpUDP; +const char timeSite[] = "ntp3.vniiftri.ru"; // "pool.ntp.org" +NTPClient timeClient(ntpUDP, timeSite, utcOffsetInSeconds, utcPeriodMseconds); + +const char *mqtt_server = "89.110.92.137"; +const uint16_t mqtt_port = 1883; +const char *mqtt_user = "mqtt"; +const char *mqtt_pass = "qwe1243"; + +const char *mqtt_client = "Tablo_Villa_003"; +const char *mqtt_client2 = "Villa_bme280_base"; +// const char *mqtt_client2 = "Home_bme280"; +// const char *mqtt_client3 = "Villa_bme280_yama"; + +const char *inTopic = "/t;p;h;v;;"; + +String temp, pres, hum, vcc; + +WiFiClient espClient; +PubSubClient client(espClient); + +uint32_t timeUpdateH = 02; // время обновления NTP +uint32_t timeUpdateM = 05; // время обновления NTP +String z = ""; // строка данных для отображения + +uint32_t colorTime = 16766720; // цвет часы (желтый) +uint32_t colorTemp = 16711935; // цвет температура (красный) +uint32_t colorTemp2 = 65280; // цвет внешняя температура (зеленый) +uint32_t colorTempOut = 9127187; // цвет температура2 (коричневый) +uint32_t colorPress = 9830400; // цвет давление (розовый) +uint32_t colorWiFi = 16728935; // цвет WiFi (томато) +uint32_t colorHum = 52945; // цвет влажность (бирюзовый) +uint32_t colorHumOut = 255; // цвет влажность2 (синий) +uint16_t strOld = 0; +uint8_t count = 0; +uint8_t countReconnect = 20; // кол-во попыток соединения +uint16_t countPause = 500; // пауза между попытками + +uint32_t timeReadOld = 0; +uint32_t color = 0; + +bool flagSec = true; +bool flagTemp = false; +bool flagTemp2 = false; +bool flagTempOut = false; +bool flagPress = false; +bool flagHum = false; +bool flagHumOut = false; +bool flagVis = true; + +// Время отображения каждого показания: +// 0-время, 1-темп, 2-давл, 3-влажн, 4-темп2, 5-влажн2 +uint8_t countData = 3; +uint16_t visData[] = {5, 3, 3, 3, 3, 2, 2}; +uint32_t timeOld = 0; +uint8_t brightVis = BRIGHT_DAY; + +//----------------------------------- +// Login page +const char *loginIndex = + "<form name='loginForm'>" + "<table width='20%' bgcolor='A09F9F' align='center'>" + "<tr>" + "<td colspan=2>" + "<center><font size=4><b>ESP32 Login Page</b></font></center>" + "<br>" + "</td>" + "<br>" + "<br>" + "</tr>" + "<td>Username:</td>" + "<td><input type='text' size=25 name='userid'><br></td>" + "</tr>" + "<br>" + "<br>" + "<tr>" + "<td>Password:</td>" + "<td><input type='Password' size=25 name='pwd'><br></td>" + "<br>" + "<br>" + "</tr>" + "<tr>" + "<td><input type='submit' onclick='check(this.form)' value='Login'></td>" + "</tr>" + "</table>" + "</form>" + "<script>" + "function check(form)" + "{" + "if(form.userid.value=='admin' && form.pwd.value=='admin')" + "{" + "window.open('/serverIndex')" + "}" + "else" + "{" + " alert('Error Password or Username')/*displays error message*/" + "}" + "}" + "</script>"; + +// Server Index Page +const char *serverIndex = + "<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>" + "<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>" + "<input type='file' name='update'>" + "<input type='submit' value='Update'>" + "</form>" + "<div id='prg'>progress: 0%</div>" + "<script>" + "$('form').submit(function(e){" + "e.preventDefault();" + "var form = $('#upload_form')[0];" + "var data = new FormData(form);" + " $.ajax({" + "url: '/update'," + "type: 'POST'," + "data: data," + "contentType: false," + "processData:false," + "xhr: function() {" + "var xhr = new window.XMLHttpRequest();" + "xhr.upload.addEventListener('progress', function(evt) {" + "if (evt.lengthComputable) {" + "var per = evt.loaded / evt.total;" + "$('#prg').html('progress: ' + Math.round(per*100) + '%');" + "}" + "}, false);" + "return xhr;" + "}," + "success:function(d, s) {" + "console.log('success!')" + "}," + "error: function (a, b, c) {" + "}" + "});" + "});" + "</script>"; + +//----------------------------------- +inline bool mqtt_subscribe(PubSubClient &client, const String &topic) +{ + Serial.print("Subscribing to: "); + Serial.println(topic); + return client.subscribe(topic.c_str()); +} + +//----------------------------------- +inline bool mqtt_publish(PubSubClient &client, const String &topic, const String &value) +{ + Serial.print("Publishing topic "); + Serial.print(topic); + Serial.print(" = "); + Serial.println(value); + return client.publish(topic.c_str(), value.c_str()); +} + +//----------------------------------- +// Подключение к MQTT: +bool reconnect() +{ + uint8_t countMqtt = countReconnect; + while (!(client.connect(mqtt_client, mqtt_user, mqtt_pass)) && countMqtt--) + { + visibleWork("0B0B0", colorWiFi, BRIGHT_DAY); + // strip.show(); + delay(countPause / 2); + visibleWork("B0B0B", colorWiFi, BRIGHT_DAY); + // strip.show(); + delay(countPause / 2); + Serial.print(countMqtt); + Serial.print('>'); + } + + if (countMqtt) + { + Serial.println("MQTT connected - Ok !\n"); + + String topic('/'); + topic += mqtt_client2; + topic += inTopic; + mqtt_subscribe(client, topic); + + // Serial.println(); + + visibleWork("BBBBB", colorWiFi, BRIGHT_DAY); + // strip.show(); + + return true; + } + else + { + visibleWork("BBBBB", colorWiFi, BRIGHT_DAY); + // strip.show(); + return false; + } +} + +//----------------------------------- +// Обновление времени: +void timeUpdate() +{ + Serial.print("Connected timeClient: "); + Serial.println(timeSite); + + visibleWork("EBEBE", colorTime, BRIGHT_DAY); + // strip.show(); + + uint8_t countTime = countReconnect; + + while (!timeClient.update() && countTime--) + { + delay(countPause); + Serial.print(countTime); + Serial.print('.'); + } + + Serial.println(); + + if (countTime) + { + Serial.println("The time has been updated !\n"); + Serial.println(timeClient.getFormattedTime()); + Serial.println(); + } + else + { + Serial.println("The time has NOT been updated !!!\n"); + } + visibleWork("BBBBB", colorTime, BRIGHT_DAY); + // strip.show(); +} + +//******************************************************************** +// подключение к WiFi +bool setupWiFi() +{ + Serial.println("\n\nSetup WiFi: "); + Serial.println(ssid); + visibleWork("ABABA", colorWiFi, BRIGHT_DAY); + // strip.show(); + + WiFi.begin(ssid, pass); + uint8_t countWiFi = countReconnect; + + while (WiFi.status() != WL_CONNECTED && countWiFi--) + { + Serial.print(countWiFi); + Serial.print('>'); + delay(countPause); + } + + if (countWiFi) + { + //----------------------------------- + // индикация IP + String l = WiFi.localIP().toString(); + l = l.substring(l.lastIndexOf('.') + 1, l.length()); + + (l.toInt() < 100) ? l = "DDE" + l : l = "DE" + l; + visibleWork(l, colorWiFi, BRIGHT_DAY); + + strip.show(); + Serial.print("\nWiFi connected !\n"); + Serial.println(WiFi.localIP()); + delay(2000); + + //----------------------------------- + // индикация силы сигнала + int16_t RSSI_MAX = -50; + int16_t RSSI_MIN = -100; + + int16_t dBm = WiFi.RSSI(); + Serial.print("RSSI dBm = "); + Serial.println(dBm); + l = "DDE"; + (dBm <= RSSI_MIN) ? l += 0 : (dBm >= RSSI_MAX) ? l += 100 + : l += 2 * (dBm + 100); + Serial.print("RSSI % = "); + Serial.println(l.substring(3, 5)); + Serial.println("\n"); + + visibleWork(l, colorWiFi, BRIGHT_DAY); + // strip.show(); + delay(2000); + + Serial.println(); + + //----------------------------------- + timeUpdate(); + + if (!reconnect()) + { + ESP.restart(); + } + + Serial.println(); + + flagVis = true; + count = 0; + + visibleWork("BBBBB", colorTemp, BRIGHT_DAY); + // strip.show(); + + return true; + } + else + { + visibleWork("BBBBB", colorTemp, BRIGHT_DAY); + // strip.show(); + + return false; + } +} + +//******************************************************************** +// MQTT +void mqtt_callback(char *topic, byte *payload, unsigned int length) +{ + // ------------------------ + // Serial.print(topic); + // Serial.print("\t"); + // for (uint8_t i = 0; i < length; ++i) + // { + // Serial.print((char)payload[i]); + // } + // Serial.println(); + // ------------------------ + + char *topicBody = topic + strlen(mqtt_client2) + 1; + // Serial.print("*topicBody "); + // Serial.println(topicBody); + + if (!strncmp(topic + 1, mqtt_client2, strlen(mqtt_client2))) + { + char *topicBody = topic + strlen(mqtt_client2) + 1; + if (!strncmp(topicBody, inTopic, strlen(inTopic))) + { + String data_room = ""; + Serial.print(topicBody); + Serial.print(" - "); + for (uint8_t i = 0; i < length; i++) + data_room += (char)payload[i]; + Serial.println(data_room); + temp = data_room.substring(0, data_room.indexOf(";")); + data_room = data_room.substring(data_room.indexOf(";") + 1, data_room.length()); + pres = data_room.substring(0, data_room.indexOf(";")); + data_room = data_room.substring(data_room.indexOf(";") + 1, data_room.length()); + hum = data_room.substring(0, data_room.indexOf(";")); + } + } +} + +//******************************************************************** +// пересчет millis() +void TimeMillis() +{ + color = colorTime; + + if (timeClient.getHours() < 10) + z += "D"; + + z += timeClient.getHours(); // часы + (flagSec) ? z += "C" : z += "D"; + + if (timeClient.getMinutes() < 10) + z += "0"; + + z += timeClient.getMinutes(); // минуты + + if ((timeClient.getHours() >= TIME_DAY) && (timeClient.getHours() < TIME_NIGHT)) + { + brightVis = BRIGHT_DAY; + } + else + { + brightVis = BRIGHT_NIGHT; + } +} + +//******************************************************************** +// BME280 +void Temp() +{ + z = ""; + if (temp.charAt(0) == '-') + { + if (temp.indexOf('.') == 2) + { + z = "B" + temp.substring(1, temp.indexOf('.')); + z += 'E' + temp.substring(3, 4); + } + else + { + z = "DB" + temp.substring(1, temp.indexOf('.')); + } + } + else + { + if (temp.indexOf('.') == 2) + { + z = "DD" + temp.substring(0, temp.indexOf('.')); + } + else + { + z = 'D' + temp.substring(0, temp.indexOf('.')); + z += 'E' + temp.substring(2, 3); + } + } + temp.substring(0, 1); + + z += 'A'; + color = colorTemp; + flagTemp = true; +} + +void Press() +{ + z = ""; + z += "DD" + pres.substring(0, 3); + color = colorPress; + flagPress = true; +} + +void Hum() +{ + z = ""; + (hum.length() > 2) ? z = "DD" : z = "DDD"; + z += hum.substring(0, 2); + color = colorHum; + flagHum = true; +} + +// void bmeHumOut() +// { +// (outHumDataOut.length() > 2) ? z = "DD" : z = "DDD"; +// z += outHumDataOut.substring(0, 2); +// color = colorHumOut; +// flagHumOut = true; +// } +//******************************************************************** +// запись значений датчиков в память +// void dataWrite(uint8_t n, String str) +// { +// data[n].num = str.substring(0, 1).toInt(); +// if (str.indexOf('%') > 0) +// data[n].hum = str.substring(str.indexOf('%') + 1, str.indexOf('%') + 3).toInt(); +// if (str.indexOf('*') > 0) +// data[n].temp = str.substring(str.indexOf('*') + 1, str.indexOf('*' + 5)).toFloat(); +// if (str.indexOf('$') > 0) +// data[n].press = str.substring(str.indexOf('$') + 1, str.indexOf('$') + 4).toInt(); +// if (str.indexOf('^') > 0) +// data[n].voltage = str.substring(str.indexOf('^') + 1, str.indexOf('^') + 4).toInt(); +// } +//******************************************************************** +// void parserBuf(String tmp) +// { +// if (tmp.substring(0, 2).toInt() == sensorNum_1) +// { +// dataWrite(0, tmp); +// } +// // else if (tmp.substring(0, 2).toInt() == sensorNum_2) +// // { +// // dataWrite(1, tmp); +// // } +// } +//******************************************************************** +// визуальные эффекты +// void show_1() +// { +// strip.clear(); +// for (uint8_t i = 0; i < PIXEL_COUNT / 2; ++i) +// { +// strip.setPixelColor(i, strip.Color(random(1, 255), random(1, 255), random(1, 255))); +// strip.setPixelColor(PIXEL_COUNT - i - 1, strip.Color(random(1, 255), random(1, 255), random(1, 255))); +// strip.show(); +// delay(5); +// } +// delay(500); +// for (uint8_t i = 0; i < PIXEL_COUNT / 2; ++i) +// { +// strip.setPixelColor(i, 0, 0, 0); +// strip.setPixelColor(PIXEL_COUNT - i - 1, 0, 0, 0); +// strip.show(); +// delay(5); +// } +// delay(500); +// z = "DDDDD"; +// } + +//******************************************************************** +void setup() +{ + Serial.begin(115200); + + strip.begin(); + z = "DDDDD"; + strip.show(); + + client.setServer(mqtt_server, mqtt_port); + client.setCallback(mqtt_callback); + + setupWiFi(); + timeClient.begin(); + + /*use mdns for host name resolution*/ + if (!MDNS.begin(host)) + { // http://esp32.local + Serial.println("Error setting up MDNS responder!"); + while (1) + { + delay(1000); + } + } + Serial.println("mDNS responder started\n"); + /*return index page which is stored in serverIndex */ + server.on("/", HTTP_GET, []() + { + server.sendHeader("Connection", "close"); + server.send(200, "text/html", loginIndex); }); + server.on("/serverIndex", HTTP_GET, []() + { + server.sendHeader("Connection", "close"); + server.send(200, "text/html", serverIndex); }); + /*handling uploading firmware file */ + server.on("/update", HTTP_POST, []() + { + server.sendHeader("Connection", "close"); + server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK"); + ESP.restart(); }, []() + { + HTTPUpload& upload = server.upload(); + if (upload.status == UPLOAD_FILE_START) { + Serial.printf("Update: %s\n", upload.filename.c_str()); + if (!Update.begin(UPDATE_SIZE_UNKNOWN)) { //start with max available size + Update.printError(Serial); + } + } else if (upload.status == UPLOAD_FILE_WRITE) { + /* flashing firmware to ESP*/ + if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) { + Update.printError(Serial); + } + } else if (upload.status == UPLOAD_FILE_END) { + if (Update.end(true)) { //true to set the size to the current progress + Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize); + } else { + Update.printError(Serial); + } + } }); + + server.begin(); + + timeOld = millis(); +} + +//******************************************************************** +void loop() +{ + if (WiFi.status() != WL_CONNECTED || (!client.connected())) + { + setupWiFi(); + } + + if (!client.connected()) + { + reconnect(); + } + + if (flagVis) + { + z = ""; + switch (count) + { + case 0: + { + TimeMillis(); + flagTemp = false; + flagPress = false; + flagHum = false; + flagTempOut = false; + flagHumOut = false; + break; + } + case 1: + { + if (flagTemp == false) + Temp(); + break; + } + case 2: + { + if (flagPress == false) + Press(); + break; + } + case 3: + { + if (flagHum == false) + Hum(); + break; + } + } + flagVis = false; + visibleWork(z, color, brightVis); + Serial.println(z); + // timeReadOld = millis(); + } + + // Отображение секундного тире + if (millis() - timeReadOld >= 500 && (!count)) + { + flagSec = !flagSec; + timeReadOld = millis(); + + flagVis = true; + } + + // Счетчик отображаемых данных + if (millis() - timeOld >= (visData[count] * 1000)) + { + (count >= countData) ? count = 0 : count++; + flagVis = true; + timeOld = millis(); + } + + client.loop(); + server.handleClient(); + delay(1); +} + +//********************************************************************
\ No newline at end of file |