diff --git a/boards/nrf52840/.cargo/config.toml b/boards/nrf52840/.cargo/config.toml index 420a9f07..1dbf21cf 100644 --- a/boards/nrf52840/.cargo/config.toml +++ b/boards/nrf52840/.cargo/config.toml @@ -4,8 +4,8 @@ [target.'cfg(all(target_arch = "arm", target_os = "none"))'] # Have to use simmsb's elf2uf2 fork to flash https://github.com/simmsb/elf2uf2-rs -runner = "elf2uf2-rs -d" -# runner = "probe-rs run --chip nRF52840_xxAA" +# runner = "elf2uf2-rs -d" +runner = "probe-rs run --chip nRF52840_xxAA" rustflags = [ # Previously, the linker arguments --nmagic and -Tlink.x were set here. @@ -35,4 +35,4 @@ target = "thumbv7em-none-eabi" # Cortex-M4 and Cortex-M7 (no FPU) # target = "thumbv8m.main-none-eabihf" # Cortex-M33 (with FPU) [env] -DEFMT_LOG = "error" \ No newline at end of file +DEFMT_LOG = "trace" \ No newline at end of file diff --git a/boards/nrf52840/memory.x b/boards/nrf52840/memory.x index d89c5351..6625284b 100644 --- a/boards/nrf52840/memory.x +++ b/boards/nrf52840/memory.x @@ -1,11 +1,11 @@ MEMORY { /* NOTE 1 K = 1 KiBi = 1024 bytes */ - /* FLASH : ORIGIN = 0x00000000, LENGTH = 1024K - RAM : ORIGIN = 0x20000000, LENGTH = 256K */ + FLASH : ORIGIN = 0x00000000, LENGTH = 1024K + RAM : ORIGIN = 0x20000000, LENGTH = 256K /* These values correspond to the NRF52840 with Softdevices S140 7.3.0 */ - FLASH : ORIGIN = 0x00027000, LENGTH = 868K - RAM : ORIGIN = 0x20020000, LENGTH = 128K + /* FLASH : ORIGIN = 0x00027000, LENGTH = 868K + RAM : ORIGIN = 0x20020000, LENGTH = 128K */ } \ No newline at end of file diff --git a/boards/nrf52840/src/main.rs b/boards/nrf52840/src/main.rs index 84919763..0a95fb37 100644 --- a/boards/nrf52840/src/main.rs +++ b/boards/nrf52840/src/main.rs @@ -33,9 +33,6 @@ const EEPROM_SIZE: usize = 128; #[embassy_executor::main] async fn main(_spawner: Spawner) { - // if cfg!(debug_assertions) { - // rtt_logger::init(log::LevelFilter::Info); - // } info!("RMK start!"); // Initialize peripherals let p = embassy_nrf::init(Default::default());