Changes so that generic_pc13 version uses Boot1 jump link as the button pin so that the bootloader holds in DFU mode. Also rebuilt and tested generic_pa1 to check no side effects of these changes

Author: rogerclarkmelbourne

binaries/generic_boot20_pa1.bin

@@ -147,14 +147,16 @@
 
 #elif defined TARGET_GENERIC_F103_PC13
 
+
     #define LED_BANK            GPIOC
     #define LED_PIN             13
     #define LED_ON_STATE        0
 
-    // Button (if you have one)
-
-    #define BUTTON_BANK GPIOC
-    #define BUTTON_PIN 14
+// Use Boot1 PB2 as the button, as hardly anyone uses this pin as GPIO
+// Need to set the button input mode to just CR_INPUT and not CR_INPUT_PU_PD because the external pullup on the jumplink is very weak
+	#define BUTTON_INPUT_MODE 	CR_INPUT
+    #define BUTTON_BANK GPIOB
+    #define BUTTON_PIN 2
     #define BUTTON_PRESSED_STATE 1
 
 
@@ -362,6 +364,13 @@
     #error "No config for this target"
 #endif
 
+// Check if button pulldown should be enabled 
+// Default to True as this was the default prior to needing to disable it
+// in order to use the boot1 pin on the Blue Pill which has a very week pullup
+#ifndef BUTTON_INPUT_MODE
+	#define BUTTON_INPUT_MODE 	CR_INPUT_PU_PD
+#endif
+
 #define STARTUP_BLINKS 5
 #ifndef BOOTLOADER_WAIT
 #ifdef BUTTON_BANK

binaries/generic_boot20_pc13.bin

@@ -152,7 +152,7 @@ void setupLEDAndButton (void) {
     // SET_REG(AFIO_MAPR,(GET_REG(AFIO_MAPR) & ~AFIO_MAPR_SWJ_CFG) | AFIO_MAPR_SWJ_CFG_NO_JTAG_NO_SW);// Try to disable SWD AND JTAG so we can use those pins (not sure if this works).
 
 #if defined(BUTTON_BANK) && defined (BUTTON_PIN) && defined (BUTTON_PRESSED_STATE)
-    SET_REG(GPIO_CR(BUTTON_BANK,BUTTON_PIN),(GPIO_CR(BUTTON_BANK,BUTTON_PIN) & crMask(BUTTON_PIN)) | CR_INPUT_PU_PD << CR_SHITF(BUTTON_PIN));
+    SET_REG(GPIO_CR(BUTTON_BANK,BUTTON_PIN),(GPIO_CR(BUTTON_BANK,BUTTON_PIN) & crMask(BUTTON_PIN)) | BUTTON_INPUT_MODE << CR_SHITF(BUTTON_PIN));
 
     gpio_write_bit(BUTTON_BANK, BUTTON_PIN,1-BUTTON_PRESSED_STATE);// set pulldown resistor in case there is no button.
 #endif