refactor: rename rak_4631 to rak_wisblock_4631, add proper display names
Board naming now follows MeshCore conventions: - rak_4631 → rak_wisblock_4631 (feature, file, Justfile, splash screen) - Display splash shows human-readable names: "RAK WisBlock 4631", "Heltec v3", "Heltec v4" Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
5 files changed
+11
-9
No files matched your search
+1
-1
@@ -54,7 +54,7 @@ heltec_v4 = [
|
|||||||
"dep:esp-hal-embassy",
|
"dep:esp-hal-embassy",
|
||||||
"dep:esp-println",
|
"dep:esp-println",
|
||||||
]
|
]
|
||||||
rak_4631 = [
|
rak_wisblock_4631 = [
|
||||||
"dep:cortex-m-rt",
|
"dep:cortex-m-rt",
|
||||||
"dep:embassy-nrf",
|
"dep:embassy-nrf",
|
||||||
"dep:panic-probe",
|
"dep:panic-probe",
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ set shell := ["bash", "-c"]
|
|||||||
# check-all gracefully skips boards whose toolchain isn't installed.
|
# check-all gracefully skips boards whose toolchain isn't installed.
|
||||||
heltec_v3 := "heltec_v3 xtensa-esp32s3-none-elf esp32s3"
|
heltec_v3 := "heltec_v3 xtensa-esp32s3-none-elf esp32s3"
|
||||||
heltec_v4 := "heltec_v4 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"
|
firmware_dir := "firmware"
|
||||||
|
|
||||||
# All known boards
|
# 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 boards that can build with the available toolchain
|
||||||
check-all:
|
check-all:
|
||||||
@@ -81,5 +81,5 @@ _copy_firmware board profile:
|
|||||||
_info name:
|
_info name:
|
||||||
@if [ "{{name}}" == "heltec_v3" ]; then echo "{{heltec_v3}}"; \
|
@if [ "{{name}}" == "heltec_v3" ]; then echo "{{heltec_v3}}"; \
|
||||||
elif [ "{{name}}" == "heltec_v4" ]; then echo "{{heltec_v4}}"; \
|
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
|
else echo "Unknown board: {{name}}" >&2; exit 1; fi
|
||||||
File renamed without changes.
+5
-3
@@ -11,10 +11,12 @@ use crate::channel::{DisplayCommand, DisplayCommandChannel, StatusWatch};
|
|||||||
|
|
||||||
use super::render::{self, RSSI_HISTORY_LEN};
|
use super::render::{self, RSSI_HISTORY_LEN};
|
||||||
|
|
||||||
const BOARD_NAME: &str = if cfg!(feature = "rak_4631") {
|
const BOARD_NAME: &str = if cfg!(feature = "rak_wisblock_4631") {
|
||||||
"rak_4631"
|
"RAK WisBlock 4631"
|
||||||
} else if cfg!(feature = "heltec_v3") {
|
} else if cfg!(feature = "heltec_v3") {
|
||||||
"heltec_v3"
|
"Heltec v3"
|
||||||
|
} else if cfg!(feature = "heltec_v4") {
|
||||||
|
"Heltec v4"
|
||||||
} else {
|
} else {
|
||||||
"unknown"
|
"unknown"
|
||||||
};
|
};
|
||||||
|
|||||||
+2
-2
@@ -13,7 +13,7 @@ use embassy_executor::Spawner;
|
|||||||
use crate::channel::{CommandChannel, DisplayCommandChannel, ResponseChannel, StatusWatch};
|
use crate::channel::{CommandChannel, DisplayCommandChannel, ResponseChannel, StatusWatch};
|
||||||
|
|
||||||
cfg_if::cfg_if! {
|
cfg_if::cfg_if! {
|
||||||
if #[cfg(feature = "rak_4631")] {
|
if #[cfg(feature = "rak_wisblock_4631")] {
|
||||||
use panic_probe as _;
|
use panic_probe as _;
|
||||||
} else if #[cfg(any(feature = "heltec_v3", feature = "heltec_v4"))] {
|
} else if #[cfg(any(feature = "heltec_v3", feature = "heltec_v4"))] {
|
||||||
use esp_backtrace as _;
|
use esp_backtrace as _;
|
||||||
@@ -27,7 +27,7 @@ static DISPLAY_COMMANDS: DisplayCommandChannel = DisplayCommandChannel::new();
|
|||||||
|
|
||||||
// Entry point: each platform needs its own executor macro.
|
// Entry point: each platform needs its own executor macro.
|
||||||
cfg_if::cfg_if! {
|
cfg_if::cfg_if! {
|
||||||
if #[cfg(feature = "rak_4631")] {
|
if #[cfg(feature = "rak_wisblock_4631")] {
|
||||||
#[embassy_executor::main]
|
#[embassy_executor::main]
|
||||||
async fn main(spawner: Spawner) {
|
async fn main(spawner: Spawner) {
|
||||||
run(spawner).await;
|
run(spawner).await;
|
||||||
|
|||||||
Reference in new issue
Block a user