Remove trailing whitespaces

Author: GrantM11235

Makefile

@@ -18,7 +18,7 @@ ST_USB = usb_lib
 
 # Optimization level [0,1,2,3,s]
 OPT ?= s
-DEBUG = 
+DEBUG =
 #DEBUG = dwarf-2
 
 INCDIRS = ./$(ST_LIB) ./$(ST_USB)
@@ -143,7 +143,7 @@ build_maple-mini: TARGETFLAGS= -DTARGET_MAPLE_MINI
 build_maple-mini: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 
 build_maple-mini: elf bin lss sym
-copy_maple_mini: 
+copy_maple_mini:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
@@ -155,7 +155,7 @@ build_maple-rev3: TARGETFLAGS= -DTARGET_MAPLE_REV3
 build_maple-rev3: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 
 build_maple-rev3: elf bin lss sym
-copy_maple-rev3: 
+copy_maple-rev3:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
@@ -166,196 +166,196 @@ build_maple-rev5: TARGETFLAGS= -DTARGET_MAPLE_REV5
 # Set the linker script
 build_maple-rev5: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_maple-rev5: elf bin lss sym
-copy_maple-rev5: 
+copy_maple-rev5:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/maple_rev5_boot20.bin
 	@echo
-	
-	
+
+
 build_generic-pc13: TARGETFLAGS= -DTARGET_GENERIC_F103_PC13
 # Set the linker script
 build_generic-pc13: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pc13: elf bin lss sym
-copy_generic-pc13: 
+copy_generic-pc13:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pc13.bin
-	@echo	
-	
+	@echo
+
 build_generic-pg15: TARGETFLAGS= -DTARGET_GENERIC_F103_PG15
 # Set the linker script
 build_generic-pg15: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pg15: elf bin lss sym
-copy_generic-pg15: 
+copy_generic-pg15:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pg15.bin
-	@echo		
+	@echo
 
 
 build_generic-pd2: TARGETFLAGS= -DTARGET_GENERIC_F103_PD2
 # Set the linker script
 build_generic-pd2: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pd2: elf bin lss sym
-copy_generic-pd2: 
+copy_generic-pd2:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pd2.bin
-	@echo	
-	
-	
+	@echo
+
+
 build_generic-pd1: TARGETFLAGS= -DTARGET_GENERIC_F103_PD1
 # Set the linker script
 build_generic-pd1: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pd1: elf bin lss sym
-copy_generic-pd1: 
+copy_generic-pd1:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pd1.bin
-	@echo		
-	
+	@echo
+
 build_generic-pa1: TARGETFLAGS= -DTARGET_GENERIC_F103_PA1
 # Set the linker script
 build_generic-pa1: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pa1: elf bin lss sym
-copy_generic-pa1: 
+copy_generic-pa1:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pa1.bin
-	@echo		
+	@echo
 
 build_generic-pb9: TARGETFLAGS= -DTARGET_GENERIC_F103_PB9
 # Set the linker script
 build_generic-pb9: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pb9: elf bin lss sym
-copy_generic-pb9: 
+copy_generic-pb9:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pb9.bin
-	@echo	
-	
+	@echo
+
 
 build_generic-pe2: TARGETFLAGS= -DTARGET_GENERIC_F103_PE2
 # Set the linker script
 build_generic-pe2: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pe2: elf bin lss sym
-copy_generic-pe2: 
+copy_generic-pe2:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pe2.bin
-	@echo		
-	
-	
+	@echo
+
+
 build_generic-pa9: TARGETFLAGS= -DTARGET_GENERIC_F103_PA9
 # Set the linker script
 build_generic-pa9: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pa9: elf bin lss sym
-copy_generic-pa9: 
+copy_generic-pa9:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pa9.bin
-	@echo		
+	@echo
 
 
 build_generic-pe5: TARGETFLAGS= -DTARGET_GENERIC_F103_PE5
 # Set the linker script
 build_generic-pe5: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pe5: elf bin lss sym
