Merge branch 'master' of github.com:andysworkshop/stm32plus

andysworkshop · Jul 10, 2016 · ba772e8 · ba772e8
2 parents dd08dca + 290d523
commit ba772e8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/cmake/stm32plus-config.cmake.in b/cmake/stm32plus-config.cmake.in
@@ -1 +1,8 @@
-include(${CMAKE_CURRENT_LIST_DIR}/stm32plus-config-${STM32PLUS_CONFIGURATION}.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/stm32plus-config-${STM32PLUS_CONFIGURATION}.cmake
+  OPTIONAL RESULT_VARIABLE STM32PLUS_CONFIG_FILE)
+
+if(NOT "${STM32PLUS_CONFIG_FILE}")
+  # If we couldn't find the requested config, try with an "e" appended, for
+  # explicit external oscillator. This config name change was made in 4.0.3.
+  include(${CMAKE_CURRENT_LIST_DIR}/stm32plus-config-${STM32PLUS_CONFIGURATION}e.cmake)
+endif()
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.
+   */
+
+  void MillisecondTimer::delay(uint32_t millis) {
+
+    uint32_t target;
+
+    target=_counter+millis;
+    while(_counter<target);
+  }
 }