Fix LVGL build issues for ESP32

Xila-Project · Apr 11, 2024 · fe18bfd · fe18bfd
1 parent 6b3b54c
commit fe18bfd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -10,9 +10,6 @@ linker = "ldproxy"
 runner = "espflash flash --monitor" # Select this runner for espflash v2.x.x
 rustflags = [ "--cfg",  "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110
 
-#[unstable]
-#build-std = ["std", "panic_abort"]
-
 [env]
 # Note: this variable is not used by the pio builder (`cargo build --features pio`)
 ESP_IDF_VERSION = "v5.1.1"
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,7 +40,8 @@ embedded-sdmmc = "0.7.0"
 embedded-hal = "1.0.0"
 fatfs = { version = "0.3.6" }
 byteorder = "1.5.0"
-lvgl = { version="0.6.2", features = [] }
+lvgl = { version="0.6.2", default-features=false, features = ["embedded-graphics", "unsafe_no_autoinit"] }
+lvgl-sys = { version="0.6.2" }
 embedded-graphics = "0.8.1"
 
 [build-dependencies]

diff --git a/Export.sh b/Export.sh
@@ -5,14 +5,14 @@ clear && echo "Setting up environment variables for Rust cross-compilation"
 
 # Variables
 
-Linux_environment_variables="DEP_LV_CONFIG_PATH=\"$PWD\""
+Linux_environment_variables="DEP_LV_CONFIG_PATH=\"$PWD/Modules/LVGL\""
 Linux_target="--target x86_64-unknown-linux-gnu"
 Windows_target="--target x86_64-pc-windows-gnu"
 
-ESP32_environment_variables="MCU=esp32 DEP_LV_CONFIG_PATH='pwd'"
-ESP32_target="--target xtensa-esp32-espidf --features ESP32"
-ESP32_S3_environment_variables="MCU=esp32s3 DEP_LV_CONFIG_PATH='pwd'"
-ESP32_S3_target="--target xtensa-esp32s3-espidf --features ESP32_S3"
+ESP32_environment_variables="MCU=esp32 DEP_LV_CONFIG_PATH=\"$PWD/Modules/LVGL\""
+ESP32_target="--target xtensa-esp32-espidf --features ESP32 -Z build-std=std,panic_abort"
+ESP32_S3_environment_variables="MCU=esp32s3 DEP_LV_CONFIG_PATH=\"$PWD/Modules/LVGL\""
+ESP32_S3_target="--target xtensa-esp32s3-espidf --features ESP32_S3 -Z build-std=std,panic_abort"
 
 Cargo="cargo"
 

diff --git a/lv_conf.h → Modules/LVGL/lv_conf.h b/lv_conf.h → Modules/LVGL/lv_conf.h
diff --git a/lv_drv_conf.h → Modules/LVGL/lv_drv_conf.h b/lv_drv_conf.h → Modules/LVGL/lv_drv_conf.h