From 68406b2a9b9698eea7cd5d27d8b3eef916631d1f Mon Sep 17 00:00:00 2001 From: arovak Date: Mon, 22 Mar 2021 01:05:03 +0100 Subject: [PATCH 1/2] fix esp8266 core status message --- src/dev/esp8266/esp8266.cpp | 2 +- src/dev/esp8266/esp8266.h | 2 ++ src/hasp/hasp_dispatch.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dev/esp8266/esp8266.cpp b/src/dev/esp8266/esp8266.cpp index 7435133e..9b8c5ec3 100644 --- a/src/dev/esp8266/esp8266.cpp +++ b/src/dev/esp8266/esp8266.cpp @@ -39,7 +39,7 @@ void Esp8266Device::set_hostname(const char* hostname) const char* Esp8266Device::get_core_version() { - return ESP.getCoreVersion().c_str(); + return _core_version.c_str(); } const char* Esp8266Device::get_chip_model() diff --git a/src/dev/esp8266/esp8266.h b/src/dev/esp8266/esp8266.h index 460cb264..4c48d1ae 100644 --- a/src/dev/esp8266/esp8266.h +++ b/src/dev/esp8266/esp8266.h @@ -19,6 +19,7 @@ class Esp8266Device : public BaseDevice { _hostname = "plate"; _backlight_power = 1; _backlight_level = 100; + _core_version = ESP.getCoreVersion().c_str(); #ifdef TFT_BCKL _backlight_pin = TFT_BCKL; #else @@ -49,6 +50,7 @@ class Esp8266Device : public BaseDevice { private: std::string _hostname; + std::string _core_version; uint8_t _backlight_pin; uint8_t _backlight_level; diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index ba16c45b..d177edd3 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -1050,10 +1050,10 @@ void dispatch_output_statusupdate(const char*, const char*) (HASP_NUM_PAGES)); strcat(data, buffer); -#if defined(ARDUINO_ARCH_ESP8266) - snprintf_P(buffer, sizeof(buffer), PSTR("\"espVcc\":%.2f,"), (float)ESP.getVcc() / 1000); - strcat(data, buffer); -#endif +// #if defined(ARDUINO_ARCH_ESP8266) +// snprintf_P(buffer, sizeof(buffer), PSTR("\"espVcc\":%.2f,"), (float)ESP.getVcc() / 1000); +// strcat(data, buffer); +// #endif snprintf_P(buffer, sizeof(buffer), PSTR("\"tftDriver\":\"%s\",\"tftWidth\":%u,\"tftHeight\":%u}"), haspTft.get_tft_model(), (TFT_WIDTH), (TFT_HEIGHT)); From 4c26b9ee3afed948bc7ee6ce7211347c93745a7b Mon Sep 17 00:00:00 2001 From: arovak Date: Mon, 22 Mar 2021 01:07:49 +0100 Subject: [PATCH 2/2] update setting min/max attributes --- src/hasp/hasp_attribute.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hasp/hasp_attribute.cpp b/src/hasp/hasp_attribute.cpp index c476165c..1ac5d9ea 100644 --- a/src/hasp/hasp_attribute.cpp +++ b/src/hasp/hasp_attribute.cpp @@ -1323,7 +1323,7 @@ static void hasp_process_obj_attribute_range(lv_obj_t* obj, const char* attr, co if(check_obj_type(obj, LV_HASP_SLIDER)) { int16_t min = lv_slider_get_min_value(obj); int16_t max = lv_slider_get_max_value(obj); - if(update && (set_min ? val : min) >= (set_max ? val : max)) return; // prevent setting min>=max + if(update && (set_min ? val : min) == (set_max ? val : max)) return; // prevent setting min=max return update ? lv_slider_set_range(obj, set_min ? val : min, set_max ? val : max) : hasp_out_int(obj, attr, set_min ? min : max); } @@ -1331,7 +1331,7 @@ static void hasp_process_obj_attribute_range(lv_obj_t* obj, const char* attr, co if(check_obj_type(obj, LV_HASP_GAUGE)) { int32_t min = lv_gauge_get_min_value(obj); int32_t max = lv_gauge_get_max_value(obj); - if(update && (set_min ? val32 : min) >= (set_max ? val32 : max)) return; // prevent setting min>=max + if(update && (set_min ? val32 : min) == (set_max ? val32 : max)) return; // prevent setting min=max return update ? lv_gauge_set_range(obj, set_min ? val32 : min, set_max ? val32 : max) : hasp_out_int(obj, attr, set_min ? min : max); } @@ -1339,7 +1339,7 @@ static void hasp_process_obj_attribute_range(lv_obj_t* obj, const char* attr, co if(check_obj_type(obj, LV_HASP_ARC)) { int16_t min = lv_arc_get_min_value(obj); int16_t max = lv_arc_get_max_value(obj); - if(update && (set_min ? val : min) >= (set_max ? val : max)) return; // prevent setting min>=max + if(update && (set_min ? val : min) == (set_max ? val : max)) return; // prevent setting min=max return update ? lv_arc_set_range(obj, set_min ? val : min, set_max ? val : max) : hasp_out_int(obj, attr, set_min ? min : max); } @@ -1347,7 +1347,7 @@ static void hasp_process_obj_attribute_range(lv_obj_t* obj, const char* attr, co if(check_obj_type(obj, LV_HASP_BAR)) { int16_t min = lv_bar_get_min_value(obj); int16_t max = lv_bar_get_max_value(obj); - if(update && (set_min ? val : min) >= (set_max ? val : max)) return; // prevent setting min>=max + if(update && (set_min ? val : min) == (set_max ? val : max)) return; // prevent setting min=max return update ? lv_bar_set_range(obj, set_min ? val : min, set_max ? val : max) : hasp_out_int(obj, attr, set_min ? min : max); } @@ -1355,7 +1355,7 @@ static void hasp_process_obj_attribute_range(lv_obj_t* obj, const char* attr, co if(check_obj_type(obj, LV_HASP_LMETER)) { int32_t min = lv_linemeter_get_min_value(obj); int32_t max = lv_linemeter_get_max_value(obj); - if(update && (set_min ? val32 : min) >= (set_max ? val32 : max)) return; // prevent setting min>=max + if(update && (set_min ? val32 : min) == (set_max ? val32 : max)) return; // prevent setting min=max return update ? lv_linemeter_set_range(obj, set_min ? val32 : min, set_max ? val32 : max) : hasp_out_int(obj, attr, set_min ? min : max); } @@ -1363,7 +1363,7 @@ static void hasp_process_obj_attribute_range(lv_obj_t* obj, const char* attr, co if(check_obj_type(obj, LV_HASP_CHART)) { int16_t min = my_chart_get_min_value(obj); int16_t max = my_chart_get_max_value(obj); - if(update && (set_min ? val : min) >= (set_max ? val : max)) return; // prevent setting min>=max + if(update && (set_min ? val : min) == (set_max ? val : max)) return; // prevent setting min=max return update ? lv_chart_set_range(obj, set_min ? val : min, set_max ? val : max) : hasp_out_int(obj, attr, set_min ? min : max); }