adequate IWDG driver

modm-io · May 3, 2023 · b1b96b6 · b1b96b6
1 parent 187ad38
commit b1b96b6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/examples/nucleo_f072rb/independend_watchdog/project.xml b/examples/nucleo_f072rb/independend_watchdog/project.xml
@@ -1,7 +1,7 @@
 <library>
   <extends>modm:nucleo-f072rb</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/nucleo_f072rb/idwg_blink</option>
+    <option name="modm:build:build.path">../../../build/nucleo_f072rb/independend_watchdog</option>
   </options>
   <modules>
     <module>modm:build:scons</module>

diff --git a/src/modm/platform/iwdg/stm32/iwdg.cpp b/src/modm/platform/iwdg/stm32/iwdg.cpp
@@ -14,22 +14,23 @@
 void
 Iwdg::initialize(Iwdg::Prescaler prescaler, uint32_t reload)
 {
-	writeKey(_write);
+	writeKey(writeCommand);
 	IWDG->PR = (IWDG->PR & ~static_cast<uint32_t>(Iwdg::Prescaler::All)) |
 			   static_cast<uint32_t>(prescaler);
 	IWDG->RLR = (IWDG->RLR & ~IWDG_RLR_RL) | (reload << IWDG_RLR_RL_Pos);
+	writeKey(0); // disable access to PR and RLR registers
 }
 
 void
 Iwdg::enable()
 {
-	writeKey(_enable);
+	writeKey(enableCommand);
 }
 
 void
 Iwdg::trigger()
 {
-	writeKey(_reload);
+	writeKey(reloadCommand);
 }
 
 void

diff --git a/src/modm/platform/iwdg/stm32/iwdg.hpp b/src/modm/platform/iwdg/stm32/iwdg.hpp
@@ -15,7 +15,8 @@
 class Iwdg
 {
 public:
-	enum class Prescaler : uint32_t
+	enum class
+	Prescaler : uint32_t
 	{
 		Div4 = 0,
 		Div8 = IWDG_PR_PR_0,
@@ -27,7 +28,8 @@ class Iwdg
 		All = IWDG_PR_PR_2 | IWDG_PR_PR_1 | IWDG_PR_PR_0,
 	};
 
-	enum class Status : uint32_t
+	enum class
+	Status : uint32_t
 	{
 		None = 0,
 		Prescaler = IWDG_SR_PVU,
@@ -45,9 +47,9 @@ class Iwdg
 	getStatus();
 
 private:
-	static const auto _reload = static_cast<uint32_t>(0xAAAA);
-	static const auto _write = static_cast<uint32_t>(0x5555);
-	static const auto _enable = static_cast<uint32_t>(0xCCCC);
+	static constexpr uint32_t reloadCommand = 0xAAAA;
+	static constexpr uint32_t writeCommand = 0x5555;
+	static constexpr uint32_t enableCommand = 0xCCCC;
 
 	static void
 	writeKey(uint32_t key);

diff --git a/src/modm/platform/iwdg/stm32/module.lb b/src/modm/platform/iwdg/stm32/module.lb
@@ -20,7 +20,7 @@ def prepare(module, options):
     if target["family"] in ["h7"]:
         # STM32h75 is not yet supported with any IWDG implementation im modm
         return False
-    return options[":target"].identifier.platform == "stm32"
+    return device.has_driver("iwdg:stm32")
 
 def build(env):
     env.outbasepath = "modm/src/modm/platform/iwdg"