Skip to content

Commit

Permalink
Merge pull request #139 from gustavonihei/feature/rwdt_esp32_s2_s3
Browse files Browse the repository at this point in the history
rtc: Add RWDT examples for ESP32, ESP32-S2 and ESP32-S3
  • Loading branch information
bjoernQ authored Aug 9, 2022
2 parents 91ea205 + a33c0de commit 4c44f3e
Show file tree
Hide file tree
Showing 8 changed files with 205 additions and 24 deletions.
66 changes: 66 additions & 0 deletions esp32-hal/examples/rtc_watchdog.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//! This demos the RTC Watchdog Timer (RWDT).
//! The RWDT is initially configured to trigger an interrupt after a given
//! timeout. Then, upon expiration, the RWDT is restarted and then reconfigured
//! to reset both the main system and the RTC.

#![no_std]
#![no_main]

use core::cell::RefCell;

use esp32_hal::{
clock::ClockControl,
interrupt,
pac::{self, Peripherals},
prelude::*,
Rtc,
Rwdt,
};
use panic_halt as _;
use xtensa_lx::mutex::{CriticalSectionMutex, Mutex};
use xtensa_lx_rt::entry;

static mut RWDT: CriticalSectionMutex<RefCell<Option<Rwdt>>> =
CriticalSectionMutex::new(RefCell::new(None));

#[entry]
fn main() -> ! {
let peripherals = Peripherals::take().unwrap();
let system = peripherals.DPORT.split();
let _clocks = ClockControl::boot_defaults(system.clock_control).freeze();

let mut rtc = Rtc::new(peripherals.RTC_CNTL);

// Disable watchdog timer
rtc.rwdt.disable();

rtc.rwdt.start(2000u64.millis());
rtc.rwdt.listen();

interrupt::enable(pac::Interrupt::RTC_CORE, interrupt::Priority::Priority1).unwrap();

unsafe {
(&RWDT).lock(|data| (*data).replace(Some(rtc.rwdt)));
}

loop {}
}

#[interrupt]
fn RTC_CORE() {
unsafe {
(&RWDT).lock(|data| {
esp_println::println!("RWDT Interrupt");

let mut rwdt = data.borrow_mut();
let rwdt = rwdt.as_mut().unwrap();

rwdt.clear_interrupt();

esp_println::println!("Restarting in 5 seconds...");

rwdt.start(5000u64.millis());
rwdt.unlisten();
});
}
}
1 change: 1 addition & 0 deletions esp32-hal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pub use esp_hal_common::{
PulseControl,
Rng,
Rtc,
Rwdt,
Serial,
};

Expand Down
3 changes: 1 addition & 2 deletions esp32c3-hal/examples/rtc_watchdog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ use esp32c3_hal::{
interrupt,
pac::{self, Peripherals},
prelude::*,
Rtc,
Rtc, Rwdt,
};
use esp_hal_common::Rwdt;
use panic_halt as _;
use riscv_rt::entry;

Expand Down
24 changes: 2 additions & 22 deletions esp32c3-hal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,8 @@ use core::arch::global_asm;

pub use embedded_hal as ehal;
pub use esp_hal_common::{
clock,
efuse,
gpio as gpio_types,
i2c,
interrupt,
ledc,
macros,
pac,
prelude,
pulse_control,
serial,
spi,
system,
systimer,
timer,
utils,
Cpu,
Delay,
PulseControl,
Rng,
Rtc,
Serial,
clock, efuse, gpio as gpio_types, i2c, interrupt, ledc, macros, pac, prelude, pulse_control,
serial, spi, system, systimer, timer, utils, Cpu, Delay, PulseControl, Rng, Rtc, Rwdt, Serial,
UsbSerialJtag,
};
#[cfg(feature = "direct-boot")]
Expand Down
66 changes: 66 additions & 0 deletions esp32s2-hal/examples/rtc_watchdog.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//! This demos the RTC Watchdog Timer (RWDT).
//! The RWDT is initially configured to trigger an interrupt after a given
//! timeout. Then, upon expiration, the RWDT is restarted and then reconfigured
//! to reset both the main system and the RTC.

