(message);
- while (written < totalSize)
- {
+ while (written < totalSize) {
size_t n = tmp.write(buf + written, totalSize - written);
- if (n == 0)
- {
- ESP_LOGE(tag, "Write failed to temp file: %s at %u/%u bytes", tmpPath.c_str(), (unsigned)written, (unsigned)totalSize);
+ if (n == 0) {
+ ESP_LOGE(tag, "Write failed to temp file: %s at %u/%u bytes", tmpPath.c_str(),
+ (unsigned)written, (unsigned)totalSize);
tmp.close();
fs.remove(tmpPath.c_str());
return false;
@@ -1211,17 +1171,14 @@ bool writeFile(fs::FS &fs, const char *path, const char *message)
tmp.close();
// Replace the target file atomically: remove existing then rename
- if (fs.exists(finalPath.c_str()))
- {
- if (!fs.remove(finalPath.c_str()))
- {
+ if (fs.exists(finalPath.c_str())) {
+ if (!fs.remove(finalPath.c_str())) {
ESP_LOGE(tag, "Failed to remove existing file: %s", finalPath.c_str());
fs.remove(tmpPath.c_str());
return false;
}
}
- if (!fs.rename(tmpPath.c_str(), finalPath.c_str()))
- {
+ if (!fs.rename(tmpPath.c_str(), finalPath.c_str())) {
ESP_LOGE(tag, "Failed to rename %s to %s", tmpPath.c_str(), finalPath.c_str());
fs.remove(tmpPath.c_str());
return false;
@@ -1231,30 +1188,26 @@ bool writeFile(fs::FS &fs, const char *path, const char *message)
return true;
}
-char *readFile(fs::FS &fs, const char *path)
-{
+char *readFile(fs::FS &fs, const char *path) {
static const char *tag = "readFile";
static const size_t MAX_FILE_SIZE = 1024 * 1024; // 1MB limit
// Validate input
- if (!path)
- {
+ if (!path) {
ESP_LOGE(tag, "Invalid path parameter");
return nullptr;
}
// Open file
File file = fs.open(path, "r");
- if (!file || file.isDirectory())
- {
+ if (!file || file.isDirectory()) {
ESP_LOGE(tag, "Failed to open file: %s", path);
return nullptr;
}
// Check file size
size_t fileSize = file.size();
- if (fileSize == 0 || fileSize > MAX_FILE_SIZE)
- {
+ if (fileSize == 0 || fileSize > MAX_FILE_SIZE) {
ESP_LOGE(tag, "Invalid file size: %u bytes", fileSize);
file.close();
return nullptr;
@@ -1262,8 +1215,7 @@ char *readFile(fs::FS &fs, const char *path)
// Allocate memory
char *fileContent = new (std::nothrow) char[fileSize + 1];
- if (!fileContent)
- {
+ if (!fileContent) {
ESP_LOGE(tag, "Memory allocation failed for size: %u", fileSize + 1);
file.close();
return nullptr;
@@ -1273,8 +1225,7 @@ char *readFile(fs::FS &fs, const char *path)
size_t bytesRead = file.readBytes(fileContent, fileSize);
file.close();
- if (bytesRead != fileSize)
- {
+ if (bytesRead != fileSize) {
ESP_LOGE(tag, "Read failed: expected %u bytes, got %u", fileSize, bytesRead);
delete[] fileContent;
return nullptr;
@@ -1286,14 +1237,12 @@ char *readFile(fs::FS &fs, const char *path)
return fileContent;
}
-String getSoftAPMacAddress()
-{
+String getSoftAPMacAddress() {
uint8_t mac[6];
WiFi.softAPmacAddress(mac);
String macString = "";
- for (int i = 0; i < 6; i++)
- {
+ for (int i = 0; i < 6; i++) {
macString += String(mac[i], HEX);
if (i < 5)
macString += ":";
@@ -1301,47 +1250,107 @@ String getSoftAPMacAddress()
return macString;
}
-String listDirAsHtml(String directoryList[], int count)
-{
- String listedFiles;
+String listDirAsHtml(String directoryList[], int count) {
+ // Validate input parameters
+ if (!directoryList || count <= 0 || count > MAX_DIRECTORIES) {
+ ESP_LOGW(tag, "Invalid parameters: directoryList=%p, count=%d", directoryList, count);
+ return String();
+ }
- for (int i = 0; i < count; i++)
- {
- // directory html
- listedFiles += "| Dir: ";
- listedFiles += directoryList[i];
- listedFiles += "/ | - |
\n";
+ // Pre-calculate estimated size to reduce reallocations
+ // Estimate: ~150 bytes per directory + ~120 bytes per file (conservative)
+ size_t estimatedSize = count * 300 + 512; // Extra buffer for safety
+ String result;
+ result.reserve(estimatedSize);
- filesDropdownOptions += "\n";
+ // Track statistics for debugging
+ int totalFiles = 0;
+ int totalDirs = 0;
+ int skippedDirs = 0;
- dirDropdownOptions += "\n";
+ for (int i = 0; i < count; i++) {
+ // Validate and normalize directory path
+ if (directoryList[i].isEmpty()) {
+ ESP_LOGD(tag, "Skipping empty directory path at index %d", i);
+ continue;
+ }
- File dir = LittleFS.open(directoryList[i]);
+ String dirPath = directoryList[i];
+
+ // Security check: prevent directory traversal
+ if (dirPath.indexOf("..") >= 0) {
+ ESP_LOGW(tag, "Skipping directory with traversal attempt: %s", dirPath.c_str());
+ skippedDirs++;
+ continue;
+ }
+
+ // Normalize path efficiently
+ if (!dirPath.startsWith("/")) {
+ dirPath = "/" + dirPath;
+ }
+
+ // Replace multiple slashes with single slash (more efficient than while loop)
+ dirPath.replace("//", "/");
+ if (dirPath.indexOf("//") >= 0) {
+ // If still contains //, do more thorough cleanup
+ while (dirPath.indexOf("//") >= 0) {
+ dirPath.replace("//", "/");
+ }
+ }
+
+ // Generate directory row HTML with better formatting
+ result += "| 📁 ";
+ result += dirPath;
+ result += "/ | - |
\n";
+ totalDirs++;
+
+ // Open directory with error handling
+ File dir = LittleFS.open(dirPath);
+ if (!dir) {
+ ESP_LOGW(tag, "Cannot open directory: %s", dirPath.c_str());
+ skippedDirs++;
+ continue;
+ }
+
+ if (!dir.isDirectory()) {
+ ESP_LOGW(tag, "Path is not a directory: %s", dirPath.c_str());
+ dir.close();
+ skippedDirs++;
+ continue;
+ }
+
+ // Process files in directory
File file = dir.openNextFile();
- while (file)
- {
- String fileName = file.name();
- if (!file.isDirectory())
- {
- // Serial.println(" File: " + String(file.name()));
- listedFiles += "| ";
- listedFiles += fileName;
- listedFiles += " | ";
- listedFiles += convertFileSize(file.size());
- listedFiles += " |
\n";
+ while (file) {
+ if (!file.isDirectory()) {
+ String fileName = file.name();
+ String filePath = file.path();
+ size_t fileSize = file.size();
+
+ // Validate file data
+ if (fileName.isEmpty()) {
+ ESP_LOGD(tag, "Skipping file with empty name in %s", dirPath.c_str());
+ file = dir.openNextFile();
+ continue;
+ }
+ // Build file row HTML efficiently
+ result += "| 📄 ";
+ result += fileName;
+ result += " | ";
+ result += convertFileSize(fileSize);
+ result += " |
\n";
+
+ totalFiles++;
+
+ // Update global dropdown options (maintaining compatibility)
filesDropdownOptions += "\n";
@@ -1349,196 +1358,173 @@ String listDirAsHtml(String directoryList[], int count)
file = dir.openNextFile();
}
dir.close();
+
+ // Update directory dropdown options (maintaining compatibility)
+ dirDropdownOptions += "\n";
}
- return listedFiles;
+ // Log summary for debugging
+ ESP_LOGD(tag, "Listed %d directories (%d skipped), %d files. HTML size: %d bytes",
+ totalDirs, skippedDirs, totalFiles, result.length());
+
+ return result;
}
/******************** Specific Html Processors ********************/
// file manager html processor
-String fileManagerHtmlProcessor(const String &var)
-{
- if (var == "ALLOWED_EXTENSIONS_EDIT")
- {
+String fileManagerHtmlProcessor(const String &var) {
+ if (var == "ALLOWED_EXTENSIONS_EDIT") {
return allowedExtensionsForEdit;
}
- if (var == "FS_FREE_BYTES")
- {
+ if (var == "FS_FREE_BYTES") {
return convertFileSize(LittleFS.totalBytes() - LittleFS.usedBytes());
}
- if (var == "FS_USED_BYTES")
- {
+ if (var == "FS_USED_BYTES") {
return convertFileSize(LittleFS.usedBytes());
}
- if (var == "FS_TOTAL_BYTES")
- {
+ if (var == "FS_TOTAL_BYTES") {
return convertFileSize(LittleFS.totalBytes());
}
- if (var == "RAM_FREE_BYTES")
- {
+ if (var == "RAM_FREE_BYTES") {
return convertFileSize(LittleFS.totalBytes());
}
- if (var == "RAM_USED_BYTES")
- {
+ if (var == "RAM_USED_BYTES") {
return convertFileSize(LittleFS.totalBytes());
}
- if (var == "RAM_TOTAL_BYTES")
- {
+ if (var == "RAM_TOTAL_BYTES") {
return convertFileSize(LittleFS.totalBytes());
}
- if (var == "LISTED_FILES")
- {
+ if (var == "LISTED_FILES") {
filesDropdownOptions = ""; // clear out
dirDropdownOptions = ""; // clear out
- String directories[MAX_DIRECTORIES];
+ String *directories = new (std::nothrow) String[MAX_DIRECTORIES];
+ if (!directories) {
+ ESP_LOGE(tag, "Failed to allocate directories array");
+ return String();
+ }
int dirCount = 0;
getAllDirectories(directories, dirCount);
- return listDirAsHtml(directories, dirCount);
+ String out = listDirAsHtml(directories, dirCount);
+ delete[] directories;
+ return out;
}
- if (var == "EDIT-DEL_FILES")
- {
+ if (var == "EDIT-DEL_FILES") {
return filesDropdownOptions;
}
- if (var == "DIR_LIST")
- {
+ if (var == "DIR_LIST") {
return dirDropdownOptions;
}
- if (var == "SAVE_PATH_INPUT")
- {
+ if (var == "SAVE_PATH_INPUT") {
return savePath;
}
- if (var == "FIRM_VER")
- {
+ if (var == "FIRM_VER") {
return localVersion.toString();
}
return var;
}
-String HomeHtmlProcessor(const String &var)
-{
- if (var == "APP_NAME")
- {
+String HomeHtmlProcessor(const String &var) {
+ if (var == "APP_NAME") {
// return sysProps.appName;
return "N/A";
}
- if (var == "OLED")
- {
+ if (var == "OLED") {
return "N/A";
}
- if (var == "STRIP1")
- {
+ if (var == "STRIP1") {
// return (strip1) ? "Yes" : "No";
return "N/A";
}
- if (var == "STRIP2")
- {
+ if (var == "STRIP2") {
// return (strip2) ? "Yes" : "No";
return "N/A";
}
- if (var == "FRONT_LIGHT")
- {
+ if (var == "FRONT_LIGHT") {
// return (animProps.frontLight.enabled) ? "Yes" : "No";
return "N/A";
}
- if (var == "REAR_LIGHT")
- {
+ if (var == "REAR_LIGHT") {
// return (animProps.rearLight.enabled) ? "Yes" : "No";
return "N/A";
}
- if (var == "FIRMWARE")
- {
+ if (var == "FIRMWARE") {
return localVersion.toString();
}
- if (var == "BOOTH_T")
- {
+ if (var == "BOOTH_T") {
// return String(sysProps.t_sensor.temperature) + "F";
return "N/A";
}
- if (var == "SETPOINT")
- {
+ if (var == "SETPOINT") {
// return String(sysProps.t_sensor.Setpoint1) + "F";
return "N/A";
}
- if (var == "FLASH_SIZE")
- {
+ if (var == "FLASH_SIZE") {
return convertFileSize(ESP.getSketchSize());
}
- if (var == "FLASH_FREE")
- {
+ if (var == "FLASH_FREE") {
return convertFileSize(ESP.getFreeSketchSpace());
}
- if (var == "HEAP_SIZE")
- {
+ if (var == "HEAP_SIZE") {
return convertFileSize(ESP.getHeapSize());
}
- if (var == "HEAP_FREE")
- {
+ if (var == "HEAP_FREE") {
return convertFileSize(ESP.getFreeHeap());
}
- if (var == "CPU_FREQ")
- {
+ if (var == "CPU_FREQ") {
return String(ESP.getCpuFreqMHz()) + "Mhz";
}
- if (var == "IP")
- {
+ if (var == "IP") {
return WiFi.localIP().toString();
}
- if (var == "MAC")
- {
+ if (var == "MAC") {
return chipInfo.macStr;
}
- if (var == "SSID")
- {
+ if (var == "SSID") {
return WiFi.SSID();
}
- if (var == "RSSI")
- {
+ if (var == "RSSI") {
return String(WiFi.RSSI());
}
- if (var == "WIFI_CH")
- {
+ if (var == "WIFI_CH") {
return String(WiFi.channel());
}
- if (var == "ENCRYP")
- {
+ if (var == "ENCRYP") {
return String(WiFi.encryptionType(0));
}
- if (var == "AP_SSID")
- {
+ if (var == "AP_SSID") {
return WiFi.softAPSSID();
}
- if (var == "AP_CLIENTS")
- {
+ if (var == "AP_CLIENTS") {
return String(WiFi.softAPgetStationNum());
}
- if (var == "BLE")
- {
+ if (var == "BLE") {
return (commMode == COMM_WIFI_AP_BLE) ? "Yes" : "No";
}
- if (var == "BLE_SSID")
- {
+ if (var == "BLE_SSID") {
// return (commMode == COMM_WIFI_AP_BLE) ? BLEDeviceName : "";
return "N/A";
}
- if (var == "BLE_CLIENTS")
- {
+ if (var == "BLE_CLIENTS") {
// return (BTDeviceConnected) ? "1" : "0";
return "N/A";
}
- if (var == "AP_MAC")
- {
+ if (var == "AP_MAC") {
return getSoftAPMacAddress();
}
@@ -1546,8 +1532,7 @@ String HomeHtmlProcessor(const String &var)
return var;
}
-void handleUpdateProgress(AsyncWebServerRequest *request)
-{
+void handleUpdateProgress(AsyncWebServerRequest *request) {
static const char *tag = "UpdateProgress";
// if (!request->authenticate(http_username, http_password)) {
diff --git a/temporary/AppUpgrade copy.cpp b/temporary/AppUpgrade copy.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/temporary/AppUpgrade orig.cpp b/temporary/AppUpgrade orig.cpp
deleted file mode 100644
index 91e6c90..0000000
--- a/temporary/AppUpgrade orig.cpp
+++ /dev/null
@@ -1,673 +0,0 @@
-#include "AppUpgrade.h"
-#include "esp_log.h"
-#include
-#include
-#include
-#include "global.h"
-#include "JsonConstrain.h"
-#include "BLE_UpdateService.h"
-#include
-#include
-
-static const char* TAG = "AppUpdater";
-TaskHandle_t Update_Task_Handle = NULL;
-TaskHandle_t versionCheckTask_Handle = NULL;
-
-// Queue handle for firmware update messages
-//QueueHandle_t updateMsgQueue = NULL;
-
-String updateUrl = "";
-
-Version otaVersion;
-
-
-AppUpdater::AppUpdater(fs::FS& fs, Version localVersion, const char* bucket, const char* manifestName, const char* appBin)
- : localVersion(localVersion), manifestName(manifestName), appName(appBin), fileSystem(fs), downloadBuffer(new uint8_t[BUFFER_SIZE])
-{
- baseUrl = bucket ? String(bucket) : String(DEFAULT_MANIFEST_URL);
- // Ensure baseUrl ends with a single '/'
- if(!baseUrl.endsWith("/")) baseUrl += "/";
- ESP_LOGI(TAG, "AppUpdater initialized (local v%s) baseUrl=%s", localVersion.toString().c_str(), baseUrl.c_str());
-}
-
-void AppUpdater::setProgressCallback(void (*callback)( UpdateStatus status, int percentage, const char* message)) {
- progressCb = callback;
-}
-
-void AppUpdater::updateProgress(UpdateStatus newStatus, int percentage, const char* message) {
- status = newStatus;
- if (progressCb) {
- progressCb(status, percentage, message);
- }
-}
-
-bool AppUpdater::checkManifest() {
- String url = buildUrl(manifestName);
- ESP_LOGD(TAG, "Fetching manifest from: %s", url.c_str());
-
- // Start the HTTP client and Send GET request for manifest
- HTTPClient http;
- http.begin(url);
- int httpCode = http.GET();
- if (httpCode != HTTP_CODE_OK) {
- ESP_LOGE(TAG, "HTTP GET failed, error: %d", httpCode);
- http.end();
- return false;
- }
-
- // Read the response
- String payload = http.getString();
- http.end();
-
- // Parse JSON
- DeserializationError error = deserializeJson(jsonManifest, payload);
- ESP_LOGD(TAG, "Manifest deserialized");
- if (error) {
- ESP_LOGE(TAG, "Failed to parse manifest: %s", error.c_str());
- return false;
- }
-
- // Check for files section
- jsonFilesArray = jsonManifest["files"];
- if (jsonFilesArray.isNull()) {
- ESP_LOGE(TAG, "No files section in manifest");
- return false;
- }else{
- ESP_LOGD(TAG, "%d Files found", jsonFilesArray.size());
- }
-
- // Check for version section
- JsonObject jsonVersion = jsonManifest["version"];
- ESP_LOGD(TAG, "Version section found");
- if (jsonVersion.isNull()) {
- ESP_LOGE(TAG, "No version section in manifest");
- return false;
- }
-
- // Get the remote version
- byte major = jsonVersion["major"] | 0;
- byte minor = jsonVersion["minor"] | 0;
- byte patch = jsonVersion["patch"] | 0;
- otaVersion = {major, minor, patch};
-
- //Version localVersion;
- //::sscanf(localVersion, "%d.%d.%d", &localVersion.major, &localVersion.minor, &localVersion.patch);
-
- // Check if an update is available
- updateAvailable = false;
- // Only mark update available if remote is strictly newer than local
- if (otaVersion <= localVersion) {
- ESP_LOGI(TAG, "No updates available");
- return false;
- }else{
- updateAvailable = true;
- ESP_LOGD(TAG, "Update available");
- }
-
- //ESP_LOGD(TAG, "Manifest content: %s", payload.c_str());
-
- return true;
-}
-
-bool AppUpdater::updateFile(const char* remotePath, const char* localPath, const char* expectedMd5) {
- //updateProgress(UpdateStatus::DOWNLOADING, 0, localPath);
-
- // Construct full URL
- String url = buildUrl(remotePath);
- ESP_LOGD(TAG, "Downloading: %s -> %s", url.c_str(), localPath);
-
- String localMd5 = getLocalMD5(localPath);
-
- if (localMd5.equals(expectedMd5)) {
- ESP_LOGI(TAG, "File already up to date: %s", localPath);
- updateProgress(UpdateStatus::FILE_SKIPPED, 100, localPath);
- return true;
- }
-
- // Start the download
- HTTPClient http;
- http.begin(url);
- int httpCode = http.GET();
- if (httpCode != HTTP_CODE_OK) {
- ESP_LOGE(TAG, "Download failed: %d", httpCode);
- updateProgress(UpdateStatus::ERROR, 0, "Download failed");
- http.end();
- return false;
- }
-
- // Get the stream and content length
- WiFiClient* stream = http.getStreamPtr();
- size_t contentLength = http.getSize();
-
- // Verify and save the file
- bool success = verifyAndSaveFile(stream, contentLength, localPath, expectedMd5);
- http.end();
- if(!success){
- updateProgress( UpdateStatus::ERROR, 0, "MD5 verification failed");
- }else{
- updateProgress( UpdateStatus::FILE_SAVED, 100, localPath);
- }
-
- return success;
-}
-
-bool AppUpdater::verifyAndSaveFile(WiFiClient* stream, size_t contentLength, const char* localPath, const char* expectedMd5)
-{
- MD5Builder md5;
- md5.begin();
- size_t totalRead = 0;
-
- // Create temporary filename
- String tempPath = String(localPath) + ".tmp";
-
- // Open temporary file for writing
- File file = fileSystem.open(tempPath.c_str(), FILE_WRITE);
- if (!file) {
- ESP_LOGE(TAG, "Failed to open temporary file for writing");
- return false;
- }
-
- //updateProgress(UpdateStatus::DOWNLOADING, 0, localPath);
-
- if (contentLength > 0) {
- // Single pass with known content length
- while (totalRead < contentLength) {
- size_t available = stream->available();
- if (available) {
- size_t readLen = stream->readBytes(downloadBuffer.get(), std::min(available, size_t(BUFFER_SIZE)));
-
- // Write to temp file and update MD5
- if (file.write(downloadBuffer.get(), readLen) != readLen) {
- ESP_LOGE(TAG, "Failed to write to temporary file");
-
- file.close();
- fileSystem.remove(tempPath.c_str());
- return false;
- }
-
- md5.add(downloadBuffer.get(), readLen);
- totalRead += readLen;
- updateProgress(UpdateStatus::DOWNLOADING, (totalRead * 90) / contentLength , localPath);
- }
- yield();
- }
- } else {
- // Unknown content length: read until stream ends
- for (;;) {
- size_t readLen = stream->readBytes(downloadBuffer.get(), BUFFER_SIZE);
- if (readLen == 0) {
- break;
- }
- if (file.write(downloadBuffer.get(), readLen) != readLen) {
- ESP_LOGE(TAG, "Failed to write to temporary file");
- file.close();
- fileSystem.remove(tempPath.c_str());
- return false;
- }
- md5.add(downloadBuffer.get(), readLen);
- totalRead += readLen;
- // Progress unknown; emit periodic heartbeats at 0%
- updateProgress(UpdateStatus::DOWNLOADING, 0, localPath);
- yield();
- }
- }
-
- file.close();
- md5.calculate();
- String calculatedMd5 = md5.toString();
-
- // Verify MD5 hash
- if (!calculatedMd5.equals(expectedMd5)) {
- //ESP_LOGE(TAG, "MD5 mismatch for %s", localPath);
- fileSystem.remove(tempPath.c_str());
- return false;
- }
-
- // Replace original file with verified temp file
- if (fileSystem.exists(localPath)) {
- fileSystem.remove(localPath);
- }
- if (!fileSystem.rename(tempPath.c_str(), localPath)) {
- ESP_LOGE(TAG, "Failed to rename temporary file");
- fileSystem.remove(tempPath.c_str());
- return false;
- }
-
- return true;
-}
-
-String AppUpdater::getLocalMD5(const char* filePath){
- File file = fileSystem.open(filePath, "r");
- if(!file){
- ESP_LOGE(TAG, "Error opening %s...", filePath);
- return String();
- }
-
- MD5Builder md5Builder;
- md5Builder.begin();
- size_t fileSize = file.size();
- size_t totalRead = 0;
- size_t readLen = 0;
- while (totalRead < fileSize) {
- readLen = file.readBytes(reinterpret_cast(downloadBuffer.get()), std::min(fileSize - totalRead, size_t(BUFFER_SIZE)));
- md5Builder.add(downloadBuffer.get(), readLen);
- totalRead += readLen;
- }
-
- md5Builder.calculate();
- file.close();
- return md5Builder.toString();
-}
-
-bool AppUpdater::updateFilesArray() {
- int successCount = 0;
- int totalFiles = jsonFilesArray.size();
- ESP_LOGI(TAG, "Found %d files in manifest", totalFiles);
-
- // Iterate over each file entry in the manifest
- for (JsonObject file : jsonFilesArray) {
- const char* remotePath = file["remote"];
- const char* localPath = file["local"];
- const char* expectedMd5 = file["md5"];
-
- // Skip invalid entries
- if (!remotePath || !localPath || !expectedMd5) {
- ESP_LOGE(TAG, "Invalid file entry in manifest");
- continue;
- }
-
- // Attempt to update the file
- if (updateFile(remotePath, localPath, expectedMd5)) {
- successCount++;
- }
- }
-
- ESP_LOGI(TAG, "Manifest update complete: %d/%d files updated", successCount, totalFiles);
- return successCount == totalFiles;
-}
-
-bool AppUpdater::updateApp() {
- updateProgress(UpdateStatus::MESSAGE, 0, "Starting firmware update");
-
- // Check for firmware section in manifest
- if (!jsonManifest["firmware"].is() || !jsonManifest["firmware"]["md5"].is()) {
- ESP_LOGE(TAG, "Invalid firmware section in manifest");
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Invalid firmware section in manifest");
- return false;
- }
-
- // Get the firmware MD5 hash and URL
- const char* expectedMd5 = jsonManifest["firmware"]["md5"];
- String firmwareUrl = buildUrl(appName);
-
- // Download the firmware
- HTTPClient http;
- http.begin(firmwareUrl);
- int httpCode = http.GET();
- if (httpCode != HTTP_CODE_OK) {
- ESP_LOGE(TAG, "Firmware download failed: %d", httpCode);
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Firmware download failed");
- http.end();
- return false;
- }
-
- // Check available space
- size_t firmwareSize = http.getSize();
- if (!Update.begin(firmwareSize > 0 ? firmwareSize : UPDATE_SIZE_UNKNOWN)) {
- ESP_LOGE(TAG, "Firmware: Not enough space for update");
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Not enough space for update");
- http.end();
- return false;
- }
-
- // Set up MD5 checking
- MD5Builder md5;
- md5.begin();
-
- // Download and verify firmware
- WiFiClient* stream = http.getStreamPtr();
- if (firmwareSize > 0) {
- size_t remaining = firmwareSize;
- while (remaining > 0) {
- size_t chunk = std::min(remaining, size_t(BUFFER_SIZE));
- size_t read = stream->readBytes(downloadBuffer.get(), chunk);
-
- // Check for timeout
- if (read == 0) {
- ESP_LOGE(TAG, "Read timeout");
- Update.abort();
- http.end();
- return false;
- }
-
- // Update MD5 and write firmware
- md5.add(downloadBuffer.get(), read);
- if (Update.write(downloadBuffer.get(), read) != read) {
- ESP_LOGE(TAG, "Write failed");
- Update.abort();
- http.end();
- return false;
- }
-
- remaining -= read;
- updateProgress(UpdateStatus::DOWNLOADING, (firmwareSize - remaining) * 100 / firmwareSize, "firmware");
- }
- } else {
- // Unknown size: stream until end
- for (;;) {
- size_t read = stream->readBytes(downloadBuffer.get(), BUFFER_SIZE);
- if (read == 0) break;
- md5.add(downloadBuffer.get(), read);
- if (Update.write(downloadBuffer.get(), read) != read) {
- ESP_LOGE(TAG, "Write failed");
- Update.abort();
- http.end();
- return false;
- }
- updateProgress(UpdateStatus::DOWNLOADING, 0, "firmware");
- }
- }
-
- // Verify MD5
- md5.calculate();
- String calculatedMd5 = md5.toString();
- if (!calculatedMd5.equals(expectedMd5)) {
- ESP_LOGE(TAG, "MD5 mismatch. Expected: %s, Got: %s", expectedMd5, calculatedMd5.c_str());
- updateProgress(UpdateStatus::MD5_FAILED, 0, "Firmware: MD5 mismatch");
- Update.abort();
- http.end();
- return false;
- }
-
- // Finish update
- if (!Update.end()) {
- ESP_LOGE(TAG, "Update end failed");
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Update failed");
- http.end();
- return false;
- }
-
- http.end();
- updateProgress(UpdateStatus::COMPLETE, 0, "Firmware: Complete");
- return true;
-}
-
-bool AppUpdater::IsUpdateAvailable(){
- return updateAvailable;
-}
-
-String AppUpdater::buildUrl(const char* path) const {
- if(!path || !*path) return baseUrl; // just base
- String p(path);
- // If already absolute URL, pass through
- if(p.startsWith("http://") || p.startsWith("https://")) return p;
- // Strip leading slashes to avoid double
- while(p.startsWith("/")) p.remove(0,1);
- // Ensure baseUrl has single trailing slash
- String b = baseUrl;
- if(!b.endsWith("/")) b += "/";
- return b + p;
-}
-
-
-AsyncEventSource* eventProgress = nullptr;
-void startFirmwareUpdateTask(AsyncEventSource* evProg) {
- eventProgress = evProg;
- if(Update_Task_Handle) {
- ESP_LOGW(TAG, "Firmware update task already running");
- return;
- }
- xTaskCreate(firmwareUpdateTask, "FirmwareUpdate", 1024*8, NULL, 1, &Update_Task_Handle);
-}
-
-void firmwareUpdateTask(void* parameter) {
- static const char* TAG = "UpdateTask";
- AppUpdater* updater = nullptr;
-
- try {
- loadUpdateJson();
-
- // Initialize updater
- updater = new AppUpdater(LittleFS, localVersion, updateUrl.c_str(), "update.json", "firmware.bin");
- updater->setProgressCallback(updateProgress);
-
- ESP_LOGI(TAG, "Starting update check from: %s", updateUrl.c_str());
-
- // Check and perform updates
- if (!updater->checkManifest()) { throw std::runtime_error("Failed to check manifest"); }
-
- if (updater->IsUpdateAvailable()) {
- ESP_LOGI(TAG, "Update available, updating files...");
-
- if (!updater->updateFilesArray()) {
- throw std::runtime_error("Failed to update files");
- }
-
- ESP_LOGI(TAG, "Updating firmware...");
- if (!updater->updateApp()) {
- throw std::runtime_error("Failed to update firmware");
- }
- ESP_LOGI(TAG, "Update successful, restarting...");
-
- sendUpdateMessage("Restarting ", true, 100);
- vTaskDelay(2000);
-
- ESP.restart();
-
- }
-
- } catch (const std::exception& e) {
- ESP_LOGE(TAG, "Update failed: %s", e.what());
- }
- end:
- delete updater;
- Update_Task_Handle = NULL;
- vTaskDelete(NULL);
-}
-
-void startVersionCheckTask() {
- if(versionCheckTask_Handle != NULL) {
- ESP_LOGW(TAG, "Version Check Tak already running");
- return;
- }
- xTaskCreate(versionCheckTask, "VersionCheckTask", 1024*8, NULL, 1, &versionCheckTask_Handle);
-}
-
-void versionCheckTask(void* parameter){
-
- if(updateUrl == ""){
- loadUpdateJson();
- }
-
- if(checkManifest(otaVersion) == false){
- ESP_LOGE(TAG, "Error checking manifest");
- }
-
- versionCheckTask_Handle = NULL;
- vTaskDelete(NULL);
-}
-
-void loadUpdateJson(void) {
- try {
- ESP_LOGD(TAG, "loadUpdateJaon function...");
- if(updateUrl == "") {
- String updateJsonPath = "/system/update.json";
-
- // Read and parse update.json
- File file = LittleFS.open(updateJsonPath);
- if (!file) {
- throw std::runtime_error("Failed to open update.json");
- }
-
- JsonDocument doc;
- DeserializationError error = deserializeJson(doc, file);
- file.close();
-
- if (error) { throw std::runtime_error("Failed to parse update.json"); }
-
- // Get update configuration
- JsonObject jObj = doc.as();
- String folderName = jsonConstrainString(TAG, jObj, "folder", "latest/");
- String baseUrl = jsonConstrainString(TAG, jObj, "baseurl", "https://s3-minio.boothwizard.com/boothifier/");
- updateUrl = baseUrl + folderName;
-
- ESP_LOGD(TAG, "updateUrl: %s", updateUrl.c_str());
- }
- } catch (const std::exception& e) {
- ESP_LOGE(TAG, "Update failed: %s", e.what());
- }
-}
-
-void updateProgress(AppUpdater::UpdateStatus newStatus, int percentage, const char* message = nullptr) {
-
- char buffer[128];
- const char* msg;
- bool isComplete = false;
-
- const char* safeMsg = message ? message : "";
- switch (newStatus) {
- case AppUpdater::UpdateStatus::IDLE:
- snprintf(buffer, sizeof(buffer), "Update idle");
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::MESSAGE:
- msg = message ? message : "";
- break;
- case AppUpdater::UpdateStatus::DOWNLOADING:
- snprintf(buffer, sizeof(buffer), "%s: Download progress: %d%%", safeMsg, percentage);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::VERIFYING:
- snprintf(buffer, sizeof(buffer), "%s: Verifying update: %d%%", safeMsg, percentage);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::FILE_SKIPPED:
- snprintf(buffer, sizeof(buffer), "%s: Skipping file update, already up to date", safeMsg);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::FILE_SAVED:
- snprintf(buffer, sizeof(buffer), "%s: File Saved", safeMsg);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::MD5_FAILED:
- snprintf(buffer, sizeof(buffer), "%s: MD5 Verification Failed", safeMsg);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::COMPLETE:
- snprintf(buffer, sizeof(buffer), "Firmware Update Complete!!!");
- msg = buffer;
- isComplete = true;
- break;
- case AppUpdater::UpdateStatus::ERROR:
- snprintf(buffer, sizeof(buffer), "Error!: %s", safeMsg);
- msg = buffer;
- break;
- default:
- snprintf(buffer, sizeof(buffer), "Unknown update status: %d", (int)newStatus);
- msg = buffer;
- break;
- }
-
- ESP_LOGI(TAG, "%s", msg);
- sendUpdateMessage(msg, isComplete, percentage);
-}
-
-void sendUpdateMessage(const char* message, bool complete, int progress = -1) {
- if(eventProgress && eventProgress->count() > 0) {
- JsonDocument jsonDoc;
- jsonDoc["message"] = message;
- jsonDoc["complete"] = complete;
- jsonDoc["progress"] = progress;
- String strMessage;
- serializeJson(jsonDoc, strMessage);
- eventProgress->send(strMessage.c_str(), "update", millis());
- }
- else{
- ESP_LOGW(TAG, "No clients connected to event source");
- }
-
- bleUpgrade_send_message(message);
-}
-
-bool checkManifest(Version& remoteVersion) {
- const char* TAG = "manifestCheck";
- String url = updateUrl + "update.json";
- ESP_LOGD(TAG, "Fetching manifest from: %s", url.c_str());
-
- // Start the HTTP client and send GET request for manifest
- HTTPClient http;
- http.begin(url);
- int httpCode = http.GET();
- if (httpCode != HTTP_CODE_OK) {
- ESP_LOGE(TAG, "HTTP GET failed, error: %d", httpCode);
- http.end();
- return false;
- }
-
- // Read the response
- String payload = http.getString();
- http.end();
-
- //ESP_LOGD(TAG, "%s", payload.c_str());
-
- // Parse JSON
- JsonDocument jsonManifest;
- DeserializationError error = deserializeJson(jsonManifest, payload);
- if (error) {
- ESP_LOGE(TAG, "Failed to parse manifest: %s", error.c_str());
- return false;
- }
-
- // Check for version section
- JsonObject jsonVersion = jsonManifest["version"];
-
- if (jsonVersion.isNull()) {
- ESP_LOGE(TAG, "No version section in manifest");
- return false;
- }
-
- // Get the remote version
- byte major = jsonVersion["major"] | 0;
- byte minor = jsonVersion["minor"] | 0;
- byte patch = jsonVersion["patch"] | 0;
- remoteVersion = {major, minor, patch};
- ESP_LOGI(TAG, "Remote version: %s", remoteVersion.toString().c_str());
- return true;
-}
-
-/*
-void setup() {
- Serial.begin(115200);
-
- // Initialize WiFi connection first
- // ... WiFi connection code ...
-
- // Initialize filesystem
- if(!LittleFS.begin()) {
- Serial.println("LittleFS Mount Failed");
- return;
- }
-
- // Create updater instance with:
- // - Current version: "1.0.0"
- // - Update server URL: "https://my-update-server.com/"
- // - Filesystem: LittleFS
- AppUpdater updater("1.0.0", "https://storage.googleapis.com/boothifier/latest/", LittleFS);
-
- // Set progress callback
- updater.setProgressCallback([](int progress) {
- Serial.printf("Update progress: %d%%\n", progress);
- });
-
- // Check and update firmware
- if (updater.checkAndUpdate()) {
- Serial.println("Update successful! Rebooting...");
- ESP.restart();
- }
-
- // Update specific files from manifest
- int updatedFiles = updater.updateFilesFromManifest("test_update.json");
- Serial.printf("Updated %d files\n", updatedFiles);
-}
-
-*/
\ No newline at end of file
diff --git a/temporary/AppUpgrade_orig.cpp b/temporary/AppUpgrade_orig.cpp
deleted file mode 100644
index 2d72a74..0000000
--- a/temporary/AppUpgrade_orig.cpp
+++ /dev/null
@@ -1,716 +0,0 @@
-#include "AppUpgrade.h"
-#include "esp_log.h"
-#include
-#include
-#include
-#include "global.h"
-#include "JsonConstrain.h"
-#include "BLE_UpdateService.h"
-#include
-#include
-#include
-
-static const char* TAG = "AppUpdater";
-TaskHandle_t Update_Task_Handle = NULL;
-TaskHandle_t versionCheckTask_Handle = NULL;
-volatile bool g_UpdateCancelFlag = false; // cancellation flag
-String updateUrl = "";
-Version otaVersion;
-
-
-AppUpdater::AppUpdater(fs::FS& fs, Version localVersion, const char* bucket, const char* manifestName, const char* appBin)
- : localVersion(localVersion), manifestName(manifestName), appName(appBin), fileSystem(fs), downloadBuffer(new uint8_t[BUFFER_SIZE])
-{
- baseUrl = bucket ? String(bucket) : String(DEFAULT_MANIFEST_URL);
- // Ensure baseUrl ends with a single '/'
- if(!baseUrl.endsWith("/")) baseUrl += "/";
- ESP_LOGI(TAG, "AppUpdater initialized (local v%s) baseUrl=%s", localVersion.toString().c_str(), baseUrl.c_str());
-}
-
-void AppUpdater::setProgressCallback(void (*callback)( UpdateStatus status, int percentage, const char* message)) {
- progressCb = callback;
-}
-
-void AppUpdater::updateProgress(UpdateStatus newStatus, int percentage, const char* message) {
- status = newStatus;
- if (progressCb) {
- progressCb(status, percentage, message);
- }
-}
-
-AppUpdater::ManifestCheckResult AppUpdater::checkManifest() {
- String url = buildUrl(manifestName);
- ESP_LOGD(TAG, "Fetching manifest from: %s", url.c_str());
-
- String payload;
- for(int attempt=0; attempt MAX_MANIFEST_SIZE){
- ESP_LOGE(TAG, "Manifest too large (%u bytes)", (unsigned)payload.length());
- return ManifestCheckResult::ERROR_TOO_LARGE;
- }
-
- // Parse JSON
- DeserializationError error = deserializeJson(jsonManifest, payload);
- ESP_LOGD(TAG, "Manifest deserialized");
- if (error) {
- ESP_LOGE(TAG, "Failed to parse manifest: %s", error.c_str());
- return ManifestCheckResult::ERROR_PARSE_FAILED;
- }
-
- // Check for files section
- jsonFilesArray = jsonManifest["files"];
- if (jsonFilesArray.isNull()) {
- ESP_LOGE(TAG, "No files section in manifest");
- return ManifestCheckResult::ERROR_NO_FILES_SECTION;
- }else{
- ESP_LOGD(TAG, "%d Files found", jsonFilesArray.size());
- }
-
- // Check for version section
- JsonObject jsonVersion = jsonManifest["version"];
- ESP_LOGD(TAG, "Version section found");
- if (jsonVersion.isNull()) {
- ESP_LOGE(TAG, "No version section in manifest");
- return ManifestCheckResult::ERROR_NO_VERSION;
- }
-
- // Get the remote version
- byte major = jsonVersion["major"] | 0;
- byte minor = jsonVersion["minor"] | 0;
- byte patch = jsonVersion["patch"] | 0;
- otaVersion = {major, minor, patch};
-
- //Version localVersion;
- //::sscanf(localVersion, "%d.%d.%d", &localVersion.major, &localVersion.minor, &localVersion.patch);
-
- // Check if an update is available
- updateAvailable = false;
- // Only mark update available if remote is strictly newer than local
- if (otaVersion <= localVersion) {
- ESP_LOGI(TAG, "No updates available: remote=%s, local=%s",
- otaVersion.toString().c_str(), localVersion.toString().c_str());
- return ManifestCheckResult::VERSION_CURRENT;
- }else{
- updateAvailable = true;
- ESP_LOGI(TAG, "Update available: remote=%s, local=%s",
- otaVersion.toString().c_str(), localVersion.toString().c_str());
- }
-
- //ESP_LOGD(TAG, "Manifest content: %s", payload.c_str());
-
- return ManifestCheckResult::UPDATE_AVAILABLE;
-}
-
-bool AppUpdater::updateFile(const char* remotePath, const char* localPath, const char* expectedMd5) {
- //updateProgress(UpdateStatus::DOWNLOADING, 0, localPath);
-
- // Construct full URL
- String url = buildUrl(remotePath);
- ESP_LOGD(TAG, "Downloading: %s -> %s", url.c_str(), localPath);
-
- // Quick skip: if exists and size & MD5 match
- bool skip = false;
- if(fileSystem.exists(localPath)){
- String localMd5 = getLocalMD5(localPath);
- if(localMd5.equals(expectedMd5)) skip = true;
- }
- if(skip){
- ESP_LOGI(TAG, "File already up to date: %s", localPath);
- updateProgress(UpdateStatus::FILE_SKIPPED, 100, localPath);
- return true;
- }
-
- // Start the download
- HTTPClient http;
- int httpCode = -1;
- for(int attempt=0; attempt 0) {
- // Single pass with known content length
- while (totalRead < contentLength) {
- if(g_UpdateCancelFlag){ file.close(); fileSystem.remove(tempPath.c_str()); return false; }
- size_t available = stream->available();
- if (available) {
- size_t readLen = stream->readBytes(downloadBuffer.get(), std::min(available, size_t(BUFFER_SIZE)));
-
- // Write to temp file and update MD5
- if (file.write(downloadBuffer.get(), readLen) != readLen) {
- ESP_LOGE(TAG, "Failed to write to temporary file");
-
- file.close();
- fileSystem.remove(tempPath.c_str());
- return false;
- }
-
- md5.add(downloadBuffer.get(), readLen);
- totalRead += readLen;
- updateProgress(UpdateStatus::DOWNLOADING, (totalRead * 80) / contentLength , localPath);
- }
- yield();
- }
- } else {
- // Unknown content length: read until stream ends
- for (;;) {
- if(g_UpdateCancelFlag){ file.close(); fileSystem.remove(tempPath.c_str()); return false; }
- size_t readLen = stream->readBytes(downloadBuffer.get(), BUFFER_SIZE);
- if (readLen == 0) {
- break;
- }
- if (file.write(downloadBuffer.get(), readLen) != readLen) {
- ESP_LOGE(TAG, "Failed to write to temporary file");
- file.close();
- fileSystem.remove(tempPath.c_str());
- return false;
- }
- md5.add(downloadBuffer.get(), readLen);
- totalRead += readLen;
- // Progress unknown; emit periodic heartbeats at 0%
- // For unknown size, send heartbeats every ~16KB
- if((totalRead & 0x3FFF) == 0){
- updateProgress(UpdateStatus::DOWNLOADING, 0, localPath);
- }
- yield();
- }
- }
-
- file.close();
- md5.calculate();
- String calculatedMd5 = md5.toString();
-
- // Verify MD5 hash
- updateProgress(UpdateStatus::VERIFYING, 90, localPath);
- if (!calculatedMd5.equals(expectedMd5)) {
- //ESP_LOGE(TAG, "MD5 mismatch for %s", localPath);
- fileSystem.remove(tempPath.c_str());
- return false;
- }
-
- updateProgress(UpdateStatus::VERIFYING, 95, localPath);
-
- // Replace original file with verified temp file
- if (fileSystem.exists(localPath)) {
- fileSystem.remove(localPath);
- }
- if (!fileSystem.rename(tempPath.c_str(), localPath)) {
- ESP_LOGE(TAG, "Failed to rename temporary file");
- fileSystem.remove(tempPath.c_str());
- return false;
- }
-
- updateProgress(UpdateStatus::VERIFYING, 100, localPath);
- return true;
-}
-
-String AppUpdater::getLocalMD5(const char* filePath){
- File file = fileSystem.open(filePath, "r");
- if(!file){
- ESP_LOGE(TAG, "Error opening %s...", filePath);
- return String();
- }
-
- MD5Builder md5Builder;
- md5Builder.begin();
- size_t fileSize = file.size();
- size_t totalRead = 0;
- size_t readLen = 0;
- while (totalRead < fileSize) {
- readLen = file.readBytes(reinterpret_cast(downloadBuffer.get()), std::min(fileSize - totalRead, size_t(BUFFER_SIZE)));
- md5Builder.add(downloadBuffer.get(), readLen);
- totalRead += readLen;
- }
-
- md5Builder.calculate();
- file.close();
- return md5Builder.toString();
-}
-
-bool AppUpdater::updateFilesArray() {
- int successCount = 0;
- int totalFiles = jsonFilesArray.size();
- ESP_LOGI(TAG, "Found %d files in manifest", totalFiles);
-
- // Iterate over each file entry in the manifest
- for (JsonObject file : jsonFilesArray) {
- const char* remotePath = file["path"];
- const char* localPath = remotePath;
- // If path begins with "data/" or "/data/" strip only the "data" portion, retaining the leading slash
- if (localPath) {
- if (strncmp(localPath, "data/", 5) == 0) {
- localPath += 4; // points to '/'
- } else if (strncmp(localPath, "/data/", 6) == 0) {
- localPath += 5; // points to '/'
- }
- }
- const char* expectedMd5 = file["md5"];
-
- // Skip invalid entries
- if (!remotePath || !localPath || !expectedMd5) {
- ESP_LOGE(TAG, "Invalid file entry in manifest");
- continue;
- }
-
- // Attempt to update the file
- if (updateFile(remotePath, localPath, expectedMd5)) {
- successCount++;
- }
- }
-
- ESP_LOGI(TAG, "Manifest update complete: %d/%d files updated", successCount, totalFiles);
- return successCount == totalFiles;
-}
-
-bool AppUpdater::updateApp() {
- updateProgress(UpdateStatus::MESSAGE, 0, "Starting firmware update");
-
- // Check for firmware section in manifest
- if (!jsonManifest["firmware"].is() || !jsonManifest["firmware"]["md5"].is()) {
- ESP_LOGE(TAG, "Invalid firmware section in manifest");
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Invalid firmware section in manifest");
- return false;
- }
-
- // Get the firmware MD5 hash and URL
- const char* expectedMd5 = jsonManifest["firmware"]["md5"];
- String firmwareUrl = buildUrl(appName);
-
- // Download the firmware
- HTTPClient http;
- int httpCode = -1;
- for(int attempt=0; attempt 0 ? firmwareSize : UPDATE_SIZE_UNKNOWN)) {
- ESP_LOGE(TAG, "Firmware: Not enough space for update");
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Not enough space for update");
- http.end();
- return false;
- }
-
- // Set up MD5 checking
- MD5Builder md5;
- md5.begin();
-
- // Download and verify firmware
- WiFiClient* stream = http.getStreamPtr();
- if (firmwareSize > 0) {
- size_t remaining = firmwareSize;
- while (remaining > 0) {
- if(g_UpdateCancelFlag){ Update.abort(); http.end(); return false; }
- size_t chunk = std::min(remaining, size_t(BUFFER_SIZE));
- size_t read = stream->readBytes(downloadBuffer.get(), chunk);
-
- // Check for timeout
- if (read == 0) {
- ESP_LOGE(TAG, "Read timeout");
- Update.abort();
- http.end();
- return false;
- }
-
- // Update MD5 and write firmware
- md5.add(downloadBuffer.get(), read);
- if (Update.write(downloadBuffer.get(), read) != read) {
- ESP_LOGE(TAG, "Write failed");
- Update.abort();
- http.end();
- return false;
- }
-
- remaining -= read;
- updateProgress(UpdateStatus::DOWNLOADING, (firmwareSize - remaining) * 100 / firmwareSize, "firmware");
- }
- } else {
- // Unknown size: stream until end
- for (;;) {
- if(g_UpdateCancelFlag){ Update.abort(); http.end(); return false; }
- size_t read = stream->readBytes(downloadBuffer.get(), BUFFER_SIZE);
- if (read == 0) break;
- md5.add(downloadBuffer.get(), read);
- if (Update.write(downloadBuffer.get(), read) != read) {
- ESP_LOGE(TAG, "Write failed");
- Update.abort();
- http.end();
- return false;
- }
- updateProgress(UpdateStatus::DOWNLOADING, 0, "firmware");
- }
- }
-
- // Verify MD5
- md5.calculate();
- String calculatedMd5 = md5.toString();
- updateProgress(UpdateStatus::VERIFYING, 95, "firmware");
- if (!calculatedMd5.equals(expectedMd5)) {
- ESP_LOGE(TAG, "MD5 mismatch. Expected: %s, Got: %s", expectedMd5, calculatedMd5.c_str());
- updateProgress(UpdateStatus::MD5_FAILED, 0, "Firmware: MD5 mismatch");
- Update.abort();
- http.end();
- return false;
- }
-
- // Finish update
- if (!Update.end()) {
- ESP_LOGE(TAG, "Update end failed");
- updateProgress(UpdateStatus::ERROR, 0, "Firmware: Update failed");
- http.end();
- return false;
- }
-
- http.end();
- updateProgress(UpdateStatus::COMPLETE, 100, "Firmware: Complete");
- return true;
-}
-
-bool AppUpdater::IsUpdateAvailable(){
- return updateAvailable;
-}
-
-String AppUpdater::buildUrl(const char* path) const {
- if(!path || !*path) return baseUrl; // just base
- String p(path);
- // If already absolute URL, pass through
- if(p.startsWith("http://") || p.startsWith("https://")) return p;
- // Strip leading slashes to avoid double
- while(p.startsWith("/")) p.remove(0,1);
- // Ensure baseUrl has single trailing slash
- String b = baseUrl;
- if(!b.endsWith("/")) b += "/";
- return b + p;
-}
-
-
-AsyncEventSource* eventProgress = nullptr;
-void startFirmwareUpdateTask(AsyncEventSource* evProg) {
- eventProgress = evProg;
- if(Update_Task_Handle) {
- ESP_LOGW(TAG, "Firmware update task already running");
- return;
- }
- xTaskCreate(firmwareUpdateTask, "FirmwareUpdate", 1024*8, NULL, 1, &Update_Task_Handle);
-}
-
-void firmwareUpdateTask(void* parameter) {
- static const char* TAG = "UpdateTask";
- AppUpdater* updater = nullptr;
-
- try {
- loadUpdateJson();
-
- // Initialize updater
- updater = new AppUpdater(LittleFS, localVersion, updateUrl.c_str(), "manifest.json", "firmware.bin");
- updater->setProgressCallback(updateProgress);
-
- ESP_LOGI(TAG, "Starting update check from: %s", updateUrl.c_str());
-
- // Check and perform updates
- auto manifestResult = updater->checkManifest();
-
- if (manifestResult != AppUpdater::ManifestCheckResult::UPDATE_AVAILABLE) {
- // Handle different error cases
- std::string errorMsg;
- switch (manifestResult) {
- case AppUpdater::ManifestCheckResult::ERROR_FETCH_FAILED:
- errorMsg = "Failed to fetch manifest";
- break;
- case AppUpdater::ManifestCheckResult::ERROR_TOO_LARGE:
- errorMsg = "Manifest file too large";
- break;
- case AppUpdater::ManifestCheckResult::ERROR_PARSE_FAILED:
- errorMsg = "Failed to parse manifest";
- break;
- case AppUpdater::ManifestCheckResult::ERROR_NO_FILES_SECTION:
- errorMsg = "Manifest missing files section";
- break;
- case AppUpdater::ManifestCheckResult::ERROR_NO_VERSION:
- errorMsg = "Manifest missing version section";
- break;
- case AppUpdater::ManifestCheckResult::VERSION_CURRENT:
- errorMsg = "Current version is up to date";
- // This is not actually an error
- ESP_LOGI(TAG, "No update needed: %s", errorMsg.c_str());
- throw std::runtime_error(errorMsg);
- break;
- default:
- errorMsg = "Unknown manifest check error";
- }
- throw std::runtime_error(errorMsg);
- }
-
- if (updater->IsUpdateAvailable()) {
- ESP_LOGI(TAG, "Update available, updating files...");
-
- if (!updater->updateFilesArray()) {
- throw std::runtime_error("Failed to update files");
- }
-
- ESP_LOGI(TAG, "Updating firmware...");
- if (!updater->updateApp()) {
- throw std::runtime_error("Failed to update firmware");
- }
- ESP_LOGI(TAG, "Update successful, restarting...");
-
- sendUpdateMessage("Restarting ", true, 100);
- vTaskDelay(2000);
-
- ESP.restart();
-
- }
-
- } catch (const std::exception& e) {
- ESP_LOGE(TAG, "Update failed: %s", e.what());
- }
- delete updater;
- Update_Task_Handle = NULL;
- vTaskDelete(NULL);
-}
-
-void startVersionCheckTask() {
- if(versionCheckTask_Handle != NULL) {
- ESP_LOGW(TAG, "Version Check Tak already running");
- return;
- }
- xTaskCreate(versionCheckTask, "VersionCheckTask", 1024*8, NULL, 1, &versionCheckTask_Handle);
-}
-
-void versionCheckTask(void* parameter){
- if(updateUrl == ""){
- loadUpdateJson();
- }
- AppUpdater updater(LittleFS, localVersion, updateUrl.c_str(), "manifest.json", "firmware.bin");
-
- auto manifestResult = updater.checkManifest();
-
- if (manifestResult == AppUpdater::ManifestCheckResult::UPDATE_AVAILABLE ||
- manifestResult == AppUpdater::ManifestCheckResult::VERSION_CURRENT) {
- otaVersion = updater.otaVersion; // capture remote
- ESP_LOGI(TAG, "Version check: remote=%s", otaVersion.toString().c_str());
- } else {
- ESP_LOGE(TAG, "Version check: manifest check failed with code %d", static_cast(manifestResult));
- }
-
- versionCheckTask_Handle = NULL;
- vTaskDelete(NULL);
-}
-
-void loadUpdateJson(void) {
- try {
- ESP_LOGD(TAG, "loadUpdateJaon function...");
- if(updateUrl == "") {
- String updateJsonPath = "/system/update.json";
-
- // Read and parse update.json
- File file = LittleFS.open(updateJsonPath);
- if (!file) {
- throw std::runtime_error("Failed to open update.json");
- }
-
- JsonDocument doc;
- DeserializationError error = deserializeJson(doc, file);
- file.close();
-
- if (error) { throw std::runtime_error("Failed to parse update.json"); }
-
- // Get update configuration
- JsonObject jObj = doc.as();
- String folderName = jsonConstrainString(TAG, jObj, "folder", "latest/");
- String baseUrl = jsonConstrainString(TAG, jObj, "baseurl", "https://s3-minio.boothwizard.com/boothifier/");
- updateUrl = baseUrl + folderName;
-
- ESP_LOGD(TAG, "updateUrl: %s", updateUrl.c_str());
- }
- } catch (const std::exception& e) {
- ESP_LOGE(TAG, "Update failed: %s", e.what());
- }
-}
-
-void updateProgress(AppUpdater::UpdateStatus newStatus, int percentage, const char* message = nullptr) {
-
- char buffer[128];
- const char* msg;
- bool isComplete = false;
-
- const char* safeMsg = message ? message : "";
- switch (newStatus) {
- case AppUpdater::UpdateStatus::IDLE:
- snprintf(buffer, sizeof(buffer), "Update idle");
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::MESSAGE:
- msg = message ? message : "";
- break;
- case AppUpdater::UpdateStatus::DOWNLOADING:
- snprintf(buffer, sizeof(buffer), "%s: Download progress: %d%%", safeMsg, percentage);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::VERIFYING:
- snprintf(buffer, sizeof(buffer), "%s: Verifying update: %d%%", safeMsg, percentage);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::FILE_SKIPPED:
- snprintf(buffer, sizeof(buffer), "%s: File Skipped, up to date", safeMsg);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::FILE_SAVED:
- snprintf(buffer, sizeof(buffer), "%s: File Saved", safeMsg);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::MD5_FAILED:
- snprintf(buffer, sizeof(buffer), "%s: MD5 Verification Failed", safeMsg);
- msg = buffer;
- break;
- case AppUpdater::UpdateStatus::COMPLETE:
- snprintf(buffer, sizeof(buffer), "Firmware Update Complete!!!");
- msg = buffer;
- isComplete = true;
- break;
- case AppUpdater::UpdateStatus::ERROR:
- snprintf(buffer, sizeof(buffer), "Error!: %s", safeMsg);
- msg = buffer;
- break;
- default:
- snprintf(buffer, sizeof(buffer), "Unknown update status: %d", (int)newStatus);
- msg = buffer;
- break;
- }
-
- ESP_LOGI(TAG, "%s", msg);
- sendUpdateMessage(msg, isComplete, percentage);
-}
-
-void sendUpdateMessage(const char* message, bool complete, int progress = -1) {
-
- if(eventProgress && eventProgress->count() > 0) {
- // This is for the web client and not the BLE client
- JsonDocument jsonDoc;
- jsonDoc["message"] = message;
- jsonDoc["complete"] = complete;
- jsonDoc["progress"] = progress;
- String strMessage;
- serializeJson(jsonDoc, strMessage);
- eventProgress->send(strMessage.c_str(), "update", millis());
- }
- else{
- ESP_LOGW(TAG, "No clients connected to event source");
- }
-
- bleUpgrade_send_message(message);
-}
-
-// (Removed duplicate global checkManifest; AppUpdater::checkManifest used instead)
-
-/*
-void setup() {
- Serial.begin(115200);
-
- // Initialize WiFi connection first
- // ... WiFi connection code ...
-
- // Initialize filesystem
- if(!LittleFS.begin()) {
- Serial.println("LittleFS Mount Failed");
- return;
- }
-
- // Create updater instance with:
- // - Current version: "1.0.0"
- // - Update server URL: "https://my-update-server.com/"
- // - Filesystem: LittleFS
- AppUpdater updater("1.0.0", "https://storage.googleapis.com/boothifier/latest/", LittleFS);
-
- // Set progress callback
- updater.setProgressCallback([](int progress) {
- Serial.printf("Update progress: %d%%\n", progress);
- });
-
- // Check and update firmware
- if (updater.checkAndUpdate()) {
- Serial.println("Update successful! Rebooting...");
- ESP.restart();
- }
-
- // Update specific files from manifest
- int updatedFiles = updater.updateFilesFromManifest("test_update.json");
- Serial.printf("Updated %d files\n", updatedFiles);
-}
-
-*/
\ No newline at end of file
diff --git a/temporary/Temp/ATALights2.cpp b/temporary/Temp/ATALights2.cpp
deleted file mode 100644
index d64a258..0000000
--- a/temporary/Temp/ATALights2.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-#include "ATALights.h"
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "freertos/semphr.h"
-#include
-#include "Animations.h"
-#include
-#include
-
-
-static const char* tag = "strips";
-
-// Define constants for maximum LEDs
-#define MAX_LEDS 300 // Adjust based on your LED requirements
-
-// Create pointers for NeoPixelBus objects
-void* strip1 = nullptr;
-void* strip2 = nullptr;
-
-TaskHandle_t Animation_Task_Handle;
-
-// Runtime configuration variables
-int numLeds1 = 0, numLeds2 = 0; // Number of LEDs for each strip
-int dataPin1 = -1, dataPin2 = -1; // Data pins for each strip
-String chipType1, chipType2; // Chip types (e.g., WS2812, SK6812, TM1814)
-String colorOrder1, colorOrder2; // Color orders (e.g., GRB, RGB, BGR)
-
-
-void Init_Lights_Task(void){
-
- xTaskCreatePinnedToCore(Lights_Control_Task, "LumaMaster_Task", 1024*6, NULL, 1, &Animation_Task_Handle, CONFIG_ARDUINO_RUNNING_CORE);
- ESP_LOGI(tag, "Lights Task Created...");
-
-
- // Example runtime configuration for two strips
- dataPin1 = 5; // Pin for Strip 1
- numLeds1 = 150; // Number of LEDs on Strip 1
- chipType1 = "WS2812"; // Chip type for Strip 1
- colorOrder1 = "GRB"; // Color order for Strip 1
-
- dataPin2 = 18; // Pin for Strip 2
- numLeds2 = 100; // Number of LEDs on Strip 2
- chipType2 = "WS2812"; // Chip type for Strip 2
- colorOrder2 = "RGB"; // Color order for Strip 2
-
- // Dynamically initialize the strips
- strip1 = initializeStrip(dataPin1, numLeds1, chipType1, colorOrder1);
- strip2 = initializeStrip(dataPin2, numLeds2, chipType2, colorOrder2);
-
-
- // Start the strips if initialized
- if (strip1) static_cast*>(strip1)->Begin();
- if (strip2) static_cast*>(strip2)->Begin();
-}
-
-
-void Animation_Loop_Exit(void){
- if( Animation_Task_Handle ){
- xTaskNotifyGive( Animation_Task_Handle );
- }
-}
-
-
-void LightsON(void){
- FastLED.show();
-}
-
-
-void LightsOff(void){
- FastLED.clear();
- FastLED.show();
-}
-
-
-
-inline void setPixel1(int pixelIndex, const CRGB col) {
- register uint16_t x = pixelIndex + ledSettings[0].shift;
- // If strip.effSize is power of 2, use faster bit masking
- if ((ledSettings[0].effSize & (ledSettings[0].effSize - 1)) == 0) {
- x = (x < 0) ? ((x + ledSettings[0].effSize) & (ledSettings[0].effSize - 1)) : (x & (ledSettings[0].effSize - 1));
- leds1[(x + ledSettings[0].offset) & (ledSettings[0].effSize - 1)] = col;
- } else {
- // For non-power-of-2 sizes, still need modulo
- x = (x < 0) ? ((x + ledSettings[0].effSize) % ledSettings[0].effSize) : (x % ledSettings[0].effSize);
- leds1[(x + ledSettings[0].offset) % ledSettings[0].effSize] = col;
- }
-}
-
-
-inline void setPixel2(int pixelIndex, const CRGB col) {
- register uint16_t x = pixelIndex + ledSettings[1].shift;
- // If strip.effSize is power of 2, use faster bit masking
- if ((ledSettings[1].effSize & (ledSettings[1].effSize - 1)) == 0) {
- x = (x < 0) ? ((x + ledSettings[1].effSize) & (ledSettings[1].effSize - 1)) : (x & (ledSettings[1].effSize - 1));
- leds2[(x + ledSettings[1].offset) & (ledSettings[1].effSize - 1)] = col;
- } else {
- // For non-power-of-2 sizes, still need modulo
- x = (x < 0) ? ((x + ledSettings[1].effSize) % ledSettings[1].effSize) : (x % ledSettings[1].effSize);
- leds2[(x + ledSettings[1].offset) % ledSettings[1].effSize] = col;
- }
-}
-
-
-void Lights_Control_Task_Resume(void){
- vTaskResume(Animation_Task_Handle);
-}
-
-void Lights_Control_Task(void *parameters){
-
- ESP_LOGD(tag, "Lights Control Task Entered...");
- vTaskSuspend(NULL);
- ESP_LOGD(tag, "Lights Control Task Resumed...");
- vTaskDelay(2000);
- fill_solid(leds1, ledSettings[0].size-1, CRGB::Blue);
- FastLED.show();
- vTaskDelay(5000);
-
- while(true){
- Animation_Loop(2000, [&]() {
- ESP_LOGD(tag, "Looping....");
-
- // Example animation: Alternate colors between strips
- setStripColor>(strip1, numLeds1, RgbColor(255, 0, 0)); // Red for Strip 1
- setStripColor>(strip2, numLeds2, RgbColor(0, 255, 0)); // Green for Strip 2
- delay(1000);
-
- setStripColor>(strip1, numLeds1, RgbColor(0, 0, 255)); // Blue for Strip 1
- setStripColor>(strip2, numLeds2, RgbColor(255, 255, 0)); // Yellow for Strip 2
- delay(1000);
- });
-
- /*
- uint8_t animMode = 1;
- switch(animMode){
- case 0:
- break;
- case 1:
- break;
- }
- */
- }
-}
-
-
-void Init_FastLED_Strip(CRGB* leds, uint8_t pin, int size, EOrder rgbOrder, const String& chipType) {
-
-
-
-}
-
-// Function to initialize a strip dynamically (Non-SPI chipsets only)
-void* initializeStrip(int dataPin, int numLeds, const String& chipType, const String& colorOrder) {
- if (chipType == "WS2812" || chipType == "SK6812") {
- if (colorOrder == "GRB") {
- return new NeoPixelBus(numLeds, dataPin);
- } else if (colorOrder == "RGB") {
- return new NeoPixelBus(numLeds, dataPin);
- } else if (colorOrder == "BGR") {
- return new NeoPixelBus(numLeds, dataPin);
- }
- }
- Serial.println("Unsupported chipset or color order!");
- return nullptr;
-}
-
-// Function to set all LEDs of a strip to a specific color
-template
-void setStripColor(void* strip, int numLeds, RgbColor color) {
- if (strip) {
- T* actualStrip = static_cast(strip);
- for (int i = 0; i < numLeds; i++) {
- actualStrip->SetPixelColor(i, color);
- }
- actualStrip->Show();
- }
-}
-
-
diff --git a/temporary/Temp/BLE-FlashStick-Service.h b/temporary/Temp/BLE-FlashStick-Service.h
deleted file mode 100644
index 29260e8..0000000
--- a/temporary/Temp/BLE-FlashStick-Service.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include
-#include
diff --git a/temporary/Temp/BLE-FlaskStick-Service.cpp b/temporary/Temp/BLE-FlaskStick-Service.cpp
deleted file mode 100644
index 2172ffc..0000000
--- a/temporary/Temp/BLE-FlaskStick-Service.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include "BLE-FlashStick-Service.h"
-#include "WiFi.h"
-#include "my_wifi.h"
-#include "global.h"
-#include "AppUpgrade.h"
-#include "AppVersion.h"
-
-static const char *tag = "BLE_FlashStickService";
-
-#define UPGRADE_SERVICE_UUID "abcdef03-2345-6789-1234-56789abcdef0"
-#define UPGRADE_CHARACTERISTIC1_UUID "abcdef03-2345-6789-1234-56789abcdef1"
-
-NimBLEService *pUpgradeService = nullptr;
-NimBLECharacteristic *pUpgradeCharacteristic1 = nullptr;
-
-enum WIFI_STAT : byte { WIFI_DISCONNECTED=0, WIFI_BAD_CREDS=1, WIFI_NO_AP=2, WIFI_CONNECTED=3 };
-
-struct FLASHSTICK_PACKET {
- bool reistered = false;
- char msg[16] = "Hello...";
-}flashstickPacket;
-
-
-// Class for handling server events
-class ServerCallbacks : public NimBLEServerCallbacks {
- void onConnect(NimBLEServer* pServer) override {
- ESP_LOGI(tag, "Flash-Stick connected");
- }
-
- void onDisconnect(NimBLEServer* pServer) override {
- ESP_LOGI(tag, "Flash-Stick disconnected");
- }
-};
-
-
-// Class for handling characteristic events
-class UpgradeChar_Callbacks : public NimBLECharacteristicCallbacks {
-
- void onWrite(NimBLECharacteristic *pCharacteristic) override {
- std::string value = pCharacteristic->getValue();
- ESP_LOGD(tag, "Upgrade Char written with value: %s", value.c_str());
-
- if (value.compare(0, 12, "wifi-connect") == 0) { // Update WiFi credentials
- JsonDocument doc;
- deserializeJson(doc, value.substr(13));
- JsonObject wifiJson = doc.as();
- String ssid = wifiJson["ssid"].as();
- String pass = wifiJson["pass"].as();
- ESP_LOGI(tag, "Wifi Credentials: %s, %s", ssid.c_str(), pass.c_str());
-
- bool status = StartWifiConnectTask(ssid, pass);
- if(status == true){
- updatePacket.wifiStatus = WIFI_DISCONNECTED;
- updatePacket.wifiOnline = false;
- updatePacket.wifiIP[0] = updatePacket.wifiIP[1] = updatePacket.wifiIP[2] = updatePacket.wifiIP[3] = 0;
- }else{
- ESP_LOGI(tag, "Failed to start WiFi connection task");
- }
- }
- else if (value.compare("version-check") == 0) { // Check if new version is available
- ESP_LOGI(tag, "Version check command received: newVersion=%d.%d.%d", otaVersion.major(), otaVersion.minor(), otaVersion.patch());
- if(updatePacket.newVersion[0] == 0){
- startVersionCheckTask(); // start the task and done
- }else{
- ESP_LOGI(tag, "Version already checked");
- }
- }
- else if (value.compare("upgrade-start") == 0) { // Start OTA update
- ESP_LOGI(tag, "Start OTA update command received");
- startFirmwareUpdateTask(nullptr); // start the task
- }
- else if (value.compare("rename-device") == 0) { // Start renaming device
- ESP_LOGI(tag, "Start renane device command received");
- }
- else {
- ESP_LOGW(tag, "Unknown command received: %s", value.c_str());
- }
- }
-
- void onRead(NimBLECharacteristic *pCharacteristic) override {
- updatePacket.wifiOnline = InternetAvailable;
- if(WiFi.status() == WL_CONNECTED){
- updatePacket.wifiStatus = WIFI_CONNECTED;
- if(updatePacket.wifiIP[0] == 0){
- updatePacket.wifiIP[0] = WiFi.localIP()[0];
- updatePacket.wifiIP[1] = WiFi.localIP()[1];
- updatePacket.wifiIP[2] = WiFi.localIP()[2];
- updatePacket.wifiIP[3] = WiFi.localIP()[3];
- }
- }else{
- updatePacket.wifiStatus = WIFI_DISCONNECTED;
- if(updatePacket.wifiIP[0] > 0){
- updatePacket.wifiIP[0] = 0;
- updatePacket.wifiIP[1] = 0;
- updatePacket.wifiIP[2] = 0;
- updatePacket.wifiIP[3] = 0;
- }
- }
-
- //update version
- if(otaVersion.major() != 0){
- ESP_LOGI(tag, "Updated new version: major=%d, minor=%d, patch=%d", otaVersion.major(), otaVersion.minor(), otaVersion.patch());
- updatePacket.newVersion[0] = otaVersion.major();
- updatePacket.newVersion[1] = otaVersion.minor();
- updatePacket.newVersion[2] = otaVersion.patch();
- }
-
- pCharacteristic->setValue(reinterpret_cast(&updatePacket), sizeof(updatePacket));
- ESP_LOGI(tag, "Upgrade Char read");
- }
-};
-
-
-void bleUpgrade_send_message(String s){
- if(pUpgradeCharacteristic2){
- if (s != nullptr) {
- pUpgradeCharacteristic2->setValue(s);
- pUpgradeCharacteristic2->notify();
- } else {
- ESP_LOGW(tag, "Null string passed to bleUpgrade_send_message");
- }
- }
-}
-
-
-void Init_UpgradeBLEService(NimBLEServer *pServer){
-
- // Create Upgrade BLE Service
- pUpgradeService= pServer->createService( UPGRADE_SERVICE_UUID );
-
- pUpgradeCharacteristic1 = pUpgradeService->createCharacteristic(
- UPGRADE_CHARACTERISTIC1_UUID,
- NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::NOTIFY
- );
-
- // Register the callback with the characteristic
- pUpgradeCharacteristic1->setCallbacks(new UpgradeChar_Callbacks());
- ESP_LOGI(tag, "Upgrade callback registered!");
-
-
- pUpgradeCharacteristic2 = pUpgradeService->createCharacteristic(
- UPGRADE_CHARACTERISTIC2_UUID,
- NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY
- );
-
- // Register the callback with the characteristic
- pUpgradeCharacteristic2->setCallbacks(new UpgradeChar_Callbacks());
- ESP_LOGI(tag, "Upgrade callback registered!");
-
- pUpgradeService->start();
-
- NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
- pAdvertising->addServiceUUID( UPGRADE_SERVICE_UUID ); // Advertise service UUID
-
-
-}
-
diff --git a/temporary/Temp/BTSerial.cpp b/temporary/Temp/BTSerial.cpp
deleted file mode 100644
index 4295c4b..0000000
--- a/temporary/Temp/BTSerial.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-#include "BTSerial.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include "command_processor.h"
-#include "led_strip.h"
-#include "global.h"
-#include "JsonConstrain.h"
-#include "my_buzzer.h"
-#include "common/led_animation.h"
-
-
-static const char* tag = "ble";
-TaskHandle_t BTSerial_Task_Handle;
-bool BTDeviceConnected = false;
-
-BLEServer *pServer = NULL;
-BLECharacteristic * pTxCharacteristic;
-BLECharacteristic * pRxCharacteristic;
-bool oldDeviceConnected = false;
-uint8_t txValue = 0;
-
-// See the following for generating UUIDs:
-// https://www.uuidgenerator.net/
-#define SERVICE_UUID_DEF "6E400001-B5A3-F393-E0A9-E50E24DCCA9E" // UART service UUID
-#define CHARACTERISTIC_UUID_RX_DEF "6E400002-B5A3-F393-E0A9-E50E24DCCA9E"
-#define CHARACTERISTIC_UUID_TX_DEF "6E400003-B5A3-F393-E0A9-E50E24DCCA9E"
-
-String BLEDeviceName;
-String BLEKey;
-String SERVICE_UUID;
-String CHARACTERISTIC_UUID_RX;
-String CHARACTERISTIC_UUID_TX;
-
-#define replyActive true
-
-
-void Init_BTSerial(void)
-{
- File file = LittleFS.open("/cfg/ble.json");
- if(!file){
- ESP_LOGE(tag, "Error opening ble.json...");
- }
- else{
- JsonDocument doc;
- DeserializationError error = deserializeJson(doc, file);
- file.close();
- if(error){ ESP_LOGE(tag, "ble.json deserialize error!.."); return;}
-
- JsonObject bleJson = doc.as