Merge branch 'master' of https://github.com/rogerclarkmelbourne/stm32duino-bootloader

Author: rogerclarkmelbourne

STM32F1/Makefile

@@ -124,6 +124,8 @@ generic-pb9: begin gccversion build_generic-pb9 sizeafter finished  copy_generic
 generic-pe2: begin gccversion build_generic-pe2 sizeafter finished  copy_generic-pe2 end
 generic-pa9: begin gccversion build_generic-pa9 sizeafter finished  copy_generic-pa9 end
 generic-pe5: begin gccversion build_generic-pe5 sizeafter finished  copy_generic-pe5 end
+generic-pe5-button-pa0: begin gccversion build_generic-pe5-button-pa0 sizeafter finished  copy_generic-pe5-button-pa0 end
+generic-pb7: begin gccversion build_generic-pb7 sizeafter finished  copy_generic-pb7 end
 
 build: elf bin lss sym
 
@@ -268,6 +270,29 @@ copy_generic-pe5:
 	@echo		
 
 
+build_generic-pe5-button-pa0: TARGETFLAGS= -DTARGET_GENERIC_F103_PE5_BUTTON_PA0
+# Set the linker script
+build_generic-pe5-button-pa0: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
+build_generic-pe5-button-pa0: elf bin lss sym
+copy_generic-pe5-button-pa0: 
+	@echo
+	@echo "Copying to binaries folder"
+	@echo
+	cp $(TARGET).bin binaries/generic_boot20_pe5_button_pa0.bin
+	@echo		
+	
+	
+build_generic-pb7: TARGETFLAGS= -DTARGET_GENERIC_F103_PB7
+# Set the linker script
+build_generic-pb7: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
+build_generic-pb7: elf bin lss sym
+copy_generic-pb7: 
+	@echo
+	@echo "Copying to binaries folder"
+	@echo
+	cp $(TARGET).bin binaries/generic_boot20_pb7.bin
+	@echo		
+	
 bin: $(TARGET).bin
 elf: $(TARGET).elf
 lss: $(TARGET).lss

STM32F1/binaries/generic_boot20_pb7.bin

@@ -232,6 +232,22 @@
 	#define BUTTON_PIN 2
 	#define BUTTON_PRESSED_STATE 1
 
+#elif defined TARGET_GENERIC_F103_PE5_BUTTON_PA0
+	
+	#define LED_BANK			GPIOE 
+	#define LED_PIN 			5
+	#define LED_ON_STATE		1	
+	
+	#define BUTTON_BANK GPIOA
+	#define BUTTON_PIN 0
+	#define BUTTON_PRESSED_STATE 1	
+
+#elif defined TARGET_GENERIC_F103_PB7
+	
+	#define LED_BANK			GPIOB 
+	#define LED_PIN 			7
+	#define LED_ON_STATE		1	
+
 #else
 	#error "No config for this target"
 #endif