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

Updates on ground side, corrected bugs.

Browse Source
This commit is contained in:
elafargue 2011-04-30 17:50:36 +02:00
parent f234651d9c
commit 1c6d760371
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/openpilotgcs/src/plugins/uavtalk/uavtalk.cpp
View File

@ -273,7 +273,7 @@ bool UAVTalk::processInputByte(quint8 rxbyte)
rxObjId = (qint32)qFromLittleEndian<quint32>(rxTmpBuffer); rxObjId = (qint32)qFromLittleEndian<quint32>(rxTmpBuffer);
{ {
UAVObject *rxObj = objMngr->getObject(rxObjId); UAVObject *rxObj = objMngr->getObject(rxObjId);
if (rxObj == NULL && rxType != TYPE_NACK) if (rxObj == NULL && rxType != TYPE_OBJ_REQ)
{ {
stats.rxErrors++; stats.rxErrors++;
rxState = STATE_SYNC; rxState = STATE_SYNC;
@ -303,9 +303,10 @@ bool UAVTalk::processInputByte(quint8 rxbyte)
} }
// Check if this is a single instance object (i.e. if the instance ID field is coming next) // Check if this is a single instance object (i.e. if the instance ID field is coming next)
if (rxType == TYPE_NACK) if (rxObj == NULL)
{ {
// If this is a NACK, just skip to checksum // This is a non-existing object, just skip to checksum
// and we'll send a NACK next.
rxState = STATE_CS; rxState = STATE_CS;
rxInstId = 0; rxInstId = 0;
rxCount = 0; rxCount = 0;