Merge pull request #51 from faxe1008/upddate_lvgl_840

Update LVGL to 8.4

.github/workflows/ccpp.yml

@@ -36,6 +36,11 @@ jobs:
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: Install prerequisites
       run: scripts/install-prerequisites.sh
+    - name: Fix kernel mmap rnd bits
+      # Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
+      # high-entropy ASLR in much newer kernels that GitHub runners are
+      # using leading to random crashes: https://reviews.llvm.org/D148280
+      run: sudo sysctl vm.mmap_rnd_bits=28
     - name: Run tests
       run: python tests/main.py --report test
     - name: Upload coverage to Codecov
@@ -93,4 +98,12 @@ jobs:
             echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc
 
           run: |
+            if [[ "${{ matrix.distro }}" == "ubuntu22.04" ]]; then
+              # ASan in llvm 14 provided in ubuntu-22.04 is incompatible with
+              # high-entropy ASLR configured in much newer kernels that GitHub
+              # runners are using leading to random crashes:
+              #   https://github.com/actions/runner-images/issues/9491
+              # can remove this once the issue is fixed.
+              sysctl -w vm.mmap_rnd_bits=28
+            fi
             env PATH="/usr/lib/ccache:$PATH" ASAN_OPTIONS=detect_leaks=0 python3 tests/main.py test

.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

Kconfig

@@ -1,4 +1,4 @@
-# Kconfig file for LVGL v8.0
+# Kconfig file for LVGL v8.4
 
 if LVGL
 menu "LVGL configuration"

demos/benchmark/lv_demo_benchmark.c

@@ -226,7 +226,6 @@ static void shadow_small_ofs_cb(void)
     rect_create(&style_common);
 }
 
-
 static void shadow_large_cb(void)
 {
     lv_style_reset(&style_common);
@@ -250,7 +249,6 @@ static void shadow_large_ofs_cb(void)
     rect_create(&style_common);
 }
 
-
 static void img_rgb_cb(void)
 {
     lv_style_reset(&style_common);
@@ -293,7 +291,6 @@ static void img_alpha_cb(void)
     img_create(&style_common, &img_benchmark_cogwheel_alpha16, false, false, false);
 }
 
-
 static void img_rgb_recolor_cb(void)
 {
     lv_style_reset(&style_common);
@@ -382,7 +379,6 @@ static void img_rgb_zoom_aa_cb(void)
     lv_style_set_img_opa(&style_common, opa_mode ? LV_OPA_50 : LV_OPA_COVER);
     img_create(&style_common, &img_benchmark_cogwheel_rgb, false, true, true);
 
-
 }
 
 static void img_argb_zoom_cb(void)
@@ -396,7 +392,6 @@ static void img_argb_zoom_cb(void)
 #endif
 }
 
-
 static void img_argb_zoom_aa_cb(void)
 {
     lv_style_reset(&style_common);
@@ -462,7 +457,6 @@ static void txt_large_compr_cb(void)
 
 }
 
-
 static void line_cb(void)
 {
     lv_style_reset(&style_common);
@@ -490,7 +484,6 @@ static void arc_thick_cb(void)
 
 }
 
-
 static void sub_rectangle_cb(void)
 {
     lv_style_reset(&style_common);
@@ -563,8 +556,6 @@ static void sub_text_cb(void)
     txt_create(&style_common);
 }
 
-
-
 /**********************
  *  STATIC VARIABLES
  **********************/
@@ -702,7 +693,6 @@ static void benchmark_init(void)
     lv_obj_update_layout(scr);
 }
 
-
 void lv_demo_benchmark(void)
 {
     benchmark_init();
@@ -750,7 +740,6 @@ void lv_demo_benchmark_run_scene(int_fast16_t scene_no)
     }
 }
 
-
 void lv_demo_benchmark_set_finished_cb(finished_cb_t * finished_cb)
 {
     benchmark_finished_cb = finished_cb;
@@ -799,7 +788,6 @@ static void generate_report(void)
         weight_opa_sum += w;
     }
 
-
     fps_sum = fps_normal_sum + fps_opa_sum;
     weight_sum = weight_normal_sum + weight_opa_sum;
 
@@ -816,7 +804,6 @@ static void generate_report(void)
     lv_obj_clean(lv_scr_act());
     scene_bg = NULL;
 
-
     lv_obj_set_flex_flow(lv_scr_act(), LV_FLEX_FLOW_COLUMN);
 
     title = lv_label_create(lv_scr_act());
@@ -852,7 +839,6 @@ static void generate_report(void)
     //        lv_obj_add_style(table, LV_TABLE_PART_CELL3, &style_cell_very_slow);
     //        lv_obj_add_style(table, LV_TABLE_PART_CELL4, &style_cell_title);
 
-
     uint16_t row = 0;
     lv_table_add_cell_ctrl(table, row, 0, LV_TABLE_CELL_CTRL_MERGE_RIGHT);
     lv_table_set_cell_value(table, row, 0, "Slow but common cases");
