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

Assert object creations

Browse Source
This commit is contained in:
fvanroie 2020-11-29 02:16:17 +01:00
parent 8ddcdc7db3
commit 689c193f82
1 changed files with 72 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/hasp_object.cpp
View File

@ -491,57 +491,60 @@ void hasp_new_object(const JsonObject & config, uint8_t & saved_page_id)
/* ----- Basic Objects ------ */ /* ----- Basic Objects ------ */
case LV_HASP_BTNMATRIX: case LV_HASP_BTNMATRIX:
obj = lv_btnmatrix_create(parent_obj, NULL); obj = lv_btnmatrix_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, btnmap_event_handler); if(obj) lv_obj_set_event_cb(obj, btnmap_event_handler);
break; break;
case LV_HASP_TABLE: case LV_HASP_TABLE:
obj = lv_table_create(parent_obj, NULL); obj = lv_table_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, table_event_handler); if(obj) lv_obj_set_event_cb(obj, table_event_handler);
break; break;
case LV_HASP_BUTTON: case LV_HASP_BUTTON:
obj = lv_btn_create(parent_obj, NULL); obj = lv_btn_create(parent_obj, NULL);
lv_label_create(obj, NULL); if(obj) {
lv_obj_set_event_cb(obj, btn_event_handler); lv_obj_t * lbl = lv_label_create(obj, NULL);
if(lbl) lv_label_set_text(lbl, "");
lv_obj_set_event_cb(obj, btn_event_handler);
}
break; break;
case LV_HASP_CHECKBOX: case LV_HASP_CHECKBOX:
obj = lv_checkbox_create(parent_obj, NULL); obj = lv_checkbox_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, checkbox_event_handler); if(obj) lv_obj_set_event_cb(obj, checkbox_event_handler);
break; break;
case LV_HASP_LABEL: { case LV_HASP_LABEL: {
obj = lv_label_create(parent_obj, NULL); obj = lv_label_create(parent_obj, NULL);
/* click area padding */ /* click area padding */
uint8_t padh = config[F("padh")].as<uint8_t>(); // uint8_t padh = config[F("padh")].as<uint8_t>();
uint8_t padv = config[F("padv")].as<uint8_t>(); // uint8_t padv = config[F("padv")].as<uint8_t>();
/* text align */ /* text align */
if(padh > 0 || padv > 0) { // if(padh > 0 || padv > 0) {
lv_obj_set_ext_click_area(obj, padh, padh, padv, padv); // lv_obj_set_ext_click_area(obj, padh, padh, padv, padv);
} // }
if(!config[F("align")].isNull()) { // if(!config[F("align")].isNull()) {
lv_label_set_align(obj, LV_LABEL_ALIGN_CENTER); // lv_label_set_align(obj, LV_LABEL_ALIGN_CENTER);
} // }
lv_obj_set_event_cb(obj, btn_event_handler); if(obj) lv_obj_set_event_cb(obj, btn_event_handler);
break; break;
} }
case LV_HASP_IMAGE: { case LV_HASP_IMAGE: {
obj = lv_img_create(parent_obj, NULL); obj = lv_img_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, btn_event_handler); if(obj) lv_obj_set_event_cb(obj, btn_event_handler);
break; break;
} }
case LV_HASP_ARC: { case LV_HASP_ARC: {
obj = lv_arc_create(parent_obj, NULL); obj = lv_arc_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, btn_event_handler); if(obj) lv_obj_set_event_cb(obj, btn_event_handler);
break; break;
} }
case LV_HASP_CONTAINER: { case LV_HASP_CONTAINER: {
obj = lv_cont_create(parent_obj, NULL); obj = lv_cont_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, btn_event_handler); if(obj) lv_obj_set_event_cb(obj, btn_event_handler);
break; break;
} }
case LV_HASP_OBJECT: { case LV_HASP_OBJECT: {
obj = lv_obj_create(parent_obj, NULL); obj = lv_obj_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, btn_event_handler); if(obj) lv_obj_set_event_cb(obj, btn_event_handler);
break; break;
} }
case LV_HASP_PAGE: { case LV_HASP_PAGE: {
@ -559,13 +562,15 @@ void hasp_new_object(const JsonObject & config, uint8_t & saved_page_id)
case LV_HASP_TABVIEW: { case LV_HASP_TABVIEW: {
obj = lv_tabview_create(parent_obj, NULL); obj = lv_tabview_create(parent_obj, NULL);
// No event handler for tabs // No event handler for tabs
lv_obj_t * tab; if(obj) {
tab = lv_tabview_add_tab(obj, "tab 1"); lv_obj_t * tab;
lv_obj_set_user_data(tab, id + 1); tab = lv_tabview_add_tab(obj, "tab 1");
tab = lv_tabview_add_tab(obj, "tab 2"); lv_obj_set_user_data(tab, id + 1);
lv_obj_set_user_data(tab, id + 2); tab = lv_tabview_add_tab(obj, "tab 2");
tab = lv_tabview_add_tab(obj, "tab 3"); lv_obj_set_user_data(tab, id + 2);
lv_obj_set_user_data(tab, id + 3); tab = lv_tabview_add_tab(obj, "tab 3");
lv_obj_set_user_data(tab, id + 3);
}
break; break;
} }
case LV_HASP_TILEVIEW: { case LV_HASP_TILEVIEW: {
@ -576,7 +581,7 @@ void hasp_new_object(const JsonObject & config, uint8_t & saved_page_id)
/* ----- Color Objects ------ */ /* ----- Color Objects ------ */
case LV_HASP_CPICKER: { case LV_HASP_CPICKER: {
obj = lv_cpicker_create(parent_obj, NULL); obj = lv_cpicker_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, cpicker_event_handler); if(obj) lv_obj_set_event_cb(obj, cpicker_event_handler);
break; break;
} }
@ -589,73 +594,87 @@ void hasp_new_object(const JsonObject & config, uint8_t & saved_page_id)
/* ----- Range Objects ------ */ /* ----- Range Objects ------ */
case LV_HASP_SLIDER: { case LV_HASP_SLIDER: {
obj = lv_slider_create(parent_obj, NULL); obj = lv_slider_create(parent_obj, NULL);
lv_slider_set_range(obj, 0, 100); if(obj) {
lv_obj_set_event_cb(obj, slider_event_handler); lv_slider_set_range(obj, 0, 100);
lv_obj_set_event_cb(obj, slider_event_handler);
}
// bool knobin = config[F("knobin")].as<bool>() | true; // bool knobin = config[F("knobin")].as<bool>() | true;
// lv_slider_set_knob_in(obj, knobin); // lv_slider_set_knob_in(obj, knobin);
break; break;
} }
case LV_HASP_GAUGE: { case LV_HASP_GAUGE: {
obj = lv_gauge_create(parent_obj, NULL); obj = lv_gauge_create(parent_obj, NULL);
lv_gauge_set_range(obj, 0, 100); if(obj) {
lv_obj_set_event_cb(obj, btn_event_handler); lv_gauge_set_range(obj, 0, 100);
lv_obj_set_event_cb(obj, btn_event_handler);
}
break; break;
} }
case LV_HASP_BAR: { case LV_HASP_BAR: {
obj = lv_bar_create(parent_obj, NULL); obj = lv_bar_create(parent_obj, NULL);
lv_bar_set_range(obj, 0, 100); if(obj) {
lv_obj_set_event_cb(obj, btn_event_handler); lv_bar_set_range(obj, 0, 100);
lv_obj_set_event_cb(obj, btn_event_handler);
}
break; break;
} }
case LV_HASP_LMETER: { case LV_HASP_LMETER: {
obj = lv_linemeter_create(parent_obj, NULL); obj = lv_linemeter_create(parent_obj, NULL);
lv_linemeter_set_range(obj, 0, 100); if(obj) {
lv_obj_set_event_cb(obj, btn_event_handler); lv_linemeter_set_range(obj, 0, 100);
lv_obj_set_event_cb(obj, btn_event_handler);
}
break; break;
} }
case LV_HASP_CHART: { case LV_HASP_CHART: {
obj = lv_chart_create(parent_obj, NULL); obj = lv_chart_create(parent_obj, NULL);
lv_chart_set_range(obj, 0, 100); if(obj) {
lv_obj_set_event_cb(obj, btn_event_handler); lv_chart_set_range(obj, 0, 100);
lv_obj_set_event_cb(obj, btn_event_handler);
lv_chart_add_series(obj, LV_COLOR_RED); lv_chart_add_series(obj, LV_COLOR_RED);
lv_chart_add_series(obj, LV_COLOR_GREEN); lv_chart_add_series(obj, LV_COLOR_GREEN);
lv_chart_add_series(obj, LV_COLOR_BLUE); lv_chart_add_series(obj, LV_COLOR_BLUE);
lv_chart_series_t * ser = lv_chart_get_series(obj, 2);
lv_chart_set_next(obj, ser, 10);
lv_chart_set_next(obj, ser, 20);
lv_chart_set_next(obj, ser, 30);
lv_chart_set_next(obj, ser, 40);
lv_chart_series_t * ser = lv_chart_get_series(obj, 2);
lv_chart_set_next(obj, ser, 10);
lv_chart_set_next(obj, ser, 20);
lv_chart_set_next(obj, ser, 30);
lv_chart_set_next(obj, ser, 40);
}
break; break;
} }
/* ----- On/Off Objects ------ */ /* ----- On/Off Objects ------ */
case LV_HASP_SWITCH: { case LV_HASP_SWITCH: {
obj = lv_switch_create(parent_obj, NULL); obj = lv_switch_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, switch_event_handler); if(obj) lv_obj_set_event_cb(obj, switch_event_handler);
break; break;
} }
case LV_HASP_LED: { case LV_HASP_LED: {
obj = lv_led_create(parent_obj, NULL); obj = lv_led_create(parent_obj, NULL);
lv_obj_set_event_cb(obj, btn_event_handler); if(obj) lv_obj_set_event_cb(obj, btn_event_handler);
break; break;
} }
/* ----- List Object ------- */ /* ----- List Object ------- */
case LV_HASP_DDLIST: { case LV_HASP_DDLIST: {
obj = lv_dropdown_create(parent_obj, NULL); obj = lv_dropdown_create(parent_obj, NULL);
lv_dropdown_set_draw_arrow(obj, true); if(obj) {
// lv_dropdown_set_anim_time(obj, 200); lv_dropdown_set_draw_arrow(obj, true);
lv_obj_set_top(obj, true); // lv_dropdown_set_anim_time(obj, 200);
// lv_obj_align(obj, NULL, LV_ALIGN_IN_TOP_MID, 0, 20); lv_obj_set_top(obj, true);
lv_obj_set_event_cb(obj, ddlist_event_handler); // lv_obj_align(obj, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
lv_obj_set_event_cb(obj, ddlist_event_handler);
}
break; break;
} }
case LV_HASP_ROLLER: { case LV_HASP_ROLLER: {
obj = lv_roller_create(parent_obj, NULL); obj = lv_roller_create(parent_obj, NULL);
// lv_obj_align(obj, NULL, LV_ALIGN_IN_TOP_MID, 0, 20); // lv_obj_align(obj, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
lv_obj_set_event_cb(obj, roller_event_handler); if(obj) {
lv_roller_set_auto_fit(obj, false);
lv_obj_set_event_cb(obj, roller_event_handler);
}
break; break;
} }