diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-22 13:28:53 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-22 13:28:53 +0200 |
| commit | 3a26708203cbdc5ca8dd0e6b00435f204b9fd2e8 (patch) | |
| tree | 317863d434ede4f62c813ab3bcda7d08babcc6a6 /mavlink | |
| parent | 3932bad137dcb908c4b4b563a996a7205a844b3f (diff) | |
| download | px4-firmware-3a26708203cbdc5ca8dd0e6b00435f204b9fd2e8.tar.gz px4-firmware-3a26708203cbdc5ca8dd0e6b00435f204b9fd2e8.tar.bz2 px4-firmware-3a26708203cbdc5ca8dd0e6b00435f204b9fd2e8.zip | |
Resolved wrong TX drop display
Diffstat (limited to 'mavlink')
| -rw-r--r-- | mavlink/include/mavlink/v1.0/mavlink_helpers.h | 4 | ||||
| -rw-r--r-- | mavlink/include/mavlink/v1.0/protocol.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mavlink/include/mavlink/v1.0/mavlink_helpers.h b/mavlink/include/mavlink/v1.0/mavlink_helpers.h index f0f3404a2..f41b36883 100644 --- a/mavlink/include/mavlink/v1.0/mavlink_helpers.h +++ b/mavlink/include/mavlink/v1.0/mavlink_helpers.h @@ -12,15 +12,18 @@ /* * Internal function to give access to the channel status for each channel */ +#ifndef MAVLINK_GET_CHANNEL_STATUS MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan) { static mavlink_status_t m_mavlink_status[MAVLINK_COMM_NUM_BUFFERS]; return &m_mavlink_status[chan]; } +#endif /* * Internal function to give access to the channel buffer for each channel */ +#ifndef MAVLINK_GET_CHANNEL_BUFFER MAVLINK_HELPER mavlink_message_t* mavlink_get_channel_buffer(uint8_t chan) { @@ -35,6 +38,7 @@ MAVLINK_HELPER mavlink_message_t* mavlink_get_channel_buffer(uint8_t chan) #endif return &m_mavlink_buffer[chan]; } +#endif /** * @brief Reset the status of a channel. diff --git a/mavlink/include/mavlink/v1.0/protocol.h b/mavlink/include/mavlink/v1.0/protocol.h index 019ae5fc4..64dc22229 100644 --- a/mavlink/include/mavlink/v1.0/protocol.h +++ b/mavlink/include/mavlink/v1.0/protocol.h @@ -42,7 +42,9 @@ #endif // MAVLINK_SEPARATE_HELPERS /* always include the prototypes to ensure we don't get out of sync */ +#ifndef MAVLINK_GET_CHANNEL_STATUS MAVLINK_HELPER mavlink_status_t* mavlink_get_channel_status(uint8_t chan); +#endif MAVLINK_HELPER void mavlink_reset_channel_status(uint8_t chan); #if MAVLINK_CRC_EXTRA MAVLINK_HELPER uint16_t mavlink_finalize_message_chan(mavlink_message_t* msg, uint8_t system_id, uint8_t component_id, |