diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:07:13 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-12-21 19:07:13 -0700 |
| commit | 456c27a7ed26e4edde02aa0a0b8ef4f46f1ea464 (patch) | |
| tree | 7c259a612e315ac439c2d6ac87e08f6c67b68485 /src/easymini-v2.0 | |
| parent | fe2fe0f4b8382d7e0a5eceaeccced28ef004dab8 (diff) | |
| parent | 16a9d8617b2d2092d166a85ada4349601afb0dce (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'src/easymini-v2.0')
| -rw-r--r-- | src/easymini-v2.0/ao_pins.h | 10 | ||||
| -rw-r--r-- | src/easymini-v2.0/flash-loader/ao_pins.h | 4 |
2 files changed, 7 insertions, 7 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) diff --git a/src/easymini-v2.0/flash-loader/ao_pins.h b/src/easymini-v2.0/flash-loader/ao_pins.h index 3098fc22..9cba43e5 100644 --- a/src/easymini-v2.0/flash-loader/ao_pins.h +++ b/src/easymini-v2.0/flash-loader/ao_pins.h @@ -21,11 +21,11 @@ #include <ao_flash_stm_pins.h> -/* pin 5 (PB1) on debug header to gnd for boot mode */ +/* pin 27 (PB6) on debug header to gnd for boot mode */ #define AO_BOOT_PIN 1 #define AO_BOOT_APPLICATION_GPIO stm_gpiob -#define AO_BOOT_APPLICATION_PIN 1 +#define AO_BOOT_APPLICATION_PIN 6 #define AO_BOOT_APPLICATION_VALUE 1 #define AO_BOOT_APPLICATION_MODE AO_EXTI_MODE_PULL_UP |