From 5fde4418fb0da9f3c3dab84672eb9f4c3404565f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Costa?= Date: Thu, 30 Jan 2025 22:08:36 +0100 Subject: [PATCH] fix: warn user about deprecated LV_DEFAULT_DRIVE_LETTER (#7620) Co-authored-by: Liam <30486941+liamHowatt@users.noreply.github.com> --- scripts/lv_conf_internal_gen.py | 5 ----- src/lv_api_map_v9_1.h | 11 ++++++++++- src/lv_conf_internal.h | 5 ----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/lv_conf_internal_gen.py b/scripts/lv_conf_internal_gen.py index 39004023b..94d6ef86a 100755 --- a/scripts/lv_conf_internal_gen.py +++ b/scripts/lv_conf_internal_gen.py @@ -88,11 +88,6 @@ fout.write( #endif #endif -/* Renamed config backwards-compatibility */ -#if !defined(LV_FS_DEFAULT_DRIVER_LETTER) && defined(LV_FS_DEFAULT_DRIVE_LETTER) - #define LV_FS_DEFAULT_DRIVER_LETTER LV_FS_DEFAULT_DRIVE_LETTER -#endif - #ifdef CONFIG_LV_COLOR_DEPTH #define LV_KCONFIG_PRESENT #endif diff --git a/src/lv_api_map_v9_1.h b/src/lv_api_map_v9_1.h index 032016c63..6b53b172b 100644 --- a/src/lv_api_map_v9_1.h +++ b/src/lv_api_map_v9_1.h @@ -81,7 +81,16 @@ extern "C" { #define lv_chart_set_all_value lv_chart_set_all_values #define lv_calendar_set_showed_date lv_calendar_set_month_shown -#define LV_FS_DEFAULT_DRIVE_LETTER LV_FS_DEFAULT_DRIVER_LETTER +#if defined(LV_FS_DEFAULT_DRIVE_LETTER) +#warning LV_FS_DEFAULT_DRIVE_LETTER is deprecated. Rename to LV_FS_DEFAULT_DRIVER_LETTER + +#if LV_FS_DEFAULT_DRIVER_LETTER == '\0' +#undef LV_FS_DEFAULT_DRIVER_LETTER +#define LV_FS_DEFAULT_DRIVER_LETTER LV_FS_DEFAULT_DRIVE_LETTER +#endif + +#endif /* defined(LV_FS_DEFAULT_DRIVE_LETTER) */ + #define LV_LABEL_LONG_WRAP LV_LABEL_LONG_MODE_WRAP #define LV_LABEL_LONG_DOT LV_LABEL_LONG_MODE_DOTS diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 5515167f3..3ed69a5ec 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -66,11 +66,6 @@ #endif #endif -/* Renamed config backwards-compatibility */ -#if !defined(LV_FS_DEFAULT_DRIVER_LETTER) && defined(LV_FS_DEFAULT_DRIVE_LETTER) - #define LV_FS_DEFAULT_DRIVER_LETTER LV_FS_DEFAULT_DRIVE_LETTER -#endif - #ifdef CONFIG_LV_COLOR_DEPTH #define LV_KCONFIG_PRESENT #endif