From 46e338e3414ce60ba5e77b5f48ee14deacfaaaab Mon Sep 17 00:00:00 2001 From: Neo Xu Date: Sun, 18 Feb 2024 10:55:46 +0800 Subject: [PATCH] fix(formatting): fix code formating (#5673) Signed-off-by: Xu Xingliang --- .github/pull_request_template.md | 2 +- .github/workflows/check_style.yml | 1 + docs/others/fragment.rst | 3 +-- examples/others/fragment/lv_example_fragment_1.c | 2 +- examples/others/fragment/lv_example_fragment_2.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 982c8cd23..37fb1120f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -7,7 +7,7 @@ A clear and concise description of what the bug or new feature is. - Add [Examples](https://github.com/lvgl/lvgl/tree/master/examples) if relevant. - Add [Tests](https://github.com/lvgl/lvgl/blob/master/tests/README.md) if applicable. - If you added new options to `lv_conf_template.h` run [lv_conf_internal_gen.py](https://github.com/lvgl/lvgl/blob/master/scripts/lv_conf_internal_gen.py) and update [Kconfig](https://github.com/lvgl/lvgl/blob/master/Kconfig). -- Run `scripts/code-format.py` ([astyle](http://astyle.sourceforge.net/install.html) needs to be installed) and follow the [Code Conventions](https://docs.lvgl.io/master/CODING_STYLE.html) +- Run `scripts/code-format.py` ([astyle](http://astyle.sourceforge.net/install.html) version [v3.4.10](https://github.com/szepeviktor/astyle/releases/tag/v3.4.10) needs to be installed) and follow the [Code Conventions](https://docs.lvgl.io/master/CODING_STYLE.html). - Mark the Pull request as [Draft](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) while you are working on the first version, and mark is as _Ready_ when it's ready for review. - When changes were requested, [re-request review](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/requesting-a-pull-request-review) to notify the maintainers. - Help us to review this Pull Request! Anyone can [approve or request changes](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/approving-a-pull-request-with-required-reviews). diff --git a/.github/workflows/check_style.yml b/.github/workflows/check_style.yml index 7623a0191..4b69b1a39 100644 --- a/.github/workflows/check_style.yml +++ b/.github/workflows/check_style.yml @@ -18,6 +18,7 @@ jobs: with: repository: szepeviktor/astyle path: astyle + ref: v3.4.10 - name: Install astyle run: | cd astyle/build/gcc/ diff --git a/docs/others/fragment.rst b/docs/others/fragment.rst index f6feb6570..169ad4eaa 100644 --- a/docs/others/fragment.rst +++ b/docs/others/fragment.rst @@ -47,7 +47,7 @@ Create Fragment Class /* Create view objects */ .create_obj_cb = sample_fragment_create_obj, /* IMPORTANT: size of your fragment struct */ - .instance_size = sizeof(struct sample_fragment_t) + .instance_size = sizeof(struct sample_fragment_t), }; Use ``lv_fragment_manager`` @@ -84,4 +84,3 @@ Example API --- - diff --git a/examples/others/fragment/lv_example_fragment_1.c b/examples/others/fragment/lv_example_fragment_1.c index 6de981ae8..63e931cd2 100644 --- a/examples/others/fragment/lv_example_fragment_1.c +++ b/examples/others/fragment/lv_example_fragment_1.c @@ -22,7 +22,7 @@ struct sample_fragment_t { 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) + .instance_size = sizeof(struct sample_fragment_t), }; void lv_example_fragment_1(void) diff --git a/examples/others/fragment/lv_example_fragment_2.c b/examples/others/fragment/lv_example_fragment_2.c index 39f0956e7..d93c31cb0 100644 --- a/examples/others/fragment/lv_example_fragment_2.c +++ b/examples/others/fragment/lv_example_fragment_2.c @@ -28,7 +28,7 @@ typedef struct sample_fragment_t { static const lv_fragment_class_t sample_cls = { .constructor_cb = sample_fragment_ctor, .create_obj_cb = sample_fragment_create_obj, - .instance_size = sizeof(sample_fragment_t) + .instance_size = sizeof(sample_fragment_t), }; static lv_obj_t * container = NULL;