Merge pull request #169 from mikeodr/pluggable-delay-method

Make MillisecondTimer::delay weak
andysworkshop · Mar 24, 2016 · 4e58f87 · 4e58f87
2 parents 20d12f9 + 56f17cc
commit 4e58f87
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/include/timing/MillisecondTimer.h b/lib/include/timing/MillisecondTimer.h
@@ -24,7 +24,7 @@ namespace stm32plus {
 
     public:
       static void initialise();
-      static void delay(uint32_t millis_);
+      static void __attribute__ ((weak)) delay(uint32_t millis_);
       static uint32_t millis();
       static void reset();
       static bool hasTimedOut(uint32_t start,uint32_t timeout);
@@ -42,20 +42,6 @@ namespace stm32plus {
   }
 
 
-  /**
-   * Delay for given time. Waits for the current value of the systick counter to reach a target.
-   * @param millis The amount of time to wait.
-   */
-
-  inline void MillisecondTimer::delay(uint32_t millis) {
-
-    uint32_t target;
-
-    target=_counter+millis;
-    while(_counter<target);
-  }
-
-
   /**
    * Reset the counter to zero
    */

diff --git a/lib/src/timing/MillisecondTimer.cpp b/lib/src/timing/MillisecondTimer.cpp
@@ -23,6 +23,20 @@ namespace stm32plus {
     _counter=0;
     SysTick_Config(SystemCoreClock / 1000);
   }
+
+
+  /**
+   * Delay for given time. Waits for the current value of the systick counter to reach a target.
+   * @param millis The amount of time to wait.
+   */
+
+  inline void MillisecondTimer::delay(uint32_t millis) {
+
+    uint32_t target;
+
+    target=_counter+millis;
+    while(_counter<target);
+  }
 }