rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Removed debug from GCS telemetry.

Browse Source
This commit is contained in:
Brian Webb 2012-06-20 18:34:16 -07:00
parent 3da382e828
commit 7bd32253e5
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/src/plugins/uavtalk/telemetry.cpp
View File

@ -238,7 +238,6 @@ void Telemetry::transactionCompleted(UAVObject* obj, bool success)
if ( itr != transMap.end() ) if ( itr != transMap.end() )
{ {
ObjectTransactionInfo *transInfo = itr.value(); ObjectTransactionInfo *transInfo = itr.value();
//qDebug() << QString("Telemetry: transaction completed for %1").arg(obj->getName());
// Remove this transaction as it's complete. // Remove this transaction as it's complete.
transInfo->timer->stop(); transInfo->timer->stop();
transMap.remove(objId); transMap.remove(objId);
@ -258,8 +257,6 @@ void Telemetry::transactionCompleted(UAVObject* obj, bool success)
*/ */
void Telemetry::transactionTimeout(ObjectTransactionInfo *transInfo) void Telemetry::transactionTimeout(ObjectTransactionInfo *transInfo)
{ {
//qDebug() << "Telemetry: transaction timeout.";
transInfo->timer->stop(); transInfo->timer->stop();
// Check if more retries are pending // Check if more retries are pending
if (transInfo->retriesRemaining > 0) if (transInfo->retriesRemaining > 0)
@ -291,7 +288,6 @@ void Telemetry::transactionTimeout(ObjectTransactionInfo *transInfo)
void Telemetry::processObjectTransaction(ObjectTransactionInfo *transInfo) void Telemetry::processObjectTransaction(ObjectTransactionInfo *transInfo)
{ {
//qDebug() << tr("Process Object transaction for %1").arg(transInfo->obj->getName());
// Initiate transaction // Initiate transaction
if (transInfo->objRequest) if (transInfo->objRequest)
{ {
@ -309,7 +305,6 @@ void Telemetry::processObjectTransaction(ObjectTransactionInfo *transInfo)
else else
{ {
// Otherwise, remove this transaction as it's complete. // Otherwise, remove this transaction as it's complete.
transInfo->timer->stop();
transMap.remove(transInfo->obj->getObjID()); transMap.remove(transInfo->obj->getObjID());
delete transInfo; delete transInfo;
} }
@ -320,8 +315,6 @@ void Telemetry::processObjectTransaction(ObjectTransactionInfo *transInfo)
*/ */
void Telemetry::processObjectUpdates(UAVObject* obj, EventMask event, bool allInstances, bool priority) void Telemetry::processObjectUpdates(UAVObject* obj, EventMask event, bool allInstances, bool priority)
{ {
//qDebug() << "Push event into queue for obj " << QString("%1 event %2").arg(obj->getName()).arg(event);
// Push event into queue // Push event into queue
ObjectQueueInfo objInfo; ObjectQueueInfo objInfo;
objInfo.obj = obj; objInfo.obj = obj;
@ -362,8 +355,6 @@ void Telemetry::processObjectUpdates(UAVObject* obj, EventMask event, bool allIn
*/ */
void Telemetry::processObjectQueue() void Telemetry::processObjectQueue()
{ {
//qDebug() << "Process object queue " << tr("- Depth (%1 %2)").arg(objQueue.length()).arg(objPriorityQueue.length());
// Get object information from queue (first the priority and then the regular queue) // Get object information from queue (first the priority and then the regular queue)
ObjectQueueInfo objInfo; ObjectQueueInfo objInfo;
if ( !objPriorityQueue.isEmpty() ) if ( !objPriorityQueue.isEmpty() )
@ -415,9 +406,6 @@ void Telemetry::processObjectQueue()
// Insert the transaction into the transaction map. // Insert the transaction into the transaction map.
transMap.insert(objInfo.obj->getObjID(), transInfo); transMap.insert(objInfo.obj->getObjID(), transInfo);
processObjectTransaction(transInfo); processObjectTransaction(transInfo);
} else
{
qDebug() << QString("Process object queue: this is an unpack event for %1").arg(objInfo.obj->getName());
} }
// If this is a metaobject then make necessary telemetry updates // If this is a metaobject then make necessary telemetry updates

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

@ -633,6 +633,9 @@ UAVObject* UAVTalk::updateObject(quint32 objId, quint16 instId, quint8* data)
*/ */
void UAVTalk::updateNack(UAVObject* obj) void UAVTalk::updateNack(UAVObject* obj)
{ {
Q_ASSERT(obj);
if ( ! obj )
return;
quint32 objId = obj->getObjID(); quint32 objId = obj->getObjID();
QMap<quint32, Transaction*>::iterator itr = transMap.find(objId); QMap<quint32, Transaction*>::iterator itr = transMap.find(objId);
if ( itr != transMap.end() && (itr.value()->obj->getInstID() == obj->getInstID() || itr.value()->allInstances)) if ( itr != transMap.end() && (itr.value()->obj->getInstID() == obj->getInstID() || itr.value()->allInstances))