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

USB Stability fixes.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@3071 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-03-25 14:50:23 +00:00 committed by edouard
parent f19b0efc6f
commit 81269f786e
2 changed files with 19 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
View File

@ -30,86 +30,38 @@
#include <coreplugin/icore.h>
#include <coreplugin/threadmanager.h>
#include <QMutexLocker> // Pip
TelemetryManager::TelemetryManager()
{
telemetryMon = NULL; // Pip
telemetry = NULL; // Pip
utalk = NULL; // Pip
moveToThread(Core::ICore::instance()->threadManager()->getRealTimeThread());
// Get UAVObjectManager instance
ExtensionSystem::PluginManager* pm = ExtensionSystem::PluginManager::instance();
objMngr = pm->getObject<UAVObjectManager>();
moveToThread(Core::ICore::instance()->threadManager()->getRealTimeThread());
mutex = new QMutex(QMutex::Recursive); // Pip
QMutexLocker locker(mutex); // Pip
// Get UAVObjectManager instance
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
if (pm) // Pip
{
objMngr = pm->getObject<UAVObjectManager>();
if (objMngr)
connect(objMngr, SIGNAL(destroyed(QObject *)), this, SLOT(onObjectDestroyed(QObject *))); // Pip
}
// connect to start stop signals
connect(this, SIGNAL(myStart()), this, SLOT(onStart()), Qt::QueuedConnection);
connect(this, SIGNAL(myStop()), this, SLOT(onStop()), Qt::QueuedConnection);
// connect to start stop signals
connect(this, SIGNAL(myStart()), this, SLOT(onStart()),Qt::QueuedConnection);
connect(this, SIGNAL(myStop()), this, SLOT(onStop()),Qt::QueuedConnection);
}
TelemetryManager::~TelemetryManager()
{
// Pip
mutex->lock();
// deleteObjects();
mutex->unlock();
}
void TelemetryManager::onObjectDestroyed(QObject *obj) // Pip
{
QMutexLocker locker(mutex);
deleteObjects();
}
void TelemetryManager::start(QIODevice *dev)
{
device = dev;
device=dev;
emit myStart();
}
void TelemetryManager::onStart()
{
QMutexLocker locker(mutex); // Pip
deleteObjects(); // Pip
// Get UAVObjectManager instance
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
if (!pm) return; // Pip
objMngr = pm->getObject<UAVObjectManager>();
if (!objMngr) return; // Pip
utalk = new UAVTalk(device, objMngr);
if (utalk) telemetry = new Telemetry(utalk, objMngr);
if (telemetry) telemetryMon = new TelemetryMonitor(objMngr, telemetry);
if (!utalk || !telemetry || !telemetryMon) // Pip
{
deleteObjects();
return;
}
// Pip
connect(objMngr, SIGNAL(destroyed(QObject *)), this, SLOT(onObjectDestroyed(QObject *)));
connect(utalk, SIGNAL(destroyed(QObject *)), this, SLOT(onObjectDestroyed(QObject *)));
connect(telemetry, SIGNAL(destroyed(QObject *)), this, SLOT(onObjectDestroyed(QObject *)));
connect(telemetryMon, SIGNAL(destroyed(QObject *)), this, SLOT(onObjectDestroyed(QObject *)));
connect(telemetryMon, SIGNAL(connected()), this, SLOT(onConnect()));
connect(telemetryMon, SIGNAL(disconnected()), this, SLOT(onDisconnect()));
utalk = new UAVTalk(device, objMngr);
telemetry = new Telemetry(utalk, objMngr);
telemetryMon = new TelemetryMonitor(objMngr, telemetry);
connect(telemetryMon, SIGNAL(connected()), this, SLOT(onConnect()));
connect(telemetryMon, SIGNAL(disconnected()), this, SLOT(onDisconnect()));
}
void TelemetryManager::stop()
{
emit myStop();
@ -117,12 +69,11 @@ void TelemetryManager::stop()
void TelemetryManager::onStop()
{
mutex->lock(); // Pip
if (telemetryMon) telemetryMon->disconnect(this);
deleteObjects();
mutex->unlock();
onDisconnect();
telemetryMon->disconnect(this);
delete telemetryMon;
delete telemetry;
delete utalk;
onDisconnect();
}
void TelemetryManager::onConnect()
@ -134,31 +85,3 @@ void TelemetryManager::onDisconnect()
{
emit disconnected();
}
void TelemetryManager::deleteObjects() // Pip
{
if (!objMngr) return; // we've already destroyed everything
objMngr = NULL;
if (telemetryMon)
{
disconnect(telemetryMon, SIGNAL(destroyed(QObject *)), this, 0);
delete telemetryMon;
telemetryMon = NULL;
}
if (telemetry)
{
disconnect(telemetry, SIGNAL(destroyed(QObject *)), this, 0);
delete telemetry;
telemetry = NULL;
}
if (utalk)
{
disconnect(utalk, SIGNAL(destroyed(QObject *)), this, 0);
delete utalk;
utalk = NULL;
}
}

7
ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.h
View File

@ -35,7 +35,6 @@
#include "uavobjectmanager.h"
#include <QIODevice>
#include <QObject>
#include <QMutex>
class UAVTALK_EXPORT TelemetryManager: public QObject
{
@ -48,9 +47,6 @@ public:
void start(QIODevice *dev);
void stop();
public slots:
void onObjectDestroyed(QObject *obj); // Pip
signals:
void connected();
void disconnected();
@ -69,9 +65,6 @@ private:
Telemetry* telemetry;
TelemetryMonitor* telemetryMon;
QIODevice *device;
QMutex *mutex;
void deleteObjects(); // Pip
};
#endif // TELEMETRYMANAGER_H