iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 03:49:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

local sever ota

Browse Source
This commit is contained in:
Mit4el
2024-11-26 23:30:16 +03:00
parent 247cb51169
commit d726e661c0
9 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data_svelte/settings.json
View File

@@ -14,6 +14,7 @@
"mqttUser": "rise", "mqttUser": "rise",
"mqttPass": "3hostel3", "mqttPass": "3hostel3",
"serverip": "http://iotmanager.org", "serverip": "http://iotmanager.org",
"serverlocal": "http://192.168.1.2:5500",
"log": 0, "log": 0,
"mqttin": 0, "mqttin": 0,
"i2c": 0, "i2c": 0,

4
include/Const.h
View File

@@ -32,6 +32,10 @@
#define FIRMWARE_NAME "esp32_4mb" #define FIRMWARE_NAME "esp32_4mb"
#endif #endif
#ifdef esp32_4mb3f
#define FIRMWARE_NAME "esp32_4mb3f"
#endif
#ifdef esp32cam_4mb #ifdef esp32cam_4mb
#define FIRMWARE_NAME "esp32cam_4mb" #define FIRMWARE_NAME "esp32cam_4mb"
#endif #endif

1
include/StandWebServer.h
View File

@@ -9,6 +9,7 @@ extern bool handleFileRead(String path);
extern void handleFileUpload(); extern void handleFileUpload();
extern void handleFileDelete(); extern void handleFileDelete();
extern void handleFileCreate(); extern void handleFileCreate();
extern void handleLocalOTA();
extern void handleFileList(); extern void handleFileList();
//void printDirectory(File dir, String& out); //void printDirectory(File dir, String& out);
extern void handleStatus(); extern void handleStatus();

2
include/UpgradeFirm.h
View File

@@ -22,7 +22,7 @@ extern bool upgradeFS(String path);
extern bool upgradeBuild(String path); extern bool upgradeBuild(String path);
extern void restartEsp(); extern void restartEsp();
extern const String getBinPath(String file); extern const String getBinPath();
extern void putUserDataToRam(); extern void putUserDataToRam();
extern void saveUserDataToFlash(); extern void saveUserDataToFlash();
extern void saveUpdeteStatus(String key, int val); extern void saveUpdeteStatus(String key, int val);

2
platformio.ini
View File

@@ -232,7 +232,7 @@ lib_deps =
${env:esp32_4mb3f_fromitems.lib_deps} ${env:esp32_4mb3f_fromitems.lib_deps}
lib_ignore = LT_WebSockets lib_ignore = LT_WebSockets
build_flags = ${common.build_flags} build_flags = ${common.build_flags}
-Desp32_4mb="esp32_4mb" -Desp32_4mb3f="esp32_4mb3f"
-Wl,--wrap=esp_panic_handler -Wl,--wrap=esp_panic_handler
framework = arduino framework = arduino
board = esp32dev board = esp32dev

8
src/Main.cpp
View File

