altos: Switch all tick variables to AO_TICK_TYPE/AO_TICK_SIGNED

[fw/altos] / src / telemega-v2.0 / ao_pins.h

diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h
index d796826cbc4ac13687518e488a093f169834ae1d..db0d5d8ccbbebc56aa046b978d54b590792e23c1 100644 (file)
--- a/src/telemega-v2.0/ao_pins.h
+++ b/src/telemega-v2.0/ao_pins.h
@@ -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
@@ -18,7 +19,6 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_TASK_QUEUE         1
 
 /* 8MHz High speed external crystal */
 #define AO_HSE                 8000000
@@ -68,6 +68,7 @@
 #define AO_CONFIG_MAX_SIZE                     1024
 #define LOG_ERASE_MARK                         0x55
 #define LOG_MAX_ERASE                          128
+#define AO_LOG_FORMAT                          AO_LOG_FORMAT_TELEMEGA
 
 #define HAS_EEPROM             1
 #define USE_INTERNAL_FLASH     0
@@ -75,6 +76,10 @@
 #define USE_STORAGE_CONFIG     0
 #define HAS_USB                        1
 #define HAS_BEEP               1
+#define BEEPER_TIMER           3
+#define BEEPER_CHANNEL         1
+#define BEEPER_PORT            (&stm_gpioc)
+#define BEEPER_PIN             6
 #define HAS_BATTERY_REPORT     1
 #define HAS_RADIO              1
 #define HAS_TELEMETRY          1
@@ -163,9 +168,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM    4
 
-#define AO_IGNITER_SET_DROGUE(v)       stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)         stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-
 /*
  * ADC
  */
@@ -180,7 +182,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-       printf("tick: %5u A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
+       printf("tick: %5lu A: %5d B: %5d C: %5d D: %5d drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
               (p)->tick, \
               (p)->adc.sense[0], (p)->adc.sense[1], (p)->adc.sense[2], \
               (p)->adc.sense[3], (p)->adc.sense[4], (p)->adc.sense[5], \
@@ -348,6 +350,7 @@ struct ao_adc {
  */
 
 #define HAS_MMA655X            1
+#define AO_MMA655X_INVERT      0
 #define AO_MMA655X_SPI_INDEX   AO_SPI_1_PE13_PE14_PE15
 #define AO_MMA655X_CS_PORT     (&stm_gpiod)
 #define AO_MMA655X_CS_PIN      4
@@ -387,10 +390,10 @@ struct ao_adc {
  */
 
 #define NUM_PWM                        4
-#define PWM_MAX                        1023
+#define PWM_MAX                        20000
 #define AO_PWM_TIMER           stm_tim4
 #define AO_PWM_TIMER_ENABLE    STM_RCC_APB1ENR_TIM4EN
-#define AO_PWM_TIMER_SCALE     1
+#define AO_PWM_TIMER_SCALE     32
 
 #define AO_PWM_0_GPIO          (&stm_gpiod)
 #define AO_PWM_0_PIN           12