Revision 5:38379e44fae3, committed 2014-11-15

Comitter:

olympux

Date:

Sat Nov 15 11:44:16 2014 +0000

Parent:

4:22c5c4aa4661

Commit message:

Compatible with STM32F10x

Changed in this revision

diff -r 22c5c4aa4661 -r 38379e44fae3 Watchdog.cpp
--- a/Watchdog.cpp	Sat Oct 11 17:28:07 2014 +0000
+++ b/Watchdog.cpp	Sat Nov 15 11:44:16 2014 +0000
@@ -18,27 +18,31 @@
 
 /// Watchdog gets instantiated at the module level
 Watchdog::Watchdog() {
-    wdreset = (LPC_WDT->WDMOD >> 2) & 1;    // capture the cause of the previous reset
+    wdreset = false;
 }
 
 /// Load timeout value in watchdog timer and enable
-void Watchdog::Configure(float s) {
-    LPC_WDT->WDCLKSEL = 0x1;                // Set CLK src to PCLK
-    uint32_t clk = SystemCoreClock / 16;    // WD has a fixed /4 prescaler, PCLK default is /4
-    LPC_WDT->WDTC = (uint32_t)(s * (float)clk);
-    LPC_WDT->WDMOD = 0x3;                   // Enabled and Reset
-    Service();
+void Watchdog::Configure(int pr) {
+    // http://www.st.com/web/en/resource/technical/document/reference_manual/CD00171190.pdf
+    IWDG->KR  = 0x5555;                                   // enable write to PR, RLR
+    IWDG->PR  = pr;                                        // Init prescaler, page 486 Reference Manual
+    IWDG->RLR = 0xFFF;                                    // Init RLR
+    IWDG->KR  = 0xAAAA;                                   // Reload the watchdog
+    IWDG->KR  = 0xCCCC;
 }
 
 /// "Service", "kick" or "feed" the dog - reset the watchdog timer
 /// by writing this required bit pattern
 void Watchdog::Service() {
-    LPC_WDT->WDFEED = 0xAA;
-    LPC_WDT->WDFEED = 0x55;
+    IWDG->KR  = 0xAAAA;
 }
 
 /// get the flag to indicate if the watchdog causes the reset
 bool Watchdog::WatchdogCausedReset() {
+    if (RCC->CSR & (1<<29)) {
+        wdreset = true;
+        RCC->CSR |= (1<<24); // clear reset flag
+    }
     return wdreset;
 }
 

diff -r 22c5c4aa4661 -r 38379e44fae3 Watchdog.h
--- a/Watchdog.h	Sat Oct 11 17:28:07 2014 +0000
+++ b/Watchdog.h	Sat Nov 15 11:44:16 2014 +0000
@@ -73,7 +73,7 @@
     /// @param[in] timeout in seconds, as a floating point number
     /// @returns none
     ///
-    void Configure(float timeout);
+    void Configure(int pr);
     
     /// Service the Watchdog so it does not cause a system reset
     ///