diff --git a/lib/INA233/INA233.cpp b/lib/INA233/INA233.cpp index 4f6cb9e..9183374 100644 --- a/lib/INA233/INA233.cpp +++ b/lib/INA233/INA233.cpp @@ -23,31 +23,29 @@ uint16_t get_word(uint8_t address, uint8_t reg) { return (data[1] << 8) | data[0]; } -char* INA233::print_device_number() { - char data[6]; - int16_t rawVoltage; +String INA233::print_device_number() { + char data[7]; // Array size includes space for the null terminator // Request data from the PMBus device Wire.beginTransmission(INA233::_address); - Wire.write(0x9A); + Wire.write(0x9A); // Command to read the manufacturer ID Wire.endTransmission(); - Wire.requestFrom(INA233::_address, 6); + Wire.requestFrom(INA233::_address, 7); - if (Wire.available() == 6) { + if (Wire.available() == 7) { + uint8_t i = Wire.read(); data[0] = Wire.read(); data[1] = Wire.read(); data[2] = Wire.read(); data[3] = Wire.read(); data[4] = Wire.read(); data[5] = Wire.read(); + data[6] = '\0'; // Null-terminate the string } else { - // return 0 on error - data[0] = '\0'; - return data; + return String(""); } - // Combine the two bytes into a single 16-bit value - return data; + return String(data); } diff --git a/lib/INA233/INA233.h b/lib/INA233/INA233.h index f9c79c7..e4931a7 100644 --- a/lib/INA233/INA233.h +++ b/lib/INA233/INA233.h @@ -32,7 +32,7 @@ enum ConversionTime { class INA233{ public: - char* print_device_number(); + String print_device_number(); INA233(uint8_t addr, TwoWire* wire = &Wire); bool begin(const uint8_t sda, const uint8_t scl); diff --git a/src/external_interfacing/leds.cpp b/src/external_interfacing/leds.cpp index 9dc00b9..6f94ff0 100644 --- a/src/external_interfacing/leds.cpp +++ b/src/external_interfacing/leds.cpp @@ -2,6 +2,7 @@ #include #include #include "../tools/tools.h" +#include extern ActiveErrors active_errors; extern WaterData water_data; @@ -75,19 +76,19 @@ void display_task(void* parameter) // We have an error, display error code for 3 seconds and then water level for 3 seconds if (active_errors.voltage_low) { display_error_code(1); - logger.log(0, WARNING, "Sensor Error - Voltage low"); + LOG(WARNING, "Sensor Error - Voltage low"); delay(3000); } else if (active_errors.voltage_high) { display_error_code(2); - logger.log(0, WARNING, "Sensor Error - Voltage High"); + LOG(WARNING, "Sensor Error - Voltage High"); delay(3000); } else if (active_errors.current_low) { display_error_code(3); - logger.log(0, WARNING, "Sensor Error - Current low"); + LOG(WARNING, "Sensor Error - Current low"); delay(3000); } else if (active_errors.current_high) { display_error_code(4); - logger.log(0, WARNING, "Sensor Error - Current high"); + LOG(WARNING, "Sensor Error - Current high"); delay(3000); } else { delay(3000); diff --git a/src/main.cpp b/src/main.cpp index ec8a34c..f21cfe2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,6 +26,7 @@ #include #include #include "time.h" +#include "tools/log.h" #define MYLOG 0 @@ -51,7 +52,7 @@ void setup() prefs.begin("waterlevel", false); Serial.begin(115200); - logger.log(0, DEBUG, "Init LEDs"); + LOG(DEBUG, "Init LEDs"); pinMode(LED_1, OUTPUT); pinMode(LED_2, OUTPUT); pinMode(LED_3, OUTPUT); @@ -63,7 +64,7 @@ void setup() display_error_code(17); init_sensor(); - logger.log(0, DEBUG, "Beginning SPIFFS"); + LOG(DEBUG, "Beginning SPIFFS"); SPIFFS.begin(true); // Read the current SPIFFS version from the versions file on the spiffs @@ -72,21 +73,21 @@ void setup() Serial.println("Failed to open version file for reading"); } else { String version = file.readStringUntil('\n'); - logger.log(0, DEBUG, "Version: %s", version); + LOG(DEBUG, "Version: %s", version); current_spiffs_version = parseVersion(version.c_str()); - logger.log(0, DEBUG, "Current SPIFFS Version: %d.%d.%d", current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch); + LOG(DEBUG, "Current SPIFFS Version: %d.%d.%d", current_spiffs_version.major, current_spiffs_version.minor, current_spiffs_version.patch); } - logger.log(0, DEBUG, "SPIFFS initialized"); + LOG(DEBUG, "SPIFFS initialized"); display_error_code(19); - logger.log(0, DEBUG, "Begin INA"); + LOG(DEBUG, "Begin INA"); display_error_code(22); /////////////////////////////// ROUTES /////////////////////////////// - logger.log(0, DEBUG, "Route Setup"); + LOG(DEBUG, "Route Setup"); // Normal HTML stuff server.on("/", HTTP_GET, [](AsyncWebServerRequest* request) { request->send(SPIFFS, "/status.html", "text/html", false, processor); }); @@ -105,7 +106,7 @@ void setup() // For settings SSID if (request->hasParam(ssid_key, true) && request->hasParam(wifi_password_key, true)) { - logger.log(0, DEBUG, "Updating SSID config"); + LOG(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()); @@ -121,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)) { - logger.log(0, DEBUG, "Updating Sensor config"); + LOG(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); @@ -143,24 +144,24 @@ void setup() // Convert the C string to a float using strtod float value = strtod(paramCStr, &endPtr); - logger.log(0, DEBUG, "range_float:%D:", range_float); + LOG(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); - logger.log(0, DEBUG, "range_float_after:%D:", prefs.getFloat(level_sensor_range_key, -1.0)); + LOG(DEBUG, "range_float_after:%D:", prefs.getFloat(level_sensor_range_key, -1.0)); } else { - logger.log(0, DEBUG, "!!!! FAIL lo"); + LOG(DEBUG, "!!!! FAIL lo"); for (int i = 0; i < params; i++) { AsyncWebParameter* p = request->getParam(i); if (p->isFile()) { // p->isPost() is also true - logger.log(0, DEBUG, "POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); + LOG(DEBUG, "POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); } else if (p->isPost()) { - logger.log(0, DEBUG, "POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); + LOG(DEBUG, "POST[%s]: %s\n", p->name().c_str(), p->value().c_str()); } else { - logger.log(0, DEBUG, "GET[%s]: %s\n", p->name().c_str(), p->value().c_str()); + LOG(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 @@ -180,7 +181,7 @@ void setup() display_error_code(24); - logger.log(0, DEBUG, "OTA Setup"); + LOG(DEBUG, "OTA Setup"); ArduinoOTA .onStart([]() { String type; @@ -190,16 +191,16 @@ void setup() type = "filesystem"; // NOTE: if updating SPIFFS this would be the place to unmount SPIFFS using SPIFFS.end() - logger.log(0, DEBUG, "Start updating %s", type); }) - .onEnd([]() { logger.log(0, DEBUG, "\nEnd"); }) + LOG(DEBUG, "Start updating %s", type); }) + .onEnd([]() { LOG(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) 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"); }); + if (error == OTA_AUTH_ERROR) LOG(DEBUG, "Auth Failed"); + else if (error == OTA_BEGIN_ERROR) LOG(DEBUG, "Begin Failed"); + else if (error == OTA_CONNECT_ERROR) LOG(DEBUG, "Connect Failed"); + else if (error == OTA_RECEIVE_ERROR) LOG(DEBUG, "Receive Failed"); + else if (error == OTA_END_ERROR) LOG(DEBUG, "End Failed"); }); display_error_code(26); digitalWrite(LED_RED, 0); @@ -209,20 +210,20 @@ void setup() xTaskCreate(ethernet_task, "EthernetTask", 4096, NULL, 1, NULL); // Create Etnernet task and wait a second to see if there is connection - logger.log(0, DEBUG, "Started Ethernet, waiting"); + LOG(DEBUG, "Started Ethernet, waiting"); delay(2000); if (ETH.linkUp()){ - logger.log(0, DEBUG, "Ethernet connected, starting update checker"); + LOG(DEBUG, "Ethernet connected, starting update checker"); xTaskCreate(check_update_task, "CheckUpdateTask", 1024 * 8, NULL, 1, NULL); } else { - logger.log(0, DEBUG, "Ethernet not connected, starting update checker and WiFi Task"); + LOG(DEBUG, "Ethernet not connected, starting update checker and WiFi Task"); xTaskCreate(wifi_task, "WiFiTask", 10000, NULL, 1, NULL); xTaskCreate(check_update_task, "CheckUpdateTask", 1024 * 8, NULL, 1, NULL); delay(2000); } - logger.log(0, DEBUG, "Getting time now"); + LOG(DEBUG, "Getting time now"); // Configure time to UTC configTime(0, 0, "pool.ntp.org"); @@ -244,26 +245,26 @@ void setup() // Sanity check: Ensure the year is at least 2020. int currentYear = timeinfo.tm_year + 1900; // tm_year is years since 1900 if (currentYear < 2020) { - logger.log(0, DEBUG, "Time not set properly: "); + LOG(DEBUG, "Time not set properly: "); } else { - logger.log(0, DEBUG, "Time is valid: %s", asctime(&timeinfo)); + LOG(DEBUG, "Time is valid: %s", asctime(&timeinfo)); } // Setup syslog logger.configureSyslog("192.168.6.11", 5514, "esp32"); logger.registerSyslog(MYLOG, DEBUG, FAC_USER, "waterlevel"); - logger.log(MYLOG, ERROR, "Here is an error message, error code: %d", 17); + LOG(ERROR, "Here is an error message, error code: %d", 17); - logger.log(0, DEBUG, "Starting webserver"); + LOG(DEBUG, "Starting webserver"); server.begin(); ArduinoOTA.begin(); display_error_code(25); xTaskCreate(display_task, "DisplayTask", 10000, NULL, 1, NULL); - xTaskCreate(read_sensor_task, "ReadSensorTask", 2048, NULL, 1, NULL); + xTaskCreate(read_sensor_task, "ReadSensorTask", 1024 * 4, NULL, 1, NULL); xTaskCreate(collect_internal_telemetry_task, "InternalTelemetryTask", 2048, NULL, 1, NULL); // Wait until there is network connection @@ -271,13 +272,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) { - logger.log(0, DEBUG, "Network connection established"); + LOG(DEBUG, "Network connection established"); break; } else { - logger.log(0, DEBUG, "Network not ready, retrying..."); + LOG(DEBUG, "Network not ready, retrying..."); } } else { - logger.log(0, DEBUG, "No WiFi or Ethernet connection, retrying..."); + LOG(DEBUG, "No WiFi or Ethernet connection, retrying..."); } delay(1000); // Delay to prevent rapid retry } diff --git a/src/networking/networking.cpp b/src/networking/networking.cpp index 510b626..a4e74a6 100644 --- a/src/networking/networking.cpp +++ b/src/networking/networking.cpp @@ -4,6 +4,7 @@ #include "../global_data/defines.h" #include #include "../global_data/global_data.h" +#include int64_t mac_address = ESP.getEfuseMac(); uint8_t failed_connection_attempts = 0; @@ -34,21 +35,21 @@ const char * get_hostname(HostnameType host_type) { void wifi_task(void* parameter) { - logger.log(0, DEBUG, "Starting WiFi Task"); + LOG(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) { - logger.log(0, DEBUG, "Failed to connecto to currently saved SSID, starting SoftAP"); + LOG(DEBUG, "Failed to connecto to currently saved SSID, starting SoftAP"); } else { - logger.log(0, DEBUG, "No SSID saved, starting SoftAP"); + LOG(DEBUG, "No SSID saved, starting SoftAP"); } String ap_ssid = get_hostname(Wireless); WiFi.softAP(ap_ssid, ""); - logger.log(0, DEBUG, "[WIFI_TASK] Waiting for SSID now..."); + LOG(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 +65,11 @@ void wifi_task(void* parameter) wifi_data.network_name = WiFi.SSID(); wifi_data.ip_address = WiFi.localIP().toString(); - // logger.log(0, DEBUG, "RSSI: %F, IP Address, %p, SSID: %s", float(WiFi.RSSI()), WiFi.localIP(), prefs.getString(ssid_key, "NOSSID")); + // LOG(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 { - logger.log(0, DEBUG, "Connecting to %s using password %s", prefs.getString(ssid_key, ""), prefs.getString(wifi_password_key, "")); + LOG(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 +81,14 @@ void wifi_task(void* parameter) void ethernet_task(void* parameter) { - logger.log(0, DEBUG, "Connecting Ethernet"); + LOG(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(); - // logger.log(0, DEBUG, "Ethernet RSSI: %F, IP Address, %s, LINK: %s", float(ethernet_data.rssi), ethernet_data.ip_address, String(ethernet_data.link)); + // LOG(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/sensor/sensor.cpp b/src/sensor/sensor.cpp index bdf6e78..913ecc2 100644 --- a/src/sensor/sensor.cpp +++ b/src/sensor/sensor.cpp @@ -12,6 +12,10 @@ INA226 ina_sensor(0x40); #include INA233 ina_sensor(0x40); #endif +#include + +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" extern Preferences prefs; extern WaterData water_data; @@ -40,13 +44,13 @@ void read_sensor_task(void* parameter) while (true) { // Get Values from sensor - char* chip_id = ina_sensor.print_device_number(0x40); - logger.log(MYLOG, ERROR, "Chip Model: %s", chip_id); + String chip_id = ina_sensor.print_device_number(); + LOG(DEBUG, "Chip Model: %s", chip_id.c_str()); float bus_voltage = ina_sensor.getBusVoltage(); float shunt_voltage = ina_sensor.getShuntVoltage_mV() - zero_value; - logger.log(0, DEBUG, "RAW Shunt voltage: %F mV", ina_sensor.getShuntVoltage_mV()); + LOG(DEBUG, "RAW Shunt voltage: %F mV", ina_sensor.getShuntVoltage_mV()); float shunt_current = shunt_voltage / RESISTOR_VALUE; @@ -66,8 +70,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; - 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); + LOG(DEBUG, "max_water_level_mA: %F", max_water_level_mA); + LOG(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; @@ -87,10 +91,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; - 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); + LOG(DEBUG, "Shunt current: %F", shunt_current); + LOG(DEBUG, "Shunt voltage: %F", shunt_voltage); + LOG(DEBUG, "Bus voltage: %F", bus_voltage); + LOG(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/log.h b/src/tools/log.h new file mode 100644 index 0000000..3f46fef --- /dev/null +++ b/src/tools/log.h @@ -0,0 +1,11 @@ +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" + +#define LOG(LEVEL, FMT, ...) \ + do { \ + logger.log(0, LEVEL, "[Core: %i][Task: %s][%s] " FMT, \ + xPortGetCoreID(), \ + pcTaskGetName(xTaskGetCurrentTaskHandle()), \ + __FUNCTION__, \ + ##__VA_ARGS__); \ + } while (0) diff --git a/src/tools/tools.cpp b/src/tools/tools.cpp index a24b8e2..8850a44 100644 --- a/src/tools/tools.cpp +++ b/src/tools/tools.cpp @@ -5,6 +5,7 @@ #include #include #include +#include "log.h" extern Preferences prefs; extern OTAStatus ota_status; @@ -35,12 +36,12 @@ String processor(const String& var) // OTA Callbacks void update_started() { - logger.log(0, DEBUG, "OTA Update started"); + LOG(DEBUG, "OTA Update started"); ota_status.update_progress = 0; } void update_finished() { - logger.log(0, DEBUG, "OTA Update finished"); + LOG(DEBUG, "OTA Update finished"); ota_status.update_progress = -1; webSocket.textAll(String(-1).c_str()); } @@ -49,14 +50,14 @@ 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); - logger.log(0, DEBUG, "OTA Update progress: %d/%d, %i", cur, total, ota_status.update_progress); + LOG(DEBUG, "OTA Update progress: %d/%d, %i", cur, total, ota_status.update_progress); } webSocket.textAll(String(ota_status.update_progress).c_str()); - logger.log(0, DEBUG, "OTA Update progress: %d/%d", cur, total); + LOG(DEBUG, "OTA Update progress: %d/%d", cur, total); } void update_error(int err) { - logger.log(0, ERROR, "OTA Update error: %d", err); + LOG(ERROR, "OTA Update error: %d", err); ota_status.update_progress = -2; } @@ -75,20 +76,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(); - 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); + LOG(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 - logger.log(0, DEBUG, "New SPIFFS version, running update now"); + LOG(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 - 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); + LOG(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 { - logger.log(0, DEBUG, "No new SPIFFS version available"); + LOG(DEBUG, "No new SPIFFS version available"); } } @@ -96,11 +97,11 @@ void check_update_task(void* parameter) { while (true) { Firmware fw = ota.getLatestVersionOnServer(); if (fw.valid) { - 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); + LOG(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)) { - logger.log(0, DEBUG, "Remote version is newer than current version"); + LOG(DEBUG, "Remote version is newer than current version"); ota_status.update_available = true; } else { ota_status.update_available = false; @@ -111,7 +112,7 @@ void check_update_task(void* parameter) { ota_status.update_available = false; } - logger.log(0, DEBUG, "No new firmware available"); + LOG(DEBUG, "No new firmware available"); } delay(1000 * 60 * 1); } @@ -121,7 +122,7 @@ void check_update_task(void* parameter) { void run_ota_update_task(void* parameter) { TaskArgs_t *args = (TaskArgs_t *) parameter; - logger.log(0, DEBUG, "Running OTA upgrade now with URL: %s", args->ota_status.update_url.c_str()); + LOG(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); }