Dreaded_X/pico_p1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Repartitioned flash and improved how firmwares are loaded when flashed seperately

Browse Source
This commit is contained in:
Dreaded_X
2023-09-01 19:54:13 +02:00
parent 7cda449922
commit ff40ad796f
4 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main.rs
View File

@@ -131,6 +131,36 @@ async fn uart_rx_task(
}
}
/// Get the cyw43 firmware blobs
///
/// # Safety
/// When building with `exclude_firmwares` make sure to flash the firmwares using the following
/// commands:
/// ```bash
/// probe-rs download firmware/43439A0.bin --format bin --chip RP2040 --base-address 0x101BE000
/// probe-rs download firmware/43439A0_clm.bin --format bin --chip RP2040 --base-address 0x101FE000
/// ```
unsafe fn get_firmware() -> (&'static [u8], &'static [u8]) {
cfg_if::cfg_if! {
if #[cfg(feature = "exclude_firmwares")] {
// TODO: It would be nice if it could automatically get the correct size
extern "C" {
#[link_name = "__fw_start"]
static fw: [u8; 230321];
#[link_name = "__clm_start"]
static clm: [u8; 4752];
}
(&fw, &clm)
} else {
let fw = include_bytes!("../firmware/43439A0.bin");
let clm = include_bytes!("../firmware/43439A0_clm.bin");
(fw, clm)
}
}
}
#[embassy_executor::main]
async fn main(spawner: Spawner) {
info!("Starting...");
@@ -148,16 +178,6 @@ async fn main(spawner: Spawner) {
spawner.spawn(uart_rx_task(rx, channel.sender())).unwrap();
// === WIFI ===
// To make flashing faster for development, you may want to flash the firmwares independently
// at hardcoded addresses, instead of baking them into the program with `include_bytes!`:
// probe-rs download firmware/43439A0.bin --format bin --chip RP2040 --base-address 0x10100000
// probe-rs download firmware/43439A0_clm.bin --format bin --chip RP2040 --base-address 0x10140000
let fw = unsafe { core::slice::from_raw_parts(0x10100000 as *const u8, 230321) };
let clm = unsafe { core::slice::from_raw_parts(0x10140000 as *const u8, 4752) };
// let fw = include_bytes!("../firmware/43439A0.bin");
// let clm = include_bytes!("../firmware/43439A0_clm.bin");
let pwr = Output::new(p.PIN_23, Level::Low);
let cs = Output::new(p.PIN_25, Level::High);
@@ -172,6 +192,8 @@ async fn main(spawner: Spawner) {
p.DMA_CH0,
);
let (fw, clm) = unsafe { get_firmware() };
let state = make_static!(cyw43::State::new());
let (net_device, mut control, runner) = cyw43::new(state, pwr, spi, fw).await;
spawner.spawn(wifi_task(runner)).unwrap();