From 67bc7f9f9080e52f17f1e6c0b8c471204e65531e Mon Sep 17 00:00:00 2001
From: jonas <@DISTRIB_ID=Pop.com>
Date: Mon, 3 Jun 2024 13:23:45 +0200
Subject: [PATCH] impl wdt modes

---
 avr-hal-generic/src/wdt.rs | 46 ++++++++++++++++++++++++++++++++++++++
 mcu/atmega-hal/src/wdt.rs  |  2 +-
 mcu/attiny-hal/src/wdt.rs  |  2 +-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/avr-hal-generic/src/wdt.rs b/avr-hal-generic/src/wdt.rs
index 94d0a2d7ed..45ee2dbf8e 100644
--- a/avr-hal-generic/src/wdt.rs
+++ b/avr-hal-generic/src/wdt.rs
@@ -37,6 +37,12 @@ pub trait WdtOps<H> {
     /// **Warning**: This is a low-level method and should not be called directly from user code.
     fn raw_init(&mut self, m: &Self::MCUSR);
 
+    /// Sets the mode for the watchdog timer.
+    /// Refer to the `WdtMode` enum for more infos.
+    ///
+    /// **Warning**: This is a low-level method and should not be called directly from user code.
+    fn raw_set_mode(&mut self, mode: WdtMode);
+
     /// Start the watchdog timer with the specified timeout.
     ///
     /// If the timeout value is not supported, `Err(())` should be returned.
@@ -55,6 +61,21 @@ pub trait WdtOps<H> {
     fn raw_stop(&mut self);
 }
 
+#[derive(Copy, Clone)]
+/// The mode that dictates how the watchdog should behave.
+/// This needs to be called **after** the `start` function.
+pub enum WdtMode {
+    /// Trigger the interrupt `WDT`, but do not perform a softreset.
+    /// **Warning**: On many `atmega` devices, a watchdog timeout resets the mode automatically, to
+    /// prevent the microcontroller from getting stuck in a infinite loop. So subsequent timeouts
+    /// will cause a softreset. When you want to trigger an interrupt multiple times,
+    /// you need to call the `rearm` method after every timeout.
+    Interrupt,
+    /// Softreset the microcontroller.
+    /// This is the default on many microcontrollers.
+    SystemReset,
+}
+
 pub struct Wdt<H, WDT> {
     p: WDT,
     _h: PhantomData<H>,
@@ -66,6 +87,14 @@ impl<H, WDT: WdtOps<H>> Wdt<H, WDT> {
         Self { p, _h: PhantomData }
     }
 
+    pub fn rearm(&mut self, m: &WDT::MCUSR) {
+        self.p.raw_init(m);
+    }
+
+    pub fn set_mode(&mut self, mode: WdtMode) {
+        self.p.raw_set_mode(mode);
+    }
+
     pub fn start(&mut self, timeout: Timeout) -> Result<(), ()> {
         self.p.raw_start(timeout)
     }
@@ -96,6 +125,23 @@ macro_rules! impl_wdt {
                 /// If a prior reset was provided by the watchdog, the WDRF in MCUSR would be set,
                 /// so WDRF is also cleared to allow for re-enabling the watchdog.
                 m.modify(|_, w| w.wdrf().clear_bit());
+                self.$wdtcsr.modify(|_, w| w.wde().clear_bit());
+            }
+
+            #[inline]
+            fn raw_set_mode(&mut self, mode: $crate::wdt::WdtMode) {
+                // Enable watchdog configuration mode.
+                self.$wdtcsr.modify(|_, w| w.wdce().set_bit());
+                match mode {
+                    $crate::wdt::WdtMode::Interrupt => {
+                        self.$wdtcsr
+                            .modify(|_, w| w.wde().clear_bit().wdie().set_bit());
+                    }
+                    $crate::wdt::WdtMode::SystemReset => {
+                        self.$wdtcsr
+                            .modify(|_, w| w.wde().set_bit().wdie().clear_bit());
+                    }
+                }
             }
 
             #[inline]
diff --git a/mcu/atmega-hal/src/wdt.rs b/mcu/atmega-hal/src/wdt.rs
index 434189a82e..3202e48b54 100644
--- a/mcu/atmega-hal/src/wdt.rs
+++ b/mcu/atmega-hal/src/wdt.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-pub use avr_hal_generic::wdt::{Timeout, WdtOps};
+pub use avr_hal_generic::wdt::{Timeout, WdtMode, WdtOps};
 
 pub type Wdt = avr_hal_generic::wdt::Wdt<crate::Atmega, crate::pac::WDT>;
 
diff --git a/mcu/attiny-hal/src/wdt.rs b/mcu/attiny-hal/src/wdt.rs
index 1693051483..880c9a0029 100644
--- a/mcu/attiny-hal/src/wdt.rs
+++ b/mcu/attiny-hal/src/wdt.rs
@@ -1,5 +1,5 @@
 #[allow(unused_imports)]
-pub use avr_hal_generic::wdt::{Timeout, WdtOps};
+pub use avr_hal_generic::wdt::{Timeout, WdtMode, WdtOps};
 
 pub type Wdt = avr_hal_generic::wdt::Wdt<crate::Attiny, crate::pac::WDT>;