Merge branch 'dc740-add-smart-v2-support'

Author: rogerclarkmelbourne

Makefile

@@ -139,6 +139,7 @@ gd32f1-generic-pc13: begin clean gccversion build_gd32f1-generic-pc13 sizeafter
 gd32f1-frankenmaple: begin clean gccversion build_gd32f1-frankenmaple sizeafter finished  copy_gd32f1-frankenmaple end
 cc3d: begin clean gccversion build_cc3d sizeafter finished  copy_cc3d end
 generic-pc13-fastboot: begin clean gccversion build_generic-pc13-fastboot sizeafter finished  copy_generic-pc13-fastboot end
+smart-v2: begin clean gccversion build_smart-v2 sizeafter finished  copy_smart-v2 end
 
 build: elf bin lss sym
 
@@ -439,6 +440,16 @@ copy_generic-pc13-fastboot:
 	cp $(TARGET).bin bootloader_only_binaries/generic_boot20_pc13_fastboot.bin
 	@echo
 
+build_smart-v2: TARGETFLAGS= -DTARGET_STM32_SMART_V20 $(DEFINES)
+# Set the linker script
+build_smart-v2: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
+build_smart-v2: elf bin lss sym
+copy_smart-v2:
+	@echo
+	@echo "Copying to binaries folder"
+	@echo
+	cp $(TARGET).bin bootloader_only_binaries/smart-v2.bin
+	@echo
 
 bin: $(TARGET).bin
 elf: $(TARGET).elf

binaries/cc3d.bin

@@ -388,6 +388,18 @@
     /* CRISTAL 12MHz */
     #define XTAL12M     1
 
+#elif defined TARGET_STM32_SMART_V20
+
+    #define LED_BANK            GPIOC
+    #define LED_PIN             13
+    #define LED_ON_STATE        1
+
+    #define BUTTON_BANK GPIOA
+    #define BUTTON_PIN 0
+    #define BUTTON_PRESSED_STATE 1
+
+    /* CRISTAL 8MHz */
+
 #elif defined TARGET_CC3D
 
     #define LED_BANK            GPIOB

binaries/smart-v2.bin

@@ -24,3 +24,4 @@ make gd32f1-generic-pc13
 make gd32f1-frankenmaple
 make cc3d
 make generic-pc13-fastboot
+make smart-v2

bootloader_only_binaries/smart-v2.bin

@@ -1,15 +1,13 @@
 '@echo off
 setlocal disableDelayedExpansion
-for /f "delims=" %%A in ('forfiles /p .\bootloader_only_binaries /s /m generic*.bin /c "cmd /c echo @relpath"') do (
+for /f "delims=" %%A in ('forfiles /p .\bootloader_only_binaries /s /m *.bin /c "cmd /c echo @relpath"') do (
   set "file=%%~A"
   setlocal enableDelayedExpansion
   .\sketch_combiner\bin_merge_tool\mergesketch.exe .\bootloader_only_binaries\!file:~2! .\sketch_combiner\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\binaries\!file:~2!
   endlocal
 )
 
-.\sketch_combiner\bin_merge_tool\mergesketch.exe .\bootloader_only_binaries\naze32_boot20.bin .\sketch_combiner\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\binaries\naze32_boot20.bin
-.\sketch_combiner\bin_merge_tool\mergesketch.exe .\bootloader_only_binaries\stbee_boot20.bin  .\sketch_combiner\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\binaries\stbee_boot20.bin
-.\sketch_combiner\bin_merge_tool\mergesketch.exe .\bootloader_only_binaries\dso138_boot20.bin  .\sketch_combiner\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\binaries\dso138_boot20.bin
+
 
 setlocal disableDelayedExpansion
 for /f "delims=" %%A in ('forfiles /p .\bootloader_only_binaries /s /m maple*.bin /c "cmd /c echo @relpath"') do (