Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 05:42:49 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Switched to usb_ser for flashing

Browse Source
This commit is contained in:
kevindehecker
2016-03-04 18:53:22 +01:00
parent 69ac06cf98
commit 3a7d08685a
8 changed files with 184 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/Makefile.stm32-upload
+1 -1
View File
@@ -158,7 +158,7 @@ else ifeq ($(FLASH_MODE),PX4_BOOTLOADER)
# Program the device and start it.
upload: $(OBJDIR)/$(TARGET).bin
$(PAPARAZZI_SRC)/sw/tools/px4/px_mkfw.py --prototype $(PX4_PROTOTYPE) --image $(OBJDIR)/$(TARGET).bin > $(OBJDIR)/$(TARGET).px4
$(PAPARAZZI_SRC)/sw/tools/px4/print_message.py
$(PAPARAZZI_SRC)/sw/tools/px4/set_target.py $(PX4_TARGET)
$(PAPARAZZI_SRC)/sw/tools/px4/px_uploader.py --port $(PX4_BL_PORT) $(OBJDIR)/$(TARGET).px4
#
conf/boards/px4fmu_2.4.makefile
+2 -1
View File
@@ -22,6 +22,7 @@ HARD_FLOAT=yes
# default flash mode is the PX4 bootloader
# possibilities: DFU, SWD, PX4 bootloader
FLASH_MODE ?= PX4_BOOTLOADER
PX4_TARGET = "ap"
PX4_PROTOTYPE ?= "${PAPARAZZI_HOME}/sw/tools/px4/px4fmu-v2.prototype"
PX4_BL_PORT ?= "/dev/serial/by-id/usb-3D_Robotics*,/dev/serial/by-id/pci-3D_Robotics*"
@@ -33,7 +34,7 @@ RADIO_CONTROL_LED ?= none
BARO_LED ?= none
AHRS_ALIGNER_LED ?= none
GPS_LED ?= none
SYS_TIME_LED ?= 1
SYS_TIME_LED ?= none
#
# default UART configuration (modem, gps, spektrum)
conf/boards/px4io_2.4.makefile
+2 -2
View File
@@ -16,9 +16,9 @@ $(TARGET).LDSCRIPT=$(SRC_ARCH)/px4io_2.4.ld
# default flash mode is via usb dfu bootloader
# possibilities: DFU, SWD, PX4_BOOTLOADER
PX4_BL_PORT ?= "/dev/serial/by-id/usb-FTDI_*"
PX4_BL_PORT ?= "/dev/serial/by-id/usb-Paparazzi_UAV_CDC_Serial_STM32_*"
PX4_PROTOTYPE ?= "${PAPARAZZI_HOME}/sw/tools/px4/px4io-v2.prototype"
PX4_TARGET = "fbw"
FLASH_MODE ?= PX4_BOOTLOADER
conf/modules/px4io_flash.xml
+2 -1
View File
@@ -14,13 +14,14 @@
</raw>
<file name="px4io_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="TELEM2_UART" default="uart3" case="upper|lower"/>
<configure name="TELEM2_UART" default="usb_serial" case="upper|lower"/>
<configure name="TELEM2_BAUD" default="B115200"/>
<define name="USE_$(TELEM2_UART_UPPER)"/>
<define name="TELEM2_UART" value="$(TELEM2_UART_LOWER)"/>