Merge branch 'Serasidis-master'

Author: rogerclarkmelbourne

STM32F1/boards.txt

@@ -399,6 +399,12 @@ genericSTM32F103C.menu.upload_method.jlinkMethod.upload.protocol=jlink
 genericSTM32F103C.menu.upload_method.jlinkMethod.upload.tool=jlink_upload
 genericSTM32F103C.menu.upload_method.jlinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER 
 
+genericSTM32F103C.menu.upload_method.HIDUploadMethod=HID bootloader 2.0
+genericSTM32F103C.menu.upload_method.HIDUploadMethod.upload.tool=hid_upload
+genericSTM32F103C.menu.upload_method.HIDUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
+genericSTM32F103C.menu.upload_method.HIDUploadMethod.build.vect=VECT_TAB_ADDR=0x8001000
+genericSTM32F103C.menu.upload_method.HIDUploadMethod.build.ldscript=ld/hid_bootloader.ld
+
 #-- CPU Clock frequency
 genericSTM32F103C.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
 genericSTM32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L

STM32F1/platform.txt

@@ -162,14 +162,14 @@ tools.jlink_upload.upload.params.verbose=-d
 tools.jlink_upload.upload.params.quiet=n
 tools.jlink_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin"
 
-# HID upload
+# HID upload 2.0
 tools.hid_upload.cmd=hid_upload
-tools.hid_upload.cmd.windows=hid_upload.bat
-tools.hid_upload.cmd.macosx=hid_upload
+tools.hid_upload.cmd.windows=hid-flash.exe
+tools.hid_upload.cmd.macosx=hid_flash
 tools.hid_upload.path={runtime.hardware.path}/tools/win
 tools.hid_upload.path.macosx={runtime.hardware.path}/tools/macosx
 tools.hid_upload.path.linux={runtime.hardware.path}/tools/linux
 tools.hid_upload.path.linux64={runtime.hardware.path}/tools/linux64
 tools.hid_upload.upload.params.verbose=-d
 tools.hid_upload.upload.params.quiet=n
-tools.hid_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+tools.hid_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin" {serial.port.file}

STM32F1/system/libmaple/stm32f1/include/series/dma.h

@@ -538,6 +538,10 @@ static inline void dma_clear_isr_bits(dma_dev *dev, dma_tube tube) {
     dev->regs->IFCR = (1U << (4 * (tube - 1)));
 }
 
+static inline uint16 dma_get_count(dma_dev *dev, dma_tube tube) {
+    return dma_channel_regs(dev, tube)->CNDTR;
+}
+
 /**
  * @brief Deprecated
  * STM32F1 mode flags for dma_setup_xfer(). Use dma_tube_cfg() instead.

STM32F1/variants/generic_stm32f103c/ld/hid_bootloader.ld

@@ -0,0 +1,30 @@
+/*
+ * libmaple linker script for "Flash" builds.
+ *
+ * A Flash build puts .text (and .rodata) in Flash, and
+ * .data/.bss/heap (of course) in SRAM, but offsets the sections by
+ * enough space to store the Maple bootloader, which lives in low
+ * Flash and uses low memory.
+ */
+
+/*
+ * This pulls in the appropriate MEMORY declaration from the right
+ * subdirectory of stm32/mem/ (the environment must call ld with the
+ * right include directory flags to make this happen). Boards can also
+ * use this file to use any of libmaple's memory-related hooks (like
+ * where the heap should live).
+ */
+MEMORY
+{
+  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K
+  rom (rx)  : ORIGIN = 0x08001000, LENGTH = 124K
+}
+
+/* Provide memory region aliases for common.inc */
+REGION_ALIAS("REGION_TEXT", rom);
+REGION_ALIAS("REGION_DATA", ram);
+REGION_ALIAS("REGION_BSS", ram);
+REGION_ALIAS("REGION_RODATA", rom);
+
+/* Let common.inc handle the real work. */
+INCLUDE common.inc

STM32F4/boards.txt

@@ -111,6 +111,10 @@ generic_f407v.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
 generic_f407v.menu.upload_method.STLinkMethod.upload.dfuse_addr=0x08004000
 generic_f407v.menu.upload_method.STLinkMethod.build.vect_flags=-DVECT_TAB_FLASH -DUSER_ADDR_ROM=(uint32)0x08000000
 
+generic_f407v.menu.upload_method.HIDUploadMethod=HID bootloader 2.0
+generic_f407v.menu.upload_method.HIDUploadMethod.upload.tool=hid_upload
+generic_f407v.menu.upload_method.HIDUploadMethod.build.vect_flags=-DVECT_TAB_FLASH -DUSER_ADDR_ROM=(uint32)0x08004000 -DVECT_TAB_OFFSET=0x4000
+generic_f407v.menu.upload_method.HIDUploadMethod.build.ldscript=ld/bootloader_8004000.ld
 
 generic_f407v.menu.upload_method.DFUUploadMethod=STM32duino bootloader
 generic_f407v.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu

STM32F4/platform.txt

@@ -123,3 +123,15 @@ tools.stlink_upload.path.linux64={runtime.hardware.path}/tools/linux64
 tools.stlink_upload.upload.params.verbose=-d
 tools.stlink_upload.upload.params.quiet=
 tools.stlink_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
+
+# HID upload 2.0 (HID bootloader 2.0 This bootloader will cover the STM32F1 and STM32F4 MCUs)
+tools.hid_upload.cmd=hid_upload
+tools.hid_upload.cmd.windows=hid-flash.exe
+tools.hid_upload.cmd.macosx=hid_flash
+tools.hid_upload.path={runtime.hardware.path}/tools/win
+tools.hid_upload.path.macosx={runtime.hardware.path}/tools/macosx
+tools.hid_upload.path.linux={runtime.hardware.path}/tools/linux
+tools.hid_upload.path.linux64={runtime.hardware.path}/tools/linux64
+tools.hid_upload.upload.params.verbose=-d
+tools.hid_upload.upload.params.quiet=n
+tools.hid_upload.upload.pattern="{path}/{cmd}" "{build.path}/{build.project_name}.bin" {serial.port.file}