debug: add style sentinel

src/lv_conf_checker.h

@@ -312,6 +312,54 @@
 #endif
 #endif  /*LV_USE_LOG*/
 
+/*=================
+ * Debug settings
+ *================*/
+
+/* If Debug is enabled LittelvGL validates the parameters of the functions.
+ * If an invalid parameter is found an error log message is printed and
+ * the MCU halts at the error. (`LV_USE_LOG` should be enabled)
+ * If you are debugging the MCU you can pause
+ * the debugger to see exactly where  the issue is.
+ *
+ * The behavior of asserts can be overwritten by redefining them here.
+ * E.g. #define LV_ASSERT_MEM(p)  <my_assert_code>
+ */
+#ifndef LV_USE_DEBUG
+#define LV_USE_DEBUG        1
+#endif
+#if LV_USE_DEBUG
+
+/*Check if the parameter is NULL. (Quite fast) */
+#ifndef LV_USE_ASSERT_NULL
+#define LV_USE_ASSERT_NULL      1
+#endif
+
+/*Checks is the memory is successfully allocated or no. (Quite fast)*/
+#ifndef LV_USE_ASSERT_MEM
+#define LV_USE_ASSERT_MEM       1
+#endif
+
+/* Check the strings.
+ * Search for NULL, very long strings, invalid characters, and unnatural repetitions. (Slow)
+ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
+#ifndef LV_USE_ASSERT_STR
+#define LV_USE_ASSERT_STR       0
+#endif
+
+/* Check NULL, the object's type and existence (e.g. not deleted). (Quite slow)
+ * If disabled `LV_USE_ASSERT_NULL` will be performed instead (if it's enabled) */
+#ifndef LV_USE_ASSERT_OBJ
+#define LV_USE_ASSERT_OBJ       0
+#endif
+
+/*Check if the styles are properly initialized. (Fast)*/
+#ifndef LV_USE_ASSERT_STYLE
+#define LV_USE_ASSERT_STYLE     1
+#endif
+
+#endif /*LV_USE_DEBUG*/
+
 /*================
  *  THEME USAGE
  *================*/

src/lv_core/lv_debug.c

@@ -8,12 +8,18 @@
  *********************/
 #include "lv_obj.h"
 
+#if LV_USE_DEBUG
+
 /*********************
  *      DEFINES
  *********************/
+#ifndef LV_DEBUG_STR_MAX_LENGTH
 #define LV_DEBUG_STR_MAX_LENGTH  (1024 * 8)
-#define LV_DEBUG_STR_MAX_REPEAT  8
+#endif
 
+#ifndef LV_DEBUG_STR_MAX_REPEAT
+#define LV_DEBUG_STR_MAX_REPEAT  8
+#endif
 /**********************
  *      TYPEDEFS
  **********************/
@@ -75,12 +81,18 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj)
     return false;
 }
 
-bool lv_debug_check_style(const void * str)
+bool lv_debug_check_style(const lv_style_t * style)
 {
-    return true;
+    if(style == NULL) return true;  /*NULL style is still valid*/
 
-    LV_LOG_WARN("Invalid style (local variable or not initialized?)");
-    return false;
+#if LV_USE_ASSERT_STYLE
+    if(style->debug_sentinel != LV_STYLE_DEGUG_SENTINEL_VALUE) {
+        LV_LOG_WARN("Invalid style (local variable or not initialized?)");
+        return false;
+    }
+#endif
+
+    return true;
 }
 
 bool lv_debug_check_str(const void * str)
@@ -94,10 +106,10 @@ bool lv_debug_check_str(const void * str)
         if(s[i] != last_byte) {
             last_byte = s[i];
             rep = 1;
-        } else {
+        } else if(s[i] > 0x7F){
             rep++;
             if(rep > LV_DEBUG_STR_MAX_REPEAT) {
-                LV_LOG_WARN("lv_debug_check_str: a char has repeated more than LV_DEBUG_STR_MAX_REPEAT times)");
+                LV_LOG_WARN("lv_debug_check_str: a non-ASCII char has repeated more than LV_DEBUG_STR_MAX_REPEAT times)");
                 return false;
             }
         }
@@ -175,3 +187,6 @@ static bool obj_valid_child(const lv_obj_t * parent, const lv_obj_t * obj_to_fin
 
     return false;
 }
+
+#endif /*LV_USE_DEBUG*/
+

src/lv_core/lv_debug.h

@@ -15,6 +15,8 @@ extern "C" {
  *********************/
 #include "lv_obj.h"
 
+#if LV_USE_DEBUG
+
 /*********************
  *      DEFINES
  *********************/
@@ -62,7 +64,8 @@ void lv_debug_log_error(const char * msg, uint64_t value);
 #endif
 
 #ifndef LV_DEBUG_IS_STR
-#define LV_DEBUG_IS_STR(str)   (lv_debug_check_str(str))
+#define LV_DEBUG_IS_STR(str)   (lv_debug_check_null(str) &&      \
+                                lv_debug_check_str(str))
 #endif
 
 #ifndef LV_DEBUG_IS_OBJ
@@ -101,8 +104,12 @@ void lv_debug_log_error(const char * msg, uint64_t value);
 # ifndef LV_ASSERT_STR
 #  define LV_ASSERT_STR(str) LV_DEBUG_ASSERT(LV_DEBUG_IS_STR(str), "Strange or invalid string", str);
 # endif
-#else
-# define LV_ASSERT_STR(p) true
+#else /* LV_USE_ASSERT_OBJ == 0 */
+# if LV_USE_ASSERT_NULL /*Use at least LV_ASSERT_NULL if enabled*/
+#   define LV_ASSERT_STR(str) LV_ASSERT_NULL(str)
+# else
+#   define LV_ASSERT_STR(str) true
+# endif
 #endif
 
 
@@ -110,8 +117,12 @@ void lv_debug_log_error(const char * msg, uint64_t value);
 # ifndef LV_ASSERT_OBJ
 #  define LV_ASSERT_OBJ(obj_p, obj_type) LV_DEBUG_ASSERT(LV_DEBUG_IS_OBJ(obj_p, obj_type), "Invalid object", obj_p);
 # endif
-#else
-# define LV_ASSERT_OBJ(obj_p, obj_type) true
+#else /* LV_USE_ASSERT_OBJ == 0 */
+# if LV_USE_ASSERT_NULL /*Use at least LV_ASSERT_NULL if enabled*/
+#   define LV_ASSERT_OBJ(obj_p, obj_type) LV_ASSERT_NULL(obj_p)
+# else
+#   define LV_ASSERT_OBJ(obj_p, obj_type) true
+# endif
 #endif
 
 
@@ -123,6 +134,15 @@ void lv_debug_log_error(const char * msg, uint64_t value);
 #  define LV_ASSERT_STYLE(style) true
 #endif
 
+#else /* LV_USE_DEBUG == 0 */
+
+#define LV_ASSERT_NULL(p) true
+#define LV_ASSERT_MEM(p) true
+#define LV_ASSERT_STR(p) true
+#define LV_ASSERT_OBJ(obj, obj_type) true
+#define LV_ASSERT_STYLE(p) true
+
+#endif /* LV_USE_DEBUG */
 /*clang-format on*/
 
 #ifdef __cplusplus

src/lv_core/lv_style.c

@@ -107,6 +107,12 @@ void lv_style_init(void)
     lv_style_scr.line.width   = 2;
     lv_style_scr.line.rounded = 0;
 
+#if LV_USE_DEBUG
+#if LV_USE_ASSERT_STYLE
+    lv_style_scr.debug_sentinel = LV_STYLE_DEGUG_SENTINEL_VALUE;
+#endif
+#endif
+
     /*Plain style (by default near the same as the screen style)*/
     lv_style_copy(&lv_style_plain, &lv_style_scr);
     lv_style_plain.body.padding.left   = LV_DPI / 20;

src/lv_core/lv_style.h

@@ -23,6 +23,7 @@ extern "C" {
  *      DEFINES
  *********************/
 #define LV_RADIUS_CIRCLE (LV_COORD_MAX) /**< A very big radius to always draw as circle*/
+#define LV_STYLE_DEGUG_SENTINEL_VALUE 0x12345678
 
 /**********************
  *      TYPEDEFS
@@ -119,6 +120,13 @@ typedef struct
         lv_opa_t opa;
         uint8_t rounded : 1; /**< 1: rounded line endings*/
     } line;
+
+#if LV_USE_DEBUG
+#if LV_USE_ASSERT_STYLE
+    uint32_t debug_sentinel; /**<Should `LV_STYLE_DEGUG_SENTINEL_VALUE` to indicate that the style is valid*/
+#endif
+#endif
+
 } lv_style_t;
 
 #if LV_USE_ANIMATION

src/lv_objx/lv_win.c

@@ -96,6 +96,8 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy)
         ext->title = lv_label_create(ext->header, NULL);
         lv_label_set_text(ext->title, "My title");
 
+        lv_obj_set_signal_cb(new_win, lv_win_signal);
+
         /*Set the default styles*/
         lv_theme_t * th = lv_theme_get_current();
         if(th) {
@@ -110,8 +112,6 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy)
             lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT, &lv_style_transp);
             lv_win_set_style(new_win, LV_WIN_STYLE_HEADER, &lv_style_plain_color);
         }
-
-        lv_obj_set_signal_cb(new_win, lv_win_signal);
     }
     /*Copy an existing object*/
     else {