Reimplemented tone using timer interrupts in output compare toggle mode

particle-iot · Apr 20, 2014 · 6c8ac53 · 6c8ac53
1 parent edd2293
commit 6c8ac53
Show file tree

Hide file tree

Showing 4 changed files with 358 additions and 38 deletions.
diff --git a/inc/spark_wiring.h b/inc/spark_wiring.h
@@ -31,6 +31,7 @@
 #include "spark_macros.h"
 #include "debug.h"
 #include "platform_config.h"
+#include "stm32_it.h"
 #include "spark_utilities.h"
 #include "spark_wiring_stream.h"
 #include "spark_wiring_printable.h"
@@ -150,6 +151,8 @@ typedef struct STM32_Pin_Info {
   TIM_TypeDef* timer_peripheral;
   uint16_t timer_ch;
   PinMode pin_mode;
+  uint16_t timer_ccr;
+  int32_t user_property;
 } STM32_Pin_Info;
 
 extern STM32_Pin_Info PIN_MAP[];
@@ -184,7 +187,7 @@ long map(long value, long fromStart, long fromEnd, long toStart, long toEnd);
 void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 
-void tone(uint8_t pin, unsigned int frequency);
+void tone(uint8_t pin, unsigned int frequency, unsigned long duration = 0);
 void noTone(uint8_t pin);
 
 #ifdef __cplusplus

diff --git a/inc/stm32_it.h b/inc/stm32_it.h
@@ -63,11 +63,17 @@ void EXTI4_IRQHandler(void);
 void EXTI9_5_IRQHandler(void);
 void EXTI15_10_IRQHandler(void);
 void TIM1_CC_IRQHandler(void);
+void TIM2_IRQHandler(void);
+void TIM3_IRQHandler(void);
+void TIM4_IRQHandler(void);
 void RTC_IRQHandler(void);
 void RTCAlarm_IRQHandler(void);
 void DMA1_Channel5_IRQHandler(void);
 void USB_LP_CAN1_RX0_IRQHandler(void);
 
+extern void (*Wiring_TIM2_Interrupt_Handler)(void);
+extern void (*Wiring_TIM3_Interrupt_Handler)(void);
+extern void (*Wiring_TIM4_Interrupt_Handler)(void);
 }
 
 #endif /* __STM32_IT_H */