Merge branch 'main' into curl-cleanup

Author: jonathanpallant

nrf52-code/boards/dk-solution/src/lib.rs

@@ -323,11 +323,6 @@ pub enum Error {
 ///
 /// This return an `Err`or if called more than once
 pub fn init() -> Result<Board, Error> {
-    // probe-rs puts us in blocking mode, so wait for blocking mode as a proxy
-    // for waiting for probe-rs to connect.
-    while !defmt_rtt::in_blocking_mode() {
-        core::hint::spin_loop();
-    }
     // NOTE: this branch runs at most once
     #[cfg(feature = "advanced")]
     static EP0IN_BUF: GroundedArrayCell<u8, 64> = GroundedArrayCell::const_init();
@@ -337,6 +332,14 @@ pub fn init() -> Result<Board, Error> {
     config.lfclk_source = hal::config::LfclkSource::ExternalXtal;
     let periph = hal::init(config);
 
+    // probe-rs puts us in blocking mode, so wait for blocking mode as a proxy
+    // for waiting for probe-rs to connect.
+    //
+    // do this *after* clock set-up to avoid start-up issues
+    while !defmt_rtt::in_blocking_mode() {
+        core::hint::spin_loop();
+    }
+
     // NOTE: this branch runs at most once
 
     let mut rtc = hal::rtc::Rtc::new(periph.RTC0, 0).unwrap();

nrf52-code/boards/dk/src/lib.rs

@@ -295,11 +295,6 @@ pub enum Error {
 ///
 /// This return an `Err`or if called more than once
 pub fn init() -> Result<Board, Error> {
-    // probe-rs puts us in blocking mode, so wait for blocking mode as a proxy
-    // for waiting for probe-rs to connect.
-    while !defmt_rtt::in_blocking_mode() {
-        core::hint::spin_loop();
-    }
     // NOTE: this branch runs at most once
     #[cfg(feature = "advanced")]
     static EP0IN_BUF: GroundedArrayCell<u8, 64> = GroundedArrayCell::const_init();
@@ -309,6 +304,14 @@ pub fn init() -> Result<Board, Error> {
     config.lfclk_source = hal::config::LfclkSource::ExternalXtal;
     let periph = hal::init(config);
 
+    // probe-rs puts us in blocking mode, so wait for blocking mode as a proxy
+    // for waiting for probe-rs to connect.
+    //
+    // do this *after* clock set-up to avoid start-up issues
+    while !defmt_rtt::in_blocking_mode() {
+        core::hint::spin_loop();
+    }
+
     // NOTE: this branch runs at most once
 
     let mut rtc = hal::rtc::Rtc::new(periph.RTC0, 0).unwrap();