Merge branch 'master'

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

diff --git a/src/easymini-v1.0/ao_pins.h b/src/easymini-v1.0/ao_pins.h
index 45c6891d8ad790c8b8b3c32090f89cf38db0033f..940d0d98c26a7ac62e292a3c4b262a9a78fb5862 100644 (file)
--- a/src/easymini-v1.0/ao_pins.h
+++ b/src/easymini-v1.0/ao_pins.h
@@ -19,7 +19,9 @@
 #define HAS_BEEP               1
 #define HAS_BATTERY_REPORT     1
 
-#define AO_STACK_SIZE  376
+#define AO_STACK_SIZE          352
+#define SLEEP_HASH_SIZE                3
+#define AO_NUM_TASKS           6
 
 #define IS_FLASH_LOADER        0
 
@@ -32,6 +34,12 @@
 /* System clock frequency */
 #define AO_LPC_SYSCLK  24000000
 
+/* Beeper is on pio0_14 ct32b1_mat1 */
+#define BEEPER_PORT    0
+#define BEEPER_PIN     14
+#define BEEPER_TIMER   1
+#define BEEPER_OUTPUT  1
+
 #define HAS_USB                1
 
 #define HAS_USB_CONNECT        0
@@ -93,6 +101,7 @@
 #define USE_INTERNAL_FLASH     0
 #define HAS_IGNITE             1
 #define HAS_IGNITE_REPORT      1
+#define SLEEP_HASH_SIZE                3
 
 #define AO_DATA_RING           16
 
@@ -123,17 +132,15 @@ struct ao_adc {
 
 #define AO_IGNITER_DROGUE_PORT 0
 #define AO_IGNITER_DROGUE_PIN  2
-#define AO_IGNITER_SET_DROGUE(v)       ao_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, AO_IGNITER_DROGUE, v)
 
 #define AO_IGNITER_MAIN_PORT   0
 #define AO_IGNITER_MAIN_PIN    3
-#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)
 
 /*