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 branch '0.4.0-dev' into feature-pagenav

Browse Source
This commit is contained in:
fvanroie 2021-03-19 00:18:44 +01:00
parent 1b17282ce3
commit bdbff875dc
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hasp/hasp.cpp
View File

@ -92,13 +92,8 @@ lv_style_t style_mbox_bg; /*Black bg. style with opacity*/
lv_obj_t* kb; lv_obj_t* kb;
// lv_font_t * defaultFont; // lv_font_t * defaultFont;
<<<<<<< HEAD
static lv_font_t* haspFonts[4] = {nullptr, LV_THEME_DEFAULT_FONT_NORMAL, LV_THEME_DEFAULT_FONT_SUBTITLE,
LV_THEME_DEFAULT_FONT_TITLE};
== == == = lv_obj_t * pages[HASP_NUM_PAGES];
static lv_font_t* haspFonts[4] = {nullptr, nullptr, nullptr, nullptr}; static lv_font_t* haspFonts[4] = {nullptr, nullptr, nullptr, nullptr};
uint8_t current_page = 1; uint8_t current_page = 1;
>>>>>>> 0.4.0-dev
/** /**
* Get Font ID * Get Font ID
@ -529,7 +524,7 @@ void haspGetVersion(char* version, size_t len)
void haspClearPage(uint16_t pageid) void haspClearPage(uint16_t pageid)
{ {
lv_obj_t* page = get_page_obj(pageid); lv_obj_t* page = haspPages.get_obj(pageid);
if(!page || (pageid > HASP_NUM_PAGES)) { if(!page || (pageid > HASP_NUM_PAGES)) {
LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid); LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid);
} else if(page == lv_layer_sys() /*|| page == lv_layer_top()*/) { } else if(page == lv_layer_sys() /*|| page == lv_layer_top()*/) {
@ -547,7 +542,7 @@ uint8_t haspGetPage()
void haspSetPage(uint8_t pageid) void haspSetPage(uint8_t pageid)
{ {
lv_obj_t* page = get_page_obj(pageid); lv_obj_t* page = haspPages.get_obj(pageid);
if(!page || pageid == 0 || pageid > HASP_NUM_PAGES) { if(!page || pageid == 0 || pageid > HASP_NUM_PAGES) {
LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid); LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid);
} else { } else {

7
src/hasp/hasp_object.cpp
View File

@ -364,7 +364,6 @@ void generic_event_handler(lv_obj_t* obj, lv_event_t event)
return; return;
} }
<<<<<<< HEAD
hasp_update_sleep_state(); // wakeup? hasp_update_sleep_state(); // wakeup?
/* If an actionid is attached, perform that action on UP event only */ /* If an actionid is attached, perform that action on UP event only */
@ -377,12 +376,8 @@ void generic_event_handler(lv_obj_t* obj, lv_event_t event)
} else { } else {
dispatch_object_generic_event(obj, eventid); // send object event dispatch_object_generic_event(obj, eventid); // send object event
} }
dispatch_normalized_group_value(obj->user_data.groupid, NORMALIZE(dispatch_get_event_state(eventid), 0, 1), obj);
== == == = hasp_update_sleep_state(); // wakeup?
dispatch_object_generic_event(obj, eventid); // send object event
dispatch_normalized_group_value(obj->user_data.groupid, obj, dispatch_get_event_state(eventid), HASP_EVENT_OFF, dispatch_normalized_group_value(obj->user_data.groupid, obj, dispatch_get_event_state(eventid), HASP_EVENT_OFF,
HASP_EVENT_ON); HASP_EVENT_ON);
>>>>>>> 0.4.0-dev
} }
/** /**
@ -602,7 +597,7 @@ void object_set_normalized_group_value(uint8_t groupid, lv_obj_t* src_obj, int16
if(min == max) return; if(min == max) return;
for(uint8_t page = 0; page < HASP_NUM_PAGES; page++) { for(uint8_t page = 0; page < HASP_NUM_PAGES; page++) {
object_set_group_value(get_page_obj(page), groupid, val); object_set_group_value(haspPages.get_obj(page), groupid, val);
// uint8_t startid = 1; // uint8_t startid = 1;
// for(uint8_t objid = startid; objid < 20; objid++) { // for(uint8_t objid = startid; objid < 20; objid++) {
// lv_obj_t* obj = hasp_find_obj_from_parent_id(get_page_obj(page), objid); // lv_obj_t* obj = hasp_find_obj_from_parent_id(get_page_obj(page), objid);