first cut at turnon scripts for EasyTimer v2

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

diff --git a/src/stm/ao_pwm_stm.c b/src/stm/ao_pwm_stm.c
index cea2103038b2ffe61cda7134a50f138d10e984bf..9f3dde5492e148771a0ae8a3e60cfdfd82e95f25 100644 (file)
--- a/src/stm/ao_pwm_stm.c
+++ b/src/stm/ao_pwm_stm.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,11 +28,23 @@ ao_pwm_up(void)
 {
        if (pwm_running++ == 0) {
                struct stm_tim234       *tim = &AO_PWM_TIMER;
+
                tim->ccr1 = 0;
                tim->ccr2 = 0;
                tim->ccr3 = 0;
                tim->ccr4 = 0;
-               tim->arr = PWM_MAX;     /* turn on the timer */
+               tim->arr = PWM_MAX - 1; /* turn on the timer */
+               tim->cr1 = ((STM_TIM234_CR1_CKD_1 << STM_TIM234_CR1_CKD) |
+                           (0 << STM_TIM234_CR1_ARPE) |
+                           (STM_TIM234_CR1_CMS_EDGE << STM_TIM234_CR1_CMS) |
+                           (STM_TIM234_CR1_DIR_UP << STM_TIM234_CR1_DIR) |
+                           (0 << STM_TIM234_CR1_OPM) |
+                           (0 << STM_TIM234_CR1_URS) |
+                           (0 << STM_TIM234_CR1_UDIS) |
+                           (1 << STM_TIM234_CR1_CEN));
+
+               /* Set the timer running */
+               tim->egr = (1 << STM_TIM234_EGR_UG);
        }
 }
 
@@ -40,7 +53,19 @@ ao_pwm_down(void)
 {
        if (--pwm_running == 0) {
                struct stm_tim234       *tim = &AO_PWM_TIMER;
-               tim->arr = 0;   /* turn off the timer */
+
+               tim->arr = 0;
+               tim->cr1 = ((STM_TIM234_CR1_CKD_1 << STM_TIM234_CR1_CKD) |
+                           (0 << STM_TIM234_CR1_ARPE) |
+                           (STM_TIM234_CR1_CMS_EDGE << STM_TIM234_CR1_CMS) |
+                           (STM_TIM234_CR1_DIR_UP << STM_TIM234_CR1_DIR) |
+                           (0 << STM_TIM234_CR1_OPM) |
+                           (0 << STM_TIM234_CR1_URS) |
+                           (0 << STM_TIM234_CR1_UDIS) |
+                           (0 << STM_TIM234_CR1_CEN));
+
+               /* Stop the timer */
+               tim->egr = (1 << STM_TIM234_EGR_UG);
        }
 }
 
@@ -49,14 +74,12 @@ ao_pwm_set(uint8_t pwm, uint16_t value)
 {
        struct stm_tim234       *tim = &AO_PWM_TIMER;
 
+       if (value > PWM_MAX)
+               value = PWM_MAX;
        if (value != 0) {
                if (pwm_value[pwm] == 0)
                        ao_pwm_up();
-       } else {
-               if (pwm_value[pwm] != 0)
-                       ao_pwm_down();
        }
-       pwm_value[pwm] = value;
        switch (pwm) {
        case 0:
                tim->ccr1 = value;
@@ -71,6 +94,11 @@ ao_pwm_set(uint8_t pwm, uint16_t value)
                tim->ccr4 = value;
                break;
        }
+       if (value == 0) {
+               if (pwm_value[pwm] != 0)
+                       ao_pwm_down();
+       }
+       pwm_value[pwm] = value;
 }
 
 static void
@@ -79,10 +107,8 @@ ao_pwm_cmd(void)
        uint8_t ch;
        uint16_t val;
 
-       ao_cmd_decimal();
-       ch = ao_cmd_lex_u32;
-       ao_cmd_decimal();
-       val = ao_cmd_lex_u32;
+       ch = (uint8_t) ao_cmd_decimal();
+       val = (uint16_t) ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
 
