Merge remote-tracking branch 'odp/main' into james/impl-clocks

5 files changed, 11 insertions, 4 deletions

diff --git a/examples/.cargo/config.toml b/examples/.cargo/config.toml
index ecb11be64..aedc55b06 100644
--- a/examples/.cargo/config.toml
+++ b/examples/.cargo/config.toml
@@ -1,5 +1,5 @@
 [target.thumbv8m.main-none-eabihf]
-runner = 'probe-rs run --chip MCXA276 --preverify --verify'
+runner = 'probe-rs run --chip MCXA276 --preverify --verify --protocol swd --speed 12000'
 
 rustflags = [
   "-C", "linker=flip-link",
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
index b774aff97..b2ac9a051 100644
--- a/examples/Cargo.lock
+++ b/examples/Cargo.lock
@@ -240,7 +240,6 @@ dependencies = [
  "critical-section",
  "defmt",
  "embassy-embedded-hal",
- "embassy-executor",
  "embassy-hal-internal",
  "embassy-sync",
  "embassy-time",
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
index 6b100de42..d03d3d95c 100644
--- a/examples/Cargo.toml
+++ b/examples/Cargo.toml
@@ -19,3 +19,7 @@ embassy-time-driver = "0.2.1"
 embedded-io-async = "0.6.1"
 heapless = "0.9.2"
 panic-probe = { version = "1.0", features = ["print-defmt"] }
+
+[profile.release]
+lto = true # better optimizations
+debug = 2  # enough information for defmt/rtt locations
diff --git a/examples/memory.x b/examples/memory.x
index 528545b64..315ced58a 100644
--- a/examples/memory.x
+++ b/examples/memory.x
@@ -1,5 +1,5 @@
 MEMORY
 {
-    FLASH : ORIGIN = 0x20000000, LENGTH = 80K
-    RAM   : ORIGIN = 0x20014000, LENGTH = 48K
+    FLASH : ORIGIN = 0x00000000, LENGTH = 1M
+    RAM   : ORIGIN = 0x20000000, LENGTH = 128K
 }
diff --git a/examples/src/bin/blink.rs b/examples/src/bin/blink.rs
index 8c48e79f1..d8b158d50 100644
--- a/examples/src/bin/blink.rs
+++ b/examples/src/bin/blink.rs
@@ -26,6 +26,8 @@ async fn main(_spawner: Spawner) {
         init_led_gpio_clocks(hal::pac());
     }
 
+    defmt::info!("Blink example");
+
     // Initialize embassy-time global driver backed by OSTIMER0
     hal::ostimer::time_driver::init(hal::config::Config::default().time_interrupt_priority, 1_000_000);
 
@@ -41,6 +43,8 @@ async fn main(_spawner: Spawner) {
     // With pauses between letters and words
 
     loop {
+        defmt::info!("SOS");
+
         // S: three short blinks
         for _ in 0..3 {
             led.set_low();