altos: Use #define values for ublox packet types

[fw/altos] / src / stm / ao_beep_stm.c

diff --git a/src/stm/ao_beep_stm.c b/src/stm/ao_beep_stm.c
index 37c30e25b1374e3d791a1a131fd7c4686ae24031..a95d869bdf7caacfd6eca90e66899196cacdf8bb 100644 (file)
--- a/src/stm/ao_beep_stm.c
+++ b/src/stm/ao_beep_stm.c
@@ -17,6 +17,10 @@
 
 #include "ao.h"
 
+#ifndef BEEPER_CHANNEL
+#define BEEPER_CHANNEL 1
+#endif
+
 void
 ao_beep(uint8_t beep)
 {
@@ -26,15 +30,6 @@ ao_beep(uint8_t beep)
        } else {
                stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_TIM3EN);
 
-               stm_tim3.cr1 = ((STM_TIM234_CR1_CKD_1 << STM_TIM234_CR1_CKD) |
-                               (0 << STM_TIM234_CR1_ARPE) |
-                               (STM_TIM234_CR1_CMS_EDGE << STM_TIM234_CR1_CMS) |
-                               (0 << STM_TIM234_CR1_DIR) |
-                               (0 << STM_TIM234_CR1_OPM) |
-                               (0 << STM_TIM234_CR1_URS) |
-                               (0 << STM_TIM234_CR1_UDIS) |
-                               (0 << STM_TIM234_CR1_CEN));
-
                stm_tim3.cr2 = ((0 << STM_TIM234_CR2_TI1S) |
                                (STM_TIM234_CR2_MMS_RESET << STM_TIM234_CR2_MMS) |
                                (0 << STM_TIM234_CR2_CCDS));
@@ -65,6 +60,7 @@ ao_beep(uint8_t beep)
                 *  is enabled and active high.
                 */
 
+#if BEEPER_CHANNEL == 1
                stm_tim3.ccmr1 = ((0 << STM_TIM234_CCMR1_OC2CE) |
                                  (STM_TIM234_CCMR1_OC2M_FROZEN << STM_TIM234_CCMR1_OC2M) |
                                  (0 << STM_TIM234_CCMR1_OC2PE) |
@@ -77,7 +73,6 @@ ao_beep(uint8_t beep)
                                  (0 << STM_TIM234_CCMR1_OC1FE) |
                                  (STM_TIM234_CCMR1_CC1S_OUTPUT << STM_TIM234_CCMR1_CC1S));
 
-
                stm_tim3.ccer = ((0 << STM_TIM234_CCER_CC4NP) |
                                 (0 << STM_TIM234_CCER_CC4P) |
                                 (0 << STM_TIM234_CCER_CC4E) |
@@ -90,6 +85,33 @@ ao_beep(uint8_t beep)
                                 (0 << STM_TIM234_CCER_CC1NP) |
                                 (0 << STM_TIM234_CCER_CC1P) |
                                 (1 << STM_TIM234_CCER_CC1E));
+#endif
+#if BEEPER_CHANNEL == 4
+               stm_tim3.ccmr2 = ((0 << STM_TIM234_CCMR2_OC4CE) |
+                                 (STM_TIM234_CCMR2_OC4M_TOGGLE << STM_TIM234_CCMR2_OC4M) |
+                                 (0 << STM_TIM234_CCMR2_OC4PE) |
+                                 (0 << STM_TIM234_CCMR2_OC4FE) |
+                                 (STM_TIM234_CCMR2_CC4S_OUTPUT << STM_TIM234_CCMR2_CC4S) |
+
+                                 (0 << STM_TIM234_CCMR2_OC3CE) |
+                                 (STM_TIM234_CCMR2_OC3M_FROZEN << STM_TIM234_CCMR2_OC3M) |
+                                 (0 << STM_TIM234_CCMR2_OC3PE) |
+                                 (0 << STM_TIM234_CCMR2_OC3FE) |
+                                 (STM_TIM234_CCMR2_CC3S_OUTPUT << STM_TIM234_CCMR2_CC3S));
+
+               stm_tim3.ccer = ((0 << STM_TIM234_CCER_CC4NP) |
+                                (0 << STM_TIM234_CCER_CC4P) |
+                                (1 << STM_TIM234_CCER_CC4E) |
+                                (0 << STM_TIM234_CCER_CC3NP) |
+                                (0 << STM_TIM234_CCER_CC3P) |
+                                (0 << STM_TIM234_CCER_CC3E) |
+                                (0 << STM_TIM234_CCER_CC2NP) |
+                                (0 << STM_TIM234_CCER_CC2P) |
+                                (0 << STM_TIM234_CCER_CC2E) |
+                                (0 << STM_TIM234_CCER_CC1NP) |
+                                (0 << STM_TIM234_CCER_CC1P) |
+                                (0 << STM_TIM234_CCER_CC1E));
+#endif
 
 
                /* 5. Enable the counter by setting the CEN bit in the TIMx_CR1 register. */
@@ -102,6 +124,9 @@ ao_beep(uint8_t beep)
                                (0 << STM_TIM234_CR1_URS) |
                                (0 << STM_TIM234_CR1_UDIS) |
                                (1 << STM_TIM234_CR1_CEN));
+
+               /* Update the values */
+               stm_tim3.egr = (1 << STM_TIM234_EGR_UG);
        }
 }
 
@@ -116,13 +141,22 @@ ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant
 void
 ao_beep_init(void)
 {
-       /* Our beeper is on PC6, which is hooked to TIM3_CH1,
-        * which is on PC6
-        */
+#if BEEPER_CHANNEL == 1
 
+       /* Our beeper is on PC6, which is hooked to TIM3_CH1.
+        */
        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN);
 
        stm_afr_set(&stm_gpioc, 6, STM_AFR_AF2);
+#endif
+#if BEEPER_CHANNEL == 4
+
+       /* Our beeper is on PB1, which is hooked to TIM3_CH4.
+        */
+       stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOBEN);
+
+       stm_afr_set(&stm_gpiob, 1, STM_AFR_AF2);
+#endif
 
        /* Leave the timer off until requested */