X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemini-v3.0%2Fao_pins.h;h=28b3540bb88d910cc05c636bceecbdd3f35b0d56;hb=b10049d847fac855b1139d6441de853641b7365b;hp=d91b1d21fcf8d04374fc4efe3029b3a72f134c20;hpb=dbc52686c6d9808275c35e0c9c987cbbd9f7859d;p=fw%2Faltos diff --git a/src/telemini-v3.0/ao_pins.h b/src/telemini-v3.0/ao_pins.h index d91b1d21..28b3540b 100644 --- a/src/telemini-v3.0/ao_pins.h +++ b/src/telemini-v3.0/ao_pins.h @@ -74,9 +74,9 @@ #define AO_RECOVERY_VALUE 0 #define AO_RECOVERY_MODE AO_EXTI_MODE_PULL_UP -/* Beeper is on Tim3 CH4 */ +/* Beeper is on Tim2 CH4 */ #define BEEPER_CHANNEL 4 -#define BEEPER_TIMER 3 +#define BEEPER_TIMER 2 #define BEEPER_PORT (&stm_gpioa) #define BEEPER_PIN 3 @@ -106,7 +106,6 @@ #define AO_MS5607_MISO_PIN 4 #define AO_MS5607_MISO_MASK (1 << AO_MS5607_MISO_PIN) #define AO_MS5607_SPI_INDEX AO_SPI_1_PB3_PB4_PB5 -#define AO_MS5607_SPI_SPEED AO_SPI_SPEED_12MHz /* CC1200 */ @@ -119,7 +118,6 @@ #define AO_CC1200_SPI_CS_PIN 0 #define AO_CC1200_SPI_BUS AO_SPI_1_PA5_PA6_PA7 #define AO_CC1200_SPI stm_spi1 -#define AO_CC1200_SPI_SPEED AO_SPI_SPEED_12MHz #define AO_CC1200_INT_PORT (&stm_gpiob) #define AO_CC1200_INT_PIN 1 @@ -173,7 +171,7 @@ struct ao_adc { #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) /*