diff --git a/include/EasyDeviceCommunicationProvider.h b/include/EasyDeviceCommunicationProvider.h index c50c3882..4a9fac7d 100644 --- a/include/EasyDeviceCommunicationProvider.h +++ b/include/EasyDeviceCommunicationProvider.h @@ -28,6 +28,9 @@ private slots: virtual const bool run(const QString& name); virtual CompilationPtr compile(const QString& name); virtual const bool download(const QString& name, TinyArchive *archive); + virtual bool deleteProgram(const QString& name); + virtual QStringList list() const; + virtual QString interaction(const QString& command); virtual const bool isAuthenticated(const QHostAddress& address); virtual const bool authenticationRequest(const QHostAddress& address); diff --git a/include/FilesystemProvider.h b/include/FilesystemProvider.h index 93d71ed3..0aec8f34 100644 --- a/include/FilesystemProvider.h +++ b/include/FilesystemProvider.h @@ -1,7 +1,7 @@ #ifndef _FILESYSTEMPROVIDER_H_ #define _FILESYSTEMPROVIDER_H_ -#include +#include #include #include #include diff --git a/src/EasyDeviceCommunicationProvider.cpp b/src/EasyDeviceCommunicationProvider.cpp index ffab9311..2832f470 100644 --- a/src/EasyDeviceCommunicationProvider.cpp +++ b/src/EasyDeviceCommunicationProvider.cpp @@ -94,6 +94,24 @@ const bool EasyDeviceCommunicationProvider::download(const QString& name, TinyAr return filesystem && filesystem->setProgram(name, archive); } +bool EasyDeviceCommunicationProvider::deleteProgram(const QString& name) +{ + // TODO: NYI + return false; +} + +QStringList EasyDeviceCommunicationProvider::list() const +{ + // TODO: NYI + return QStringList(); +} + +QString EasyDeviceCommunicationProvider::interaction(const QString& command) +{ + // TODO: NYI + return QString(); +} + const bool EasyDeviceCommunicationProvider::isAuthenticated(const QHostAddress& address) { return m_currentAddress == address; diff --git a/src/SerialCommunicationProvider.cpp b/src/SerialCommunicationProvider.cpp index a76317ed..2e083c13 100644 --- a/src/SerialCommunicationProvider.cpp +++ b/src/SerialCommunicationProvider.cpp @@ -21,7 +21,7 @@ #define AUTHENTICATE_KEY "authenticate" SerialCommunicationProvider::SerialCommunicationProvider(Device *device, const QString& path) - : CommunicationProvider(device), m_serial(new SerialIODevice(path)), m_payload(0) + : CommunicationProvider(device), m_payload(0), m_serial(new SerialIODevice(path)) { connect(m_serial, SIGNAL(readyRead()), SLOT(readyRead())); m_serial->open(QIODevice::ReadWrite); @@ -92,7 +92,7 @@ void SerialCommunicationProvider::handleCommand(const QString& command, QDataStr stream >> name; qDebug() << "Compiling" << name << "..."; CompilationPtr compilation = compile(name); - if(!compilation.get()) out << CompileResult(false); + if(!compilation.isNull()) out << CompileResult(false); else out << compilation->results(); } else if(command == DOWNLOAD_KEY) { QString name; @@ -112,6 +112,7 @@ void SerialCommunicationProvider::handleCommand(const QString& command, QDataStr void SerialCommunicationProvider::readyRead() { // qDebug() << "Got data over serial!"; + if(m_serial->bytesAvailable() > 0) qDebug() << "Bytes ready for reading" << m_serial->bytesAvailable(); for(;;) { if(!m_payload && m_serial->bytesAvailable() < sizeof(quint32)) return; if(!m_payload && m_serial->bytesAvailable() >= sizeof(quint32)) {