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

Merge branch 'master' of http://github.com/fvanroie/hasp-lvgl

Browse Source
This commit is contained in:
fvanroie 2021-06-20 00:31:38 +02:00
commit b6072c08ed
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hasp/hasp_attribute.cpp
View File

@ -1367,18 +1367,21 @@ static hasp_attribute_type_t attribute_common_val(lv_obj_t* obj, int32_t& val, b
break;
case LV_HASP_BTNMATRIX:
if(update) {
if(!lv_btnmatrix_get_one_check(obj)) return HASP_ATTR_TYPE_NOT_FOUND;
if(!lv_btnmatrix_get_one_check(obj)) return HASP_ATTR_TYPE_NOT_FOUND;
if(update) {
if(val < 0 || val >= my_btnmatrix_get_count(obj)) {
LOG_WARNING(TAG_ATTR, F("Invalid value %d"), val);
LOG_WARNING(TAG_ATTR, F("Invalid index %d"), val);
} else {
lv_btnmatrix_clear_btn_ctrl_all(obj, LV_BTNMATRIX_CTRL_CHECK_STATE);
lv_btnmatrix_set_btn_ctrl(obj, val, LV_BTNMATRIX_CTRL_CHECK_STATE);
lv_btnmatrix_ext_t* ext = (lv_btnmatrix_ext_t*)lv_obj_get_ext_attr(obj);
ext->btn_id_act = val;
}
} else {
val = lv_checkbox_is_checked(obj);
val = lv_btnmatrix_get_active_btn(obj);
}
break;