From 88e0e22cb5d2bce7a4324ddec17c4abb1748b7aa Mon Sep 17 00:00:00 2001 From: ROMemories <152802150+ROMemories@users.noreply.github.com> Date: Tue, 21 Jan 2025 15:30:04 +0100 Subject: [PATCH] fix(boards): rename the ESP32 boards Some of them were using the *module* name instead of the board name. --- .github/workflows/build.yml | 2 +- Cargo.lock | 8 ++++---- book/src/support_matrix.html | 2 +- doc/support_matrix.yml | 4 ++-- laze-project.yml | 6 +++--- src/ariel-os-boards/Cargo.toml | 4 ++-- .../Cargo.toml | 2 +- .../src/lib.rs | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 2 +- src/ariel-os-boards/src/lib.rs | 8 ++++---- 11 files changed, 21 insertions(+), 21 deletions(-) rename src/ariel-os-boards/{espressif-esp32-wroom-32 => espressif-esp32-devkitc}/Cargo.toml (84%) rename src/ariel-os-boards/{espressif-esp32-wroom-32 => espressif-esp32-devkitc}/src/lib.rs (54%) rename src/ariel-os-boards/{espressif-esp32-s3-wroom-1 => espressif-esp32-s3-devkitc-1}/Cargo.toml (83%) rename src/ariel-os-boards/{espressif-esp32-s3-wroom-1 => espressif-esp32-s3-devkitc-1}/src/lib.rs (54%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04f8cded6..1b0fab43c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -132,7 +132,7 @@ jobs: if: github.event_name != 'schedule' run: | source ~/source-this-first.sh - echo "LAZE_BUILDERS=ai-c3,espressif-esp32-c6-devkitc-1,espressif-esp32-s3-wroom-1,microbit-v2,nrf52840dk,nrf5340dk,rpi-pico,rpi-pico-w,st-nucleo-h755zi-q,st-nucleo-wb55" >> "$GITHUB_ENV" + echo "LAZE_BUILDERS=ai-c3,espressif-esp32-c6-devkitc-1,espressif-esp32-s3-devkitc-1,microbit-v2,nrf52840dk,nrf5340dk,rpi-pico,rpi-pico-w,st-nucleo-h755zi-q,st-nucleo-wb55" >> "$GITHUB_ENV" - name: "ariel-os compilation test" if: steps.result-cache.outputs.cache-hit != 'true' diff --git a/Cargo.lock b/Cargo.lock index 13bb80cef..8bc5f2560 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,8 +121,8 @@ dependencies = [ "cfg-if", "dwm1001", "espressif-esp32-c6-devkitc-1", - "espressif-esp32-s3-wroom-1", - "espressif-esp32-wroom-32", + "espressif-esp32-devkitc", + "espressif-esp32-s3-devkitc-1", "linkme", "microbit", "microbit-v2", @@ -2354,7 +2354,7 @@ dependencies = [ ] [[package]] -name = "espressif-esp32-s3-wroom-1" +name = "espressif-esp32-devkitc" version = "0.1.0" dependencies = [ "ariel-os-debug", @@ -2362,7 +2362,7 @@ dependencies = [ ] [[package]] -name = "espressif-esp32-wroom-32" +name = "espressif-esp32-s3-devkitc-1" version = "0.1.0" dependencies = [ "ariel-os-debug", diff --git a/book/src/support_matrix.html b/book/src/support_matrix.html index 4a3b822bc..3166b0347 100644 --- a/book/src/support_matrix.html +++ b/book/src/support_matrix.html @@ -52,7 +52,7 @@ ESP32-S3 - Espressif ESP32-S3-WROOM-1 + Espressif ESP32-S3-DevKitC-1 ✅ ✅ ❌ diff --git a/doc/support_matrix.yml b/doc/support_matrix.yml index b91e7aeab..a6270ce82 100644 --- a/doc/support_matrix.yml +++ b/doc/support_matrix.yml @@ -216,8 +216,8 @@ boards: user_usb: not_currently_supported ethernet_over_usb: not_currently_supported - espressif-esp32-s3-wroom-1: - name: Espressif ESP32-S3-WROOM-1 + espressif-esp32-s3-devkitc-1: + name: Espressif ESP32-S3-DevKitC-1 chip: esp32-s3 support: user_usb: not_currently_supported diff --git a/laze-project.yml b/laze-project.yml index fef2d76bb..091e7e8a1 100644 --- a/laze-project.yml +++ b/laze-project.yml @@ -670,7 +670,7 @@ modules: - name: hw/usb-device-port help: provided if a device has a USB device port wired up context: - - espressif-esp32-s3-wroom-1 + - espressif-esp32-s3-devkitc-1 - nrf5340dk - nrf52840dk - rpi-pico @@ -1000,13 +1000,13 @@ builders: - name: ai-c3 parent: esp32c3 - - name: espressif-esp32-wroom-32 + - name: espressif-esp32-devkitc parent: esp32 - name: espressif-esp32-c6-devkitc-1 parent: esp32c6 - - name: espressif-esp32-s3-wroom-1 + - name: espressif-esp32-s3-devkitc-1 parent: esp32s3 - name: nrf5340dk diff --git a/src/ariel-os-boards/Cargo.toml b/src/ariel-os-boards/Cargo.toml index 59ebb0143..cdfb9ab36 100644 --- a/src/ariel-os-boards/Cargo.toml +++ b/src/ariel-os-boards/Cargo.toml @@ -15,8 +15,8 @@ ariel-os-rt = { path = "../ariel-os-rt" } ai-c3 = { optional = true, path = "ai-c3" } espressif-esp32-c6-devkitc-1 = { optional = true, path = "espressif-esp32-c6-devkitc-1" } -espressif-esp32-s3-wroom-1 = { optional = true, path = "espressif-esp32-s3-wroom-1" } -espressif-esp32-wroom-32 = { optional = true, path = "espressif-esp32-wroom-32" } +espressif-esp32-s3-devkitc-1 = { optional = true, path = "espressif-esp32-s3-devkitc-1" } +espressif-esp32-devkitc = { optional = true, path = "espressif-esp32-devkitc" } dwm1001 = { optional = true, path = "dwm1001" } microbit = { optional = true, path = "microbit" } microbit-v2 = { optional = true, path = "microbit-v2" } diff --git a/src/ariel-os-boards/espressif-esp32-wroom-32/Cargo.toml b/src/ariel-os-boards/espressif-esp32-devkitc/Cargo.toml similarity index 84% rename from src/ariel-os-boards/espressif-esp32-wroom-32/Cargo.toml rename to src/ariel-os-boards/espressif-esp32-devkitc/Cargo.toml index 41b256987..b70d0a704 100644 --- a/src/ariel-os-boards/espressif-esp32-wroom-32/Cargo.toml +++ b/src/ariel-os-boards/espressif-esp32-devkitc/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "espressif-esp32-wroom-32" +name = "espressif-esp32-devkitc" version = "0.1.0" license.workspace = true edition.workspace = true diff --git a/src/ariel-os-boards/espressif-esp32-wroom-32/src/lib.rs b/src/ariel-os-boards/espressif-esp32-devkitc/src/lib.rs similarity index 54% rename from src/ariel-os-boards/espressif-esp32-wroom-32/src/lib.rs rename to src/ariel-os-boards/espressif-esp32-devkitc/src/lib.rs index 9cc260867..cad038601 100644 --- a/src/ariel-os-boards/espressif-esp32-wroom-32/src/lib.rs +++ b/src/ariel-os-boards/espressif-esp32-devkitc/src/lib.rs @@ -3,5 +3,5 @@ use ariel_os_debug::println; pub fn init() { - println!("espressif-esp32-wroom-32::init()"); + println!("espressif-esp32-devkitc::init()"); } diff --git a/src/ariel-os-boards/espressif-esp32-s3-wroom-1/Cargo.toml b/src/ariel-os-boards/espressif-esp32-s3-devkitc-1/Cargo.toml similarity index 83% rename from src/ariel-os-boards/espressif-esp32-s3-wroom-1/Cargo.toml rename to src/ariel-os-boards/espressif-esp32-s3-devkitc-1/Cargo.toml index 55574fa4b..97a55bb07 100644 --- a/src/ariel-os-boards/espressif-esp32-s3-wroom-1/Cargo.toml +++ b/src/ariel-os-boards/espressif-esp32-s3-devkitc-1/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "espressif-esp32-s3-wroom-1" +name = "espressif-esp32-s3-devkitc-1" version = "0.1.0" license.workspace = true edition.workspace = true diff --git a/src/ariel-os-boards/espressif-esp32-s3-wroom-1/src/lib.rs b/src/ariel-os-boards/espressif-esp32-s3-devkitc-1/src/lib.rs similarity index 54% rename from src/ariel-os-boards/espressif-esp32-s3-wroom-1/src/lib.rs rename to src/ariel-os-boards/espressif-esp32-s3-devkitc-1/src/lib.rs index 1efb42a60..2e1c2a829 100644 --- a/src/ariel-os-boards/espressif-esp32-s3-wroom-1/src/lib.rs +++ b/src/ariel-os-boards/espressif-esp32-s3-devkitc-1/src/lib.rs @@ -3,5 +3,5 @@ use ariel_os_debug::log::debug; pub fn init() { - debug!("espressif-esp32-s3-wroom-1::init()"); + debug!("espressif-esp32-s3-devkitc-1::init()"); } diff --git a/src/ariel-os-boards/src/lib.rs b/src/ariel-os-boards/src/lib.rs index 2fac32320..a6b2e05e0 100644 --- a/src/ariel-os-boards/src/lib.rs +++ b/src/ariel-os-boards/src/lib.rs @@ -6,12 +6,12 @@ use cfg_if::cfg_if; cfg_if! { if #[cfg(feature = "ai-c3")] { pub use ai_c3 as board; - } else if #[cfg(feature = "espressif-esp32-wroom-32")] { - pub use espressif_esp32_wroom_32 as board; + } else if #[cfg(feature = "espressif-esp32-devkitc")] { + pub use espressif_esp32_devkitc as board; } else if #[cfg(feature = "espressif-esp32-c6-devkitc-1")] { pub use espressif_esp32_c6_devkitc_1 as board; - } else if #[cfg(feature = "espressif-esp32-s3-wroom-1")] { - pub use espressif_esp32_s3_wroom_1 as board; + } else if #[cfg(feature = "espressif-esp32-s3-devkitc-1")] { + pub use espressif_esp32_s3_devkitc_1 as board; } else if #[cfg(feature = "nrf52dk")] { pub use nrf52dk as board; } else if #[cfg(feature = "dwm1001")] {