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

Removed TestThread stuff

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2889 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2011-02-26 13:35:50 +00:00 committed by pip
parent 77cbc36ad5
commit 770c623f34
2 changed files with 42 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
ground/openpilotgcs/src/plugins/rawhid/rawhidplugin.cpp
View File

@ -36,18 +36,23 @@
#include "rawhid_const.h"
// ***************************************
// **********************************************************************
RawHIDEnumerationThread::RawHIDEnumerationThread(RawHIDConnection *rawhid) :
QThread(rawhid), // Pip
m_rawhid(rawhid),
m_running(true)
{
connect(m_rawhid, SLOT(destroyed(QObject *)), this, SLOT(onRawHidConnectionDestroyed(QObject *))); // Pip
if (m_rawhid)
connect(m_rawhid, SLOT(destroyed(QObject *)), this, SLOT(onRawHidConnectionDestroyed(QObject *))); // Pip
}
RawHIDEnumerationThread::~RawHIDEnumerationThread()
{
mutex.lock();
m_rawhid = NULL; // safe guard
mutex.unlock();
m_running = false;
// wait for the thread to terminate
@ -76,17 +81,27 @@ void RawHIDEnumerationThread::run()
mutex.lock(); // Pip
// update available devices every second (doesn't need more)
if (++counter >= 100 && m_rawhid && !m_rawhid->deviceOpened())
{
counter = 0;
if (m_rawhid)
{
// if (!m_rawhid->deviceOpened()) // this was stopping us getting enumerations changes fed back
{
if (++counter >= 100)
{
counter = 0;
QStringList newDev = m_rawhid->availableDevices();
if (devices != newDev)
{
devices = newDev;
emit enumerationChanged();
}
}
QStringList newDev = m_rawhid->availableDevices();
if (devices != newDev)
{
devices = newDev;
emit enumerationChanged();
}
}
}
// else
// counter = 0;
}
else
counter = 0;
mutex.unlock(); // Pip
@ -94,7 +109,7 @@ void RawHIDEnumerationThread::run()
}
}
// ***************************************
// **********************************************************************
RawHIDConnection::RawHIDConnection()
: m_enumerateThread(this)
@ -117,6 +132,17 @@ RawHIDConnection::~RawHIDConnection()
void RawHIDConnection::onEnumerationChanged()
{
if (RawHidHandle) // Pip
{ // check to see if the connection has closed
if (!RawHidHandle->isOpen())
{ // connection has closed .. hmmmm, this connection is still showing as open after the USB device is unplugged from PC
delete RawHidHandle;
RawHidHandle = NULL;
emit deviceClosed(this);
}
}
if (enablePolling)
emit availableDevChanged(this);
}
@ -208,45 +234,7 @@ void RawHIDConnection::resumePolling()
enablePolling = true;
}
//usb hid test thread
//temporary...
RawHIDTestThread::RawHIDTestThread()
{
Core::ConnectionManager *cm = Core::ICore::instance()->connectionManager();
QObject::connect(cm, SIGNAL(deviceConnected(QIODevice *)),
this, SLOT(onDeviceConnect(QIODevice *)));
QObject::connect(cm, SIGNAL(deviceDisconnected()),
this, SLOT(onDeviceDisconnect()));
}
void RawHIDTestThread::onDeviceConnect(QIODevice *dev)
{
this->dev = dev;
dev->open(QIODevice::ReadWrite);
QObject::connect(dev, SIGNAL(readyRead()),
this, SLOT(onReadyRead()));
QObject::connect(dev, SIGNAL(bytesWritten(qint64)),
this, SLOT(onBytesWritten(qint64)));
dev->write("Hello raw hid device\n");
}
void RawHIDTestThread::onDeviceDisconnect()
{
dev->close();
}
void RawHIDTestThread::onReadyRead()
{
qDebug() << "Rx:" << dev->readLine(32);
}
void RawHIDTestThread::onBytesWritten(qint64 sz)
{
qDebug() << "Sent " << sz << " bytes";
}
// **********************************************************************
RawHIDPlugin::RawHIDPlugin()
{
@ -276,3 +264,5 @@ bool RawHIDPlugin::initialize(const QStringList & arguments, QString * errorStri
}
Q_EXPORT_PLUGIN(RawHIDPlugin)
// **********************************************************************

18
ground/openpilotgcs/src/plugins/rawhid/rawhidplugin.h
View File

@ -129,22 +129,4 @@ private:
RawHIDConnection *hidConnection;
};
//usb hid test thread
#include "coreplugin/icore.h"
#include "coreplugin/connectionmanager.h"
class RawHIDTestThread: public QObject
{
Q_OBJECT
public:
RawHIDTestThread();
protected slots:
void onDeviceConnect(QIODevice *);
void onDeviceDisconnect();
void onReadyRead();
void onBytesWritten(qint64 sz);
protected:
QIODevice *dev;
};
#endif // RAWHIDPLUGIN_H