@@ -939,7 +925,6 @@ static void generate_report(void)
         lv_snprintf(buf, sizeof(buf), "%"LV_PRIu32, scenes[i].fps_opa);
         lv_table_set_cell_value(table, row, 1, buf);
 
-
         if(scenes[i].fps_opa < 10) {
             //                lv_table_set_cell_type(table, row, 0, 3);
             //                lv_table_set_cell_type(table, row, 1, 3);
@@ -1051,7 +1036,6 @@ static void next_scene_timer_cb(lv_timer_t * timer)
     }
 }
 
-
 static void rect_create(lv_style_t * style)
 {
     uint32_t i;
@@ -1069,7 +1053,6 @@ static void rect_create(lv_style_t * style)
     }
 }
 
-
 static void img_create(lv_style_t * style, const void * src, bool rotate, bool zoom, bool aa)
 {
     uint32_t i;
@@ -1088,7 +1071,6 @@ static void img_create(lv_style_t * style, const void * src, bool rotate, bool z
     }
 }
 
-
 static void txt_create(lv_style_t * style)
 {
     uint32_t i;
@@ -1104,7 +1086,6 @@ static void txt_create(lv_style_t * style)
     }
 }
 
-
 static void line_create(lv_style_t * style)
 {
     static lv_point_t points[OBJ_NUM][LINE_POINT_NUM];
@@ -1119,7 +1100,6 @@ static void line_create(lv_style_t * style)
             points[i][j].y = rnd_next(LINE_POINT_DIFF_MIN, LINE_POINT_DIFF_MAX);
         }
 
-
         lv_obj_t * obj = lv_line_create(scene_bg);
         lv_obj_remove_style_all(obj);
         lv_obj_add_style(obj, style, 0);
@@ -1132,7 +1112,6 @@ static void line_create(lv_style_t * style)
     }
 }
 
-
 static void arc_anim_end_angle_cb(void * var, int32_t v)
 {
     lv_arc_set_end_angle(var, v);
@@ -1166,7 +1145,6 @@ static void arc_create(lv_style_t * style)
     }
 }
 
-
 static void fall_anim_y_cb(void * var, int32_t v)
 {
     lv_obj_set_y(var, v);

demos/benchmark/lv_demo_benchmark.h

@@ -24,7 +24,6 @@ extern "C" {
  **********************/
 typedef void finished_cb_t(void);
 
-
 /**********************
  * GLOBAL PROTOTYPES
  **********************/

demos/lv_demos.h

@@ -47,7 +47,6 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
-
 /**********************
  *      MACROS
  **********************/

demos/music/lv_demo_music_list.c

@@ -130,7 +130,6 @@ lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent)
     return list;
 }
 
-
 void _lv_demo_music_list_close(void)
 {
     lv_style_reset(&style_scrollbar);
@@ -218,7 +217,6 @@ static lv_obj_t * add_list_btn(lv_obj_t * parent, uint32_t track_id)
     return btn;
 }
 
-
 static void btn_click_event_cb(lv_event_t * e)
 {
     lv_obj_t * btn = lv_event_get_target(e);
@@ -228,4 +226,3 @@ static void btn_click_event_cb(lv_event_t * e)
     _lv_demo_music_play(idx);
 }
 #endif /*LV_USE_DEMO_MUSIC*/
-

demos/music/lv_demo_music_main.c

@@ -981,7 +981,6 @@ static void next_click_event_cb(lv_event_t * e)
     }
 }
 
-
 static void timer_cb(lv_timer_t * t)
 {
     LV_UNUSED(t);
@@ -996,7 +995,6 @@ static void spectrum_end_cb(lv_anim_t * a)
     _lv_demo_music_album_next(true);
 }
 
-
 static void stop_start_anim_timer_cb(lv_timer_t * t)
 {
     LV_UNUSED(t);
@@ -1010,4 +1008,3 @@ static void album_fade_anim_cb(void * var, int32_t v)
     lv_obj_set_style_img_opa(var, v, 0);
 }
 #endif /*LV_USE_DEMO_MUSIC*/
-

demos/music/lv_demo_music_main.h

@@ -40,7 +40,6 @@ void _lv_demo_music_album_next(bool next);
  **********************/
 #endif /*LV_USE_DEMO_MUSIC*/
 
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

demos/stress/lv_demo_stress.c

@@ -98,7 +98,6 @@ static void obj_test_timer_cb(lv_timer_t * tmr)
             lv_obj_set_size(main_page, LV_HOR_RES / 2, LV_VER_RES);
             lv_obj_set_flex_flow(main_page, LV_FLEX_FLOW_COLUMN);
 
-
             obj = lv_btn_create(main_page);
             lv_obj_set_size(obj, 100, 70);
             obj = lv_label_create(obj);