Merge pull request alexmoon#28 from plaes/nrf52832-examples

Add target-specific feature flags for examples (ie nrf52832, nrf52840)

Author: lulf

.cargo/config.toml

@@ -1,5 +1,6 @@
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
 runner = "probe-rs run --chip nRF52840_xxAA"
+#runner = "probe-rs run --chip nRF52832_xxAA"
 
 [build]
 # Pick ONE of these compilation targets

ci.sh

@@ -4,7 +4,8 @@ set -euxo pipefail
 
 export RUSTFLAGS=-Dwarnings
 
-cargo clippy -p nrf-sdc-examples
+cargo clippy -p nrf-sdc-examples --features nrf52832
+cargo clippy -p nrf-sdc-examples --features nrf52840
 
 cargo clippy -p nrf-mpsl-sys
 cargo clippy -p nrf-mpsl-sys --features fem-simple-gpio
@@ -15,7 +16,7 @@ cargo clippy -p nrf-mpsl --features nrf52805
 cargo clippy -p nrf-mpsl --features nrf52810
 cargo clippy -p nrf-mpsl --features nrf52811
 cargo clippy -p nrf-mpsl --features nrf52820
-# cargo clippy -p nrf-mpsl --features nrf52832
+cargo clippy -p nrf-mpsl --features nrf52832
 cargo clippy -p nrf-mpsl --features nrf52833
 cargo clippy -p nrf-mpsl --features nrf52840
 cargo clippy -p nrf-mpsl --features nrf52840,defmt
@@ -33,7 +34,7 @@ cargo clippy -p nrf-sdc --features nrf52805,peripheral,central
 cargo clippy -p nrf-sdc --features nrf52810,peripheral,central
 cargo clippy -p nrf-sdc --features nrf52811,peripheral,central
 cargo clippy -p nrf-sdc --features nrf52820,peripheral,central
-# cargo clippy -p nrf-sdc --features nrf52832,peripheral,central
+cargo clippy -p nrf-sdc --features nrf52832,peripheral,central
 cargo clippy -p nrf-sdc --features nrf52833,peripheral,central
 cargo clippy -p nrf-sdc --features nrf52840,peripheral
 cargo clippy -p nrf-sdc --features nrf52840,central

examples/Cargo.toml

@@ -10,13 +10,13 @@ publish = false
 name = "adv-simple"
 
 [dependencies]
-nrf-sdc = { version = "0.1.0", path = "../nrf-sdc", features = ["defmt", "nrf52840", "peripheral"] }
+nrf-sdc = { version = "0.1.0", path = "../nrf-sdc", features = ["defmt", "peripheral"] }
 nrf-mpsl = { version = "0.1.0", path = "../nrf-mpsl", features = ["defmt", "critical-section-impl"] }
 bt-hci = { version = "0.1.0", default-features = false }
 
 embassy-executor = { version = "0.6", features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers", "executor-interrupt"] }
 embassy-time = { version = "0.3", features = ["defmt", "defmt-timestamp-uptime"] }
-embassy-nrf = { version = "0.2.0", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] }
+embassy-nrf = { version = "0.2.0", features = ["defmt", "time-driver-rtc1", "gpiote", "unstable-pac"] }
 embassy-sync = { version = "0.6.0", features = ["defmt"] }
 
 defmt = "0.3"
@@ -28,3 +28,14 @@ cortex-m = { version = "0.7.6" }
 cortex-m-rt = "0.7.0"
 panic-probe = { version = "0.3", features = ["print-defmt"] }
 static_cell = "2"
+
+[features]
+nrf52832 = [
+  "nrf-sdc/nrf52832",
+  "embassy-nrf/nrf52832",
+]
+
+nrf52840 = [
+  "nrf-sdc/nrf52840",
+  "embassy-nrf/nrf52840",
+]

examples/build.rs

@@ -13,13 +13,20 @@ use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
 
