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

Code cleanup

Browse Source
This commit is contained in:
fvanroie 2022-10-25 19:37:28 +02:00
parent dae78c1996
commit 97308367bf
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/hasp/hasp_page.cpp
View File

@ -90,36 +90,34 @@ void Page::clear(uint8_t pageid)
} }
} }
// void Page::set(uint8_t pageid)
// {
// set(pageid, LV_SCR_LOAD_ANIM_NONE);
// }
void Page::set(uint8_t pageid, lv_scr_load_anim_t anim_type, uint32_t time, uint32_t delay) void Page::set(uint8_t pageid, lv_scr_load_anim_t anim_type, uint32_t time, uint32_t delay)
{ {
lv_obj_t* page = get_obj(pageid); if(!is_valid(pageid)) return; // produces a log warning if not between 1 and 12
if(!is_valid(pageid)) {
return; lv_obj_t* page = get_obj(pageid);
} else if(!page) { if(!page) {
LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid); // Invalid page object
} else { LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid);
_current_page = pageid;
if(page == lv_scr_act()) { } else if(page == lv_scr_act()) {
dispatch_current_page(); // No change needed, just send current page again
return; _current_page = pageid;
} dispatch_current_page();
} else if((anim_type != LV_SCR_LOAD_ANIM_NONE && time > 0) || delay > 0) {
// Change page after a delay or animation, don't publish it yet
my_scr_load_anim(page, anim_type, time, delay, false); // dispatches when animation ends
if((anim_type != LV_SCR_LOAD_ANIM_NONE && time > 0) || delay > 0) {
my_scr_load_anim(page, anim_type, time, delay, false);
} else { } else {
// No delay or animation set, update now
LOG_TRACE(TAG_HASP, F(D_HASP_CHANGE_PAGE), pageid); LOG_TRACE(TAG_HASP, F(D_HASP_CHANGE_PAGE), pageid);
lv_scr_load_anim(page, anim_type, time, delay, false); lv_scr_load_anim(page, anim_type, time, delay, false);
_current_page = pageid;
dispatch_current_page(); dispatch_current_page();
#if defined(HASP_DEBUG_OBJ_TREE) #if defined(HASP_DEBUG_OBJ_TREE)
hasp_object_tree(page, pageid, 0); hasp_object_tree(page, pageid, 0);
#endif #endif
} }
}
} }
uint8_t Page::get_next(uint8_t pageid) uint8_t Page::get_next(uint8_t pageid)
@ -164,26 +162,26 @@ void Page::set_name(uint8_t pageid, const char* name)
return; return;
} }
LOG_VERBOSE(TAG_HASP, F("%s - %d"), __FILE__, __LINE__); LOG_DEBUG(TAG_HASP, F("%s - %d"), __FILE__, __LINE__);
if(_pagenames[pageid]) { if(_pagenames[pageid]) {
hasp_free(_pagenames[pageid]); hasp_free(_pagenames[pageid]);
_pagenames[pageid] = NULL; _pagenames[pageid] = NULL;
} }
LOG_VERBOSE(TAG_HASP, F("%s - %d"), __FILE__, __LINE__); LOG_DEBUG(TAG_HASP, F("%s - %d"), __FILE__, __LINE__);
if(!name) return; if(!name) return;
size_t size = strlen(name) + 1; size_t size = strlen(name) + 1;
LOG_VERBOSE(TAG_HASP, F("%s - %d"), __FILE__, __LINE__); LOG_DEBUG(TAG_HASP, F("%s - %d"), __FILE__, __LINE__);
if(size > 1) { if(size > 1) {
_pagenames[pageid] = (char*)hasp_calloc(sizeof(char), size); _pagenames[pageid] = (char*)hasp_calloc(sizeof(char), size);
LOG_VERBOSE(TAG_HASP, F("%s - %d"), __FILE__, __LINE__); LOG_DEBUG(TAG_HASP, F("%s - %d"), __FILE__, __LINE__);
if(_pagenames[pageid] == NULL) return; if(_pagenames[pageid] == NULL) return;
strncpy(_pagenames[pageid], name, size); strncpy(_pagenames[pageid], name, size);
LOG_VERBOSE(TAG_HASP, F("%s"), _pagenames[pageid]); LOG_VERBOSE(TAG_HASP, F("%s"), _pagenames[pageid]);
} }
LOG_VERBOSE(TAG_HASP, F("%s - %d"), __FILE__, __LINE__); LOG_DEBUG(TAG_HASP, F("%s - %d"), __FILE__, __LINE__);
} }
void Page::next(lv_scr_load_anim_t anim_type, uint32_t time, uint32_t delay) void Page::next(lv_scr_load_anim_t anim_type, uint32_t time, uint32_t delay)