#![no_std]
#![no_main]

use core::cell::RefCell;

use esp32s2_hal::{
clock::ClockControl,
interrupt,
pac::{self, Peripherals},
prelude::*,
Rtc,
Rwdt,
};
use panic_halt as _;
use xtensa_lx::mutex::{CriticalSectionMutex, Mutex};
use xtensa_lx_rt::entry;

static mut RWDT: CriticalSectionMutex<RefCell<Option<Rwdt>>> =
CriticalSectionMutex::new(RefCell::new(None));

#[entry]
fn main() -> ! {
let peripherals = Peripherals::take().unwrap();
let system = peripherals.SYSTEM.split();
let _clocks = ClockControl::boot_defaults(system.clock_control).freeze();

let mut rtc = Rtc::new(peripherals.RTC_CNTL);

// Disable watchdog timer
rtc.rwdt.disable();

rtc.rwdt.start(2000u64.millis());
rtc.rwdt.listen();

interrupt::enable(pac::Interrupt::RTC_CORE, interrupt::Priority::Priority1).unwrap();

unsafe {
(&RWDT).lock(|data| (*data).replace(Some(rtc.rwdt)));
}

loop {}
}

#[interrupt]
fn RTC_CORE() {
unsafe {
(&RWDT).lock(|data| {
esp_println::println!("RWDT Interrupt");

let mut rwdt = data.borrow_mut();
let rwdt = rwdt.as_mut().unwrap();

rwdt.clear_interrupt();

esp_println::println!("Restarting in 5 seconds...");

rwdt.start(5000u64.millis());
rwdt.unlisten();
});
}
}
1 change: 1 addition & 0 deletions esp32s2-hal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pub use esp_hal_common::{
PulseControl,
Rng,
Rtc,
Rwdt,
Serial,
};

Expand Down
67 changes: 67 additions & 0 deletions esp32s3-hal/examples/rtc_watchdog.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
//! This demos the RTC Watchdog Timer (RWDT).
//! The RWDT is initially configured to trigger an interrupt after a given
//! timeout. Then, upon expiration, the RWDT is restarted and then reconfigured
//! to reset both the main system and the RTC.

#![no_std]
#![no_main]

use core::cell::RefCell;

use esp32s3_hal::{
clock::ClockControl,
interrupt,
pac::{self, Peripherals},
prelude::*,
Rtc,
Rwdt,
};
use panic_halt as _;
use xtensa_lx::mutex::{CriticalSectionMutex, Mutex};
use xtensa_lx_rt::entry;

static mut RWDT: CriticalSectionMutex<RefCell<Option<Rwdt>>> =
CriticalSectionMutex::new(RefCell::new(None));

#[entry]
fn main() -> ! {
let peripherals = Peripherals::take().unwrap();
let system = peripherals.SYSTEM.split();
let _clocks = ClockControl::boot_defaults(system.clock_control).freeze();

let mut rtc = Rtc::new(peripherals.RTC_CNTL);

// Disable watchdog timers
rtc.swd.disable();
rtc.rwdt.disable();

rtc.rwdt.start(2000u64.millis());
rtc.rwdt.listen();

interrupt::enable(pac::Interrupt::RTC_CORE, interrupt::Priority::Priority1).unwrap();

unsafe {
(&RWDT).lock(|data| (*data).replace(Some(rtc.rwdt)));
}

loop {}
}

#[interrupt]
fn RTC_CORE() {
unsafe {
(&RWDT).lock(|data| {
esp_println::println!("RWDT Interrupt");

let mut rwdt = data.borrow_mut();
let rwdt = rwdt.as_mut().unwrap();

rwdt.clear_interrupt();

esp_println::println!("Restarting in 5 seconds...");

rwdt.start(5000u64.millis());
rwdt.unlisten();
});
}
}
1 change: 1 addition & 0 deletions esp32s3-hal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub use esp_hal_common::{
PulseControl,
Rng,
Rtc,
Rwdt,
Serial,
UsbSerialJtag,
};
Expand Down

0 comments on commit 4c44f3e

Please sign in to comment.