DMA optimization and refactoring (#67)

* optimized DMA * refactor code and remove duplicated code in many targets * esp32-devkit-rust - decrease freq for reading IMU, because of interference on clock pin
georgik · Nov 23, 2023 · 743616f · 743616f
1 parent bce0bc0
commit 743616f
Show file tree

Hide file tree

Showing 49 changed files with 569 additions and 1,530 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ The ghost can find artifact "Walker" which allows him to pass throght the wall f
 The ghost can use dynamite to clear wall in the vicinity. The ghost can use also Teleport spell to move to random place in the maze.
 The Teleport spell requires some time to recharge. There are some not friendly spirits running around the maze, when collision occurs the ghost is teleported and loses five coins which are then send randomly back to the maze.
 
-![Spooky on ESP32-S3-BOX](assets/screenshot/esp32-spooky-s3-box.jpg)
+![Spooky on ESP32-S2-Kaluga](assets/screenshot/esp32-spooky-s2-kaluga.jpg)
 
 ### Creating similar custom ESP32 app from a template
 

diff --git a/assets/screenshot/esp32-spooky-s2-kaluga.jpg b/assets/screenshot/esp32-spooky-s2-kaluga.jpg
diff --git a/esp-wrover-kit/Cargo.toml b/esp-wrover-kit/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spooky-wrover-kit"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Juraj Michálek <juraj.michalek@gmail.com>"]
 edition = "2021"
 license = "MIT"
@@ -18,29 +18,12 @@ esp-println = { version = "0.7.0", features = ["esp32"] }
 [dependencies]
 esp-alloc = "0.3.0"
 embedded-graphics = "0.8.0"
-embedded-graphics-framebuf = { version = "0.3.0", git = "https://github.com/georgik/embedded-graphics-framebuf.git", branch = "feature/embedded-graphics-0.8" }
 embedded-hal = "0.2"
 display-interface = "0.4"
 display-interface-spi = "0.4"
 mipidsi = "0.7.1"
 panic-halt = "0.2"
 shared-bus = { version = "0.3.0" }
 spooky-core = { path = "../spooky-core", default-features = false, features = [ "static_maze" ] }
-spooky-embedded = { path = "../spooky-embedded", default-features = false, features = [ "static_maze" ] }
+spooky-embedded = { path = "../spooky-embedded", default-features = false, features = [ "esp32", "static_maze", "resolution_320x240" ] }
 spi-dma-displayinterface = { path = "../spi-dma-displayinterface", features = [ "esp32" ] }
-
-[features]
-default = [ "esp_wrover_kit" ]
-
-system_timer = []
-
-button_controls = []
-imu_controls = []
-
-esp32 = []
-esp32s2 = ["system_timer"]
-esp32s3 = []
-esp32c3 = ["system_timer"]
-
-# Enable this feature in case you have an ESP32 Wrover Kit with ILI9341
-esp_wrover_kit = [ "esp32" ]
diff --git a/esp-wrover-kit/src/app.rs b/esp-wrover-kit/src/app.rs
diff --git a/esp-wrover-kit/src/main.rs b/esp-wrover-kit/src/main.rs
@@ -6,8 +6,7 @@
 #[global_allocator]
 static ALLOCATOR: esp_alloc::EspHeap = esp_alloc::EspHeap::empty();
 
