Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HAL_SITL: added uartF

This commit is contained in:
Andrew Tridgell 2016-04-19 13:48:18 +10:00
parent 9c9f66e5f3
commit 0d27409511
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_SITL/HAL_SITL_Class.cpp
View File

@ -43,6 +43,7 @@ static UARTDriver sitlUart1Driver(1, &sitlState);
static UARTDriver sitlUart2Driver(2, &sitlState); static UARTDriver sitlUart2Driver(2, &sitlState);
static UARTDriver sitlUart3Driver(3, &sitlState); static UARTDriver sitlUart3Driver(3, &sitlState);
static UARTDriver sitlUart4Driver(4, &sitlState); static UARTDriver sitlUart4Driver(4, &sitlState);
static UARTDriver sitlUart5Driver(5, &sitlState);
static Util utilInstance(&sitlState); static Util utilInstance(&sitlState);
@ -53,6 +54,7 @@ HAL_SITL::HAL_SITL() :
&sitlUart2Driver, /* uartC */ &sitlUart2Driver, /* uartC */
&sitlUart3Driver, /* uartD */ &sitlUart3Driver, /* uartD */
&sitlUart4Driver, /* uartE */ &sitlUart4Driver, /* uartE */
&sitlUart5Driver, /* uartF */
&i2c_mgr_instance, &i2c_mgr_instance,
&emptyI2C, /* i2c */ &emptyI2C, /* i2c */
&emptyI2C, /* i2c */ &emptyI2C, /* i2c */

3
libraries/AP_HAL_SITL/SITL_State.h
View File

@ -61,12 +61,13 @@ public:
const char *get_client_address(void) const { return _client_address; } const char *get_client_address(void) const { return _client_address; }
// paths for UART devices // paths for UART devices
const char *_uart_path[5] { const char *_uart_path[6] {
"tcp:0:wait", "tcp:0:wait",
"GPS1", "GPS1",
"tcp:2", "tcp:2",
"tcp:3", "tcp:3",
"GPS2" "GPS2"
"tcp:4",
}; };
private: private:

2
libraries/AP_HAL_SITL/SITL_cmdline.cpp
View File

@ -122,6 +122,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[])
CMDLINE_UARTC, CMDLINE_UARTC,
CMDLINE_UARTD, CMDLINE_UARTD,
CMDLINE_UARTE, CMDLINE_UARTE,
CMDLINE_UARTF,
CMDLINE_ADSB, CMDLINE_ADSB,
CMDLINE_DEFAULTS CMDLINE_DEFAULTS
}; };
@ -211,6 +212,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[])
case CMDLINE_UARTC: case CMDLINE_UARTC:
case CMDLINE_UARTD: case CMDLINE_UARTD:
case CMDLINE_UARTE: case CMDLINE_UARTE:
case CMDLINE_UARTF:
_uart_path[opt - CMDLINE_UARTA] = gopt.optarg; _uart_path[opt - CMDLINE_UARTA] = gopt.optarg;
break; break;