@@ -100,13 +126,10 @@ ao_pwm_init(void)
 {
        struct stm_tim234       *tim = &AO_PWM_TIMER;
 
-       stm_rcc.apb1enr |= AO_PWM_TIMER_ENABLE;
-       tim->ccr1 = 0;
-       tim->ccr2 = 0;
-       tim->ccr3 = 0;
-       tim->ccr4 = 0;
-       tim->arr = 0;   /* turn off the timer */
-       tim->psc = 0;
+       stm_rcc.apb1enr |= (1 << AO_PWM_TIMER_ENABLE);
+
+       tim->cr1 = 0;
+       tim->psc = AO_PWM_TIMER_SCALE - 1;
        tim->cnt = 0;
        tim->ccer = ((1 << STM_TIM234_CCER_CC1E) |
                     (0 << STM_TIM234_CCER_CC1P) |
@@ -119,26 +142,26 @@ ao_pwm_init(void)
 
        tim->ccmr1 = ((0 << STM_TIM234_CCMR1_OC2CE) |
                      (STM_TIM234_CCMR1_OC2M_PWM_MODE_1 << STM_TIM234_CCMR1_OC2M) |
-                     (1 << STM_TIM234_CCMR1_OC2PE) |
+                     (0 << STM_TIM234_CCMR1_OC2PE) |
                      (0 << STM_TIM234_CCMR1_OC2FE) |
                      (STM_TIM234_CCMR1_CC2S_OUTPUT << STM_TIM234_CCMR1_CC2S) |
 
                      (0 << STM_TIM234_CCMR1_OC1CE) |
                      (STM_TIM234_CCMR1_OC1M_PWM_MODE_1 << STM_TIM234_CCMR1_OC1M) |
-                     (1 << STM_TIM234_CCMR1_OC1PE) |
+                     (0 << STM_TIM234_CCMR1_OC1PE) |
                      (0 << STM_TIM234_CCMR1_OC1FE) |
                      (STM_TIM234_CCMR1_CC1S_OUTPUT << STM_TIM234_CCMR1_CC1S));
 
 
        tim->ccmr2 = ((0 << STM_TIM234_CCMR2_OC4CE) |
                      (STM_TIM234_CCMR2_OC4M_PWM_MODE_1 << STM_TIM234_CCMR2_OC4M) |
-                     (1 << STM_TIM234_CCMR2_OC4PE) |
+                     (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_PWM_MODE_1 << STM_TIM234_CCMR2_OC3M) |
-                     (1 << STM_TIM234_CCMR2_OC3PE) |
+                     (0 << STM_TIM234_CCMR2_OC3PE) |
                      (0 << STM_TIM234_CCMR2_OC3FE) |
                      (STM_TIM234_CCMR2_CC3S_OUTPUT << STM_TIM234_CCMR2_CC3S));
        tim->egr = 0;
@@ -150,25 +173,19 @@ ao_pwm_init(void)
                    (STM_TIM234_CR2_MMS_RESET<< STM_TIM234_CR2_MMS) |
                    (0 << STM_TIM234_CR2_CCDS));
 
-       tim->cr1 = ((STM_TIM234_CR1_CKD_1 << STM_TIM234_CR1_CKD) |
-                   (1 << STM_TIM234_CR1_ARPE) |
-                   (STM_TIM234_CR1_CMS_EDGE << STM_TIM234_CR1_CMS) |
-                   (STM_TIM234_CR1_DIR_UP << STM_TIM234_CR1_DIR) |
-                   (0 << STM_TIM234_CR1_OPM) |
-                   (0 << STM_TIM234_CR1_URS) |
-                   (0 << STM_TIM234_CR1_UDIS) |
-                   (1 << STM_TIM234_CR1_CEN));
-
-       stm_afr_set(&stm_gpiod, 12, STM_AFR_AF2);
+       stm_afr_set(AO_PWM_0_GPIO, AO_PWM_0_PIN, STM_AFR_AF2);
+       stm_ospeedr_set(AO_PWM_0_GPIO, AO_PWM_0_PIN, STM_OSPEEDR_40MHz);
 #if NUM_PWM > 1
-       stm_afr_set(&stm_gpiod, 13, STM_AFR_AF2);
+       stm_afr_set(AO_PWM_1_GPIO, AO_PWM_1_PIN, STM_AFR_AF2);
+       stm_ospeedr_set(AO_PWM_1_GPIO, AO_PWM_1_PIN, STM_OSPEEDR_40MHz);
 #endif
 #if NUM_PWM > 2
-       stm_afr_set(&stm_gpiod, 14, STM_AFR_AF2);
+       stm_afr_set(AO_PWM_2_GPIO, AO_PWM_2_PIN, STM_AFR_AF2);
+       stm_ospeedr_set(AO_PWM_2_GPIO, AO_PWM_2_PIN, STM_OSPEEDR_40MHz);
 #endif
 #if NUM_PWM > 3
-       stm_afr_set(&stm_gpiod, 15, STM_AFR_AF2);
+       stm_afr_set(AO_PWM_3_GPIO, AO_PWM_3_PIN, STM_AFR_AF2);
+       stm_ospeedr_set(AO_PWM_3_GPIO, AO_PWM_3_PIN, STM_OSPEEDR_40MHz);
 #endif
-
        ao_cmd_register(&ao_pwm_cmds[0]);
 }