X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymini-v2.0%2Fao_pins.h;h=e6479e1039d15ccca6a3759f692a6d725653f836;hb=09a3c086dae1cce43c843626a1c624b4e2ad8d04;hp=47eb577e1be8f58e892937dfc0827ae16aff507b;hpb=6d05747941b8e31afb1f8522ac0b8c1ad12aa90f;p=fw%2Faltos diff --git a/src/easymini-v2.0/ao_pins.h b/src/easymini-v2.0/ao_pins.h index 47eb577e..e6479e10 100644 --- a/src/easymini-v2.0/ao_pins.h +++ b/src/easymini-v2.0/ao_pins.h @@ -19,7 +19,7 @@ #define HAS_BEEP 1 #define HAS_BATTERY_REPORT 1 -#define AO_STACK_SIZE 448 +#define AO_STACK_SIZE 432 #define IS_FLASH_LOADER 0 @@ -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 @@ -132,17 +131,15 @@ struct ao_adc { #define AO_IGNITER_DROGUE_PORT (&stm_gpioa) #define AO_IGNITER_DROGUE_PIN 3 -#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 (&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) /*