AP_HAL_SITL: move from HAL_NO_GCS to HAL_GCS_ENABLED

This commit is contained in:
Peter Barker 2021-09-18 09:48:38 +10:00 committed by Peter Barker
parent 275457fd2c
commit 9c24916115

View File

@ -39,7 +39,9 @@
#include "UARTDriver.h" #include "UARTDriver.h"
#include "SITL_State.h" #include "SITL_State.h"
#if HAL_GCS_ENABLED
#include <AP_HAL/utility/packetise.h> #include <AP_HAL/utility/packetise.h>
#endif
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
@ -474,7 +476,9 @@ void UARTDriver::_udp_start_client(const char *address, uint16_t port)
} }
_is_udp = true; _is_udp = true;
#if HAL_GCS_ENABLED
_packetise = true; _packetise = true;
#endif
_connected = true; _connected = true;
} }
@ -698,9 +702,11 @@ void UARTDriver::_timer_tick(void)
if (_packetise) { if (_packetise) {
uint16_t n = _writebuffer.available(); uint16_t n = _writebuffer.available();
n = MIN(n, max_bytes); n = MIN(n, max_bytes);
#if HAL_GCS_ENABLED
if (n > 0) { if (n > 0) {
n = mavlink_packetise(_writebuffer, n); n = mavlink_packetise(_writebuffer, n);
} }
#endif
if (n > 0) { if (n > 0) {
// keep as a single UDP packet // keep as a single UDP packet
uint8_t tmpbuf[n]; uint8_t tmpbuf[n];