@@ -52,7 +52,7 @@ void elementsLoop() {
#define COUNTER_ERRORMARKER 4 // количество шагов счетчика #define COUNTER_ERRORMARKER 4 // количество шагов счетчика
#define STEPPER_ERRORMARKER 100000 // размер шага счетчика интервала доверия выполнения блока кода мкс #define STEPPER_ERRORMARKER 100000 // размер шага счетчика интервала доверия выполнения блока кода мкс
#if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb) #if defined(esp32_4mb) || defined(esp32_4mb3f) || defined(esp32_16mb) || defined(esp32cam_4mb)
static int IRAM_ATTR initErrorMarkerId = 0; // ИД маркера static int IRAM_ATTR initErrorMarkerId = 0; // ИД маркера
static int IRAM_ATTR errorMarkerId = 0; static int IRAM_ATTR errorMarkerId = 0;
@@ -71,14 +71,14 @@ void IRAM_ATTR onTimer() {
#endif #endif
void initErrorMarker(int id) { void initErrorMarker(int id) {
#if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb) #if defined(esp32_4mb) || defined(esp32_4mb3f) || defined(esp32_16mb) || defined(esp32cam_4mb)
initErrorMarkerId = id; initErrorMarkerId = id;
errorMarkerCounter = 0; errorMarkerCounter = 0;
#endif #endif
} }
void stopErrorMarker(int id) { void stopErrorMarker(int id) {
#if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb) #if defined(esp32_4mb) || defined(esp32_4mb3f) || defined(esp32_16mb) || defined(esp32cam_4mb)
errorMarkerCounter = -1; errorMarkerCounter = -1;
if (errorMarkerId) if (errorMarkerId)
SerialPrint("I", "WARNING!", "A lazy (freezing loop more than " + (String)(COUNTER_ERRORMARKER * STEPPER_ERRORMARKER / 1000) + " ms) section has been found! With ID=" + (String)errorMarkerId); SerialPrint("I", "WARNING!", "A lazy (freezing loop more than " + (String)(COUNTER_ERRORMARKER * STEPPER_ERRORMARKER / 1000) + " ms) section has been found! With ID=" + (String)errorMarkerId);
@@ -91,7 +91,7 @@ void setup() {
#if defined(esp32s2_4mb) || defined(esp32s3_16mb) #if defined(esp32s2_4mb) || defined(esp32s3_16mb)
USB.begin(); USB.begin();
#endif #endif
#if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb) #if defined(esp32_4mb) || defined(esp32_4mb3f) || defined(esp32_16mb) || defined(esp32cam_4mb)
My_timer = timerBegin(0, 80, true); My_timer = timerBegin(0, 80, true);
timerAttachInterrupt(My_timer, &onTimer, true); timerAttachInterrupt(My_timer, &onTimer, true);
timerAlarmWrite(My_timer, STEPPER_ERRORMARKER, true); timerAlarmWrite(My_timer, STEPPER_ERRORMARKER, true);

2
src/PeriodicTasks.cpp
View File

@@ -121,7 +121,7 @@ String ESP32GetResetReason(uint32_t cpu_no) {
} }
} }
#endif #endif
#if defined(esp32_4mb) || defined(esp32_16mb) || defined(esp32cam_4mb) #if defined(esp32_4mb) || defined(esp32_4mb3f) || defined(esp32_16mb) || defined(esp32cam_4mb)
String ESP_getResetReason(void) { String ESP_getResetReason(void) {
// return ESP32GetResetReason(0); // CPU 0 // return ESP32GetResetReason(0); // CPU 0
esp_reset_reason_t esp_reason = esp_reset_reason(); esp_reset_reason_t esp_reason = esp_reset_reason();

6
src/StandWebServer.cpp
View File

@@ -89,6 +89,8 @@ void standWebServerInit() {
// - second callback handles file upload at that location // - second callback handles file upload at that location
HTTP.on("/edit", HTTP_POST, replyOK, handleFileUpload); HTTP.on("/edit", HTTP_POST, replyOK, handleFileUpload);
HTTP.on("/localota", HTTP_GET, handleLocalOTA);
// Default handler for all URIs not defined above // Default handler for all URIs not defined above
// Use it to read files from filesystem // Use it to read files from filesystem
HTTP.onNotFound(handleNotFound); HTTP.onNotFound(handleNotFound);
@@ -156,6 +158,10 @@ void handleStatus() {
HTTP.send(200, "application/json", json); HTTP.send(200, "application/json", json);
} }
void handleLocalOTA() {
upgrade_firmware(3, "local");
}
#ifdef ESP32 #ifdef ESP32
String getContentType(String filename) { String getContentType(String filename) {
if (HTTP.hasArg("download")) { if (HTTP.hasArg("download")) {

46
src/UpgradeFirm.cpp
View File

@@ -44,6 +44,8 @@ bool upgradeFS(String path) {
SerialPrint("E", F("Update"), F("FS Path error")); SerialPrint("E", F("Update"), F("FS Path error"));
saveUpdeteStatus("fs", PATH_ERROR); saveUpdeteStatus("fs", PATH_ERROR);
return ret; return ret;
} else if (path == "local"){
path = getBinPath();
} }
#ifdef ESP8266 #ifdef ESP8266
ESPhttpUpdate.rebootOnUpdate(false); ESPhttpUpdate.rebootOnUpdate(false);
@@ -58,14 +60,17 @@ bool upgradeFS(String path) {
// если FS обновилась успешно // если FS обновилась успешно
if (retFS == HTTP_UPDATE_OK) { if (retFS == HTTP_UPDATE_OK) {
SerialPrint("!!!", F("Update"), F("FS upgrade done!")); SerialPrint("!!!", F("Update"), F("FS upgrade done!"));
//HTTP.send(200, "text/plain", "FS upgrade done!");
saveUpdeteStatus("fs", UPDATE_COMPLETED); saveUpdeteStatus("fs", UPDATE_COMPLETED);
ret = true; ret = true;
} else { } else {
saveUpdeteStatus("fs", UPDATE_FAILED); saveUpdeteStatus("fs", UPDATE_FAILED);
if (retFS == HTTP_UPDATE_FAILED) { if (retFS == HTTP_UPDATE_FAILED) {
SerialPrint("E", F("Update"), "HTTP_UPDATE_FAILED"); SerialPrint("E", F("Update"), "HTTP_UPDATE_FAILED");
HTTP.send(200, "text/plain", "FS UPDATE_FAILED! DELETE /localota !!!");
} else if (retFS == HTTP_UPDATE_NO_UPDATES) { } else if (retFS == HTTP_UPDATE_NO_UPDATES) {
SerialPrint("E", F("Update"), "HTTP_UPDATE_NO_UPDATES"); SerialPrint("E", F("Update"), "HTTP_UPDATE_NO_UPDATES! DELETE /localota !!!");
//HTTP.send(200, "text/plain", "NO_UPDATES");
} }
} }
#endif #endif
@@ -82,6 +87,8 @@ bool upgradeBuild(String path) {
SerialPrint("E", F("Update"), F("Build Path error")); SerialPrint("E", F("Update"), F("Build Path error"));
saveUpdeteStatus("build", PATH_ERROR); saveUpdeteStatus("build", PATH_ERROR);
return ret; return ret;
} else if (path == "local"){
path = getBinPath();
} }
#if defined(esp8266_4mb) || defined(esp8266_16mb) || defined(esp8266_1mb) || defined(esp8266_1mb_ota) || defined(esp8266_2mb) || defined(esp8266_2mb_ota) #if defined(esp8266_4mb) || defined(esp8266_16mb) || defined(esp8266_1mb) || defined(esp8266_1mb_ota) || defined(esp8266_2mb) || defined(esp8266_2mb_ota)
ESPhttpUpdate.rebootOnUpdate(false); ESPhttpUpdate.rebootOnUpdate(false);
@@ -95,14 +102,17 @@ bool upgradeBuild(String path) {
// если BUILD обновился успешно // если BUILD обновился успешно
if (retBuild == HTTP_UPDATE_OK) { if (retBuild == HTTP_UPDATE_OK) {
SerialPrint("!!!", F("Update"), F("BUILD upgrade done!")); SerialPrint("!!!", F("Update"), F("BUILD upgrade done!"));
HTTP.send(200, "text/plain", "BUILD upgrade done! DELETE /localota !!!");
saveUpdeteStatus("build", UPDATE_COMPLETED); saveUpdeteStatus("build", UPDATE_COMPLETED);
ret = true; ret = true;
} else { } else {
saveUpdeteStatus("build", UPDATE_FAILED); saveUpdeteStatus("build", UPDATE_FAILED);
if (retBuild == HTTP_UPDATE_FAILED) { if (retBuild == HTTP_UPDATE_FAILED) {
SerialPrint("E", F("Update"), "HTTP_UPDATE_FAILED"); SerialPrint("E", F("Update"), "HTTP_UPDATE_FAILED");
HTTP.send(200, "text/plain", "UPDATE_FAILED! DELETE /localota !!!");
} else if (retBuild == HTTP_UPDATE_NO_UPDATES) { } else if (retBuild == HTTP_UPDATE_NO_UPDATES) {
SerialPrint("E", F("Update"), "HTTP_UPDATE_NO_UPDATES"); SerialPrint("E", F("Update"), "HTTP_UPDATE_NO_UPDATES");
HTTP.send(200, "text/plain", "NO_UPDATES! DELETE /localota !!!");
} }
} }
#endif #endif
@@ -115,23 +125,23 @@ void restartEsp() {
ESP.restart(); ESP.restart();
} }
// теперь путь к обнавленю прошивки мы получаем из веб интерфейса //теперь путь к обнавленю прошивки мы получаем из веб интерфейса
// const String getBinPath(String file) { const String getBinPath() {
// String path = "error"; String path = "error";
// int targetVersion = 0; int targetVersion = 400; //HACKFUCK local OTA version in PrepareServer.py
// String serverip; String serverip;
// if (jsonRead(errorsHeapJson, F("chver"), targetVersion)) { // if (jsonRead(errorsHeapJson, F("chver"), targetVersion)) {
// if (targetVersion >= 400) { if (targetVersion >= 400) {
// if (jsonRead(settingsFlashJson, F("serverip"), serverip)) { if (jsonRead(settingsFlashJson, F("serverlocal"), serverip)) {
// if (serverip != "") { if (serverip != "") {
// path = jsonReadStr(settingsFlashJson, F("serverip")) + "/iotm/" + String(FIRMWARE_NAME) + "/" + String(targetVersion) + "/" + file; path = jsonReadStr(settingsFlashJson, F("serverlocal")) + "/iotm/" + String(FIRMWARE_NAME) + "/" + String(targetVersion) + "/";
// } }
// } }
// } }
// } // }
// SerialPrint("i", F("Update"), "path: " + path); SerialPrint("i", F("Update"), "server local: " + path);
// return path; return path;
// } }
// https://t.me/IoTmanager/128814/164752 - убрал ограничение // https://t.me/IoTmanager/128814/164752 - убрал ограничение
void putUserDataToRam() { void putUserDataToRam() {