Skip to content

Commit 5f47c91

Browse files
committed
cleanup script, upgrade lvgl version
1 parent 3119833 commit 5f47c91

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

extra_script.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import subprocess
2-
import os
3-
import glob
42

53
Import("env")
64
folder = env.GetProjectOption("src_folder")
@@ -10,35 +8,7 @@
108
PROJECT_SRC_DIR="$PROJECT_DIR/src/" + folder
119
)
1210

13-
# Remove problematic LVGL files for ESP32
14-
def remove_incompatible_files():
15-
try:
16-
# Find and remove ARM-specific assembly files (Helium and NEON)
17-
arm_assembly_patterns = [
18-
".pio/libdeps/*/lvgl/src/draw/sw/blend/helium/*.S",
19-
".pio/libdeps/*/lvgl/src/draw/sw/blend/helium/*.s",
20-
".pio/libdeps/*/lvgl/src/draw/sw/blend/neon/*.S",
21-
".pio/libdeps/*/lvgl/src/draw/sw/blend/neon/*.s"
22-
]
23-
24-
# Remove TFT_eSPI driver files (we use ST7789 instead)
25-
tft_espi_patterns = [
26-
".pio/libdeps/*/lvgl/src/drivers/display/tft_espi/*.cpp",
27-
".pio/libdeps/*/lvgl/src/drivers/display/tft_espi/*.c"
28-
]
29-
30-
all_patterns = arm_assembly_patterns + tft_espi_patterns
31-
32-
for pattern in all_patterns:
33-
for file_path in glob.glob(pattern):
34-
if os.path.exists(file_path):
35-
print(f"Removing incompatible file: {file_path}")
36-
os.remove(file_path)
37-
except Exception as e:
38-
print(f"Warning: Could not remove incompatible files: {e}")
39-
40-
# Call the function to remove incompatible files
41-
remove_incompatible_files()
11+
4212

4313
def get_git_revision_short_hash():
4414
try:

platformio.ini

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ build_flags =
3535
-D LV_CONF_INCLUDE_SIMPLE
3636
-I inc/sp140/lvgl
3737
-D LV_LVGL_H_INCLUDE_SIMPLE
38-
-D LV_USE_DRAW_SW_BLEND_HELIUM=0
39-
-D LV_USE_DRAW_ARM2D_SYNC=0
40-
-D LV_USE_NATIVE_HELIUM_ASM=0
41-
-D LV_DRAW_SW_BLEND_ASM=LV_DRAW_SW_BLEND_NONE
4238

4339
build_type = debug
4440
debug_speed = 12000
@@ -58,7 +54,7 @@ lib_deps =
5854
https://github.com/rlogiacco/CircularBuffer@1.4.0
5955
https://github.com/openppg/SINE-ESC-CAN
6056
https://github.com/openppg/ANT-BMS-CAN#97170331e1faedb5435657806ad6f9579de9552f
61-
lvgl/lvgl@^9.1.0
57+
lvgl/lvgl@^9.2.0
6258
lib_ignore =
6359
Adafruit SleepyDog Library
6460
${extra.lib_ignore}

0 commit comments

Comments
 (0)