RTC LSI calibration should clear pending interrupts before start

andysworkshop · Aug 10, 2014 · 7964e8b · 7964e8b
1 parent 1c4c92e
commit 7964e8b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/examples/timer_interrupts/timer_interrupts.cpp b/examples/timer_interrupts/timer_interrupts.cpp
@@ -92,9 +92,10 @@ class TimerInterruptsTest  {
       timer.setTimeBaseByFrequency(5000,4999,TIM_CounterMode_CenterAligned3);
 
       /*
-       * Enable just the Update interrupt.
+       * Enable just the Update interrupt, clearing any spurious pending flag first
        */
 
+      timer.clearPendingInterruptsFlag(TIM_IT_Update);
       timer.enableInterrupts(TIM_IT_Update);
 
       /*

diff --git a/lib/include/usart/features/f4/UsartInterruptFeature.h b/lib/include/usart/features/f4/UsartInterruptFeature.h
@@ -71,6 +71,7 @@ namespace stm32plus {
 
       void enableInterrupts(uint16_t interruptMask);
       void disableInterrupts(uint16_t interruptMask);
+      void clearPendingInterruptsFlag(uint16_t interruptMask) const;
   };
 
 
@@ -144,6 +145,15 @@ namespace stm32plus {
     USART_ITConfig(_usart,interruptMask,DISABLE);
   }
 
+  /**
+   * Clear the selected pending interrupt flags
+   * @param interruptMask The bitmask of interrupts, e.g. USART_IT_TC / USART_IT_RXNE
+   */
+
+  template<uint8_t TUsartNumber>
+  inline void UsartInterruptFeature<TUsartNumber>::clearPendingInterruptsFlag(uint16_t interruptMask) const {
+    USART_ClearITPendingBit(_usart,interruptMask);
+  }
 
   /**
    * Enabler specialisation, Usart 1

diff --git a/lib/src/rtc/f0/RtcMeasuredLsiFrequencyProvider.cpp b/lib/src/rtc/f0/RtcMeasuredLsiFrequencyProvider.cpp
@@ -87,6 +87,7 @@ namespace stm32plus {
     // enable interrupts and the timer
 
     timer14.Timer::enablePeripheral();
+    timer14.clearPendingInterruptsFlag(TIM_IT_CC1);
     timer14.enableInterrupts(TIM_IT_CC1);
 
     // wait until completed

diff --git a/lib/src/rtc/f4/RtcMeasuredLsiFrequencyProvider.cpp b/lib/src/rtc/f4/RtcMeasuredLsiFrequencyProvider.cpp
@@ -87,6 +87,7 @@ namespace stm32plus {
     // enable interrupts and the timer
 
     timer5.Timer::enablePeripheral();
+    timer5.clearPendingInterruptsFlag(TIM_IT_CC4);
     timer5.enableInterrupts(TIM_IT_CC4);
 
     // wait until completed