-copy_generic-pe5: 
+copy_generic-pe5:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pe5.bin
-	@echo		
-	
-	
+	@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: 
+copy_generic-pe5-button-pa0:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pe5_button_pa0.bin
-	@echo		
-	
-	
+	@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: 
+copy_generic-pb7:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pb7.bin
-	@echo		
+	@echo
 build_generic-pb0: TARGETFLAGS= -DTARGET_GENERIC_F103_PB0
 # Set the linker script
 build_generic-pb0: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pb0: elf bin lss sym
-copy_generic-pb0: 
+copy_generic-pb0:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pb0.bin
-	@echo		
-	
-	
+	@echo
+
+
 build_stbee: TARGETFLAGS= -DTARGET_STBEE
 # Set the linker script
 build_stbee: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_stbee: elf bin lss sym
-copy_stbee: 
+copy_stbee:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/stbee_boot20.bin
-	@echo	
+	@echo
 
 build_naze32: TARGETFLAGS= -DTARGET_NAZE32
 # Set the linker script
 build_naze32: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_naze32: elf bin lss sym
-copy_naze32: 
+copy_naze32:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/naze32_boot20.bin
-	@echo	
-	
+	@echo
+
 build_generic-pb12: TARGETFLAGS= -DTARGET_GENERIC_F103_PB12
 # Set the linker script
 build_generic-pb12: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_generic-pb12: elf bin lss sym
-copy_generic-pb12: 
+copy_generic-pb12:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pb12.bin
-	@echo		
-	
+	@echo
+
 build_hytiny-stm32f103t: TARGETFLAGS= -DTARGET_HYTINY_STM32F103T
 # Set the linker script
 build_hytiny-stm32f103t: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
 build_hytiny-stm32f103t: elf bin lss sym
-copy_hytiny-stm32f103t: 
+copy_hytiny-stm32f103t:
 	@echo
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_hytiny.bin
-	@echo		
+	@echo
 
 build_dso138: TARGETFLAGS= -DTARGET_DSO138
 # Set the linker script
@@ -367,7 +367,7 @@ copy_dso138:
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/dso138_boot20.bin
 	@echo
-	
+
 build_gd32f1-generic-pc13: TARGETFLAGS= -DTARGET_GD32F1_GENERIC_F103_PC13
 # Set the linker script
 build_gd32f1-generic-pc13: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
@@ -377,8 +377,8 @@ copy_gd32f1-generic-pc13:
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/gd32f1_generic_boot20_pc13.bin
-	@echo	
-	
+	@echo
+
 build_gd32f1-frankenmaple: TARGETFLAGS= -DTARGET_GD32F1_FRANKENMAPLE
 # Set the linker script
 build_gd32f1-frankenmaple: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
@@ -388,9 +388,9 @@ copy_gd32f1-frankenmaple:
 	@echo "Copying to binaries folder"
 	@echo
 	cp $(TARGET).bin bootloader_only_binaries/gd32f1_frankenmaple.bin
-	@echo		
-	
-	
+	@echo
+
+
 bin: $(TARGET).bin
 elf: $(TARGET).elf
 lss: $(TARGET).lss

README

