rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-1246 minor cleanups in flight uavtalk

Browse Source
This commit is contained in:
Philippe Renon 2014-03-04 10:05:17 +01:00
parent 5d7e37f6b8
commit 37a09bbd34
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flight/uavtalk/uavtalk.c
View File

@ -872,7 +872,7 @@ static int32_t sendObject(UAVTalkConnectionData *connection, uint8_t type, uint3
{ {
uint32_t numInst; uint32_t numInst;
uint32_t n; uint32_t n;
uint32_t ret = -1; int32_t ret = -1;
// Important note : obj can be null (when type is NACK for example) so protect all obj dereferences. // Important note : obj can be null (when type is NACK for example) so protect all obj dereferences.
@ -890,8 +890,8 @@ static int32_t sendObject(UAVTalkConnectionData *connection, uint8_t type, uint3
// This allows the receiver to detect when the last object has been received (i.e. when instance 0 is received) // This allows the receiver to detect when the last object has been received (i.e. when instance 0 is received)
ret = 0; ret = 0;
for (n = 0; n < numInst; ++n) { for (n = 0; n < numInst; ++n) {
if (sendSingleObject(connection, type, objId, numInst - n - 1, obj) == -1) { ret = sendSingleObject(connection, type, objId, numInst - n - 1, obj);
ret = -1; if (ret == -1) {
break; break;
} }
} }
@ -914,8 +914,7 @@ static int32_t sendObject(UAVTalkConnectionData *connection, uint8_t type, uint3
* \param[in] connection UAVTalkConnection to be used * \param[in] connection UAVTalkConnection to be used
* \param[in] type Transaction type * \param[in] type Transaction type
* \param[in] objId The object ID * \param[in] objId The object ID
* \param[in] instId The instance ID (can NOT be UAVOBJ_ALL_INSTANCES, use * \param[in] instId The instance ID (can NOT be UAVOBJ_ALL_INSTANCES, use () instead)
() instead)
* \param[in] obj Object handle to send (null when type is NACK) * \param[in] obj Object handle to send (null when type is NACK)
* \return 0 Success * \return 0 Success
* \return -1 Failure * \return -1 Failure
@ -992,7 +991,7 @@ static int32_t sendSingleObject(UAVTalkConnectionData *connection, uint8_t type,
connection->stats.txBytes += tx_msg_len; connection->stats.txBytes += tx_msg_len;
} else { } else {
connection->stats.txErrors++; connection->stats.txErrors++;
// TDOD rc == -1 connection not open, -2 buffer full should retry // TODO rc == -1 connection not open, -2 buffer full should retry
connection->stats.txBytes += (rc > 0) ? rc : 0; connection->stats.txBytes += (rc > 0) ? rc : 0;
return -1; return -1;
} }