From 0d27409511e30c1d7a68a7aeaa510453f84cd99f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 19 Apr 2016 13:48:18 +1000 Subject: [PATCH] HAL_SITL: added uartF --- libraries/AP_HAL_SITL/HAL_SITL_Class.cpp | 2 ++ libraries/AP_HAL_SITL/SITL_State.h | 3 ++- libraries/AP_HAL_SITL/SITL_cmdline.cpp | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp index 97ff874539..5dbf1315a8 100644 --- a/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp +++ b/libraries/AP_HAL_SITL/HAL_SITL_Class.cpp @@ -43,6 +43,7 @@ static UARTDriver sitlUart1Driver(1, &sitlState); static UARTDriver sitlUart2Driver(2, &sitlState); static UARTDriver sitlUart3Driver(3, &sitlState); static UARTDriver sitlUart4Driver(4, &sitlState); +static UARTDriver sitlUart5Driver(5, &sitlState); static Util utilInstance(&sitlState); @@ -53,6 +54,7 @@ HAL_SITL::HAL_SITL() : &sitlUart2Driver, /* uartC */ &sitlUart3Driver, /* uartD */ &sitlUart4Driver, /* uartE */ + &sitlUart5Driver, /* uartF */ &i2c_mgr_instance, &emptyI2C, /* i2c */ &emptyI2C, /* i2c */ diff --git a/libraries/AP_HAL_SITL/SITL_State.h b/libraries/AP_HAL_SITL/SITL_State.h index 96940c57f7..3ffb1cedd4 100644 --- a/libraries/AP_HAL_SITL/SITL_State.h +++ b/libraries/AP_HAL_SITL/SITL_State.h @@ -61,12 +61,13 @@ public: const char *get_client_address(void) const { return _client_address; } // paths for UART devices - const char *_uart_path[5] { + const char *_uart_path[6] { "tcp:0:wait", "GPS1", "tcp:2", "tcp:3", "GPS2" + "tcp:4", }; private: diff --git a/libraries/AP_HAL_SITL/SITL_cmdline.cpp b/libraries/AP_HAL_SITL/SITL_cmdline.cpp index 99b1750131..c92ecf012d 100644 --- a/libraries/AP_HAL_SITL/SITL_cmdline.cpp +++ b/libraries/AP_HAL_SITL/SITL_cmdline.cpp @@ -122,6 +122,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[]) CMDLINE_UARTC, CMDLINE_UARTD, CMDLINE_UARTE, + CMDLINE_UARTF, CMDLINE_ADSB, CMDLINE_DEFAULTS }; @@ -211,6 +212,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[]) case CMDLINE_UARTC: case CMDLINE_UARTD: case CMDLINE_UARTE: + case CMDLINE_UARTF: _uart_path[opt - CMDLINE_UARTA] = gopt.optarg; break;