Merge pull request rogerclarkmelbourne#25 from GrantM11235/dso138

rogerclarkmelbourne · web-flow · commit 36113f7925f7 · 2017-08-01T20:56:41.000+10:00
Add support for DSO138 Oscilloscope
diff --git a/STM32F1/Makefile b/STM32F1/Makefile
@@ -131,6 +131,7 @@ stbee :  begin clean gccversion build_stbee sizeafter finished  copy_stbee end
 naze32: begin clean gccversion build_naze32 sizeafter finished  copy_naze32 end
 generic-pb12: begin clean gccversion build_generic-pb12 sizeafter finished  copy_generic-pb12 end
 hytiny-stm32f103t: begin clean gccversion build_hytiny-stm32f103t sizeafter finished  copy_hytiny-stm32f103t end
+dso138: begin clean gccversion build_dso138 sizeafter finished  copy_dso138 end
 build: elf bin lss sym
 
 build_maple-mini: TARGETFLAGS= -DTARGET_MAPLE_MINI
@@ -351,6 +352,17 @@ copy_hytiny-stm32f103t:
 	@echo
 	cp $(TARGET).bin binaries/generic_boot20_hytiny.bin
 	@echo		
+
+build_dso138: TARGETFLAGS= -DTARGET_DSO138
+# Set the linker script
+build_dso138: LDFLAGS +=-T$(ST_LIB)/c_only_md_high_density.ld
+build_dso138: elf bin lss sym
+copy_dso138:
+	@echo
+	@echo "Copying to binaries folder"
+	@echo
+	cp $(TARGET).bin binaries/dso138_boot20.bin
+	@echo
 	
 	
 	
diff --git a/STM32F1/binaries/dso138_boot20.bin b/STM32F1/binaries/dso138_boot20.bin
diff --git a/STM32F1/bootloader_only_binaries/dso138_boot20.bin b/STM32F1/bootloader_only_binaries/dso138_boot20.bin
diff --git a/STM32F1/config.h b/STM32F1/config.h
@@ -309,6 +309,17 @@
 	#define USB_DISC_BANK       GPIOA
 	#define USB_DISC_PIN            0
 
+#elif defined TARGET_DSO138
+
+	#define LED_BANK			GPIOA
+	#define LED_PIN 			15
+	#define LED_ON_STATE		0
+
+	// "OK" Button
+	#define BUTTON_BANK GPIOB
+	#define BUTTON_PIN 15
+	#define BUTTON_PRESSED_STATE 0
+
 	
 #else
 	#error "No config for this target"
diff --git a/STM32F1/make_all.bat b/STM32F1/make_all.bat
@@ -16,4 +16,5 @@ make generic-pb0
 make stbee
 make naze32
 make generic-pb12
-make hytiny-stm32f103t
+make hytiny-stm32f103t
+make dso138
diff --git a/sketch_and_bootloader_combined/merge_sketch.bat b/sketch_and_bootloader_combined/merge_sketch.bat
@@ -9,6 +9,7 @@ for /f "delims=" %%A in ('forfiles /p ..\STM32F1\binaries /s /m generic*.bin /c
 
 .\bin_merge_tool\mergesketch.exe ..\STM32F1\binaries\naze32_boot20.bin .\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\merged_bins\naze32_boot20.bin
 .\bin_merge_tool\mergesketch.exe ..\STM32F1\binaries\stbee_boot20.bin  .\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\merged_bins\stbee_boot20.bin
+.\bin_merge_tool\mergesketch.exe ..\STM32F1\binaries\dso138_boot20.bin  .\congratulations_sketch\congratulations_sketch.ino.generic_stm32f103c.bin .\merged_bins\dso138_boot20.bin
 
 setlocal disableDelayedExpansion
 for /f "delims=" %%A in ('forfiles /p ..\STM32F1\binaries /s /m maple*.bin /c "cmd /c echo @relpath"') do (
