X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Feasymini-v2.0%2Fao_pins.h;h=38d463100d3fd14d767bd7caf81bce52be7e31f7;hp=2ec0e90b803c22dd687b1af90234733a14f84616;hb=cdaa0d7b272505c49017f409b7c0b8e3240608f0;hpb=c8dbcaf69cd538a31ab6e2b568237ae7c8656a9a diff --git a/src/easymini-v2.0/ao_pins.h b/src/easymini-v2.0/ao_pins.h index 2ec0e90b..38d46310 100644 --- a/src/easymini-v2.0/ao_pins.h +++ b/src/easymini-v2.0/ao_pins.h @@ -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 */ @@ -130,13 +130,11 @@ 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)