From 31126be578eccd2f00ec53a0f61ac37d0e49cada Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 12 Mar 2024 14:36:14 +0100 Subject: [PATCH] update code formatter --- .github/workflows/check_style.yml | 15 +++++++++++---- examples/others/fragment/lv_example_fragment_1.c | 2 +- src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c | 10 +++++----- src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h | 8 ++++---- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/check_style.yml b/.github/workflows/check_style.yml index b5cec3ef0a..876c44ebbe 100644 --- a/.github/workflows/check_style.yml +++ b/.github/workflows/check_style.yml @@ -9,15 +9,22 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: persist-credentials: false fetch-depth: 0 + - name: Checkout astyle + uses: actions/checkout@v4 + with: + repository: szepeviktor/astyle + path: astyle + ref: v3.4.12 - name: Install astyle run: | - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" - sudo apt-get update -y -qq - sudo apt-get install astyle + cd astyle/build/gcc/ + make + sudo make install + astyle --version - name: Format code run: python code-format.py working-directory: scripts diff --git a/examples/others/fragment/lv_example_fragment_1.c b/examples/others/fragment/lv_example_fragment_1.c index ab2406be71..4f038af946 100644 --- a/examples/others/fragment/lv_example_fragment_1.c +++ b/examples/others/fragment/lv_example_fragment_1.c @@ -23,7 +23,7 @@ static const lv_fragment_class_t sample_cls = { .constructor_cb = sample_fragment_ctor, .create_obj_cb = sample_fragment_create_obj, .instance_size = sizeof(struct sample_fragment_t) -}; + }; void lv_example_fragment_1(void) { diff --git a/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c b/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c index 4348e9af3d..458561de80 100644 --- a/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c +++ b/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.c @@ -56,7 +56,7 @@ static dma2d_color_format_t lv_color_format_to_dma2d_color_format(lv_img_cf_t co static lv_point_t lv_area_get_offset(const lv_area_t * area1, const lv_area_t * area2); lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * img_dsc, - const lv_area_t * src_area, const void * src); + const lv_area_t * src_area, const void * src); LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_fill(const lv_color_t * dst_buf, lv_coord_t dst_stride, const lv_area_t * draw_area, lv_color_t color, lv_opa_t opa); LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_map(const lv_color_t * dest_buf, lv_coord_t dest_stride, @@ -315,7 +315,7 @@ static dma2d_color_format_t lv_color_format_to_dma2d_color_format(lv_img_cf_t co } lv_res_t lv_draw_stm32_dma2d_img(lv_draw_ctx_t * draw_ctx, const lv_draw_img_dsc_t * img_dsc, - const lv_area_t * src_area, const void * src) + const lv_area_t * src_area, const void * src) { //if(lv_img_src_get_type(src) != LV_IMG_SRC_VARIABLE) return LV_RES_INV; return LV_RES_INV; @@ -581,7 +581,7 @@ LV_STM32_DMA2D_STATIC void _lv_draw_stm32_dma2d_blend_paint(const lv_color_t * d * @param src_offset src offset in relation to dst, useful when src is larger than draw_area */ void _lv_draw_stm32_dma2d_copy_buffer(const lv_color_t * dest_buf, lv_coord_t dest_stride, - const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset) + const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset) { LV_ASSERT_MSG(!isDma2dInProgess, "dma2d transfer has not finished"); // critical lv_coord_t draw_width = lv_area_get_width(draw_area); @@ -664,7 +664,7 @@ LV_STM32_DMA2D_STATIC void _lv_gpu_stm32_dma2d_await_dma_transfer_finish(lv_disp #if defined (LV_STM32_DMA2D_USE_M7_CACHE) // Cortex-M7 DCache present void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset, lv_coord_t width, - lv_coord_t height, uint8_t pixel_size) + lv_coord_t height, uint8_t pixel_size) { if(((SCB->CCR) & SCB_CCR_DC_Msk) == 0) return; // L1 data cache is disabled uint16_t stride = pixel_size * (width + offset); // in bytes @@ -694,7 +694,7 @@ void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset, l } void _lv_gpu_stm32_dma2d_clean_cache(uint32_t address, lv_coord_t offset, lv_coord_t width, - lv_coord_t height, uint8_t pixel_size) + lv_coord_t height, uint8_t pixel_size) { if(((SCB->CCR) & SCB_CCR_DC_Msk) == 0) return; // L1 data cache is disabled uint16_t stride = pixel_size * (width + offset); // in bytes diff --git a/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h b/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h index 3f1e024d03..42d8256083 100644 --- a/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h +++ b/src/draw/stm32_dma2d/lv_gpu_stm32_dma2d.h @@ -32,7 +32,7 @@ extern "C" { #endif #if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U) - #define LV_STM32_DMA2D_USE_M7_CACHE +#define LV_STM32_DMA2D_USE_M7_CACHE #endif /********************** @@ -58,13 +58,13 @@ void lv_draw_stm32_dma2d_init(void); void lv_draw_stm32_dma2d_ctx_init(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx); void lv_draw_stm32_dma2d_ctx_deinit(struct _lv_disp_drv_t * drv, lv_draw_ctx_t * draw_ctx); void _lv_draw_stm32_dma2d_copy_buffer(const lv_color_t * dest_buf, lv_coord_t dest_stride, - const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset); + const lv_area_t * draw_area, const lv_color_t * src_buf, lv_coord_t src_stride, const lv_point_t * src_offset); #if defined (LV_STM32_DMA2D_USE_M7_CACHE) void _lv_gpu_stm32_dma2d_invalidate_cache(uint32_t address, lv_coord_t offset, - lv_coord_t width, lv_coord_t height, uint8_t pixel_size); + lv_coord_t width, lv_coord_t height, uint8_t pixel_size); void _lv_gpu_stm32_dma2d_clean_cache(uint32_t address, lv_coord_t offset, lv_coord_t width, - lv_coord_t height, uint8_t pixel_size); + lv_coord_t height, uint8_t pixel_size); #endif