jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix toggle error

Browse Source
This commit is contained in:
fvanroie 2020-04-02 22:04:01 +02:00
parent 8d20a35c1b
commit ccb21fe0a1
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hasp_attribute.cpp
View File

@ -695,6 +695,7 @@ static void hasp_process_obj_attribute6(lv_obj_t * obj, const char * attr, const
} else { } else {
hasp_out_int(obj, attr, lv_btn_get_checkable(obj)); hasp_out_int(obj, attr, lv_btn_get_checkable(obj));
} }
return;
} }
} }
@ -709,11 +710,13 @@ static void hasp_process_obj_attribute7(lv_obj_t * obj, const char * attr, const
if(!strcmp_P(attr, PSTR("opacity"))) { if(!strcmp_P(attr, PSTR("opacity"))) {
return update ? lv_obj_set_style_local_opa_scale(obj, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, val) return update ? lv_obj_set_style_local_opa_scale(obj, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, val)
: hasp_out_int(obj, attr, lv_obj_get_style_opa_scale(obj, LV_OBJ_PART_MAIN)); : hasp_out_int(obj, attr, lv_obj_get_style_opa_scale(obj, LV_OBJ_PART_MAIN));
}
} else if(!strcmp_P(attr, PSTR("enabled"))) { if(!strcmp_P(attr, PSTR("enabled"))) {
return update ? lv_obj_set_click(obj, is_true(payload)) : hasp_out_int(obj, attr, lv_obj_get_click(obj)); return update ? lv_obj_set_click(obj, is_true(payload)) : hasp_out_int(obj, attr, lv_obj_get_click(obj));
}
} else if(!strcmp_P(attr, PSTR("options"))) { if(!strcmp_P(attr, PSTR("options"))) {
/* Attributes depending on objecttype */ /* Attributes depending on objecttype */
lv_obj_type_t list; lv_obj_type_t list;
lv_obj_get_type(obj, &list); lv_obj_get_type(obj, &list);
@ -802,15 +805,5 @@ static inline void hasp_out_str(lv_obj_t * obj, const char * attr, const char *
static inline void hasp_out_color(lv_obj_t * obj, const char * attr, lv_color_t color) static inline void hasp_out_color(lv_obj_t * obj, const char * attr, lv_color_t color)
{ {
lv_color32_t c32; hasp_send_obj_attribute_color(obj, attr, color);
c32.full = lv_color_to32(color);
DynamicJsonDocument doc(128);
doc[F("r")] = c32.ch.red;
doc[F("g")] = c32.ch.green;
doc[F("b")] = c32.ch.blue;
char buffer[128];
serializeJson(doc, buffer, sizeof(buffer));
hasp_send_obj_attribute_str(obj, attr, buffer);
} }