From 83306ec86140240691b8c8fc830b06c588fc3cd9 Mon Sep 17 00:00:00 2001 From: fvanroie Date: Thu, 5 Mar 2020 21:46:07 +0100 Subject: [PATCH] Add debugTelePeriod --- src/hasp_debug.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp index 55ac3f3c..a538a83d 100644 --- a/src/hasp_debug.cpp +++ b/src/hasp_debug.cpp @@ -1,6 +1,7 @@ #include "hasp_conf.h" #include #include "ArduinoJson.h" +#include "lvgl.h" #if defined(ARDUINO_ARCH_ESP8266) #include @@ -91,6 +92,17 @@ void serialPrintln(const char * debugText) debugTimeText += halGetHeapFragmentation(); debugTimeText += F(" "); +#if LV_MEM_CUSTOM == 0 + /*lv_mem_monitor_t mem_mon; + lv_mem_monitor(&mem_mon); + debugTimeText += mem_mon.used_pct; + debugTimeText += F("% "); + debugTimeText += mem_mon.free_biggest_size; + debugTimeText += F("b/"); + debugTimeText += mem_mon.free_size; + debugTimeText += F("b ");*/ +#endif + Serial.print(debugTimeText); Serial.println(debugText); } @@ -135,18 +147,18 @@ bool debugGetConfig(const JsonObject & settings) bool debugSetConfigLog(const JsonObject & settings, bool silent) { + if(!silent) configOutput(settings); bool changed = false; if(!settings[FPSTR(F_DEBUG_TELEPERIOD)].isNull()) { - if(debugTelePeriod != settings[FPSTR(F_DEBUG_TELEPERIOD)].as()) { + uint16_t period = settings[FPSTR(F_DEBUG_TELEPERIOD)].as(); + if(debugTelePeriod != period) { if(!silent) debugPrintln(F("debugTelePeriod set")); + debugTelePeriod = period; + changed = true; } - changed |= debugTelePeriod != settings[FPSTR(F_DEBUG_TELEPERIOD)].as(); - - debugTelePeriod = settings[FPSTR(F_DEBUG_TELEPERIOD)].as(); } - if(!silent) configOutput(settings); return changed; }