From 5699cf53fbd338ed9945e57a6794e27fd40f7ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Costa?= Date: Mon, 11 May 2026 14:10:03 +0200 Subject: [PATCH] refactor(external_includes): use angle brackets for external includes (#10090) --- include/lvgl/fs/lv_fsdrv.h | 2 +- src/draw/espressif/ppa/lv_draw_ppa_private.h | 14 +++++++------- src/draw/nxp/g2d/lv_draw_buf_g2d.c | 2 +- src/draw/nxp/g2d/lv_draw_g2d.c | 2 +- src/draw/nxp/g2d/lv_draw_g2d_fill.c | 2 +- src/draw/nxp/g2d/lv_draw_g2d_img.c | 2 +- src/draw/nxp/g2d/lv_g2d_buf_map.c | 2 +- src/draw/nxp/g2d/lv_g2d_utils.h | 4 ++-- src/draw/nxp/pxp/lv_draw_buf_pxp.c | 2 +- src/draw/nxp/pxp/lv_pxp_cfg.h | 4 ++-- src/draw/nxp/pxp/lv_pxp_osa.c | 4 ++-- src/draw/nxp/pxp/lv_pxp_utils.h | 2 +- src/draw/renesas/dave2d/lv_draw_dave2d.h | 4 ++-- src/draw/sw/arm2d/lv_draw_sw_arm2d.h | 4 ++-- src/draw/sw/blend/arm2d/lv_blend_arm2d.h | 4 ++-- src/draw/sw/blend/helium/lv_blend_helium.h | 4 ++-- src/drivers/display/nxp_elcdif/lv_nxp_elcdif.c | 6 +++--- .../display/renesas_glcdc/lv_renesas_glcdc.c | 10 +++++----- src/drivers/display/st_ltdc/lv_st_ltdc.c | 2 +- src/libs/freetype/lv_freetype_private.h | 2 +- src/libs/fsdrv/lv_fs_arduino_esp_littlefs.cpp | 2 +- src/libs/fsdrv/lv_fs_arduino_sd.cpp | 2 +- src/libs/fsdrv/lv_fs_fatfs.c | 2 +- src/libs/fsdrv/lv_fs_littlefs.c | 2 +- .../gltf/gltf_data/lv_gltf_data_animations.cpp | 4 ++-- src/libs/gltf/gltf_data/lv_gltf_model_node.cpp | 2 +- src/libs/gltf/gltf_view/lv_gltf_view_shader.cpp | 2 +- src/osal/lv_cmsis_rtos2.h | 2 +- src/osal/lv_freertos.c | 4 ++-- src/osal/lv_freertos.h | 12 ++++++------ src/osal/lv_mqx.h | 4 ++-- 31 files changed, 58 insertions(+), 58 deletions(-) diff --git a/include/lvgl/fs/lv_fsdrv.h b/include/lvgl/fs/lv_fsdrv.h index 0dc9b00d9f..1d4b75f176 100644 --- a/include/lvgl/fs/lv_fsdrv.h +++ b/include/lvgl/fs/lv_fsdrv.h @@ -50,7 +50,7 @@ void lv_fs_memfs_init(void); #endif #if LV_USE_FS_LITTLEFS -#include "lfs.h" +#include struct lfs; /** * Set the default LittleFS handler to be used by LVGL diff --git a/src/draw/espressif/ppa/lv_draw_ppa_private.h b/src/draw/espressif/ppa/lv_draw_ppa_private.h index 0a68b7ae3d..e87b966104 100644 --- a/src/draw/espressif/ppa/lv_draw_ppa_private.h +++ b/src/draw/espressif/ppa/lv_draw_ppa_private.h @@ -29,7 +29,7 @@ extern "C" { #include "../../../misc/lv_area_private.h" /* The ppa driver depends heavily on the esp-idf headers*/ -#include "sdkconfig.h" +#include #if (CONFIG_LV_DRAW_BUF_ALIGN != CONFIG_CACHE_L2_CACHE_LINE_SIZE) #error "CONFIG_LV_DRAW_BUF_ALIGN must be equal to CONFIG_CACHE_L2_CACHE_LINE_SIZE!" @@ -40,12 +40,12 @@ extern "C" { #error "This SoC does not support PPA" #endif -#include "driver/ppa.h" -#include "esp_heap_caps.h" -#include "esp_err.h" -#include "hal/color_hal.h" -#include "esp_cache.h" -#include "esp_log.h" +#include +#include +#include +#include +#include +#include /********************* * DEFINES *********************/ diff --git a/src/draw/nxp/g2d/lv_draw_buf_g2d.c b/src/draw/nxp/g2d/lv_draw_buf_g2d.c index 1980e40446..ef5e505f26 100644 --- a/src/draw/nxp/g2d/lv_draw_buf_g2d.c +++ b/src/draw/nxp/g2d/lv_draw_buf_g2d.c @@ -18,7 +18,7 @@ #if LV_USE_G2D #if LV_USE_DRAW_G2D #include "../../lv_draw_buf_private.h" -#include "g2d.h" +#include #include "lv_g2d_buf_map.h" #include "lv_g2d_utils.h" diff --git a/src/draw/nxp/g2d/lv_draw_g2d.c b/src/draw/nxp/g2d/lv_draw_g2d.c index 94d91e9ed0..17f3119777 100644 --- a/src/draw/nxp/g2d/lv_draw_g2d.c +++ b/src/draw/nxp/g2d/lv_draw_g2d.c @@ -13,7 +13,7 @@ #if LV_USE_G2D #include "../../../misc/lv_area_private.h" -#include "g2d.h" +#include #include "lv_g2d_buf_map.h" #include "lv_g2d_utils.h" diff --git a/src/draw/nxp/g2d/lv_draw_g2d_fill.c b/src/draw/nxp/g2d/lv_draw_g2d_fill.c index 73dda3fc68..7772e968e3 100644 --- a/src/draw/nxp/g2d/lv_draw_g2d_fill.c +++ b/src/draw/nxp/g2d/lv_draw_g2d_fill.c @@ -18,7 +18,7 @@ #if LV_USE_G2D #if LV_USE_DRAW_G2D #include -#include "g2d.h" +#include #include "../../../misc/lv_area_private.h" #include "lv_g2d_buf_map.h" #include "lv_g2d_utils.h" diff --git a/src/draw/nxp/g2d/lv_draw_g2d_img.c b/src/draw/nxp/g2d/lv_draw_g2d_img.c index 8a008dae9e..02dfa38feb 100644 --- a/src/draw/nxp/g2d/lv_draw_g2d_img.c +++ b/src/draw/nxp/g2d/lv_draw_g2d_img.c @@ -18,7 +18,7 @@ #if LV_USE_G2D #if LV_USE_DRAW_G2D #include -#include "g2d.h" +#include #include "../../../misc/lv_area_private.h" #include "../../lv_draw_image_private.h" #include "../../lv_image_decoder_private.h" diff --git a/src/draw/nxp/g2d/lv_g2d_buf_map.c b/src/draw/nxp/g2d/lv_g2d_buf_map.c index 5feeb9b592..9106f5e864 100644 --- a/src/draw/nxp/g2d/lv_g2d_buf_map.c +++ b/src/draw/nxp/g2d/lv_g2d_buf_map.c @@ -15,7 +15,7 @@ #if LV_USE_DRAW_G2D #include #include "lv_g2d_utils.h" -#include "g2d.h" +#include /********************* * DEFINES diff --git a/src/draw/nxp/g2d/lv_g2d_utils.h b/src/draw/nxp/g2d/lv_g2d_utils.h index 8d8be3224c..4158ea5f8d 100644 --- a/src/draw/nxp/g2d/lv_g2d_utils.h +++ b/src/draw/nxp/g2d/lv_g2d_utils.h @@ -24,8 +24,8 @@ extern "C" { #if LV_USE_G2D #if LV_USE_DRAW_G2D #include "../../sw/lv_draw_sw_private.h" -#include "g2d.h" -#include "g2dExt.h" +#include +#include /********************* * DEFINES diff --git a/src/draw/nxp/pxp/lv_draw_buf_pxp.c b/src/draw/nxp/pxp/lv_draw_buf_pxp.c index 11600053cf..03f36cbf6a 100644 --- a/src/draw/nxp/pxp/lv_draw_buf_pxp.c +++ b/src/draw/nxp/pxp/lv_draw_buf_pxp.c @@ -21,7 +21,7 @@ #include "lv_pxp_cfg.h" #include "lv_pxp_utils.h" -#include "lvgl_support.h" +#include /********************* * DEFINES diff --git a/src/draw/nxp/pxp/lv_pxp_cfg.h b/src/draw/nxp/pxp/lv_pxp_cfg.h index 67bc0c7a46..fc30a17844 100644 --- a/src/draw/nxp/pxp/lv_pxp_cfg.h +++ b/src/draw/nxp/pxp/lv_pxp_cfg.h @@ -24,8 +24,8 @@ extern "C" { #if LV_USE_PXP #if LV_USE_DRAW_PXP || LV_USE_ROTATE_PXP -#include "fsl_cache.h" -#include "fsl_pxp.h" +#include +#include #if ((LV_DRAW_BUF_ALIGN % 32) != 0) #error "If PXP is enabled the draw buffers should be aligned to 32-byte boundary, please set LV_DRAW_BUF_ALIGN to a multiple of 32 in lv_conf.h" diff --git a/src/draw/nxp/pxp/lv_pxp_osa.c b/src/draw/nxp/pxp/lv_pxp_osa.c index 27abb2431d..4cc3b6746b 100644 --- a/src/draw/nxp/pxp/lv_pxp_osa.c +++ b/src/draw/nxp/pxp/lv_pxp_osa.c @@ -19,10 +19,10 @@ #if LV_USE_DRAW_PXP || LV_USE_ROTATE_PXP #include "lv_pxp_utils.h" #include "../../../osal/lv_os_private.h" -#include "fsl_pxp.h" +#include #if defined(SDK_OS_FREE_RTOS) - #include "FreeRTOS.h" + #include #endif #if defined(__ZEPHYR__) diff --git a/src/draw/nxp/pxp/lv_pxp_utils.h b/src/draw/nxp/pxp/lv_pxp_utils.h index e9841249b7..fd06f9ed01 100644 --- a/src/draw/nxp/pxp/lv_pxp_utils.h +++ b/src/draw/nxp/pxp/lv_pxp_utils.h @@ -23,7 +23,7 @@ extern "C" { #if LV_USE_PXP #if LV_USE_DRAW_PXP || LV_USE_ROTATE_PXP -#include "fsl_pxp.h" +#include /********************* * DEFINES diff --git a/src/draw/renesas/dave2d/lv_draw_dave2d.h b/src/draw/renesas/dave2d/lv_draw_dave2d.h index 5e532623d6..a46900b33b 100644 --- a/src/draw/renesas/dave2d/lv_draw_dave2d.h +++ b/src/draw/renesas/dave2d/lv_draw_dave2d.h @@ -16,8 +16,8 @@ extern "C" { #include "../../../lvgl_public.h" #if LV_USE_DRAW_DAVE2D #include "../../lv_draw_private.h" -#include "bsp_api.h" -#include "dave_driver.h" +#include +#include #if LV_USE_FLOAT diff --git a/src/draw/sw/arm2d/lv_draw_sw_arm2d.h b/src/draw/sw/arm2d/lv_draw_sw_arm2d.h index df97d0ef6f..f5767e9311 100644 --- a/src/draw/sw/arm2d/lv_draw_sw_arm2d.h +++ b/src/draw/sw/arm2d/lv_draw_sw_arm2d.h @@ -24,8 +24,8 @@ extern "C" { #if LV_USE_DRAW_ARM2D_SYNC #define __ARM_2D_IMPL__ -#include "arm_2d.h" -#include "__arm_2d_impl.h" +#include +#include <__arm_2d_impl.h> #if defined(__IS_COMPILER_ARM_COMPILER_5__) #pragma diag_suppress 174,177,188,68,513,144,1296 diff --git a/src/draw/sw/blend/arm2d/lv_blend_arm2d.h b/src/draw/sw/blend/arm2d/lv_blend_arm2d.h index 8f4928b220..5ba7098a6d 100644 --- a/src/draw/sw/blend/arm2d/lv_blend_arm2d.h +++ b/src/draw/sw/blend/arm2d/lv_blend_arm2d.h @@ -19,8 +19,8 @@ extern "C" { #if LV_USE_DRAW_ARM2D_SYNC #define __ARM_2D_IMPL__ -#include "arm_2d.h" -#include "__arm_2d_impl.h" +#include +#include <__arm_2d_impl.h> #if defined(__IS_COMPILER_ARM_COMPILER_5__) #pragma diag_suppress 174,177,188,68,513,144,1296 diff --git a/src/draw/sw/blend/helium/lv_blend_helium.h b/src/draw/sw/blend/helium/lv_blend_helium.h index 2ffc3e054d..a206068978 100644 --- a/src/draw/sw/blend/helium/lv_blend_helium.h +++ b/src/draw/sw/blend/helium/lv_blend_helium.h @@ -15,8 +15,8 @@ extern "C" { *********************/ #if defined(_RTE_) -#include "Pre_Include_Global.h" -#include "lv_conf_cmsis.h" +#include +#include #endif #include "../../../../lvgl_public.h" diff --git a/src/drivers/display/nxp_elcdif/lv_nxp_elcdif.c b/src/drivers/display/nxp_elcdif/lv_nxp_elcdif.c index c08e915332..f16f5f0995 100644 --- a/src/drivers/display/nxp_elcdif/lv_nxp_elcdif.c +++ b/src/drivers/display/nxp_elcdif/lv_nxp_elcdif.c @@ -11,9 +11,9 @@ * INCLUDES *********************/ #include "../../../display/lv_display_private.h" -#include "fsl_video_common.h" -#include "fsl_elcdif.h" -#include "fsl_cache.h" +#include +#include +#include /********************* * DEFINES diff --git a/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c b/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c index 9bb9993b80..ba9c4b76b4 100644 --- a/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c +++ b/src/drivers/display/renesas_glcdc/lv_renesas_glcdc.c @@ -27,12 +27,12 @@ #endif /*_RENESAS_RA_*/ #ifdef _RENESAS_RA_ - #include "LVGL_thread.h" + #include #else /* RX */ - #include "hal_data.h" - #include "platform.h" - #include "r_glcdc_rx_if.h" - #include "r_glcdc_rx_pinset.h" + #include + #include + #include + #include #endif /*_RENESAS_RA_*/ #include LV_STDBOOL_INCLUDE diff --git a/src/drivers/display/st_ltdc/lv_st_ltdc.c b/src/drivers/display/st_ltdc/lv_st_ltdc.c index 47137663f1..7cbe5a680f 100644 --- a/src/drivers/display/st_ltdc/lv_st_ltdc.c +++ b/src/drivers/display/st_ltdc/lv_st_ltdc.c @@ -13,7 +13,7 @@ #include "../../../display/lv_display_private.h" #include "../../../draw/sw/lv_draw_sw.h" #include "../../../osal/lv_os_private.h" -#include "main.h" +#include #if LV_ST_LTDC_USE_DMA2D_FLUSH #if LV_USE_DRAW_DMA2D diff --git a/src/libs/freetype/lv_freetype_private.h b/src/libs/freetype/lv_freetype_private.h index 9f1c0d3023..358e4158e0 100755 --- a/src/libs/freetype/lv_freetype_private.h +++ b/src/libs/freetype/lv_freetype_private.h @@ -19,7 +19,7 @@ extern "C" { #if LV_USE_FREETYPE #include "../../misc/cache/lv_cache.h" -#include "ft2build.h" +#include #include FT_FREETYPE_H #include FT_GLYPH_H #include FT_CACHE_H diff --git a/src/libs/fsdrv/lv_fs_arduino_esp_littlefs.cpp b/src/libs/fsdrv/lv_fs_arduino_esp_littlefs.cpp index 4ce88404ff..c0067783b7 100644 --- a/src/libs/fsdrv/lv_fs_arduino_esp_littlefs.cpp +++ b/src/libs/fsdrv/lv_fs_arduino_esp_littlefs.cpp @@ -2,7 +2,7 @@ #if LV_USE_FS_ARDUINO_ESP_LITTLEFS #include "../../core/lv_global.h" -#include "LittleFS.h" +#include #if !LV_FS_IS_VALID_LETTER(LV_FS_ARDUINO_ESP_LITTLEFS_LETTER) #error "Invalid drive letter" diff --git a/src/libs/fsdrv/lv_fs_arduino_sd.cpp b/src/libs/fsdrv/lv_fs_arduino_sd.cpp index fe7b5ec2e9..408b7ca336 100644 --- a/src/libs/fsdrv/lv_fs_arduino_sd.cpp +++ b/src/libs/fsdrv/lv_fs_arduino_sd.cpp @@ -3,7 +3,7 @@ #include "../../core/lv_global.h" #include -#include "SD.h" +#include #if !LV_FS_IS_VALID_LETTER(LV_FS_ARDUINO_SD_LETTER) #error "Invalid drive letter" diff --git a/src/libs/fsdrv/lv_fs_fatfs.c b/src/libs/fsdrv/lv_fs_fatfs.c index 5bc6f0253f..08ada31c9d 100644 --- a/src/libs/fsdrv/lv_fs_fatfs.c +++ b/src/libs/fsdrv/lv_fs_fatfs.c @@ -9,7 +9,7 @@ #include "../../../lvgl.h" #if LV_USE_FS_FATFS -#include "ff.h" +#include #include "../../core/lv_global.h" /********************* diff --git a/src/libs/fsdrv/lv_fs_littlefs.c b/src/libs/fsdrv/lv_fs_littlefs.c index 8f2fb92309..b2c91fb42a 100644 --- a/src/libs/fsdrv/lv_fs_littlefs.c +++ b/src/libs/fsdrv/lv_fs_littlefs.c @@ -1,7 +1,7 @@ #include "../../../lvgl.h" #if LV_USE_FS_LITTLEFS -#include "lfs.h" +#include #include "../../core/lv_global.h" #if !LV_FS_IS_VALID_LETTER(LV_FS_LITTLEFS_LETTER) diff --git a/src/libs/gltf/gltf_data/lv_gltf_data_animations.cpp b/src/libs/gltf/gltf_data/lv_gltf_data_animations.cpp index c0d45acb7e..18a6e4226b 100644 --- a/src/libs/gltf/gltf_data/lv_gltf_data_animations.cpp +++ b/src/libs/gltf/gltf_data/lv_gltf_data_animations.cpp @@ -11,6 +11,8 @@ #if LV_USE_GLTF #include +#include +#include "lv_gltf_data_internal.hpp" /********************* * DEFINES @@ -26,8 +28,6 @@ * STATIC PROTOTYPES **********************/ -#include "fastgltf/math.hpp" -#include "lv_gltf_data_internal.hpp" static fastgltf::math::fvec3 animation_get_vec3_at_timestamp(lv_gltf_model_t * data, fastgltf::AnimationSampler * sampler, float seconds); diff --git a/src/libs/gltf/gltf_data/lv_gltf_model_node.cpp b/src/libs/gltf/gltf_data/lv_gltf_model_node.cpp index 39122d997f..ae09e178ef 100644 --- a/src/libs/gltf/gltf_data/lv_gltf_model_node.cpp +++ b/src/libs/gltf/gltf_data/lv_gltf_model_node.cpp @@ -11,7 +11,7 @@ #if LV_USE_GLTF #include -#include "fastgltf/types.hpp" +#include #include "../../../misc/lv_event_private.h" /********************* diff --git a/src/libs/gltf/gltf_view/lv_gltf_view_shader.cpp b/src/libs/gltf/gltf_view/lv_gltf_view_shader.cpp index e9d4d7b2e2..f82821e509 100644 --- a/src/libs/gltf/gltf_view/lv_gltf_view_shader.cpp +++ b/src/libs/gltf/gltf_view/lv_gltf_view_shader.cpp @@ -9,7 +9,7 @@ #include "lv_gltf_view_internal.h" #if LV_USE_GLTF -#include "fastgltf/types.hpp" +#include #include "../gltf_data/lv_gltf_data_internal.hpp" #include "../gltf_data/lv_gltf_data_internal.h" #include "../../../drivers/opengles/opengl_shader/lv_opengl_shader_internal.h" diff --git a/src/osal/lv_cmsis_rtos2.h b/src/osal/lv_cmsis_rtos2.h index ae4f94f0ae..a28a8ff4ad 100644 --- a/src/osal/lv_cmsis_rtos2.h +++ b/src/osal/lv_cmsis_rtos2.h @@ -21,7 +21,7 @@ extern "C" { *********************/ #if LV_USE_OS == LV_OS_CMSIS_RTOS2 -#include "cmsis_os2.h" +#include /********************* * DEFINES diff --git a/src/osal/lv_freertos.c b/src/osal/lv_freertos.c index 33c59c3110..1f64e34678 100644 --- a/src/osal/lv_freertos.c +++ b/src/osal/lv_freertos.c @@ -16,9 +16,9 @@ #if LV_USE_OS == LV_OS_FREERTOS #ifdef ESP_PLATFORM - #include "freertos/atomic.h" + #include #else - #include "atomic.h" + #include #endif #include "../core/lv_global.h" diff --git a/src/osal/lv_freertos.h b/src/osal/lv_freertos.h index 96196b7434..398c19d228 100644 --- a/src/osal/lv_freertos.h +++ b/src/osal/lv_freertos.h @@ -24,13 +24,13 @@ extern "C" { #if LV_USE_OS == LV_OS_FREERTOS #ifdef ESP_PLATFORM -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "freertos/semphr.h" +#include +#include +#include #else -#include "FreeRTOS.h" -#include "task.h" -#include "semphr.h" +#include +#include +#include #endif /********************* diff --git a/src/osal/lv_mqx.h b/src/osal/lv_mqx.h index 1ccd0091d7..8168566afd 100644 --- a/src/osal/lv_mqx.h +++ b/src/osal/lv_mqx.h @@ -17,8 +17,8 @@ extern "C" { #if LV_USE_OS == LV_OS_MQX -#include "mqx.h" -#include "mutex.h" +#include +#include /********************* * DEFINES