Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 19:47:50 +08:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

[extra_dl] fix extra datalink (typo, doc)

Browse Source
This commit is contained in:
Gautier Hattenberger
2014-02-05 18:07:42 +01:00
parent d58f596f6f
commit 2c700f0d84
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/ENAC/fixed-wing/apogee.xml
+5 -2
View File
@@ -11,6 +11,10 @@
<!-- <load name="mcp355x.xml"> --> <!-- <load name="mcp355x.xml"> -->
<!-- <define name="USE_SPI1"/> --> <!-- <define name="USE_SPI1"/> -->
<!-- </load> --> <!-- </load> -->
<load name="extra_dl.xml">
<configure name="EXTRA_DL_PORT" value="UART6"/>
<configure name="EXTRA_DL_BAUD" value="B57600"/>
</load>
</modules> </modules>
<firmware name="fixedwing"> <firmware name="fixedwing">
@@ -24,7 +28,6 @@
<target name="sim" board="pc"/> <target name="sim" board="pc"/>
<target name="ap" board="apogee_1.0_chibios"/> <target name="ap" board="apogee_1.0_chibios"/>
<configure name="FLASH_MODE" value="SWD"/>
<subsystem name="radio_control" type="sbus"/> <subsystem name="radio_control" type="sbus"/>
@@ -40,7 +43,7 @@
<!-- Sensors --> <!-- Sensors -->
<subsystem name="gps" type="ublox"/> <subsystem name="gps" type="ublox"/>
<subsystem name="spi_master"/> <!--subsystem name="spi_master"/-->
</firmware> </firmware>
<firmware name="lisa_test_progs"> <firmware name="lisa_test_progs">
conf/boards/apogee_1.0_chibios.makefile
+2 -4
View File
@@ -22,10 +22,8 @@ HARD_FLOAT=yes
$(TARGET).MAKEFILE = chibios-libopencm3 $(TARGET).MAKEFILE = chibios-libopencm3
# default flash mode is via usb dfu bootloader # default flash mode is via usb dfu bootloader
# possibilities: DFU, SWD # possibilities: DFU-UTIL, SWD, STLINK
FLASH_MODE ?= DFU FLASH_MODE ?= DFU-UTIL
STLINK ?= y
DFU_UTIL ?= y
# #
# default LED configuration # default LED configuration
conf/modules/extra_dl.xml
+6 -4
View File
@@ -3,16 +3,18 @@
<module name="extra_dl" dir="datalink"> <module name="extra_dl" dir="datalink">
<doc> <doc>
<description>Extra datalink (PPRZ transport)</description> <description>Extra datalink (PPRZ transport)</description>
<configure name="EXTRA_DL_PORT" value="UARTX" description="Select port for extra datalink"/>
<configure name="EXTRA_DL_BAUD" value="B57600" description="Baudrate for extra datalink"/>
</doc> </doc>
<header> <header>
<file name="extra_pprz_dl.h"/> <file name="extra_pprz_dl.h"/>
</header> </header>
<event fun="ExtraDatalinkEvent()"/> <event fun="ExtraDatalinkEvent()"/>
<makefile> <makefile>
<define name="EXTRA_DOWNLINK_DEVICE" value="UART0"/> <define name="EXTRA_DOWNLINK_DEVICE" value="$(EXTRA_DL_PORT)"/>
<define name="EXTRA_PPRZ_UART" value="UART0"/> <define name="EXTRA_PPRZ_UART" value="$(EXTRA_DL_PORT)"/>
<define name="USE_UART0" value="1"/> <define name="USE_$(EXTRA_DL_PORT)"/>
<define name="UART0_BAUD" value="B57600"/> <define name="$(EXTRA_DL_PORT)_BAUD" value="$(EXTRA_DL_BAUD)"/>
<file name="extra_pprz_dl.c"/> <file name="extra_pprz_dl.c"/>
</makefile> </makefile>
</module> </module>
sw/airborne/modules/datalink/extra_pprz_dl.h
+1 -1
View File
@@ -37,7 +37,7 @@ extern struct pprz_transport extra_pprz_tp;
/* Datalink Event */ /* Datalink Event */
#define ExtraDatalinkEvent() { \ #define ExtraDatalinkEvent() { \
PpprzCheckAndParse(EXTRA_PPRZ_UART, extra_pprz_tp); \ PprzCheckAndParse(EXTRA_PPRZ_UART, extra_pprz_tp); \
DlCheckAndParse(); \ DlCheckAndParse(); \
} }