stm32: fix rtc test

2 files changed, 20 insertions, 9 deletions

diff --git a/tests/stm32/src/bin/rtc.rs b/tests/stm32/src/bin/rtc.rs
index 5fe98d807..5c80eb250 100644
--- a/tests/stm32/src/bin/rtc.rs
+++ b/tests/stm32/src/bin/rtc.rs
@@ -9,10 +9,14 @@ use chrono::{NaiveDate, NaiveDateTime};
 use common::*;
 use defmt::assert;
 use embassy_executor::Spawner;
+#[cfg(feature = "stop")]
+use embassy_stm32::low_power::reconfigure_rtc;
 use embassy_stm32::rcc::LsConfig;
+#[cfg(feature = "stop")]
+use embassy_stm32::rtc::RtcTimeProvider;
+#[cfg(not(feature = "stop"))]
 use embassy_stm32::rtc::{Rtc, RtcConfig};
 use embassy_time::Timer;
-
 #[embassy_executor::main]
 async fn main(_spawner: Spawner) {
     let mut config = config();
@@ -26,14 +30,26 @@ async fn main(_spawner: Spawner) {
         .and_hms_opt(10, 30, 15)
         .unwrap();
 
+    #[cfg(not(feature = "stop"))]
     let mut rtc = Rtc::new(p.RTC, RtcConfig::default());
 
+    #[cfg(feature = "stop")]
+    let time_provider = RtcTimeProvider::new(p.RTC);
+
+    #[cfg(not(feature = "stop"))]
     rtc.set_datetime(now.into()).expect("datetime not set");
 
+    #[cfg(feature = "stop")]
+    reconfigure_rtc(|rtc| rtc.set_datetime(now.into()).expect("datetime not set"));
+
     info!("Waiting 5 seconds");
     Timer::after_millis(5000).await;
 
+    #[cfg(not(feature = "stop"))]
     let then: NaiveDateTime = rtc.now().unwrap().into();
+    #[cfg(feature = "stop")]
+    let then: NaiveDateTime = time_provider.now().unwrap().into();
+
     let seconds = (then - now).num_seconds();
 
     info!("measured = {}", seconds);
diff --git a/tests/stm32/src/bin/stop.rs b/tests/stm32/src/bin/stop.rs
index 73580f0f2..a9dbac676 100644
--- a/tests/stm32/src/bin/stop.rs
+++ b/tests/stm32/src/bin/stop.rs
@@ -10,9 +10,8 @@ use common::*;
 use cortex_m_rt::entry;
 use embassy_executor::Spawner;
 use embassy_stm32::Config;
-use embassy_stm32::low_power::{Executor, StopMode, stop_ready, stop_with_rtc};
+use embassy_stm32::low_power::{Executor, StopMode, reconfigure_rtc, stop_ready};
 use embassy_stm32::rcc::LsConfig;
-use embassy_stm32::rtc::{Rtc, RtcConfig};
 use embassy_time::Timer;
 
 #[entry]
@@ -57,7 +56,7 @@ async fn async_main(spawner: Spawner) {
         config.rcc.hsi = Some(HSIPrescaler::DIV4); // 64 MHz HSI will need a /4
     }
 
-    let p = init_with_config(config);
+    let _p = init_with_config(config);
     info!("Hello World!");
 
     let now = NaiveDate::from_ymd_opt(2020, 5, 15)
@@ -65,11 +64,7 @@ async fn async_main(spawner: Spawner) {
         .and_hms_opt(10, 30, 15)
         .unwrap();
 
-    let mut rtc = Rtc::new(p.RTC, RtcConfig::default());
-
-    rtc.set_datetime(now.into()).expect("datetime not set");
-
-    stop_with_rtc(rtc);
+    reconfigure_rtc(|rtc| rtc.set_datetime(now.into()).expect("datetime not set"));
 
     spawner.spawn(task_1().unwrap());
     spawner.spawn(task_2().unwrap());