mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-27 14:42:18 +03:00
Fix ошибок и под esp8266
This commit is contained in:
@@ -211,9 +211,10 @@ public:
|
||||
if (!updated)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "connecting to " + (String)_host);
|
||||
HTTPClient http;
|
||||
HTTPClient http;
|
||||
#if defined ESP8266
|
||||
if (!http.begin(_host, 80, _url))
|
||||
WiFiClient client;
|
||||
if (!http.begin(client, _host, 80, _url))
|
||||
SerialPrint("I", F("NextionUpdate"), "connection failed ");
|
||||
#elif defined ESP32
|
||||
if (!http.begin(String("http://") + _host + _url))
|
||||
|
||||
@@ -87,12 +87,7 @@
|
||||
},
|
||||
"defActive": false,
|
||||
"usedLibs": {
|
||||
"esp32_4mb": [],
|
||||
"esp32_4mb3f": [],
|
||||
"esp8266_4mb": [],
|
||||
"esp8266_1mb": [],
|
||||
"esp8266_1mb_ota": [],
|
||||
"esp8285_1mb": [],
|
||||
"esp8285_1mb_ota": []
|
||||
"esp32*": [],
|
||||
"esp82*": []
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,8 @@ public:
|
||||
HTTPClient http;
|
||||
|
||||
#if defined ESP8266
|
||||
if (!http.begin(_host, 80, _url))
|
||||
WiFiClient client;
|
||||
if (!http.begin(client, _host, 80, _url))
|
||||
{
|
||||
// Serial.println("connection failed");
|
||||
SerialPrint("I", F("NextionUpdate"), "connection failed ");
|
||||
@@ -118,7 +119,13 @@ public:
|
||||
int contentLength = http.getSize();
|
||||
SerialPrint("I", F("NextionUpdate"), "File received. Update Nextion... ");
|
||||
bool result;
|
||||
ESPNexUpload nextion(115200, _NEXT_RX, _NEXT_TX);
|
||||
#ifdef ESP8266
|
||||
ESPNexUpload nextion(115200, -1, _NEXT_RX, _NEXT_TX);
|
||||
#elif defined(esp32c3m_4mb) || defined(esp32s2_4mb)
|
||||
ESPNexUpload nextion(115200, 1, _NEXT_RX, _NEXT_TX);
|
||||
#else
|
||||
ESPNexUpload nextion(115200, 2, _NEXT_RX, _NEXT_TX);
|
||||
#endif
|
||||
nextion.setUpdateProgressCallback([]()
|
||||
{ SerialPrint("I", F("NextionUpdate"), "... "); });
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <TM1637.h>
|
||||
#include <TM1638.h>
|
||||
#include <TM16xxDisplay.h>
|
||||
#include <TM16xxbuttons.h>
|
||||
#include <TM16xxButtons.h>
|
||||
|
||||
|
||||
TM16xxButtons* buttons = nullptr; // указатель на объект управления кнопками для TM1638 иначе nullptr
|
||||
|
||||
Reference in New Issue
Block a user