diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:05:46 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:05:46 -0700 |
| commit | dbb78c8222c45f4430601deee0194b0c9dc2e79a (patch) | |
| tree | 6805b815727c58ad6c01f9163e42ab3177ee56d5 /src/easymini-v2.0/ao_pins.h | |
| parent | fe38c22595b050435dbacd35f1baae064fb7de75 (diff) | |
| parent | 87aab99521dc44d1d29fbb0b7f227f868f074836 (diff) | |
Merge branch 'master' into branch-1.8
Diffstat (limited to 'src/easymini-v2.0/ao_pins.h')
| -rw-r--r-- | src/easymini-v2.0/ao_pins.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/easymini-v2.0/ao_pins.h b/src/easymini-v2.0/ao_pins.h index 2ec0e90b..47eb577e 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,8 +130,8 @@ 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_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) |