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

GCS:plugins/uavtalk/telemetry.cpp bad Bug in processPeriodicUpdates, remaining time updated in copy instead of original object, never got stored.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3108 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
corvus 2011-03-30 18:50:27 +00:00 committed by corvus
parent a4cbbfd016
commit ff3ed79bdf
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,34 +434,34 @@ void Telemetry::processPeriodicUpdates()
// Iterate through each object and update its timer, if zero then transmit object.
// Also calculate smallest delay to next update (will be used for setting timeToNextUpdateMs)
qint32 minDelay = MAX_UPDATE_PERIOD_MS;
ObjectTimeInfo objinfo;
ObjectTimeInfo *objinfo;
qint32 elapsedMs = 0;
QTime time;
qint32 offset;
for (int n = 0; n < objList.length(); ++n)
{
objinfo = objList[n];
objinfo = &objList[n];
// If object is configured for periodic updates
if (objinfo.updatePeriodMs > 0)
if (objinfo->updatePeriodMs > 0)
{
objinfo.timeToNextUpdateMs -= timeToNextUpdateMs;
objinfo->timeToNextUpdateMs -= timeToNextUpdateMs;
// Check if time for the next update
if (objinfo.timeToNextUpdateMs <= 0)
if (objinfo->timeToNextUpdateMs <= 0)
{
// Reset timer
offset = (-objinfo.timeToNextUpdateMs) % objinfo.updatePeriodMs;
objinfo.timeToNextUpdateMs = objinfo.updatePeriodMs - offset;
offset = (-objinfo->timeToNextUpdateMs) % objinfo->updatePeriodMs;
objinfo->timeToNextUpdateMs = objinfo->updatePeriodMs - offset;
// Send object
time.start();
processObjectUpdates(objinfo.obj, EV_UPDATED_MANUAL, true, false);
processObjectUpdates(objinfo->obj, EV_UPDATED_MANUAL, true, false);
elapsedMs = time.elapsed();
// Update timeToNextUpdateMs with the elapsed delay of sending the object;
timeToNextUpdateMs += elapsedMs;
}
// Update minimum delay
if (objinfo.timeToNextUpdateMs < minDelay)
if (objinfo->timeToNextUpdateMs < minDelay)
{
minDelay = objinfo.timeToNextUpdateMs;
minDelay = objinfo->timeToNextUpdateMs;
}
}
}