@@ -4,23 +4,23 @@ FILES -------------------------------------------------------------------------
 stm32lib/*
   - all the (possibly consolidated) stm32 lib and usb example code
 
-usb.c 
-  - USB-specific hardware setup. Interrupts, clocks, etc. handling USB when 
-    not "Attached". some low-level callbacks (low power mode, init, reset, 
+usb.c
+  - USB-specific hardware setup. Interrupts, clocks, etc. handling USB when
+    not "Attached". some low-level callbacks (low power mode, init, reset,
     resume, etc).
 
-usb_callbacks.c 
-  - aka endpoints: handling data transfer when "Configured". calls out to 
+usb_callbacks.c
+  - aka endpoints: handling data transfer when "Configured". calls out to
     application specific callbacks (i.e. DFU).
 
-usb_descriptor.c 
+usb_descriptor.c
   - aka application descriptor; big static struct and callbacks for sending
-    the descriptor. 
+    the descriptor.
 
 main.c
-  - main loop and calling any hardware init stuff. timing hacks for EEPROM 
+  - main loop and calling any hardware init stuff. timing hacks for EEPROM
     writes not to block usb interrupts. logic to handle 2 second timeout then
-    jump to user code. 
+    jump to user code.
 
 hardware.c
   - init routines to setup clocks, interrupts, also destructor functions.

README.md

@@ -11,7 +11,7 @@ This repo is a derivation of  https://github.com/jonatanolofsson/maple-bootloade
 
 The bootloader has been reworked so that all versions are contained in the Master branch, rather than 1 branch per version / board.
 
-Note. 
+Note.
 The upload to RAM option has effectively been removed, as it was useless and caused problems.
 The bootloader still has a DFU - AltID for RAM uploads, however this returns an error the host attempts to uplaod to this AltID. The AltID was kept, to allow backwards compatibility with anyone still using the old Maple IDE which has a upload to RAM option.
 
@@ -20,8 +20,8 @@ The makefile now has multple build targets including "maple-mini" (roughly equiv
 Additionally the bootloader now works with "generic" STM32F103 boards, which do not have the additional USB reset hardware which all Maple, and Maple mini boards have.
 
 On "generic" boards, the USB reset (to force re-enumeration by the host), is triggered by reconfiguring USB line D+ (PA12) into GPIO mode, and driving PA12 low for a short period, before setting the pin back to its USB operational mode.
-This system to reset the USB was written by @Victor_pv. 
-Note. It is not guaranteed to work on all "generic" STM32 boards, and relies on PA12 having a pull-up resistor of around 1.5k - however most "generic" boards seem to have this. 
+This system to reset the USB was written by @Victor_pv.
+Note. It is not guaranteed to work on all "generic" STM32 boards, and relies on PA12 having a pull-up resistor of around 1.5k - however most "generic" boards seem to have this.
 Its unclear if this method to reset the USB bus conforms precisely to the USB standard, but it seems to work fine on all PC's and Mac's (and Linux boxes) on which its been tested - and seems usable for hobby / non commericial / non-critical systems.
 
 
@@ -36,7 +36,7 @@ generic-pd1
 generic-pa1
 generic-pb9
 
-In addition to the LED, the difference in the build targets is 
+In addition to the LED, the difference in the build targets is
 (a) whether the device has maple USB reset hardware.
 (b) Which pin the "button" is attached to.
 
@@ -45,7 +45,7 @@ Note. Most "generic" STM32F103 boards only have a reset button, and not a user /
 IMPORTANT.
 If you have a board where you have external hardware attached to pin PC12 which will pull this pin HIGH, you will need to make a new build target for you board which uses a different pin for the Button, or completely modify the code so that the Button is ignored.
 
-The configuration for each build target / board is defined in config.h 
+The configuration for each build target / board is defined in config.h
 
 The Makefile sets the board name as a #define e.g. #define TARGET_GENERIC_F103_PD2, and config.h contains a block of config defines for each board.
 
@@ -55,7 +55,7 @@ e.g.
 #define HAS_MAPLE_HARDWARE 1
 #define LED_BANK GPIOB
 #define LED_PIN 1
-#define LED_ON_STATE	1	
+#define LED_ON_STATE	1
 /* On the Mini, BUT is PB8 */
 #define BUTTON_BANK GPIOB
 #define BUTTON 8
@@ -90,7 +90,7 @@ Note the code directly links flash page size to DFU block size. It would probabl
 #####Other improvements on the original Maple bootloader
 
 1. Smaller footprint - now only 8k (This became possible due to code changes by @jonatanolofsson which allowed the GCC optimisation for size flag to be used
-2. Additional DFU AltID upload type was added, which allows the sketch to be loaded at 0x8002000 instead of 0x8005000 (due to reduce size of the bootloader is self), 
+2. Additional DFU AltID upload type was added, which allows the sketch to be loaded at 0x8002000 instead of 0x8005000 (due to reduce size of the bootloader is self),
 Note. upload to 0x8005000 was retained for backwards compatibility.