diff --git a/.vscode/settings.json b/.vscode/settings.json index f9a309a..5601ac9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "files.associations": { "iostream": "cpp", - "random": "cpp" + "random": "cpp", + "vector": "cpp" } } \ No newline at end of file diff --git a/data/update_progress.html b/data/update_progress.html index bf06747..bf5ba8a 100644 --- a/data/update_progress.html +++ b/data/update_progress.html @@ -18,13 +18,13 @@ \ No newline at end of file diff --git a/documentation/old.md b/documentation/old.md index ea6f346..d17c7b9 100644 --- a/documentation/old.md +++ b/documentation/old.md @@ -17,7 +17,7 @@ void listNetworkInterfaces() { } void setEthernetAsDefault() { - Log.verbose("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + logger.log(0, DEBUG, "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); listNetworkInterfaces(); // Attempt to locate the Ethernet network interface. // (The name may vary—on some systems it might be "eth0") @@ -31,8 +31,8 @@ void setEthernetAsDefault() { struct netif *eth_netif2 = netif_find("ETH_DEF"); if (netif) { netif_set_default(eth_netif2); - Log.verbose("Ethernet set as default network interface."); + logger.log(0, DEBUG, "Ethernet set as default network interface."); } else { - Log.verbose("Could not find Ethernet netif."); + logger.log(0, DEBUG, "Could not find Ethernet netif."); } } \ No newline at end of file diff --git a/lib/fetchOTA/fetchOTA.cpp b/lib/fetchOTA/fetchOTA.cpp index 1d6cb8a..ccf7421 100644 --- a/lib/fetchOTA/fetchOTA.cpp +++ b/lib/fetchOTA/fetchOTA.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include @@ -22,14 +22,14 @@ Firmware OTA::getLatestVersionOnServer() { HTTPClient http; http.begin(_serverUrl); int httpCode = http.GET(); - Log.verbose("HTTP Code: %d", httpCode); + logger.log(0, DEBUG, "HTTP Code: %d", httpCode); if (httpCode != 200) { return createErrorResponse("HTTP GET request failed with code " + String(httpCode)); } String payload = http.getString(); - Log.verbose("Payload: %s", payload.c_str()); + logger.log(0, DEBUG, "Payload: %s", payload.c_str()); DynamicJsonDocument doc(4096); DeserializationError error = deserializeJson(doc, payload); @@ -54,7 +54,7 @@ Firmware OTA::getLatestVersionOnServer() { deviceConfig }); } else { - Log.verbose("Configuration %s does not match current device configuration %s", deviceConfig.c_str(), _current_device_configuration.c_str()); + logger.log(0, DEBUG, "Configuration %s does not match current device configuration %s", deviceConfig.c_str(), _current_device_configuration.c_str()); } } } @@ -67,7 +67,7 @@ Firmware OTA::getLatestVersionOnServer() { Configuration latest = getLatestConfiguration(configs.data(), configs.size()); if (!isVersionNewer(_currentVersion, latest.version)) { - Log.verbose("No newer version found. Server version: %d.%d.%d", latest.version.major, latest.version.minor, latest.version.patch); + logger.log(0, DEBUG, "No newer version found. Server version: %d.%d.%d", latest.version.major, latest.version.minor, latest.version.patch); } return Firmware{ @@ -88,79 +88,79 @@ Firmware OTA::createErrorResponse(const String& errorMsg) { } void run_ota_update(String url, std::function callback_started, std::function callback_finished, std::function callback_progress, std::function callback_error) { - Log.verbose("Starting OTA upgrade"); + logger.log(0, DEBUG, "Starting OTA upgrade"); HTTPUpdate httpUpdate; httpUpdate.onStart(callback_started); httpUpdate.onEnd(callback_finished); httpUpdate.onProgress(callback_progress); httpUpdate.onError(callback_error); - Log.verbose("Defined callbacks, Starting update now"); + logger.log(0, DEBUG, "Defined callbacks, Starting update now"); t_httpUpdate_return ret; if (url.startsWith("https")) { - Log.verbose("HTTPS URL"); + logger.log(0, DEBUG, "HTTPS URL"); WiFiClientSecure client; client.setInsecure(); ret = httpUpdate.update(client, url); } else if (url.startsWith("http")) { - Log.verbose("HTTP URL"); + logger.log(0, DEBUG, "HTTP URL"); WiFiClient client; ret = httpUpdate.update(client, url); } else { - Log.error("URL is not valid: \n%s", url.c_str()); + logger.log(0, ERROR, "URL is not valid: \n%s", url.c_str()); } switch (ret) { case HTTP_UPDATE_FAILED: - Log.error("HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str()); + logger.log(0, ERROR, "HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str()); break; case HTTP_UPDATE_NO_UPDATES: - Log.error("HTTP_UPDATE_NO_UPDATES"); + logger.log(0, ERROR, "HTTP_UPDATE_NO_UPDATES"); break; case HTTP_UPDATE_OK: - Log.verbose("Update done"); + logger.log(0, DEBUG, "Update done"); break; } } void run_ota_spiffs_update(String url, std::function callback_started, std::function callback_finished, std::function callback_progress, std::function callback_error) { - Log.verbose("Starting OTA SPIFFS upgrade"); + logger.log(0, DEBUG, "Starting OTA SPIFFS upgrade"); HTTPUpdate httpUpdate; httpUpdate.onStart(callback_started); httpUpdate.onEnd(callback_finished); httpUpdate.onProgress(callback_progress); httpUpdate.onError(callback_error); - Log.verbose("Defined callbacks, Starting update now"); + logger.log(0, DEBUG, "Defined callbacks, Starting update now"); t_httpUpdate_return ret; if (url.startsWith("https")) { - Log.verbose("HTTPS URL"); + logger.log(0, DEBUG, "HTTPS URL"); WiFiClientSecure client; client.setInsecure(); ret = httpUpdate.updateSpiffs(client, url); } else if (url.startsWith("http")) { - Log.verbose("HTTP URL"); + logger.log(0, DEBUG, "HTTP URL"); WiFiClient client; ret = httpUpdate.updateSpiffs(client, url); } else { - Log.error("URL is not valid: \n%s", url.c_str()); + logger.log(0, ERROR, "URL is not valid: \n%s", url.c_str()); } switch (ret) { case HTTP_UPDATE_FAILED: - Log.error("HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str()); + logger.log(0, ERROR, "HTTP_UPDATE_FAILED Error (%d): %s\n", httpUpdate.getLastError(), httpUpdate.getLastErrorString().c_str()); break; case HTTP_UPDATE_NO_UPDATES: - Log.error("HTTP_UPDATE_NO_UPDATES"); + logger.log(0, ERROR, "HTTP_UPDATE_NO_UPDATES"); break; case HTTP_UPDATE_OK: - Log.verbose("SPIFFS Update done"); + logger.log(0, DEBUG, "SPIFFS Update done"); break; } } diff --git a/platformio.ini b/platformio.ini index 0d10882..9dada1f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -19,14 +19,14 @@ monitor_speed = 115200 lib_deps = ottowinter/ESPAsyncWebServer-esphome@^3.3.0 bblanchon/ArduinoJson@^6.21.3 - jsc/ArduinoLog fetchOTA - INA322 + INA233 ESP32Ping + https://github.com/x821938/elog board_build.partitions = default.csv upload_protocol = espota upload_port = 192.168.5.180 -build_flags = -Wall -Wextra +build_flags = -Wall -Wextra -DLOGGING_SPIFFS_DISABLE -DLOGGING_SD_DISABLE [env:ESP32_INA226] platform = espressif32 @@ -39,10 +39,11 @@ lib_deps = bblanchon/ArduinoJson@^6.21.3 jsc/ArduinoLog ESP32Ping + https://github.com/x821938/elog board_build.partitions = default.csv upload_protocol = espota upload_port = 192.168.4.18 -build_flags = -Wall -Wextra -DUSE_INA226 +build_flags = -Wall -Wextra -DUSE_INA226 -DLOGGING_SPIFFS_DISABLE -DLOGGING_SD_DISABLE [env:native] platform = native diff --git a/src/external_interfacing/leds.cpp b/src/external_interfacing/leds.cpp index 7e1de4d..187c6bd 100644 --- a/src/external_interfacing/leds.cpp +++ b/src/external_interfacing/leds.cpp @@ -1,6 +1,6 @@ #include "leds.h" #include -#include +#include #include "../tools/tools.h" extern ActiveErrors active_errors; @@ -72,7 +72,7 @@ void display_task(void* parameter) // We have no error, refresh status display and wait half a second display_percentage(water_data.percentage); } else { - Log.verbose("Error detected"); + logger.log(0, DEBUG, "Error detected"); // We have an error, display error code for 3 seconds and then water level for 3 seconds if (active_errors.voltage_low) { diff --git a/src/main.cpp b/src/main.cpp index 62a2684..753a006 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,7 +8,7 @@ #include "AsyncJson.h" #include -#include +#include #include @@ -26,6 +26,7 @@ #include #include +#define MYLOG 0 Preferences prefs; @@ -40,19 +41,18 @@ extern "C" int rom_phy_get_vdd33(); Version current_spiffs_version; AsyncWebServer server(80); -AsyncWebSocket ws("/ws"); +AsyncWebSocket webSocket("/webSocket"); #define FORMAT_LITTLEFS_IF_FAILED true void setup() -{ +{ + logger.registerSerial(MYLOG, DEBUG, "tst"); + logger. + logger.provideTime(2025, 3, 10, 23, 28, 00); prefs.begin("waterlevel", false); Serial.begin(115200); - Log.begin(LOG_LEVEL_VERBOSE, &Serial); - Log.setSuffix(printSuffix); - Log.setPrefix(print_prefix); - - Log.verbose("Init LEDs"); + logger.log(0, DEBUG, "Init LEDs"); pinMode(LED_1, OUTPUT); pinMode(LED_2, OUTPUT); pinMode(LED_3, OUTPUT); @@ -64,7 +64,7 @@ void setup() display_error_code(17); init_sensor(); - Log.verbose("Beginning SPIFFS"); + logger.log(0, DEBUG, "Beginning SPIFFS"); SPIFFS.begin(true); // Read the current SPIFFS version from the versions file on the spiffs @@ -73,21 +73,21 @@ void setup() Serial.println("Failed to open version file for reading"); } else { String version = file.readStringUntil('\n'); - Log.verbose("Version: %s", version); + logger.log(0, DEBUG, "Version: %s", version); current_spiffs_version = parseVersion(version.c_str()); - Log.verbose("Current SPIFFS Version: %d.%d.%d", current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch); + logger.log(0, DEBUG, "Current SPIFFS Version: %d.%d.%d", current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch); } - Log.verbose("SPIFFS initialized"); + logger.log(0, DEBUG, "SPIFFS initialized"); display_error_code(19); - Log.verbose("Begin INA"); + logger.log(0, DEBUG, "Begin INA"); display_error_code(22); /////////////////////////////// ROUTES /////////////////////////////// - Log.verbose("Route Setup"); + logger.log(0, DEBUG, "Route Setup"); // Normal HTML stuff server.on("/", HTTP_GET, [](AsyncWebServerRequest* request) { request->send(SPIFFS, "/status.html", "text/html", false, processor); }); @@ -106,7 +106,7 @@ void setup() // For settings SSID if (request->hasParam(ssid_key, true) && request->hasParam(wifi_password_key, true)) { - Log.verbose("Updating SSID config"); + logger.log(0, DEBUG, "Updating SSID config"); AsyncWebParameter* ssid_param = request->getParam(ssid_key, true); AsyncWebParameter* password_param = request->getParam(wifi_password_key, true); prefs.putString(ssid_key, ssid_param->value().c_str()); @@ -122,7 +122,7 @@ void setup() int params = request->params(); if (request->hasParam(level_sensor_range_key, true) && request->hasParam(water_level_min_key, true) && request->hasParam(water_level_max_key, true) && request->hasParam(water_volume_key, true)) { - Log.verbose("Updating Sensor config"); + logger.log(0, DEBUG, "Updating Sensor config"); AsyncWebParameter* range_param = request->getParam(level_sensor_range_key, true); AsyncWebParameter* level_min_param = request->getParam(water_level_min_key, true); AsyncWebParameter* level_max_param = request->getParam(water_level_max_key, true); @@ -144,24 +144,24 @@ void setup() // Convert the C string to a float using strtod float value = strtod(paramCStr, &endPtr); - Log.verbose("range_float:%D:", range_float); + logger.log(0, DEBUG, "range_float:%D:", range_float); prefs.putFloat(level_sensor_range_key, range_float); prefs.putFloat(water_level_min_key, level_min_float); prefs.putFloat(water_level_max_key, level_max_float); prefs.putFloat(water_volume_key, liters_float); - Log.verbose("range_float_after:%D:", prefs.getFloat(level_sensor_range_key, -1.0)); + logger.log(0, DEBUG, "range_float_after:%D:", prefs.getFloat(level_sensor_range_key, -1.0)); } else { - Log.verbose("!!!! FAIL lo"); + logger.log(0, DEBUG, "!!!! FAIL lo"); for (int i = 0; i < params; i++) { AsyncWebParameter* p = request->getParam(i); if (p->isFile()) { // p->isPost() is also true - Log.verbose("POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); + logger.log(0, DEBUG, "POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); } else if (p->isPost()) { - Log.verbose("POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); + logger.log(0, DEBUG, "POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); } else { - Log.verbose("GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); + logger.log(0, DEBUG, "GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); } } request->send(400, "text/plain", "Missing parameters"); // TODO add proper error messages @@ -171,8 +171,8 @@ void setup() setup_api_endpoints(); display_error_code(23); - ws.onEvent(onWsEvent); - server.addHandler(&ws); + webSocket.onEvent(onWsEvent); + server.addHandler(&webSocket); @@ -181,7 +181,7 @@ void setup() display_error_code(24); - Log.verbose("OTA Setup"); + logger.log(0, DEBUG, "OTA Setup"); ArduinoOTA .onStart([]() { String type; @@ -191,16 +191,16 @@ void setup() type = "filesystem"; // NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end() - Log.verbose("Start updating %s", type); }) - .onEnd([]() { Log.verbose("\nEnd"); }) + logger.log(0, DEBUG, "Start updating %s", type); }) + .onEnd([]() { logger.log(0, DEBUG, "\nEnd"); }) .onProgress([](unsigned int progress, unsigned int total) { Serial.printf("Progress: %u%%\r", (progress / (total / 100))); }) .onError([](ota_error_t error) { Serial.printf("Error[%u]: ", error); - if (error == OTA_AUTH_ERROR) Log.verbose("Auth Failed"); - else if (error == OTA_BEGIN_ERROR) Log.verbose("Begin Failed"); - else if (error == OTA_CONNECT_ERROR) Log.verbose("Connect Failed"); - else if (error == OTA_RECEIVE_ERROR) Log.verbose("Receive Failed"); - else if (error == OTA_END_ERROR) Log.verbose("End Failed"); }); + if (error == OTA_AUTH_ERROR) logger.log(0, DEBUG, "Auth Failed"); + else if (error == OTA_BEGIN_ERROR) logger.log(0, DEBUG, "Begin Failed"); + else if (error == OTA_CONNECT_ERROR) logger.log(0, DEBUG, "Connect Failed"); + else if (error == OTA_RECEIVE_ERROR) logger.log(0, DEBUG, "Receive Failed"); + else if (error == OTA_END_ERROR) logger.log(0, DEBUG, "End Failed"); }); display_error_code(26); digitalWrite(LED_RED, 0); @@ -216,11 +216,13 @@ void setup() if (!started) { xTaskCreate(check_update_task, "CheckUpdateTask", 1024 * 8, NULL, 1, NULL); } + logger.configureSyslog("192.168.6.11", 5514, "esp32"); + logger.registerSyslog(MYLOG, DEBUG, FAC_LOCAL4, "mylog"); - Log.verbose("Starting webserver"); + logger.log(0, DEBUG, "Starting webserver"); server.begin(); ArduinoOTA.begin(); display_error_code(25); @@ -234,13 +236,13 @@ void setup() if (WiFi.status() == WL_CONNECTED || ETH.localIP()) { int pingResult = Ping.ping("8.8.8.8"); // Use Google's public DNS server as a test IP if (pingResult >= 0) { - Log.verbose("Network connection established"); + logger.log(0, DEBUG, "Network connection established"); break; } else { - Log.verbose("Network not ready, retrying..."); + logger.log(0, DEBUG, "Network not ready, retrying..."); } } else { - Log.verbose("No WiFi or Ethernet connection, retrying..."); + logger.log(0, DEBUG, "No WiFi or Ethernet connection, retrying..."); } delay(1000); // Delay to prevent rapid retry } diff --git a/src/networking/json_builder.cpp b/src/networking/json_builder.cpp index 7390163..309d1d0 100644 --- a/src/networking/json_builder.cpp +++ b/src/networking/json_builder.cpp @@ -1,5 +1,5 @@ #include "json_builder.h" -#include +#include extern WaterData water_data; extern DeviceTelemetry telemetry; diff --git a/src/networking/networking.cpp b/src/networking/networking.cpp index feeb5d0..510b626 100644 --- a/src/networking/networking.cpp +++ b/src/networking/networking.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "../global_data/defines.h" @@ -34,21 +34,21 @@ const char * get_hostname(HostnameType host_type) { void wifi_task(void* parameter) { - Log.verbose("Starting WiFi Task"); + logger.log(0, DEBUG, "Starting WiFi Task"); WiFi.setHostname(get_hostname(Wireless)); while (true) { if (prefs.getString(ssid_key, "") == "" || failed_connection_attempts > 5) { wifi_data.link = false; if (failed_connection_attempts > 5) { - Log.verbose("Failed to connecto to currently saved SSID, starting SoftAP"); + logger.log(0, DEBUG, "Failed to connecto to currently saved SSID, starting SoftAP"); } else { - Log.verbose("No SSID saved, starting SoftAP"); + logger.log(0, DEBUG, "No SSID saved, starting SoftAP"); } String ap_ssid = get_hostname(Wireless); WiFi.softAP(ap_ssid, ""); - Log.verbose("[WIFI_TASK] Waiting for SSID now..."); + logger.log(0, DEBUG, "[WIFI_TASK] Waiting for SSID now..."); String old_ssid = prefs.getString(ssid_key, "xxx"); while (prefs.getString(ssid_key, "") == "" || prefs.getString(ssid_key, "") == old_ssid) { @@ -64,11 +64,11 @@ void wifi_task(void* parameter) wifi_data.network_name = WiFi.SSID(); wifi_data.ip_address = WiFi.localIP().toString(); - // Log.verbose("RSSI: %F, IP Address, %p, SSID: %s", float(WiFi.RSSI()), WiFi.localIP(), prefs.getString(ssid_key, "NOSSID")); + // logger.log(0, DEBUG, "RSSI: %F, IP Address, %p, SSID: %s", float(WiFi.RSSI()), WiFi.localIP(), prefs.getString(ssid_key, "NOSSID")); // Serial.println(WiFi.channel()); delay(5000); } else { - Log.verbose("Connecting to %s using password %s", prefs.getString(ssid_key, ""), prefs.getString(wifi_password_key, "")); + logger.log(0, DEBUG, "Connecting to %s using password %s", prefs.getString(ssid_key, ""), prefs.getString(wifi_password_key, "")); WiFi.mode(WIFI_STA); WiFi.begin(prefs.getString(ssid_key, ""), prefs.getString(wifi_password_key, "")); failed_connection_attempts++; @@ -80,14 +80,14 @@ void wifi_task(void* parameter) void ethernet_task(void* parameter) { - Log.verbose("Connecting Ethernet"); + logger.log(0, DEBUG, "Connecting Ethernet"); ETH.begin(0, 17, 23, 18); ETH.setHostname(get_hostname(Ethernet)); while (true) { ethernet_data.link = ETH.linkUp(); ethernet_data.rssi = ETH.linkSpeed(); ethernet_data.ip_address = ETH.localIP().toString(); - // Log.verbose("Ethernet RSSI: %F, IP Address, %s, LINK: %s", float(ethernet_data.rssi), ethernet_data.ip_address, String(ethernet_data.link)); + // logger.log(0, DEBUG, "Ethernet RSSI: %F, IP Address, %s, LINK: %s", float(ethernet_data.rssi), ethernet_data.ip_address, String(ethernet_data.link)); delay(60 * 1000); } } \ No newline at end of file diff --git a/src/networking/responses.cpp b/src/networking/responses.cpp index d053760..ed752ef 100644 --- a/src/networking/responses.cpp +++ b/src/networking/responses.cpp @@ -4,7 +4,7 @@ #include #include "AsyncJson.h" #include -#include +#include #include "json_builder.h" #include "../tools/tools.h" #include diff --git a/src/sensor/sensor.cpp b/src/sensor/sensor.cpp index 69b813c..eac7236 100644 --- a/src/sensor/sensor.cpp +++ b/src/sensor/sensor.cpp @@ -1,6 +1,6 @@ #include "../global_data/defines.h" #include -#include +#include #include "Wire.h" #include "../global_data/global_data.h" @@ -61,8 +61,8 @@ void read_sensor_task(void* parameter) float min_water_level_mA = 4 + min_water_level_mA_over_zero; float max_water_level_mA = 4 + max_water_level_mA_over_zero; - // Log.verbose("max_water_level_mA: %F", max_water_level_mA); - // Log.verbose("min_water_level_mA_over_zero: %F", min_water_level_mA_over_zero); + // logger.log(0, DEBUG, "max_water_level_mA: %F", max_water_level_mA); + // logger.log(0, DEBUG, "min_water_level_mA_over_zero: %F", min_water_level_mA_over_zero); // Current over the 0 level of the water float shunt_current_over_zero = shunt_current - min_water_level_mA; @@ -82,10 +82,10 @@ void read_sensor_task(void* parameter) active_errors.current_high = shunt_current > 20.2; active_errors.voltage_low = bus_voltage < 23; active_errors.voltage_high = bus_voltage > 25; - // Log.verbose("Shunt current: %F", shunt_current); - // Log.verbose("Shunt voltage: %F", shunt_voltage); - // Log.verbose("Bus voltage: %F", bus_voltage); - // Log.verbose("cm_over_zero: %F", cm_over_zero); + // logger.log(0, DEBUG, "Shunt current: %F", shunt_current); + // logger.log(0, DEBUG, "Shunt voltage: %F", shunt_voltage); + // logger.log(0, DEBUG, "Bus voltage: %F", bus_voltage); + // logger.log(0, DEBUG, "cm_over_zero: %F", cm_over_zero); shunt_data.bus_voltage = bus_voltage; shunt_data.shunt_voltage = shunt_voltage; diff --git a/src/tools/tools.cpp b/src/tools/tools.cpp index 738684d..a24b8e2 100644 --- a/src/tools/tools.cpp +++ b/src/tools/tools.cpp @@ -1,6 +1,6 @@ #include #include "tools.h" -#include +#include #include "../global_data/defines.h" #include #include @@ -8,24 +8,10 @@ extern Preferences prefs; extern OTAStatus ota_status; -extern AsyncWebSocket ws; +extern AsyncWebSocket webSocket; extern Version current_spiffs_version; -void printSuffix(Print* _logOutput, int logLevel) -{ - _logOutput->print(CR); -} - -void print_prefix(Print* _logOutput, int logLevel) -{ - _logOutput->print("WATERMETER - TESTLOL - C"); - _logOutput->print(xPortGetCoreID()); - _logOutput->print(" - "); - _logOutput->print(pcTaskGetName(xTaskGetCurrentTaskHandle())); - _logOutput->print(" - "); -} - bool is_error(ActiveErrors active_errors) { return active_errors.current_high || active_errors.current_low || active_errors.level_high || active_errors.level_low || active_errors.voltage_high || active_errors.voltage_low; } @@ -49,28 +35,28 @@ String processor(const String& var) // OTA Callbacks void update_started() { - Log.verbose("OTA Update started"); + logger.log(0, DEBUG, "OTA Update started"); ota_status.update_progress = 0; } void update_finished() { - Log.verbose("OTA Update finished"); + logger.log(0, DEBUG, "OTA Update finished"); ota_status.update_progress = -1; - ws.textAll(String(-1).c_str()); + webSocket.textAll(String(-1).c_str()); } void update_progress(int cur, int total) { ota_status.update_progress = 0; if (cur != 0 ) { ota_status.update_progress = int(float(cur)/float(total)*100); - Log.verbose("OTA Update progress: %d/%d, %i", cur, total, ota_status.update_progress); + logger.log(0, DEBUG, "OTA Update progress: %d/%d, %i", cur, total, ota_status.update_progress); } - ws.textAll(String(ota_status.update_progress).c_str()); - Log.verbose("OTA Update progress: %d/%d", cur, total); + webSocket.textAll(String(ota_status.update_progress).c_str()); + logger.log(0, DEBUG, "OTA Update progress: %d/%d", cur, total); } void update_error(int err) { - Log.error("OTA Update error: %d", err); + logger.log(0, ERROR, "OTA Update error: %d", err); ota_status.update_progress = -2; } @@ -89,20 +75,20 @@ void check_update_task(void* parameter) { // If there is a SPIFSS update it will be ran automatically, as SPIFFS is necessary for the firmware to run Firmware latest_spiff_version = spiffs_fs.getLatestVersionOnServer(); - Log.verbose("Required SPIFFS Version: %d.%d.%d; Current SPIFFS version: %d.%d.%d; Server SPIFFS Version: %d.%d.%d", REQUIRED_SPIFFS_VERSION.major, REQUIRED_SPIFFS_VERSION.minor, REQUIRED_SPIFFS_VERSION.patch, current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch, latest_spiff_version.version.major, latest_spiff_version.version.minor, latest_spiff_version.version.patch); + logger.log(0, DEBUG, "Required SPIFFS Version: %d.%d.%d; Current SPIFFS version: %d.%d.%d; Server SPIFFS Version: %d.%d.%d", REQUIRED_SPIFFS_VERSION.major, REQUIRED_SPIFFS_VERSION.minor, REQUIRED_SPIFFS_VERSION.patch, current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch, latest_spiff_version.version.major, latest_spiff_version.version.minor, latest_spiff_version.version.patch); if (latest_spiff_version.valid) { if (isVersionNewer(current_spiffs_version, REQUIRED_SPIFFS_VERSION)) { // If Required SPIFFS version is newer than current version, update - Log.verbose("New SPIFFS version, running update now"); + logger.log(0, DEBUG, "New SPIFFS version, running update now"); run_ota_spiffs_update(latest_spiff_version.url, update_started, update_finished, update_progress, update_error); // Reboot just to be safe ESP.restart(); } else if (isVersionNewer(REQUIRED_SPIFFS_VERSION, latest_spiff_version.version)) { // If Server has new SPIFFS version but it's not required - Log.verbose("New SPIFFS version available: %d.%d.%d, current version: %d.%d.%d but not necessary to update", latest_spiff_version.version.major, latest_spiff_version.version.minor, latest_spiff_version.version.patch, REQUIRED_SPIFFS_VERSION.major, REQUIRED_SPIFFS_VERSION.minor, REQUIRED_SPIFFS_VERSION.patch); + logger.log(0, DEBUG, "New SPIFFS version available: %d.%d.%d, current version: %d.%d.%d but not necessary to update", latest_spiff_version.version.major, latest_spiff_version.version.minor, latest_spiff_version.version.patch, REQUIRED_SPIFFS_VERSION.major, REQUIRED_SPIFFS_VERSION.minor, REQUIRED_SPIFFS_VERSION.patch); } else { - Log.verbose("No new SPIFFS version available"); + logger.log(0, DEBUG, "No new SPIFFS version available"); } } @@ -110,11 +96,11 @@ void check_update_task(void* parameter) { while (true) { Firmware fw = ota.getLatestVersionOnServer(); if (fw.valid) { - Log.verbose("New firmware available: %d.%d.%d, current version: %d.%d.%d", fw.version.major, fw.version.minor, fw.version.patch, current_software_version.major, current_software_version.minor, current_software_version.patch); + logger.log(0, DEBUG, "New firmware available: %d.%d.%d, current version: %d.%d.%d", fw.version.major, fw.version.minor, fw.version.patch, current_software_version.major, current_software_version.minor, current_software_version.patch); ota_status.latest_version = fw.version; ota_status.update_url = fw.url; if (isVersionNewer(current_software_version, fw.version)) { - Log.verbose("Remote version is newer than current version"); + logger.log(0, DEBUG, "Remote version is newer than current version"); ota_status.update_available = true; } else { ota_status.update_available = false; @@ -125,7 +111,7 @@ void check_update_task(void* parameter) { ota_status.update_available = false; } - Log.verbose("No new firmware available"); + logger.log(0, DEBUG, "No new firmware available"); } delay(1000 * 60 * 1); } @@ -135,7 +121,7 @@ void check_update_task(void* parameter) { void run_ota_update_task(void* parameter) { TaskArgs_t *args = (TaskArgs_t *) parameter; - Log.verbose("Running OTA upgrade now with URL: %s", args->ota_status.update_url.c_str()); + logger.log(0, DEBUG, "Running OTA upgrade now with URL: %s", args->ota_status.update_url.c_str()); run_ota_update(args->ota_status.update_url, update_started, update_finished, update_progress, update_error); vTaskDelete(NULL); }