rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

OP-4 GCS/Telemetry Add connection timeout detection

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@609 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
vassilis 2010-05-08 04:11:25 +00:00 committed by vassilis
parent 6dfd8caffb
commit 8eab65a17b
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ground/src/plugins/uavtalk/telemetrymonitor.cpp
View File

@ -37,6 +37,7 @@ TelemetryMonitor::TelemetryMonitor(UAVObjectManager* objMngr, Telemetry* tel)
this->objMngr = objMngr;
this->tel = tel;
this->objPending = NULL;
this->connectionTimer = new QTime();
// Create mutex
mutex = new QMutex(QMutex::Recursive);
@ -185,6 +186,21 @@ void TelemetryMonitor::processStatsUpdates()
gcsStats.TxFailures += telStats.txErrors;
gcsStats.TxRetries += telStats.txRetries;
// Check for a connection timeout
bool connectionTimeout;
if ( telStats.rxObjects > 0 )
{
connectionTimer->start();
}
if ( connectionTimer->elapsed() > CONNECTION_TIMEOUT_MS )
{
connectionTimeout = true;
}
else
{
connectionTimeout = false;
}
// Update connection state
int oldStatus = gcsStats.Status;
if ( gcsStats.Status == GCSTelemetryStats::STATUS_DISCONNECTED )
@ -203,7 +219,7 @@ void TelemetryMonitor::processStatsUpdates()
else if ( gcsStats.Status == GCSTelemetryStats::STATUS_CONNECTED )
{
// Check if the connection is still active and the the autopilot is still connected
if (flightStats.Status == FlightTelemetryStats::STATUS_DISCONNECTED || telStats.rxObjects == 0)
if (flightStats.Status == FlightTelemetryStats::STATUS_DISCONNECTED || connectionTimeout)
{
gcsStats.Status = GCSTelemetryStats::STATUS_DISCONNECTED;
}

5
ground/src/plugins/uavtalk/telemetrymonitor.h
View File

@ -32,6 +32,7 @@
#include <QObject>
#include <QQueue>
#include <QTimer>
#include <QTime>
#include <QMutex>
#include <QMutexLocker>
#include "uavobjects/uavobjectmanager.h"
@ -53,8 +54,9 @@ public slots:
void flightStatsUpdated(UAVObject* obj);
private:
static const int STATS_UPDATE_PERIOD_MS = 5000;
static const int STATS_UPDATE_PERIOD_MS = 4000;
static const int STATS_CONNECT_PERIOD_MS = 1000;
static const int CONNECTION_TIMEOUT_MS = 8000;
UAVObjectManager* objMngr;
Telemetry* tel;
@ -64,6 +66,7 @@ private:
QTimer* statsTimer;
UAVObject* objPending;
QMutex* mutex;
QTime* connectionTimer;
void startRetrievingObjects();
void retrieveNextObject();