Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-09 09:28:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

MAVLink: comm_get_txspace should return 0 on error

Browse Source 
it is used in expressions that add constants
This commit is contained in:
Andrew Tridgell 2012-09-25 07:20:43 +10:00
parent 14b1674c3e
commit 9f9d570597
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/GCS_MAVLink/GCS_MAVLink.h
View File

@ -94,20 +94,24 @@ static inline uint16_t comm_get_available(mavlink_channel_t chan)
/// Check for available transmit space on the nominated MAVLink channel
///
/// @param chan Channel to check
/// @returns Number of bytes available, -1 for error
static inline int comm_get_txspace(mavlink_channel_t chan)
/// @returns Number of bytes available
static inline uint16_t comm_get_txspace(mavlink_channel_t chan)
{
int16_t ret = 0;
switch(chan) {
case MAVLINK_COMM_0:
return mavlink_comm_0_port->txspace();
ret = mavlink_comm_0_port->txspace();
break;
case MAVLINK_COMM_1:
return mavlink_comm_1_port->txspace();
ret = mavlink_comm_1_port->txspace();
break;
default:
break;
}
return -1;
if (ret < 0) {
ret = 0;
}
return (uint16_t)ret;
}
#define MAVLINK_USE_CONVENIENCE_FUNCTIONS