altos/easymini-v2.0: Adapt to final hardware pin assignment changes
authorKeith Packard <keithp@keithp.com>
Wed, 20 Dec 2017 00:19:40 +0000 (16:19 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 20 Dec 2017 00:19:40 +0000 (16:19 -0800)
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>
src/easymini-v2.0/ao_pins.h
src/easymini-v2.0/flash-loader/ao_pins.h

index 2ec0e90b803c22dd687b1af90234733a14f84616..47eb577e1be8f58e892937dfc0827ae16aff507b 100644 (file)
 #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)
index 3098fc227a0999012fa5caab46d01d7051db45c1..9cba43e5db07cf21d2acdb5d6a9cd139f3c47ace 100644 (file)
 
 #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