summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2017-12-19 16:19:40 -0800
committerKeith Packard <keithp@keithp.com>2017-12-19 16:19:40 -0800
commit6d05747941b8e31afb1f8522ac0b8c1ad12aa90f (patch)
treee320cecb8d436cce98f2c445f28f951a9f27405a
parent9826845f952abe898f029e31cc0f7080708e2eae (diff)
altos/easymini-v2.0: Adapt to final hardware pin assignment changes
Beeper moved from PB0 to PB1 (Tim3 CH4) Drogue fire moved from PB6 to PB3 Bootloader moved from PB1 to PB6 Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/easymini-v2.0/ao_pins.h10
-rw-r--r--src/easymini-v2.0/flash-loader/ao_pins.h4
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