1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00

Merge remote-tracking branch 'origin/next' into thread/OP-989_Revo_AccelTau

This commit is contained in:
Fredrik Arvidsson 2013-06-05 07:19:45 +02:00
commit f1fece528e

View File

@ -385,12 +385,12 @@ UAVTalkRxState UAVTalkProcessInputStreamQuiet(UAVTalkConnection connectionHandle
if (iproc->obj) { if (iproc->obj) {
iproc->length = UAVObjGetNumBytes(iproc->obj); iproc->length = UAVObjGetNumBytes(iproc->obj);
iproc->instanceLength = (UAVObjIsSingleInstance(iproc->obj) ? 0 : 2); iproc->instanceLength = (UAVObjIsSingleInstance(iproc->obj) ? 0 : 2);
iproc->timestampLength = (iproc->type & UAVTALK_TIMESTAMPED) ? 2 : 0;
} else { } else {
// We don't know if it's a multi-instance object, so just assume it's 0. // We don't know if it's a multi-instance object, so just assume it's 0.
iproc->instanceLength = 0; iproc->instanceLength = 0;
iproc->length = iproc->packet_size - iproc->rxPacketLength; iproc->length = iproc->packet_size - iproc->rxPacketLength;
} }
iproc->timestampLength = (iproc->type & UAVTALK_TIMESTAMPED) ? 2 : 0;
} }
// Check length and determine next state // Check length and determine next state