mirror of
https://github.com/IoTManagerProject/IoTManager.git
synced 2026-03-26 22:22:16 +03:00
Добавлены модули Термостат и NextionUpload
This commit is contained in:
117
src/modules/display/NextionUpload/NextionUpload.cpp
Normal file
117
src/modules/display/NextionUpload/NextionUpload.cpp
Normal file
@@ -0,0 +1,117 @@
|
||||
|
||||
#define DEBUG_SERIAL_ENABLE
|
||||
#include "Global.h"
|
||||
#include "classes/IoTItem.h"
|
||||
#include "ESPNexUpload.h"
|
||||
bool updated = false;
|
||||
// const char *host = "live-control.com";
|
||||
// const char *url = "/iotm/Live-Control.tft";
|
||||
extern IoTGpio IoTgpio;
|
||||
|
||||
class NextionUpload : public IoTItem
|
||||
{
|
||||
private:
|
||||
String _url;
|
||||
String _host;
|
||||
int _NEXT_RX;
|
||||
int _NEXT_TX;
|
||||
|
||||
public:
|
||||
NextionUpload(String parameters) : IoTItem(parameters)
|
||||
{
|
||||
_url = jsonReadStr(parameters, "url");
|
||||
_host = jsonReadStr(parameters, "host");
|
||||
|
||||
_NEXT_RX = jsonReadInt(parameters, "NEXT_RX");
|
||||
_NEXT_TX = jsonReadInt(parameters, "NEXT_TX");
|
||||
#define NEXT_RX _NEXT_RX // Nextion RX pin | Default 16
|
||||
#define NEXT_TX _NEXT_TX // Nextion TX pin | Default 17
|
||||
}
|
||||
|
||||
IoTValue execute(String command, std::vector<IoTValue> ¶m)
|
||||
{
|
||||
|
||||
if (command == "Update")
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Update .... ");
|
||||
|
||||
if (!updated)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "connecting to " + (String)_host);
|
||||
HTTPClient http;
|
||||
|
||||
#if defined ESP8266
|
||||
if (!http.begin(_host, 80, _url))
|
||||
{
|
||||
#elif defined ESP32
|
||||
if (!http.begin(String("http://") + _host + _url))
|
||||
{
|
||||
#endif
|
||||
// Serial.println("connection failed");
|
||||
SerialPrint("I", F("NextionUpdate"), "connection failed ");
|
||||
}
|
||||
|
||||
SerialPrint("I", F("NextionUpdate"), "Requesting file: " + (String)_url);
|
||||
int code = http.GET();
|
||||
int contentLength = http.getSize();
|
||||
|
||||
// Update the nextion display
|
||||
if (code == 200)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "File received. Update Nextion... ");
|
||||
bool result;
|
||||
ESPNexUpload nextion(115200);
|
||||
nextion.setUpdateProgressCallback([]()
|
||||
{ SerialPrint("I", F("NextionUpdate"), "... "); });
|
||||
|
||||
result = nextion.prepareUpload(contentLength);
|
||||
|
||||
if (!result)
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Error: " + (String)nextion.statusMessage);
|
||||
}
|
||||
else
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Start upload. File size is: " + (String)contentLength);
|
||||
result = nextion.upload(*http.getStreamPtr());
|
||||
|
||||
if (result)
|
||||
{
|
||||
updated = true;
|
||||
SerialPrint("I", F("NextionUpdate"), "Succesfully updated Nextion! ");
|
||||
}
|
||||
else
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "Error updating Nextion: " + (String)nextion.statusMessage);
|
||||
}
|
||||
|
||||
nextion.end();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
SerialPrint("I", F("NextionUpdate"), "HTTP error: " + (String)http.errorToString(code).c_str());
|
||||
}
|
||||
|
||||
http.end();
|
||||
SerialPrint("I", F("NextionUpdate"), "Closing connection ");
|
||||
}
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
~NextionUpload(){};
|
||||
};
|
||||
|
||||
void *getAPI_NextionUpload(String subtype, String param)
|
||||
{
|
||||
if (subtype == F("NextionUpload"))
|
||||
{
|
||||
return new NextionUpload(param);
|
||||
}
|
||||
else
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
50
src/modules/display/NextionUpload/modinfo.json
Normal file
50
src/modules/display/NextionUpload/modinfo.json
Normal file
@@ -0,0 +1,50 @@
|
||||
{
|
||||
"menuSection": "Экраны",
|
||||
|
||||
"configItem": [
|
||||
{
|
||||
"global": 0,
|
||||
"name": "Nextion Uploud",
|
||||
"type": "Reading",
|
||||
"subtype": "NextionUpload",
|
||||
"id": "Nextion",
|
||||
"widget": "",
|
||||
"page": "",
|
||||
"descr": "",
|
||||
"host": "192.168.1.10",
|
||||
"url": "castom_nextion.tif",
|
||||
"NEXT_TX": 16,
|
||||
"NEXT_RX": 17
|
||||
}
|
||||
],
|
||||
|
||||
"about": {
|
||||
"authorName": "AVAKS",
|
||||
"authorContact": "https://t.me/@avaks_dev",
|
||||
"authorGit": "https://github.com/avaksru",
|
||||
"specialThanks": "",
|
||||
"moduleName": "NextionUpload",
|
||||
"moduleVersion": "1.0",
|
||||
"usedRam": {
|
||||
"esp32_4mb": 15,
|
||||
"esp8266_4mb": 15
|
||||
},
|
||||
"title": "Nextion Upload",
|
||||
"moduleDesc": "загрузка прошивки в дисплей Nextion. Команда для запуска обновления дисплея: Nextion.Update(); ",
|
||||
"propInfo": {
|
||||
"host": "Сервер обновления",
|
||||
"url": "файл прошивки"
|
||||
}
|
||||
},
|
||||
|
||||
"defActive": false,
|
||||
|
||||
"usedLibs": {
|
||||
"esp32_4mb": ["https://github.com/avaksru/ESPNexUpload.git"],
|
||||
"esp8266_4mb": ["https://github.com/avaksru/ESPNexUpload.git"],
|
||||
"esp8266_1mb": ["https://github.com/avaksru/ESPNexUpload.git"],
|
||||
"esp8266_1mb_ota": ["https://github.com/avaksru/ESPNexUpload.git"],
|
||||
"esp8285_1mb": ["https://github.com/avaksru/ESPNexUpload.git"],
|
||||
"esp8285_1mb_ota": ["https://github.com/avaksru/ESPNexUpload.git"]
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user