debug: add assterts to lv_obj and update signal functions

2019-09-26 10:51:54 +02:00
parent e9b6fcd58d
commit ede392b7c9
36 changed files with 326 additions and 245 deletions
--- a/src/lv_core/lv_obj.c
+++ b/src/lv_core/lv_obj.c
@@ -30,6 +30,7 @@
 /*********************
 *      DEFINES
 *********************/
+#define LV_OBJX_NAME "lv_obj"
 #define LV_OBJ_DEF_WIDTH (LV_DPI)
 #define LV_OBJ_DEF_HEIGHT (2 * LV_DPI / 3)

@@ -182,8 +183,8 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
            new_obj->style_p = &lv_style_scr;
        }
        /*Set the callbacks*/
-        lv_obj_set_signal_cb(new_obj, lv_obj_signal);
-        lv_obj_set_design_cb(new_obj, lv_obj_design);
+        new_obj->signal_cb = lv_obj_signal;
+        new_obj->design_cb =  lv_obj_design;
        new_obj->event_cb = NULL;

        /*Init. user date*/
@@ -214,6 +215,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
    /*parent != NULL create normal obj. on a parent*/
    else {
        LV_LOG_TRACE("Object create started");
+        LV_ASSERT_OBJ(parent, LV_OBJX_NAME);

        new_obj = lv_ll_ins_head(&parent->child_ll);
        LV_ASSERT_MEM(new_obj);
@@ -255,8 +257,8 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
        }

        /*Set the callbacks*/
-        lv_obj_set_signal_cb(new_obj, lv_obj_signal);
-        lv_obj_set_design_cb(new_obj, lv_obj_design);
+        new_obj->signal_cb = lv_obj_signal;
+        new_obj->design_cb = lv_obj_design;
        new_obj->event_cb = NULL;

 #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
