altos: Switch all tick variables to AO_TICK_TYPE/AO_TICK_SIGNED

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

diff --git a/src/easymini-v2.0/ao_pins.h b/src/easymini-v2.0/ao_pins.h
index c141d1a6f5969577e4ad63b763eb919deaf3327e..da52c5fd2063e52f84c2bef9197d81d4e3856371 100644 (file)
--- a/src/easymini-v2.0/ao_pins.h
+++ b/src/easymini-v2.0/ao_pins.h
@@ -44,7 +44,7 @@
 #define AO_PA11_PA12_RMP       1
 #define AO_USB_FORCE_IDLE      1
 
-#define AO_LOG_FORMAT          AO_LOG_FORMAT_EASYMINI
+#define AO_LOG_FORMAT          AO_LOG_FORMAT_EASYMINI2
 
 #define HAS_BOOT_RADIO         0
 
@@ -60,11 +60,11 @@
 #define HAS_IGNITE             1
 #define HAS_IGNITE_REPORT      1
 
-/* Beeper is on Tim3 CH3 */
+/* Beeper is on Tim3 CH4 */
 #define BEEPER_TIMER           3
-#define BEEPER_CHANNEL         3
+#define BEEPER_CHANNEL         4
 #define BEEPER_PORT            (&stm_gpiob)
-#define BEEPER_PIN             0
+#define BEEPER_PIN             1
 #define BEEPER_AFR             STM_AFR_AF1
 
 /* SPI */
@@ -93,7 +93,6 @@
 #define AO_MS5607_MISO_PIN     6
 #define AO_MS5607_MISO_MASK    (1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX    AO_SPI_1_PA5_PA6_PA7
-#define AO_MS5607_SPI_SPEED    AO_SPI_SPEED_12MHz
 
 #define AO_DATA_RING           64
 
@@ -130,19 +129,17 @@ struct ao_adc {
 #define AO_IGNITER_CLOSED      400
 #define AO_IGNITER_OPEN                60
 
-#define AO_IGNITER_DROGUE_PORT (&stm_gpiob)
-#define AO_IGNITER_DROGUE_PIN  6
-#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
+#define AO_IGNITER_DROGUE_PORT (&stm_gpioa)
+#define AO_IGNITER_DROGUE_PIN  3
 
 #define AO_IGNITER_MAIN_PORT   (&stm_gpiob)
 #define AO_IGNITER_MAIN_PIN    7
-#define AO_IGNITER_SET_MAIN(v) ao_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, AO_IGNITER_MAIN, v)
 
 #define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
 #define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
 
 #define AO_ADC_DUMP(p) \
-       printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
+       printf("tick: %5lu apogee: %5d main: %5d batt: %5d\n", \
               (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
 
 /*