From bdbff875dc43c4c69b37038d629eabdfb5ea4da4 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Fri, 19 Mar 2021 00:18:44 +0100
Subject: [PATCH] Merge branch '0.4.0-dev' into feature-pagenav

---
 src/hasp/hasp.cpp        | 9 ++-------
 src/hasp/hasp_object.cpp | 7 +------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/hasp/hasp.cpp b/src/hasp/hasp.cpp
index 1d2f0bff..a07c62de 100644
--- a/src/hasp/hasp.cpp
+++ b/src/hasp/hasp.cpp
@@ -92,13 +92,8 @@ lv_style_t style_mbox_bg; /*Black bg. style with opacity*/
 lv_obj_t* kb;
 // 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};
 uint8_t current_page           = 1;
->>>>>>> 0.4.0-dev
 
 /**
  * Get Font ID
@@ -529,7 +524,7 @@ void haspGetVersion(char* version, size_t len)
 
 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)) {
         LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid);
     } else if(page == lv_layer_sys() /*|| page == lv_layer_top()*/) {
@@ -547,7 +542,7 @@ uint8_t haspGetPage()
 
 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) {
         LOG_WARNING(TAG_HASP, F(D_HASP_INVALID_PAGE), pageid);
     } else {
diff --git a/src/hasp/hasp_object.cpp b/src/hasp/hasp_object.cpp
index 41b3a7fe..743468fc 100644
--- a/src/hasp/hasp_object.cpp
+++ b/src/hasp/hasp_object.cpp
@@ -364,7 +364,6 @@ void generic_event_handler(lv_obj_t* obj, lv_event_t event)
             return;
     }
 
-<<<<<<< HEAD
     hasp_update_sleep_state(); // wakeup?
 
     /* 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 {
         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,
                                     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;
 
     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;
         // for(uint8_t objid = startid; objid < 20; objid++) {
         //     lv_obj_t* obj = hasp_find_obj_from_parent_id(get_page_obj(page), objid);