@@ -295,6 +297,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)

    /*Copy the attributes if required*/
    if(copy != NULL) {
+        LV_ASSERT_OBJ(copy, LV_OBJX_NAME);
        lv_area_copy(&new_obj->coords, &copy->coords);
        new_obj->ext_draw_pad = copy->ext_draw_pad;

@@ -375,6 +378,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
 */
 lv_res_t lv_obj_del(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
    lv_obj_invalidate(obj);

    /*Delete from the group*/
@@ -408,15 +412,6 @@ lv_res_t lv_obj_del(lv_obj_t * obj)

    lv_event_mark_deleted(obj);

-    /*Remove the object from parent's children list*/
-    lv_obj_t * par = lv_obj_get_parent(obj);
-    if(par == NULL) { /*It is a screen*/
-        lv_disp_t * d = lv_obj_get_disp(obj);
-        lv_ll_rem(&d->scr_ll, obj);
-    } else {
-        lv_ll_rem(&(par->child_ll), obj);
-    }
-
    /* Reset all input devices if the object to delete is used*/
    lv_indev_t * indev = lv_indev_get_next(NULL);
    while(indev) {
@@ -439,6 +434,15 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
     * Now clean up the object specific data*/
    obj->signal_cb(obj, LV_SIGNAL_CLEANUP, NULL);

+    /*Remove the object from parent's children list*/
+    lv_obj_t * par = lv_obj_get_parent(obj);
+    if(par == NULL) { /*It is a screen*/
+        lv_disp_t * d = lv_obj_get_disp(obj);
+        lv_ll_rem(&d->scr_ll, obj);
+    } else {
+        lv_ll_rem(&(par->child_ll), obj);
+    }
+
    /*Delete the base objects*/
    if(obj->ext_attr != NULL) lv_mem_free(obj->ext_attr);
    lv_mem_free(obj); /*Free the object itself*/
@@ -459,6 +463,7 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
 */
 void lv_obj_del_async(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
    lv_async_call(lv_obj_del_async_cb, obj);
 }

@@ -468,6 +473,7 @@ void lv_obj_del_async(lv_obj_t * obj)
 */
 void lv_obj_clean(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
    lv_obj_t * child = lv_obj_get_child(obj, NULL);
    lv_obj_t * child_next;
    while(child) {
@@ -485,6 +491,8 @@ void lv_obj_clean(lv_obj_t * obj)
 */
 void lv_obj_invalidate(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    if(lv_obj_get_hidden(obj)) return;

    /*Invalidate the object only if it belongs to the 'LV_GC_ROOT(_lv_act_scr)'*/
@@ -532,6 +540,9 @@ void lv_obj_invalidate(const lv_obj_t * obj)
 */
 void lv_obj_set_parent(lv_obj_t * obj, lv_obj_t * parent)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+    LV_ASSERT_OBJ(parent, LV_OBJX_NAME);
+
    if(obj->par == NULL) {
        LV_LOG_WARN("Can't set the parent of a screen");
        return;
@@ -569,6 +580,8 @@ void lv_obj_set_parent(lv_obj_t * obj, lv_obj_t * parent)
 */
 void lv_obj_move_foreground(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_t * parent = lv_obj_get_parent(obj);

    /*Do nothing of already in the foreground*/
@@ -590,6 +603,8 @@ void lv_obj_move_foreground(lv_obj_t * obj)
 */
 void lv_obj_move_background(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_t * parent = lv_obj_get_parent(obj);

    /*Do nothing of already in the background*/
@@ -617,6 +632,8 @@ void lv_obj_move_background(lv_obj_t * obj)
 */
 void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    /*Convert x and y to absolute coordinates*/
    lv_obj_t * par = obj->par;

@@ -664,6 +681,8 @@ void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
 */
 void lv_obj_set_x(lv_obj_t * obj, lv_coord_t x)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_set_pos(obj, x, lv_obj_get_y(obj));
 }

@@ -674,6 +693,8 @@ void lv_obj_set_x(lv_obj_t * obj, lv_coord_t x)
 */
 void lv_obj_set_y(lv_obj_t * obj, lv_coord_t y)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_set_pos(obj, lv_obj_get_x(obj), y);
 }

@@ -685,6 +706,8 @@ void lv_obj_set_y(lv_obj_t * obj, lv_coord_t y)
 */
 void lv_obj_set_size(lv_obj_t * obj, lv_coord_t w, lv_coord_t h)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+

    /* Do nothing if the size is not changed */
    /* It is very important else recursive resizing can
@@ -734,6 +757,8 @@ void lv_obj_set_size(lv_obj_t * obj, lv_coord_t w, lv_coord_t h)
 */
 void lv_obj_set_width(lv_obj_t * obj, lv_coord_t w)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_set_size(obj, w, lv_obj_get_height(obj));
 }

@@ -744,6 +769,8 @@ void lv_obj_set_width(lv_obj_t * obj, lv_coord_t w)
 */
 void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_set_size(obj, lv_obj_get_width(obj), h);
 }

@@ -757,6 +784,8 @@ void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h)
 */
 void lv_obj_align(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_mod, lv_coord_t y_mod)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_coord_t new_x = lv_obj_get_x(obj);
    lv_coord_t new_y = lv_obj_get_y(obj);

@@ -764,6 +793,9 @@ void lv_obj_align(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_co
        base = lv_obj_get_parent(obj);
    }

+    LV_ASSERT_OBJ(base, LV_OBJX_NAME);
+
+
    switch(align) {
        case LV_ALIGN_CENTER:
            new_x = lv_obj_get_width(base) / 2 - lv_obj_get_width(obj) / 2;
@@ -902,6 +934,8 @@ void lv_obj_align(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_co
 */
 void lv_obj_align_origo(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_mod, lv_coord_t y_mod)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_coord_t new_x = lv_obj_get_x(obj);
    lv_coord_t new_y = lv_obj_get_y(obj);

@@ -912,6 +946,9 @@ void lv_obj_align_origo(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align,
        base = lv_obj_get_parent(obj);
    }

+    LV_ASSERT_OBJ(base, LV_OBJX_NAME);
+
+
    switch(align) {
        case LV_ALIGN_CENTER:
            new_x = lv_obj_get_width(base) / 2 - obj_w_half;
@@ -1046,6 +1083,8 @@ void lv_obj_align_origo(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align,
 */
 void lv_obj_realign(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_OBJ_REALIGN
    if(obj->realign.origo_align)
        lv_obj_align_origo(obj, obj->realign.base, obj->realign.align, obj->realign.xofs, obj->realign.yofs);
@@ -1065,6 +1104,8 @@ void lv_obj_realign(lv_obj_t * obj)
 */
 void lv_obj_set_auto_realign(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_OBJ_REALIGN
    obj->realign.auto_realign = en ? 1 : 0;
 #else
@@ -1083,6 +1124,8 @@ void lv_obj_set_auto_realign(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_ext_click_area(lv_obj_t * obj, uint8_t w, uint8_t h)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->ext_click_pad_hor = w;
    obj->ext_click_pad_ver = h;
 }
@@ -1100,6 +1143,8 @@ void lv_obj_set_ext_click_area(lv_obj_t * obj, uint8_t w, uint8_t h)
 */
 void lv_obj_set_ext_click_area(lv_obj_t * obj, lv_coord_t left, lv_coord_t right, lv_coord_t top, lv_coord_t bottom)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
    obj->ext_click_pad.x1 = left;
    obj->ext_click_pad.x2 = right;
@@ -1128,6 +1173,9 @@ void lv_obj_set_ext_click_area(lv_obj_t * obj, lv_coord_t left, lv_coord_t right
 */
 void lv_obj_set_style(lv_obj_t * obj, const lv_style_t * style)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+    LV_ASSERT_STYLE(style);
+
    obj->style_p = style;

    /*Send a signal about style change to every children with NULL style*/
@@ -1143,6 +1191,8 @@ void lv_obj_set_style(lv_obj_t * obj, const lv_style_t * style)
 */
 void lv_obj_refresh_style(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_invalidate(obj);
    obj->signal_cb(obj, LV_SIGNAL_STYLE_CHG, NULL);
    lv_obj_invalidate(obj);
@@ -1155,6 +1205,8 @@ void lv_obj_refresh_style(lv_obj_t * obj)
 */
 void lv_obj_report_style_mod(lv_style_t * style)
 {
+    LV_ASSERT_STYLE(style);
+
    lv_disp_t * d = lv_disp_get_next(NULL);

    while(d) {
@@ -1182,6 +1234,8 @@ void lv_obj_report_style_mod(lv_style_t * style)
 */
 void lv_obj_set_hidden(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    if(!obj->hidden) lv_obj_invalidate(obj); /*Invalidate when not hidden (hidden objects are ignored) */

    obj->hidden = en == false ? 0 : 1;
@@ -1199,6 +1253,8 @@ void lv_obj_set_hidden(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_click(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->click = (en == true ? 1 : 0);
 }

@@ -1210,6 +1266,8 @@ void lv_obj_set_click(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_top(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->top = (en == true ? 1 : 0);
 }

@@ -1220,6 +1278,8 @@ void lv_obj_set_top(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_drag(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    if(en == true) lv_obj_set_click(obj, true); /*Drag is useless without enabled clicking*/
    obj->drag = (en == true ? 1 : 0);
 }
@@ -1231,6 +1291,8 @@ void lv_obj_set_drag(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_drag_dir(lv_obj_t * obj, lv_drag_dir_t drag_dir)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->drag_dir = drag_dir;

    if(obj->drag_dir != 0) lv_obj_set_drag(obj, true); /*Drag direction requires drag*/
@@ -1243,6 +1305,8 @@ void lv_obj_set_drag_dir(lv_obj_t * obj, lv_drag_dir_t drag_dir)
 */
 void lv_obj_set_drag_throw(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->drag_throw = (en == true ? 1 : 0);
 }

@@ -1254,6 +1318,8 @@ void lv_obj_set_drag_throw(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_drag_parent(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->drag_parent = (en == true ? 1 : 0);
 }

@@ -1264,6 +1330,8 @@ void lv_obj_set_drag_parent(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_parent_event(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->parent_event = (en == true ? 1 : 0);
 }

@@ -1274,6 +1342,8 @@ void lv_obj_set_parent_event(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_opa_scale_enable(lv_obj_t * obj, bool en)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->opa_scale_en = en ? 1 : 0;
 }

@@ -1287,6 +1357,8 @@ void lv_obj_set_opa_scale_enable(lv_obj_t * obj, bool en)
 */
 void lv_obj_set_opa_scale(lv_obj_t * obj, lv_opa_t opa_scale)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->opa_scale = opa_scale;
    lv_obj_invalidate(obj);
 }
@@ -1298,6 +1370,8 @@ void lv_obj_set_opa_scale(lv_obj_t * obj, lv_opa_t opa_scale)
 */
 void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->protect |= prot;
 }

@@ -1308,6 +1382,8 @@ void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot)
 */
 void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    prot = (~prot) & 0xFF;
    obj->protect &= prot;
 }
@@ -1320,6 +1396,8 @@ void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot)
 */
 void lv_obj_set_event_cb(lv_obj_t * obj, lv_event_cb_t event_cb)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->event_cb = event_cb;
 }

@@ -1334,6 +1412,8 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data)
 {
    if(obj == NULL) return LV_RES_OK;

+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_res_t res;
    res = lv_event_send_func(obj->event_cb, obj, event, data);
    return res;
@@ -1351,6 +1431,8 @@ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data)
 */
 lv_res_t lv_event_send_func(lv_event_cb_t event_xcb, lv_obj_t * obj, lv_event_t event, const void * data)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    /* Build a simple linked list from the objects used in the events
     * It's important to know if an this object was deleted by a nested event
     * called from this `even_cb`. */
@@ -1415,6 +1497,8 @@ const void * lv_event_get_data(void)
 */
 void lv_obj_set_signal_cb(lv_obj_t * obj, lv_signal_cb_t signal_cb)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->signal_cb = signal_cb;
 }

@@ -1425,6 +1509,8 @@ void lv_obj_set_signal_cb(lv_obj_t * obj, lv_signal_cb_t signal_cb)
 */
 void lv_signal_send(lv_obj_t * obj, lv_signal_t signal, void * param)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    if(obj->signal_cb) obj->signal_cb(obj, signal, param);
 }

@@ -1435,6 +1521,8 @@ void lv_signal_send(lv_obj_t * obj, lv_signal_t signal, void * param)
 */
 void lv_obj_set_design_cb(lv_obj_t * obj, lv_design_cb_t design_cb)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->design_cb = design_cb;
 }

@@ -1450,6 +1538,8 @@ void lv_obj_set_design_cb(lv_obj_t * obj, lv_design_cb_t design_cb)
 */
 void * lv_obj_allocate_ext_attr(lv_obj_t * obj, uint16_t ext_size)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->ext_attr = lv_mem_realloc(obj->ext_attr, ext_size);

    return (void *)obj->ext_attr;
@@ -1461,6 +1551,8 @@ void * lv_obj_allocate_ext_attr(lv_obj_t * obj, uint16_t ext_size)
 */
 void lv_obj_refresh_ext_draw_pad(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    obj->ext_draw_pad = 0;
    obj->signal_cb(obj, LV_SIGNAL_REFR_EXT_DRAW_PAD, NULL);

@@ -1478,6 +1570,8 @@ void lv_obj_refresh_ext_draw_pad(lv_obj_t * obj)
 */
 lv_obj_t * lv_obj_get_screen(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_obj_t * par = obj;
    const lv_obj_t * act_p;

@@ -1496,6 +1590,8 @@ lv_obj_t * lv_obj_get_screen(const lv_obj_t * obj)
 */
 lv_disp_t * lv_obj_get_disp(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_obj_t * scr;

    if(obj->par == NULL)
@@ -1528,6 +1624,8 @@ lv_disp_t * lv_obj_get_disp(const lv_obj_t * obj)
 */
 lv_obj_t * lv_obj_get_parent(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->par;
 }

@@ -1540,6 +1638,8 @@ lv_obj_t * lv_obj_get_parent(const lv_obj_t * obj)
 */
 lv_obj_t * lv_obj_get_child(const lv_obj_t * obj, const lv_obj_t * child)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_t * result = NULL;

    if(child == NULL) {
@@ -1560,6 +1660,8 @@ lv_obj_t * lv_obj_get_child(const lv_obj_t * obj, const lv_obj_t * child)
 */
 lv_obj_t * lv_obj_get_child_back(const lv_obj_t * obj, const lv_obj_t * child)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_t * result = NULL;

    if(child == NULL) {
@@ -1578,6 +1680,8 @@ lv_obj_t * lv_obj_get_child_back(const lv_obj_t * obj, const lv_obj_t * child)
 */
 uint16_t lv_obj_count_children(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_t * i;
    uint16_t cnt = 0;

@@ -1592,6 +1696,8 @@ uint16_t lv_obj_count_children(const lv_obj_t * obj)
 */
 uint16_t lv_obj_count_children_recursive(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_t * i;
    uint16_t cnt = 0;

@@ -1615,6 +1721,8 @@ uint16_t lv_obj_count_children_recursive(const lv_obj_t * obj)
 */
 void lv_obj_get_coords(const lv_obj_t * obj, lv_area_t * cords_p)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_area_copy(cords_p, &obj->coords);
 }

@@ -1625,6 +1733,8 @@ void lv_obj_get_coords(const lv_obj_t * obj, lv_area_t * cords_p)
 */
 void lv_obj_get_inner_coords(const lv_obj_t * obj, lv_area_t * coords_p)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_style_t * style = lv_obj_get_style(obj);
    if(style->body.border.part & LV_BORDER_LEFT) coords_p->x1 += style->body.border.width;

@@ -1642,6 +1752,8 @@ void lv_obj_get_inner_coords(const lv_obj_t * obj, lv_area_t * coords_p)
 */
 lv_coord_t lv_obj_get_x(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_coord_t rel_x;
    lv_obj_t * parent = lv_obj_get_parent(obj);
    rel_x             = obj->coords.x1 - parent->coords.x1;
@@ -1656,6 +1768,8 @@ lv_coord_t lv_obj_get_x(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_y(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_coord_t rel_y;
    lv_obj_t * parent = lv_obj_get_parent(obj);
    rel_y             = obj->coords.y1 - parent->coords.y1;
@@ -1670,6 +1784,8 @@ lv_coord_t lv_obj_get_y(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_width(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return lv_area_get_width(&obj->coords);
 }

@@ -1680,6 +1796,8 @@ lv_coord_t lv_obj_get_width(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_height(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return lv_area_get_height(&obj->coords);
 }

@@ -1690,6 +1808,8 @@ lv_coord_t lv_obj_get_height(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_width_fit(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_style_t * style = lv_obj_get_style(obj);

    return lv_obj_get_width(obj) - style->body.padding.left - style->body.padding.right;
@@ -1702,6 +1822,8 @@ lv_coord_t lv_obj_get_width_fit(lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_style_t * style = lv_obj_get_style(obj);

    return lv_obj_get_height(obj) - style->body.padding.top - style->body.padding.bottom;
@@ -1714,6 +1836,8 @@ lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj)
 */
 bool lv_obj_get_auto_realign(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_OBJ_REALIGN
    return obj->realign.auto_realign ? true : false;
 #else
@@ -1729,6 +1853,8 @@ bool lv_obj_get_auto_realign(lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_ext_click_pad_left(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY
    return obj->ext_click_pad_hor;
 #elif LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
@@ -1746,6 +1872,8 @@ lv_coord_t lv_obj_get_ext_click_pad_left(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_ext_click_pad_right(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY
    return obj->ext_click_pad_hor;
 #elif LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
@@ -1763,6 +1891,8 @@ lv_coord_t lv_obj_get_ext_click_pad_right(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_ext_click_pad_top(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY
    return obj->ext_click_pad_ver;
 #elif LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
@@ -1780,6 +1910,8 @@ lv_coord_t lv_obj_get_ext_click_pad_top(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_ext_click_pad_bottom(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
 #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY
    return obj->ext_click_pad_ver
 #elif LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
@@ -1797,6 +1929,8 @@ lv_coord_t lv_obj_get_ext_click_pad_bottom(const lv_obj_t * obj)
 */
 lv_coord_t lv_obj_get_ext_draw_pad(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->ext_draw_pad;
 }

@@ -1811,6 +1945,8 @@ lv_coord_t lv_obj_get_ext_draw_pad(const lv_obj_t * obj)
 */
 const lv_style_t * lv_obj_get_style(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_style_t * style_act = obj->style_p;
    if(style_act == NULL) {
        lv_obj_t * par = obj->par;
@@ -1859,6 +1995,8 @@ const lv_style_t * lv_obj_get_style(const lv_obj_t * obj)
 */
 bool lv_obj_get_hidden(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->hidden == 0 ? false : true;
 }

@@ -1869,6 +2007,8 @@ bool lv_obj_get_hidden(const lv_obj_t * obj)
 */
 bool lv_obj_get_click(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->click == 0 ? false : true;
 }

@@ -1879,6 +2019,8 @@ bool lv_obj_get_click(const lv_obj_t * obj)
 */
 bool lv_obj_get_top(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->top == 0 ? false : true;
 }

@@ -1889,6 +2031,8 @@ bool lv_obj_get_top(const lv_obj_t * obj)
 */
 bool lv_obj_get_drag(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->drag == 0 ? false : true;
 }

@@ -1899,6 +2043,8 @@ bool lv_obj_get_drag(const lv_obj_t * obj)
 */
 lv_drag_dir_t lv_obj_get_drag_dir(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->drag_dir;
 }

@@ -1909,6 +2055,8 @@ lv_drag_dir_t lv_obj_get_drag_dir(const lv_obj_t * obj)
 */
 bool lv_obj_get_drag_throw(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->drag_throw == 0 ? false : true;
 }

@@ -1929,6 +2077,8 @@ bool lv_obj_get_drag_parent(const lv_obj_t * obj)
 */
 bool lv_obj_get_parent_event(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->parent_event == 0 ? false : true;
 }

@@ -1939,6 +2089,8 @@ bool lv_obj_get_parent_event(const lv_obj_t * obj)
 */
 lv_opa_t lv_obj_get_opa_scale_enable(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->opa_scale_en == 0 ? false : true;
 }

@@ -1949,6 +2101,8 @@ lv_opa_t lv_obj_get_opa_scale_enable(const lv_obj_t * obj)
 */
 lv_opa_t lv_obj_get_opa_scale(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    const lv_obj_t * parent = obj;

    while(parent) {
@@ -1966,6 +2120,8 @@ lv_opa_t lv_obj_get_opa_scale(const lv_obj_t * obj)
 */
 uint8_t lv_obj_get_protect(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->protect;
 }

@@ -1977,6 +2133,8 @@ uint8_t lv_obj_get_protect(const lv_obj_t * obj)
 */
 bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return (obj->protect & prot) == 0 ? false : true;
 }

@@ -1987,6 +2145,8 @@ bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot)
 */
 lv_signal_cb_t lv_obj_get_signal_cb(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->signal_cb;
 }

@@ -1997,6 +2157,8 @@ lv_signal_cb_t lv_obj_get_signal_cb(const lv_obj_t * obj)
 */
 lv_design_cb_t lv_obj_get_design_cb(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->design_cb;
 }

@@ -2007,6 +2169,8 @@ lv_design_cb_t lv_obj_get_design_cb(const lv_obj_t * obj)
 */
 lv_event_cb_t lv_obj_get_event_cb(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->event_cb;
 }

@@ -2022,6 +2186,8 @@ lv_event_cb_t lv_obj_get_event_cb(const lv_obj_t * obj)
 */
 void * lv_obj_get_ext_attr(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->ext_attr;
 }

@@ -2033,6 +2199,9 @@ void * lv_obj_get_ext_attr(const lv_obj_t * obj)
 */
 void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf)
 {
+    LV_ASSERT_NULL(buf);
+    LV_ASSERT_NULL(obj);
+
    lv_obj_type_t tmp;

    memset(buf, 0, sizeof(lv_obj_type_t));
@@ -2061,6 +2230,8 @@ void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf)
 */
 lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->user_data;
 }

@@ -2071,6 +2242,8 @@ lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj)
 */
 lv_obj_user_data_t * lv_obj_get_user_data_ptr(lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return &obj->user_data;
 }

@@ -2081,6 +2254,8 @@ lv_obj_user_data_t * lv_obj_get_user_data_ptr(lv_obj_t * obj)
 */
 void lv_obj_set_user_data(lv_obj_t * obj, lv_obj_user_data_t data)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    memcpy(&obj->user_data, &data, sizeof(lv_obj_user_data_t));
 }
 #endif
@@ -2093,6 +2268,8 @@ void lv_obj_set_user_data(lv_obj_t * obj, lv_obj_user_data_t data)
 */
 void * lv_obj_get_group(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    return obj->group_p;
 }

@@ -2103,6 +2280,8 @@ void * lv_obj_get_group(const lv_obj_t * obj)
 */
 bool lv_obj_is_focused(const lv_obj_t * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    if(obj->group_p) {
        if(lv_group_get_focused(obj->group_p) == obj) return true;
    }
@@ -2111,12 +2290,37 @@ bool lv_obj_is_focused(const lv_obj_t * obj)
 }
 #endif

+
+/*-------------------
+ * OTHER FUNCTIONS
+ *------------------*/
+
+/**
+ * Used in the signal callback to handle `LV_SIGNAL_GET_TYPE` signal
+ * @param obj pointer to an object
+ * @param buf pointer to `lv_obj_type_t`. (`param` i nteh signal callback)
+ * @param name name of the object. E.g. "lv_btn". (Only teh pointer is saved)
+ * @return LV_RES_OK
+ */
+lv_res_t lv_obj_handle_get_type_signal(lv_obj_t * obj, lv_obj_type_t * buf, const char * name)
+{
+    uint8_t i;
+    for(i = 0; i < LV_MAX_ANCESTOR_NUM - 1; i++) { /*Find the last set data*/
+        if(buf->type[i] == NULL) break;
+    }
+    buf->type[i] = name;
+
+    return LV_RES_OK;
+}
+
 /**********************
 *   STATIC FUNCTIONS
 **********************/

 static void lv_obj_del_async_cb(void * obj)
 {
+    LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
+
    lv_obj_del(obj);
 }

@@ -2177,24 +2381,19 @@ static bool lv_obj_design(lv_obj_t * obj, const lv_area_t * mask_p, lv_design_mo
 */
 static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param)
 {
-    (void)param;
+    if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(obj, param, LV_OBJX_NAME);

    lv_res_t res = LV_RES_OK;

-    const lv_style_t * style = lv_obj_get_style(obj);
-
    if(sign == LV_SIGNAL_CHILD_CHG) {
        /*Return 'invalid' if the child change signal is not enabled*/
        if(lv_obj_is_protected(obj, LV_PROTECT_CHILD_CHG) != false) res = LV_RES_INV;
    } else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) {
+        const lv_style_t * style = lv_obj_get_style(obj);
        if(style->body.shadow.width > obj->ext_draw_pad) obj->ext_draw_pad = style->body.shadow.width;
    } else if(sign == LV_SIGNAL_STYLE_CHG) {
        lv_obj_refresh_ext_draw_pad(obj);
-    } else if(sign == LV_SIGNAL_GET_TYPE) {
-        lv_obj_type_t * buf = param;
-        buf->type[0]        = "lv_obj";
    }
-
    return res;
 }

@@ -2315,13 +2514,13 @@ static void delete_children(lv_obj_t * obj)
        indev = lv_indev_get_next(indev);
    }

+    /* Clean up the object specific data*/
+    obj->signal_cb(obj, LV_SIGNAL_CLEANUP, NULL);
+
    /*Remove the object from parent's children list*/
    lv_obj_t * par = lv_obj_get_parent(obj);
    lv_ll_rem(&(par->child_ll), obj);

-    /* Clean up the object specific data*/
-    obj->signal_cb(obj, LV_SIGNAL_CLEANUP, NULL);
-
    /*Delete the base objects*/
    if(obj->ext_attr != NULL) lv_mem_free(obj->ext_attr);
    lv_mem_free(obj); /*Free the object itself*/