-// use display_interface_spi::SPIInterfaceNoCS;
-use spi_dma_displayinterface::spi_dma_displayinterface::SPIInterfaceNoCS;
+use spi_dma_displayinterface::spi_dma_displayinterface;
 
 use esp_backtrace as _;
 use hal::{psram, prelude::*,
@@ -28,9 +27,13 @@ use embedded_graphics::{
 };
 
 mod setup;
+use setup::{setup_button_keyboard, setup_movement_controller};
 mod types;
-mod app;
-use app::app_loop;
+
+use spooky_embedded::{
+    app::app_loop,
+    embedded_display::{LCD_H_RES, LCD_V_RES, LCD_MEMORY_SIZE},
+};
 
 use crate::types::ConfiguredPins;
 
@@ -56,9 +59,6 @@ fn main() -> ! {
 
     let io = IO::new(peripherals.GPIO, peripherals.IO_MUX);
 
-    let lcd_h_res = 240;
-    let lcd_v_res = 320;
-
     let lcd_sclk = io.pins.gpio19;
     let lcd_mosi = io.pins.gpio23;
     let lcd_miso = io.pins.gpio25;
@@ -99,10 +99,10 @@ fn main() -> ! {
         DmaPriority::Priority0,
     ));
 
-    let di = SPIInterfaceNoCS::new(spi, lcd_dc);
+    let di = spi_dma_displayinterface::new_no_cs(LCD_MEMORY_SIZE, spi, lcd_dc);
 
     let mut display = match mipidsi::Builder::ili9341_rgb565(di)
-        .with_display_size(lcd_h_res as u16, lcd_v_res as u16)
+        .with_display_size(LCD_H_RES, LCD_V_RES)
         .with_orientation(mipidsi::Orientation::Landscape(false))
         .with_color_order(mipidsi::ColorOrder::Bgr)
         .init(&mut delay, Some(lcd_reset)) {
@@ -122,6 +122,10 @@ fn main() -> ! {
     let mut seed_buffer = [1u8; 32];
     rng.read(&mut seed_buffer).unwrap();
 
-    app_loop(&mut display, lcd_h_res, lcd_v_res, configured_pins, seed_buffer);
+    let button_keyboard = setup_button_keyboard(configured_pins);
+
+    let movement_controller = setup_movement_controller(seed_buffer, button_keyboard);
+
+    app_loop(&mut display, seed_buffer, movement_controller);
     loop {}
 }
diff --git a/esp-wrover-kit/src/setup.rs b/esp-wrover-kit/src/setup.rs
@@ -1,6 +1,6 @@
 use crate::types::ConfiguredPins;
 use embedded_hal::digital::v2::InputPin;
-use spooky_embedded::{ button_keyboard::ButtonKeyboard, embedded_movement_controller::EmbeddedMovementController };
+use spooky_embedded::{ button_keyboard::ButtonKeyboard, controllers::embedded::EmbeddedMovementController };
 use spooky_core;
 
 pub fn setup_button_keyboard<Up: InputPin, Down: InputPin, Left: InputPin, Right: InputPin, Dyn: InputPin, Tel: InputPin>(

diff --git a/esp32-c3-devkit-rust/.cargo/config.toml b/esp32-c3-devkit-rust/.cargo/config.toml
@@ -25,6 +25,10 @@ rustflags = [
   "--cfg", 'target_has_atomic="ptr"',
 ]
 
+[env]
+# Use clean build after changing ESP_LOGLEVEL
+ESP_LOGLEVEL="DEBUG"
+
 [build]
 target = "riscv32imac-unknown-none-elf"
 

diff --git a/esp32-c3-devkit-rust/Cargo.toml b/esp32-c3-devkit-rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spooky-esp32-c3"
-version = "0.8.0"
+version = "0.9.0"
 authors = ["Juraj Michálek <juraj.michalek@gmail.com>"]
 edition = "2021"
 license = "MIT"
@@ -10,35 +10,18 @@ hal = { package = "esp32c3-hal", version = "0.13.0" }
 esp-backtrace = { version = "0.9.0", features = [
     "esp32c3",
     "panic-handler",
-    "print-rtt",
+    "print-uart",
 ] }
-esp-println = { version = "0.7.0", default-features = false, features = [ "esp32c3",  "rtt" ] }
+esp-println = { version = "0.7.0", default-features = false, features = [ "esp32c3", "log" ] }
 
 [dependencies]
 esp-alloc = "0.3.0"
 embedded-graphics = "0.8.0"
-embedded-graphics-framebuf = { version = "0.3.0", git = "https://github.com/georgik/embedded-graphics-framebuf.git", branch = "feature/embedded-graphics-0.8" }
 embedded-hal = "0.2"
-display-interface = "0.4"
-display-interface-spi = "0.4"
 icm42670 = { git = "https://github.com/jessebraham/icm42670/" }
 mipidsi = "0.7.1"
 panic-halt = "0.2"
 shared-bus = { version = "0.3.0" }
 spooky-core = { path = "../spooky-core", default-features = false, features = ["static_maze"]}
-spooky-embedded = { path = "../spooky-embedded", default-features = false, features = [ "static_maze" ] }
+spooky-embedded = { path = "../spooky-embedded", default-features = false, features = [ "esp32c3", "static_maze", "resolution_320x240" ] }
 spi-dma-displayinterface = { path = "../spi-dma-displayinterface", features = ["esp32c3"] }
-
-[features]
-default = [ "esp32c3_ili9341" ]
-system_timer = []
-
-button_controls = []
-imu_controls = []
-
-esp32 = []
-esp32s2 = ["system_timer"]
-esp32s3 = []
-esp32c3 = ["system_timer"]
-
-esp32c3_ili9341 = [ "esp32c3", "imu_controls" ]
diff --git a/esp32-c3-devkit-rust/src/accel_movement_controller.rs b/esp32-c3-devkit-rust/src/accel_movement_controller.rs
diff --git a/esp32-c3-devkit-rust/src/app.rs b/esp32-c3-devkit-rust/src/app.rs