+fn linker_data() -> &'static [u8] {
+    #[cfg(feature = "nrf52832")]
+    return include_bytes!("memory-nrf52832.x");
+    #[cfg(feature = "nrf52840")]
+    return include_bytes!("memory-nrf52840.x");
+}
+
 fn main() {
     // Put `memory.x` in our output directory and ensure it's
     // on the linker search path.
     let out = &PathBuf::from(env::var_os("OUT_DIR").unwrap());
     File::create(out.join("memory.x"))
         .unwrap()
-        .write_all(include_bytes!("memory.x"))
+        .write_all(linker_data())
         .unwrap();
     println!("cargo:rustc-link-search={}", out.display());
 

examples/memory-nrf52832.x

@@ -0,0 +1,6 @@
+MEMORY
+{
+  /* NOTE 1 K = 1 KiBi = 1024 bytes */
+  FLASH : ORIGIN = 0x00000000, LENGTH = 512K
+  RAM : ORIGIN = 0x20000000, LENGTH = 64K
+}

examples/memory.x renamed to examples/memory-nrf52840.x

@@ -23,6 +23,16 @@ async fn mpsl_task(mpsl: &'static MultiprotocolServiceLayer<'static>) -> ! {
     mpsl.run().await
 }
 
+const PAGE_SIZE: usize = 4096;
+
+#[cfg(feature = "nrf52832")]
+const ERASE_START: u32 = 0x60000;
+
+#[cfg(feature = "nrf52840")]
+const ERASE_START: u32 = 0x80000;
+
+const ERASE_STOP: u32 = ERASE_START + 0x2000;
+
 #[embassy_executor::main]
 async fn main(spawner: Spawner) {
     let p = embassy_nrf::init(Default::default());
@@ -60,11 +70,11 @@ async fn main(spawner: Spawner) {
     pin_mut!(f);
 
     info!("starting erase");
-    unwrap!(f.as_mut().erase(0x80000, 0x82000).await);
+    unwrap!(f.as_mut().erase(ERASE_START, ERASE_STOP).await);
     info!("erased!");
 
-    let mut buf = [0; 4096];
-    for offset in (0x80000..0x82000).step_by(4096) {
+    let mut buf = [0; PAGE_SIZE];
+    for offset in (ERASE_START..ERASE_STOP).step_by(PAGE_SIZE) {
         info!("starting read");
         unwrap!(f.as_mut().read(offset, &mut buf));
         info!("read done!");
@@ -76,12 +86,12 @@ async fn main(spawner: Spawner) {
     info!("matched!");
 
     info!("starting write");
-    for offset in (0x80000..0x82000).step_by(4) {
+    for offset in (ERASE_START..ERASE_STOP).step_by(4) {
         unwrap!(f.as_mut().write(offset, &[1, 2, 3, 4]).await);
     }
     info!("write done!");
 
-    for offset in (0x80000..0x82000).step_by(4) {
+    for offset in (ERASE_START..ERASE_STOP).step_by(4) {
         let mut buf = [0; 4];
         info!("starting read");
         unwrap!(f.as_mut().read(offset, &mut buf));

examples/src/bin/flash.rs

@@ -404,12 +404,11 @@ impl FlashOp {
     }
 
     // No partial erase for this chip, just do one page at a time
-    #[allow(unused_variables)]
     #[cfg(feature = "nrf52832")]
     fn erase<F: Fn() -> u32>(
-        get_time: F,
-        slot_duration_us: u32,
-        elapsed: &mut u32,
+        _get_time: F,
+        _slot_duration_us: u32,
+        _elapsed: &mut u32,
         address: &mut u32,
         to: u32,
     ) -> core::ops::ControlFlow<()> {
@@ -421,7 +420,7 @@ impl FlashOp {
         p.config.write(|w| w.wen().ren());
         *address += PAGE_SIZE as u32;
         if *address >= to {
-            return ControlFlow::Break(());
+            ControlFlow::Break(())
         } else {
             ControlFlow::Continue(())
         }