Merge pull request #1566 from kevindehecker/PX4_USB

Pixhawk flashing via USB

Add flash through usb functionality PX4.
Automatically detects which target is being flashed, and redirects accordingly.

Also update stm32 usb serial and add timeout to try to make it more reliable...
This commit is contained in:
Felix Ruess
2016-03-23 21:20:00 +01:00
14 changed files with 436 additions and 305 deletions
+32
View File
@@ -0,0 +1,32 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="px4_flash">
<doc>
<description>Enables to flashes the px4 FBW and AP through the original px4 bootloader.</description>
</doc>
<header>
<file name="px4_flash.h"/>
</header>
<init fun="px4flash_init()"/>
<event fun="px4flash_event()"/>
<makefile target="ap">
<raw>
</raw>
<file name="px4_flash.c"/>
<file name="usb_ser_hw.c" dir="arch/stm32"/>
<configure name="PX4IO_UART" default="uart6" case="upper|lower"/>
<configure name="PX4IO_BAUD" default="B1500000"/>
<define name="USE_$(PX4IO_UART_UPPER)"/>
<define name="PX4IO_UART" value="$(PX4IO_UART_LOWER)"/>
<define name="$(PX4IO_UART_UPPER)_BAUD" value="$(PX4IO_BAUD)"/>
<configure name="FLASH_UART" default="usb_serial" case="upper|lower"/>
<configure name="FLASH_BAUD" default="B115200"/>
<define name="USE_$(FLASH_UART_UPPER)"/>
<define name="FLASH_UART" value="$(FLASH_UART_LOWER)"/>
<define name="$(FLASH_UART_UPPER)_BAUD" value="$(FLASH_BAUD)"/>
</makefile>
</module>
-31
View File
@@ -1,31 +0,0 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="px4io_flash">
<doc>
<description>Flashes the px4io f1 through the px4 bootloader.</description>
</doc>
<header>
<file name="px4io_flash.h"/>
</header>
<init fun="px4ioflash_init()"/>
<event fun="px4ioflash_event()"/>
<makefile target="ap">
<raw>
</raw>
<file name="px4io_flash.c"/>
<configure name="PX4IO_UART" default="uart6" case="upper|lower"/>
<configure name="PX4IO_BAUD" default="B1500000"/>
<define name="USE_$(PX4IO_UART_UPPER)"/>
<define name="PX4IO_UART" value="$(PX4IO_UART_LOWER)"/>
<define name="$(PX4IO_UART_UPPER)_BAUD" value="$(PX4IO_BAUD)"/>
<configure name="TELEM2_UART" default="uart3" case="upper|lower"/>
<configure name="TELEM2_BAUD" default="B115200"/>
<define name="USE_$(TELEM2_UART_UPPER)"/>
<define name="TELEM2_UART" value="$(TELEM2_UART_LOWER)"/>
<define name="$(TELEM2_UART_UPPER)_BAUD" value="$(TELEM2_BAUD)"/>
</makefile>
</module>