jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 from arovak/0.4.0-dev-tweaks

Browse Source 
0.4.0 dev tweaks
This commit is contained in:
fvanroie 2021-03-22 08:26:52 +01:00 committed by GitHub
commit 0ee205a78a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dev/esp8266/esp8266.cpp
View File

@ -39,7 +39,7 @@ void Esp8266Device::set_hostname(const char* hostname)
const char* Esp8266Device::get_core_version() const char* Esp8266Device::get_core_version()
{ {
return ESP.getCoreVersion().c_str(); return _core_version.c_str();
} }
const char* Esp8266Device::get_chip_model() const char* Esp8266Device::get_chip_model()

2
src/dev/esp8266/esp8266.h
View File

@ -19,6 +19,7 @@ class Esp8266Device : public BaseDevice {
_hostname = "plate"; _hostname = "plate";
_backlight_power = 1; _backlight_power = 1;
_backlight_level = 100; _backlight_level = 100;
_core_version = ESP.getCoreVersion().c_str();
#ifdef TFT_BCKL #ifdef TFT_BCKL
_backlight_pin = TFT_BCKL; _backlight_pin = TFT_BCKL;
#else #else
@ -49,6 +50,7 @@ class Esp8266Device : public BaseDevice {
private: private:
std::string _hostname; std::string _hostname;
std::string _core_version;
uint8_t _backlight_pin; uint8_t _backlight_pin;
uint8_t _backlight_level; uint8_t _backlight_level;

12
src/hasp/hasp_attribute.cpp
View File

@ -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)) { if(check_obj_type(obj, LV_HASP_SLIDER)) {
int16_t min = lv_slider_get_min_value(obj); int16_t min = lv_slider_get_min_value(obj);
int16_t max = lv_slider_get_max_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) return update ? lv_slider_set_range(obj, set_min ? val : min, set_max ? val : max)
: hasp_out_int(obj, attr, set_min ? min : 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)) { if(check_obj_type(obj, LV_HASP_GAUGE)) {
int32_t min = lv_gauge_get_min_value(obj); int32_t min = lv_gauge_get_min_value(obj);
int32_t max = lv_gauge_get_max_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) return update ? lv_gauge_set_range(obj, set_min ? val32 : min, set_max ? val32 : max)
: hasp_out_int(obj, attr, set_min ? min : 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)) { if(check_obj_type(obj, LV_HASP_ARC)) {
int16_t min = lv_arc_get_min_value(obj); int16_t min = lv_arc_get_min_value(obj);
int16_t max = lv_arc_get_max_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) return update ? lv_arc_set_range(obj, set_min ? val : min, set_max ? val : max)
: hasp_out_int(obj, attr, set_min ? min : 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)) { if(check_obj_type(obj, LV_HASP_BAR)) {
int16_t min = lv_bar_get_min_value(obj); int16_t min = lv_bar_get_min_value(obj);
int16_t max = lv_bar_get_max_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) return update ? lv_bar_set_range(obj, set_min ? val : min, set_max ? val : max)
: hasp_out_int(obj, attr, set_min ? min : 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)) { if(check_obj_type(obj, LV_HASP_LMETER)) {
int32_t min = lv_linemeter_get_min_value(obj); int32_t min = lv_linemeter_get_min_value(obj);
int32_t max = lv_linemeter_get_max_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) return update ? lv_linemeter_set_range(obj, set_min ? val32 : min, set_max ? val32 : max)
: hasp_out_int(obj, attr, set_min ? min : 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)) { if(check_obj_type(obj, LV_HASP_CHART)) {
int16_t min = my_chart_get_min_value(obj); int16_t min = my_chart_get_min_value(obj);
int16_t max = my_chart_get_max_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) return update ? lv_chart_set_range(obj, set_min ? val : min, set_max ? val : max)
: hasp_out_int(obj, attr, set_min ? min : max); : hasp_out_int(obj, attr, set_min ? min : max);
} }

8
src/hasp/hasp_dispatch.cpp
View File

@ -1050,10 +1050,10 @@ void dispatch_output_statusupdate(const char*, const char*)
(HASP_NUM_PAGES)); (HASP_NUM_PAGES));
strcat(data, buffer); strcat(data, buffer);
#if defined(ARDUINO_ARCH_ESP8266) // #if defined(ARDUINO_ARCH_ESP8266)
snprintf_P(buffer, sizeof(buffer), PSTR("\"espVcc\":%.2f,"), (float)ESP.getVcc() / 1000); // snprintf_P(buffer, sizeof(buffer), PSTR("\"espVcc\":%.2f,"), (float)ESP.getVcc() / 1000);
strcat(data, buffer); // strcat(data, buffer);
#endif // #endif
snprintf_P(buffer, sizeof(buffer), PSTR("\"tftDriver\":\"%s\",\"tftWidth\":%u,\"tftHeight\":%u}"), snprintf_P(buffer, sizeof(buffer), PSTR("\"tftDriver\":\"%s\",\"tftWidth\":%u,\"tftHeight\":%u}"),
haspTft.get_tft_model(), (TFT_WIDTH), (TFT_HEIGHT)); haspTft.get_tft_model(), (TFT_WIDTH), (TFT_HEIGHT));