From 2bb149b56ebe48436bd5a4e9caade9091e8db1c7 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Fri, 21 Jun 2024 13:33:40 +0200 Subject: [PATCH] fix: `s/expressif/espressif/g` --- .github/workflows/main.yml | 2 +- Cargo.lock | 16 ++++++++-------- laze-project.yml | 2 +- src/riot-rs-boards/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 2 +- src/riot-rs-boards/src/lib.rs | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) rename src/riot-rs-boards/{expressif-esp32-c6-devkitc-1 => espressif-esp32-c6-devkitc-1}/Cargo.toml (79%) rename src/riot-rs-boards/{expressif-esp32-c6-devkitc-1 => espressif-esp32-c6-devkitc-1}/src/lib.rs (52%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35ea079c2..cf7106ae1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: - name: "limit build unless nightly build" if: github.event_name != 'schedule' run: | - echo "LAZE_BUILDERS=ai-c3,expressif-esp32-c6-devkitc-1,microbit-v2,nrf52840dk,nrf5340dk,rpi-pico,rpi-pico-w" >> "$GITHUB_ENV" + echo "LAZE_BUILDERS=ai-c3,espressif-esp32-c6-devkitc-1,microbit-v2,nrf52840dk,nrf5340dk,rpi-pico,rpi-pico-w" >> "$GITHUB_ENV" - name: "riot-rs compilation test" if: steps.result-cache.outputs.cache-hit != 'true' diff --git a/Cargo.lock b/Cargo.lock index d750ebd19..9b49e79b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1675,20 +1675,20 @@ dependencies = [ ] [[package]] -name = "example-random" +name = "espressif-esp32-c6-devkitc-1" version = "0.1.0" dependencies = [ - "rand", - "riot-rs", - "riot-rs-boards", + "riot-rs-debug", + "riot-rs-rt", ] [[package]] -name = "expressif-esp32-c6-devkitc-1" +name = "example-random" version = "0.1.0" dependencies = [ - "riot-rs-debug", - "riot-rs-rt", + "rand", + "riot-rs", + "riot-rs-boards", ] [[package]] @@ -3206,7 +3206,7 @@ dependencies = [ "ai-c3", "cfg-if", "dwm1001", - "expressif-esp32-c6-devkitc-1", + "espressif-esp32-c6-devkitc-1", "linkme", "microbit", "microbit-v2", diff --git a/laze-project.yml b/laze-project.yml index fa08b8805..25b4ab68d 100644 --- a/laze-project.yml +++ b/laze-project.yml @@ -693,7 +693,7 @@ builders: - name: ai-c3 parent: esp32c3 - - name: expressif-esp32-c6-devkitc-1 + - name: espressif-esp32-c6-devkitc-1 parent: esp32c6 - name: nrf5340dk diff --git a/src/riot-rs-boards/Cargo.toml b/src/riot-rs-boards/Cargo.toml index f87742775..2855d1321 100644 --- a/src/riot-rs-boards/Cargo.toml +++ b/src/riot-rs-boards/Cargo.toml @@ -14,7 +14,7 @@ linkme.workspace = true riot-rs-rt = { path = "../riot-rs-rt" } ai-c3 = { optional = true, path = "ai-c3" } -expressif-esp32-c6-devkitc-1 = { optional = true, path = "expressif-esp32-c6-devkitc-1" } +espressif-esp32-c6-devkitc-1 = { optional = true, path = "espressif-esp32-c6-devkitc-1" } dwm1001 = { optional = true, path = "dwm1001" } microbit = { optional = true, path = "microbit" } microbit-v2 = { optional = true, path = "microbit-v2" } diff --git a/src/riot-rs-boards/expressif-esp32-c6-devkitc-1/Cargo.toml b/src/riot-rs-boards/espressif-esp32-c6-devkitc-1/Cargo.toml similarity index 79% rename from src/riot-rs-boards/expressif-esp32-c6-devkitc-1/Cargo.toml rename to src/riot-rs-boards/espressif-esp32-c6-devkitc-1/Cargo.toml index 271eeab0a..c421e9571 100644 --- a/src/riot-rs-boards/expressif-esp32-c6-devkitc-1/Cargo.toml +++ b/src/riot-rs-boards/espressif-esp32-c6-devkitc-1/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "expressif-esp32-c6-devkitc-1" +name = "espressif-esp32-c6-devkitc-1" version = "0.1.0" edition = "2021" diff --git a/src/riot-rs-boards/expressif-esp32-c6-devkitc-1/src/lib.rs b/src/riot-rs-boards/espressif-esp32-c6-devkitc-1/src/lib.rs similarity index 52% rename from src/riot-rs-boards/expressif-esp32-c6-devkitc-1/src/lib.rs rename to src/riot-rs-boards/espressif-esp32-c6-devkitc-1/src/lib.rs index efc767dfd..40c8cd569 100644 --- a/src/riot-rs-boards/expressif-esp32-c6-devkitc-1/src/lib.rs +++ b/src/riot-rs-boards/espressif-esp32-c6-devkitc-1/src/lib.rs @@ -3,5 +3,5 @@ use riot_rs_debug::println; pub fn init() { - println!("expressif-esp32-c6-devkitc-1::init()"); + println!("espressif-esp32-c6-devkitc-1::init()"); } diff --git a/src/riot-rs-boards/src/lib.rs b/src/riot-rs-boards/src/lib.rs index ad06a3ecc..5c10b40e1 100644 --- a/src/riot-rs-boards/src/lib.rs +++ b/src/riot-rs-boards/src/lib.rs @@ -6,8 +6,8 @@ use cfg_if::cfg_if; cfg_if! { if #[cfg(feature = "ai-c3")] { pub use ai_c3 as board; - } else if #[cfg(feature = "expressif-esp32-c6-devkitc-1")] { - pub use expressif_esp32_c6_devkitc_1 as board; + } else if #[cfg(feature = "espressif-esp32-c6-devkitc-1")] { + pub use espressif_esp32_c6_devkitc_1 as board; } else if #[cfg(feature = "nrf52dk")] { pub use nrf52dk as board; } else if #[cfg(feature = "dwm1001")] {