diff --git a/Cargo.toml b/Cargo.toml index 76586c23..1d5080ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ heltec_v4 = [ "dep:esp-hal-embassy", "dep:esp-println", ] -rak_4631 = [ +rak_wisblock_4631 = [ "dep:cortex-m-rt", "dep:embassy-nrf", "dep:panic-probe", diff --git a/Justfile b/Justfile index e85b575c..e7e45304 100644 --- a/Justfile +++ b/Justfile @@ -5,12 +5,12 @@ set shell := ["bash", "-c"] # check-all gracefully skips boards whose toolchain isn't installed. heltec_v3 := "heltec_v3 xtensa-esp32s3-none-elf esp32s3" heltec_v4 := "heltec_v4 xtensa-esp32s3-none-elf esp32s3" -rak_4631 := "rak_4631 thumbv7em-none-eabihf nRF52840_xxAA" +rak_wisblock_4631 := "rak_wisblock_4631 thumbv7em-none-eabihf nRF52840_xxAA" firmware_dir := "firmware" # All known boards -boards := "heltec_v3 heltec_v4 rak_4631" +boards := "heltec_v3 heltec_v4 rak_wisblock_4631" # Check all boards that can build with the available toolchain check-all: @@ -81,5 +81,5 @@ _copy_firmware board profile: _info name: @if [ "{{name}}" == "heltec_v3" ]; then echo "{{heltec_v3}}"; \ elif [ "{{name}}" == "heltec_v4" ]; then echo "{{heltec_v4}}"; \ - elif [ "{{name}}" == "rak_4631" ]; then echo "{{rak_4631}}"; \ + elif [ "{{name}}" == "rak_wisblock_4631" ]; then echo "{{rak_wisblock_4631}}"; \ else echo "Unknown board: {{name}}" >&2; exit 1; fi diff --git a/src/board/rak_4631.rs b/src/board/rak_wisblock_4631.rs similarity index 100% rename from src/board/rak_4631.rs rename to src/board/rak_wisblock_4631.rs diff --git a/src/display/task.rs b/src/display/task.rs index 9d67b03e..d1af2827 100644 --- a/src/display/task.rs +++ b/src/display/task.rs @@ -11,10 +11,12 @@ use crate::channel::{DisplayCommand, DisplayCommandChannel, StatusWatch}; use super::render::{self, RSSI_HISTORY_LEN}; -const BOARD_NAME: &str = if cfg!(feature = "rak_4631") { - "rak_4631" +const BOARD_NAME: &str = if cfg!(feature = "rak_wisblock_4631") { + "RAK WisBlock 4631" } else if cfg!(feature = "heltec_v3") { - "heltec_v3" + "Heltec v3" +} else if cfg!(feature = "heltec_v4") { + "Heltec v4" } else { "unknown" }; diff --git a/src/main.rs b/src/main.rs index 71b08305..d922bd0f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,7 +13,7 @@ use embassy_executor::Spawner; use crate::channel::{CommandChannel, DisplayCommandChannel, ResponseChannel, StatusWatch}; cfg_if::cfg_if! { - if #[cfg(feature = "rak_4631")] { + if #[cfg(feature = "rak_wisblock_4631")] { use panic_probe as _; } else if #[cfg(any(feature = "heltec_v3", feature = "heltec_v4"))] { use esp_backtrace as _; @@ -27,7 +27,7 @@ static DISPLAY_COMMANDS: DisplayCommandChannel = DisplayCommandChannel::new(); // Entry point: each platform needs its own executor macro. cfg_if::cfg_if! { - if #[cfg(feature = "rak_4631")] { + if #[cfg(feature = "rak_wisblock_4631")] { #[embassy_executor::main] async fn main(spawner: Spawner) { run(spawner).await;