diff --git a/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp b/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp index 5724ec9239..940228fe34 100644 --- a/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp +++ b/libraries/AP_ADSB/AP_ADSB_Sagetech.cpp @@ -73,7 +73,7 @@ void AP_ADSB_Sagetech::update() if (!_port->read(data)) { break; } - if (parse_byte_XP((uint8_t)data)) { + if (parse_byte_XP(data)) { handle_packet_XP(message_in.packet); } } // while nbytes diff --git a/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.cpp b/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.cpp index e5552c7341..3186a09f91 100644 --- a/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.cpp +++ b/libraries/AP_ADSB/AP_ADSB_Sagetech_MXS.cpp @@ -78,11 +78,11 @@ void AP_ADSB_Sagetech_MXS::update() // ----------------------------- uint32_t nbytes = MIN(_port->available(), 10 * PAYLOAD_MXS_MAX_SIZE); while (nbytes-- > 0) { - const int16_t data = _port->read(); - if (data < 0) { + uint8_t data; + if (!_port->read(data)) { break; } - parse_byte((uint8_t)data); + parse_byte(data); } const uint32_t now_ms = AP_HAL::millis(); diff --git a/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.cpp b/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.cpp index 0547bb85d1..b4cae2a3d2 100644 --- a/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.cpp +++ b/libraries/AP_ADSB/AP_ADSB_uAvionix_UCP.cpp @@ -76,12 +76,11 @@ void AP_ADSB_uAvionix_UCP::update() // ----------------------------- uint32_t nbytes = MIN(_port->available(), 10UL * GDL90_RX_MAX_PACKET_LENGTH); while (nbytes-- > 0) { - const int16_t data = (uint8_t)_port->read(); - if (data < 0) { + uint8_t data; + if (!_port->read(data)) { break; } - - if (parseByte((uint8_t)data, rx.msg, rx.status)) { + if (parseByte(data, rx.msg, rx.status)) { rx.last_msg_ms = now_ms; handle_msg(rx.msg); }