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

Use int16_t type in hasp_process_obj_attribute_val

Browse Source
This commit is contained in:
fvanroie 2021-03-18 23:01:17 +01:00
parent 0f52d808ea
commit 83bf62d9d6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hasp/hasp_attribute.cpp
View File

@ -1262,9 +1262,9 @@ static void hasp_process_obj_attribute_txt(lv_obj_t* obj, const char* attr, cons
LOG_WARNING(TAG_ATTR, F(D_ATTRIBUTE_UNKNOWN), attr); LOG_WARNING(TAG_ATTR, F(D_ATTRIBUTE_UNKNOWN), attr);
} }
bool hasp_process_obj_attribute_val(lv_obj_t* obj, const char* attr, const char* payload, bool update) bool hasp_process_obj_attribute_val(lv_obj_t* obj, const char* attr, int16_t intval, bool boolval, bool update)
{ {
int16_t intval = atoi(payload); // int16_t intval = atoi(payload);
if(check_obj_type(obj, LV_HASP_BUTTON)) { if(check_obj_type(obj, LV_HASP_BUTTON)) {
if(lv_btn_get_checkable(obj)) { if(lv_btn_get_checkable(obj)) {
@ -1280,11 +1280,10 @@ bool hasp_process_obj_attribute_val(lv_obj_t* obj, const char* attr, const char*
return false; // not checkable return false; // not checkable
} }
} else if(check_obj_type(obj, LV_HASP_CHECKBOX)) { } else if(check_obj_type(obj, LV_HASP_CHECKBOX)) {
update ? lv_checkbox_set_checked(obj, Utilities::is_true(payload)) update ? lv_checkbox_set_checked(obj, boolval) : hasp_out_int(obj, attr, lv_checkbox_is_checked(obj));
: hasp_out_int(obj, attr, lv_checkbox_is_checked(obj));
} else if(check_obj_type(obj, LV_HASP_SWITCH)) { } else if(check_obj_type(obj, LV_HASP_SWITCH)) {
if(update) if(update)
Utilities::is_true(payload) ? lv_switch_on(obj, LV_ANIM_ON) : lv_switch_off(obj, LV_ANIM_ON); boolval ? lv_switch_on(obj, LV_ANIM_ON) : lv_switch_off(obj, LV_ANIM_ON);
else else
hasp_out_int(obj, attr, lv_switch_get_state(obj)); hasp_out_int(obj, attr, lv_switch_get_state(obj));
} else if(check_obj_type(obj, LV_HASP_DROPDOWN)) { } else if(check_obj_type(obj, LV_HASP_DROPDOWN)) {
@ -1483,7 +1482,8 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attr_p, const char* p
break; // attribute_found break; // attribute_found
case ATTR_VAL: case ATTR_VAL:
if(!hasp_process_obj_attribute_val(obj, attr, payload, update)) goto attribute_not_found; if(!hasp_process_obj_attribute_val(obj, attr, atoi(payload), Utilities::is_true(payload), update))
goto attribute_not_found;
break; // attribute_found break; // attribute_found
case ATTR_MIN: case ATTR_MIN:

2
src/hasp/hasp_attribute.h
View File

@ -25,7 +25,7 @@ void my_btnmatrix_map_clear(lv_obj_t* obj);
void line_clear_points(lv_obj_t* obj); void line_clear_points(lv_obj_t* obj);
void hasp_process_obj_attribute(lv_obj_t* obj, const char* attr_p, const char* payload, bool update); void hasp_process_obj_attribute(lv_obj_t* obj, const char* attr_p, const char* payload, bool update);
bool hasp_process_obj_attribute_val(lv_obj_t* obj, const char* attr, const char* payload, bool update); bool hasp_process_obj_attribute_val(lv_obj_t* obj, const char* attr, int16_t intval, bool booval, bool update);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */