diff --git a/src/others/sysmon/lv_sysmon.c b/src/others/sysmon/lv_sysmon.c index caba080b6..8bf53e4ed 100644 --- a/src/others/sysmon/lv_sysmon.c +++ b/src/others/sysmon/lv_sysmon.c @@ -87,6 +87,7 @@ void _lv_sysmon_builtin_deinit(void) lv_obj_t * lv_sysmon_create(lv_display_t * disp) { LV_LOG_INFO("begin"); + if(disp == NULL) disp = lv_display_get_default(); lv_obj_t * label = lv_label_create(lv_display_get_layer_sys(disp)); lv_obj_set_style_bg_opa(label, LV_OPA_50, 0); lv_obj_set_style_bg_color(label, lv_color_black(), 0); @@ -100,6 +101,7 @@ lv_obj_t * lv_sysmon_create(lv_display_t * disp) void lv_sysmon_show_performance(lv_display_t * disp) { + if(disp == NULL) disp = lv_display_get_default(); disp->perf_label = lv_sysmon_create(disp); lv_subject_init_pointer(&disp->perf_sysmon_backend.subject, &disp->perf_sysmon_info); lv_obj_align(disp->perf_label, LV_USE_PERF_MONITOR_POS, 0, 0); @@ -116,6 +118,7 @@ void lv_sysmon_show_performance(lv_display_t * disp) void lv_sysmon_hide_performance(lv_display_t * disp) { + if(disp == NULL) disp = lv_display_get_default(); lv_obj_add_flag(disp->perf_label, LV_OBJ_FLAG_HIDDEN); } @@ -125,6 +128,7 @@ void lv_sysmon_hide_performance(lv_display_t * disp) void lv_sysmon_show_memory(lv_display_t * disp) { + if(disp == NULL) disp = lv_display_get_default(); disp->mem_label = lv_sysmon_create(disp); lv_obj_align(disp->mem_label, LV_USE_MEM_MONITOR_POS, 0, 0); lv_subject_add_observer_obj(&sysmon_mem.subject, mem_observer_cb, disp->mem_label, NULL); @@ -134,6 +138,7 @@ void lv_sysmon_show_memory(lv_display_t * disp) void lv_sysmon_hide_memory(lv_display_t * disp) { + if(disp == NULL) disp = lv_display_get_default(); lv_obj_add_flag(disp->mem_label, LV_OBJ_FLAG_HIDDEN); } diff --git a/src/others/sysmon/lv_sysmon.h b/src/others/sysmon/lv_sysmon.h index 849a482e2..6db4c5943 100644 --- a/src/others/sysmon/lv_sysmon.h +++ b/src/others/sysmon/lv_sysmon.h @@ -89,13 +89,13 @@ lv_obj_t * lv_sysmon_create(lv_display_t * disp); /** * Show system performance monitor: CPU usage and FPS count - * @param disp target display, NULL for all displays + * @param disp target display, NULL: use the default displays */ void lv_sysmon_show_performance(lv_display_t * disp); /** * Hide system performance monitor - * @param disp target display, NULL for all displays + * @param disp target display, NULL: use the default */ void lv_sysmon_hide_performance(lv_display_t * disp); @@ -105,13 +105,13 @@ void lv_sysmon_hide_performance(lv_display_t * disp); /** * Show system memory monitor: used memory and the memory fragmentation - * @param disp target display, NULL for all displays + * @param disp target display, NULL: use the default displays */ void lv_sysmon_show_memory(lv_display_t * disp); /** * Hide system memory monitor - * @param disp target display, NULL for all displays + * @param disp target display, NULL: use the default displays */ void lv_sysmon_hide_memory(lv_display_t * disp); diff --git a/tests/src/lv_test_conf.h b/tests/src/lv_test_conf.h index 91cd9c506..ccf087603 100644 --- a/tests/src/lv_test_conf.h +++ b/tests/src/lv_test_conf.h @@ -116,8 +116,6 @@ typedef void * lv_user_data_t; #define LV_DRAW_BUF_ALIGN 852 /*For screenshots*/ -#undef LV_USE_PERF_MONITOR -#undef LV_USE_MEM_MONITOR #undef LV_DPI_DEF #define LV_DPI_DEF 130 #endif diff --git a/tests/src/lv_test_conf_full.h b/tests/src/lv_test_conf_full.h index d3d872905..90726f44a 100644 --- a/tests/src/lv_test_conf_full.h +++ b/tests/src/lv_test_conf_full.h @@ -73,6 +73,8 @@ #define LV_USE_FILE_EXPLORER 1 #define LV_USE_TINY_TTF 1 #define LV_USE_SYSMON 1 +#define LV_USE_MEM_MONITOR 1 +#define LV_USE_PERF_MONITOR 1 #define LV_USE_SNAPSHOT 1 #define LV_USE_THORVG_INTERNAL 1 #define LV_USE_LZ4_INTERNAL 1 diff --git a/tests/src/lv_test_init.c b/tests/src/lv_test_init.c index 4d6f2f8b2..b01311e35 100644 --- a/tests/src/lv_test_init.c +++ b/tests/src/lv_test_init.c @@ -21,6 +21,8 @@ void lv_test_init(void) { lv_init(); hal_init(); + lv_sysmon_hide_memory(NULL); + lv_sysmon_hide_performance(NULL); } void lv_test_deinit(void) diff --git a/tests/src/test_cases/widgets/test_arc.c b/tests/src/test_cases/widgets/test_arc.c index 968ce89b3..5249ab551 100644 --- a/tests/src/test_cases/widgets/test_arc.c +++ b/tests/src/test_cases/widgets/test_arc.c @@ -182,7 +182,7 @@ void test_arc_click_sustained_from_start_to_end_does_not_set_value_to_max(void) lv_test_mouse_release(); lv_test_indev_wait(50); - TEST_ASSERT_EQUAL_UINT32(1, event_cnt); + TEST_ASSERT_EQUAL_UINT32(0, event_cnt); TEST_ASSERT_EQUAL_INT32(lv_arc_get_min_value(arc), lv_arc_get_value(arc)); /* Click close to end angle */