max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32: clenaup lp executor

Browse Source
This commit is contained in:
xoviat 2023-08-25 18:41:51 -05:00
parent cda4047310
commit 3023e70ccf
1 changed files with 91 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
embassy-stm32/src/low_power.rs
View File

@ -16,36 +16,30 @@ const THRESHOLD: Duration = Duration::from_millis(500);
use crate::rtc::{Rtc, RtcInstant}; use crate::rtc::{Rtc, RtcInstant};
static mut RTC: Option<&'static Rtc> = None; static mut EXECUTOR: Option<Executor> = None;
static mut STOP_TIME: embassy_time::Duration = Duration::from_ticks(0);
static mut NEXT_ALARM: embassy_time::Duration = Duration::from_ticks(u64::MAX);
static mut RTC_INSTANT: Option<crate::rtc::RtcInstant> = None;
foreach_interrupt! { foreach_interrupt! {
(RTC, rtc, $block:ident, WKUP, $irq:ident) => { (RTC, rtc, $block:ident, WKUP, $irq:ident) => {
#[interrupt] #[interrupt]
unsafe fn $irq() { unsafe fn $irq() {
Executor::on_wakeup_irq(); unsafe { EXECUTOR.as_mut().unwrap() }.on_wakeup_irq();
} }
}; };
} }
pub fn stop_with_rtc(rtc: &'static Rtc) { pub fn stop_with_rtc(rtc: &'static Rtc) {
crate::interrupt::typelevel::RTC_WKUP::unpend(); unsafe { EXECUTOR.as_mut().unwrap() }.stop_with_rtc(rtc)
unsafe { crate::interrupt::typelevel::RTC_WKUP::enable() };
EXTI.rtsr(0).modify(|w| w.set_line(22, true));
EXTI.imr(0).modify(|w| w.set_line(22, true));
unsafe { RTC = Some(rtc) };
} }
pub fn start_wakeup_alarm(requested_duration: embassy_time::Duration) -> RtcInstant { pub fn start_wakeup_alarm(requested_duration: embassy_time::Duration) -> RtcInstant {
unsafe { RTC }.unwrap().start_wakeup_alarm(requested_duration) unsafe { EXECUTOR.as_mut().unwrap() }
.rtc
.unwrap()
.start_wakeup_alarm(requested_duration)
} }
pub fn stop_wakeup_alarm() -> RtcInstant { pub fn stop_wakeup_alarm() -> RtcInstant {
unsafe { RTC }.unwrap().stop_wakeup_alarm() unsafe { EXECUTOR.as_mut().unwrap() }.rtc.unwrap().stop_wakeup_alarm()
} }
/// Thread mode executor, using WFE/SEV. /// Thread mode executor, using WFE/SEV.
@ -61,69 +55,103 @@ pub fn stop_wakeup_alarm() -> RtcInstant {
pub struct Executor { pub struct Executor {
inner: raw::Executor, inner: raw::Executor,
not_send: PhantomData<*mut ()>, not_send: PhantomData<*mut ()>,
scb: SCB,
pub(self) rtc: Option<&'static Rtc>,
stop_time: embassy_time::Duration,
next_alarm: embassy_time::Duration,
last_stop: Option<crate::rtc::RtcInstant>,
} }
impl Executor { impl Executor {
/// Create a new Executor. /// Create a new Executor.
pub fn new() -> Self { pub fn new() -> &'static mut Self {
Self { unsafe {
inner: raw::Executor::new(THREAD_PENDER as *mut ()), assert!(EXECUTOR.is_none());
not_send: PhantomData,
EXECUTOR = Some(Self {
inner: raw::Executor::new(THREAD_PENDER as *mut ()),
not_send: PhantomData,
scb: cortex_m::Peripherals::steal().SCB,
rtc: None,
stop_time: Duration::from_ticks(0),
next_alarm: Duration::from_ticks(u64::MAX),
last_stop: None,
});
EXECUTOR.as_mut().unwrap()
} }
} }
unsafe fn on_wakeup_irq() { unsafe fn on_wakeup_irq(&mut self) {
trace!("on wakeup irq"); trace!("low power: one wakekup irq");
let elapsed = RTC_INSTANT.take().unwrap() - stop_wakeup_alarm(); self.rtc.unwrap().clear_wakeup_alarm();
// Self::get_scb().set_sleeponexit();
STOP_TIME += elapsed; //
// let to_next = NEXT_ALARM - STOP_TIME; // return;
let to_next = Duration::from_secs(3); //
// let elapsed = RTC_INSTANT.take().unwrap() - stop_wakeup_alarm();
trace!("on wakeup irq: to next: {}", to_next); //
if to_next > THRESHOLD { // STOP_TIME += elapsed;
trace!("start wakeup alarm"); // // let to_next = NEXT_ALARM - STOP_TIME;
RTC_INSTANT.replace(start_wakeup_alarm(to_next)); // let to_next = Duration::from_secs(3);
//
trace!("set sleeponexit"); // trace!("on wakeup irq: to next: {}", to_next);
Self::get_scb().set_sleeponexit(); // if to_next > THRESHOLD {
} else { // trace!("start wakeup alarm");
Self::get_scb().clear_sleeponexit(); // RTC_INSTANT.replace(start_wakeup_alarm(to_next));
Self::get_scb().clear_sleepdeep(); //
} // trace!("set sleeponexit");
// Self::get_scb().set_sleeponexit();
// } else {
// Self::get_scb().clear_sleeponexit();
// Self::get_scb().clear_sleepdeep();
// }
} }
fn get_scb() -> SCB { pub(self) fn stop_with_rtc(&mut self, rtc: &'static Rtc) {
unsafe { cortex_m::Peripherals::steal() }.SCB assert!(self.rtc.is_none());
crate::interrupt::typelevel::RTC_WKUP::unpend();
unsafe { crate::interrupt::typelevel::RTC_WKUP::enable() };
EXTI.rtsr(0).modify(|w| w.set_line(22, true));
EXTI.imr(0).modify(|w| w.set_line(22, true));
self.rtc = Some(rtc);
} }
fn configure_pwr(&self) { fn configure_pwr(&self) {
trace!("configure_pwr"); // defeat the borrow checker
let s = unsafe { EXECUTOR.as_mut().unwrap() };
if !low_power_ready() { // trace!("configure_pwr");
trace!("configure_pwr: low power not ready"); //
return; // if !low_power_ready() {
} // trace!("configure_pwr: low power not ready");
// return;
let time_until_next_alarm = time_until_next_alarm(); // }
if time_until_next_alarm < THRESHOLD { //
trace!("configure_pwr: not enough time until next alarm"); // let time_until_next_alarm = time_until_next_alarm();
return; // if time_until_next_alarm < THRESHOLD {
} // trace!("configure_pwr: not enough time until next alarm");
// return;
unsafe { // }
NEXT_ALARM = time_until_next_alarm; //
RTC_INSTANT = Some(start_wakeup_alarm(time_until_next_alarm)) // unsafe {
}; // NEXT_ALARM = time_until_next_alarm;
// if RTC_INSTANT.is_none() {
// return; // RTC_INSTANT = Some(start_wakeup_alarm(time_until_next_alarm))
// }
pause_time(); // };
//
trace!("enter stop..."); // // return;
//
Self::get_scb().set_sleepdeep(); // pause_time();
//
// trace!("enter stop...");
//
// Self::get_scb().set_sleepdeep();
} }
/// Run the executor. /// Run the executor.