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

GCS_MAVLink: add and use a "bool read(c)" method to AP_HAL 

this is much less likely to not work vs the int16_t equivalent
This commit is contained in:
Peter Barker 2023-02-21 20:35:58 +11:00 committed by Peter Barker
parent 988aa992bf
commit a649dff390
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -6343,12 +6343,12 @@ void GCS::passthru_timer(void)
_passthru.port1->begin_locked(baud, lock_key);
}
int16_t b;
uint8_t b;
uint8_t buf[64];
uint8_t nbytes = 0;
// read from port1, and write to port2
while (nbytes < sizeof(buf) && (b = _passthru.port1->read_locked(lock_key)) >= 0) {
while (nbytes < sizeof(buf) && _passthru.port1->read_locked(lock_key, b)) {
buf[nbytes++] = b;
}
if (nbytes > 0) {
@ -6358,7 +6358,7 @@ void GCS::passthru_timer(void)
// read from port2, and write to port1
nbytes = 0;
while (nbytes < sizeof(buf) && (b = _passthru.port2->read_locked(lock_key)) >= 0) {
while (nbytes < sizeof(buf) && _passthru.port2->read_locked(lock_key, b)) {
buf[nbytes++] = b;
}
if (nbytes > 0) {