Rewrite now matches previous features (PROPMAN-31)

- Greatly improved device opening logic (PROPMAN-29)
- Previous baud rate now restored after releasing session (PROPMAN-30)
- Lengthen reset to improve stability during large Rx (PROPMAN-32)
- Prevent manager from multiply connecting sessions/devices (PROPMAN-33)
- Custom baud rates are now fully supported (PROPMAN-34)
- Add exec() function to PropellerTerminal (PROPMAN-35)
- Improved clear() function (PROPMAN-27)

Author: bweir

app/propman/main.cpp

@@ -33,6 +33,7 @@ QStringList devices = manager.listPorts();
 QCommandLineOption argList      (QStringList() << "l" << "list",    QObject::tr("List available devices"));
 QCommandLineOption argWrite     (QStringList() << "w" << "write",   QObject::tr("Write program to EEPROM"));
 QCommandLineOption argDevice    (QStringList() << "d" << "device",  QObject::tr("Device to program (default: first system device)"), "DEV");
+QCommandLineOption argBaud      (QStringList() << "b" << "baud",    QObject::tr("Baud rate for terminal (default: 115200)"), "BAUD");
 QCommandLineOption argPin       (QStringList() << "p" << "pin",     QObject::tr("Pin for GPIO reset"), "PIN");
 QCommandLineOption argTerm      (QStringList() << "t" << "terminal",QObject::tr("Drop into terminal after download"));
 QCommandLineOption argIdentify  (QStringList() << "i" << "identify",QObject::tr("Identify device connected at port"));
@@ -41,7 +42,6 @@ QCommandLineOption argClkMode   (QStringList() << "clkmode",        QObject::tr(
 QCommandLineOption argClkFreq   (QStringList() << "clkfreq",        QObject::tr("Change clock frequency before download"), "FREQ");
 QCommandLineOption argHighSpeed (QStringList() << "ultrafast",      QObject::tr("Enable two-stage high-speed mode (experimental)"));
 
-
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
@@ -61,13 +61,14 @@ int main(int argc, char *argv[])
     parser.addOption(argList);
     parser.addOption(argWrite);
     parser.addOption(argDevice);
+    parser.addOption(argBaud);
     parser.addOption(argPin);
     parser.addOption(argTerm);
     parser.addOption(argIdentify);
     parser.addOption(argInfo);
     parser.addOption(argClkMode);
     parser.addOption(argClkFreq);
-    parser.addOption(argHighSpeed);
+//    parser.addOption(argHighSpeed);
 
     parser.addPositionalArgument("file",  QObject::tr("Binary file to download"), "FILE");
 
@@ -130,6 +131,15 @@ void open_loader(QCommandLineParser &parser, QStringList devices)
             error("Device does not exist!");
     }
 
+    qint32 baudrate = 115200;
+    if (!parser.value(argBaud).isEmpty())
+    {
+        bool ok;
+        baudrate = parser.value(argBaud).toInt(&ok);
+        if (baudrate <= 0 || baudrate > 1000000 || !ok)
+            error(QString("Baud rate %1 is invalid!").arg(baudrate));
+    }
+
     if (parser.positionalArguments().isEmpty())
     {
         if (parser.isSet(argTerm))
@@ -168,6 +178,8 @@ void open_loader(QCommandLineParser &parser, QStringList devices)
         error("Image is invalid!");
 
 
+    PropellerTerminal terminal(&manager, device, baudrate);
+
     if (parser.isSet(argHighSpeed))
     {
 //        if (!loader.highSpeedUpload(image, parser.isSet(argWrite)))
@@ -178,14 +190,15 @@ void open_loader(QCommandLineParser &parser, QStringList devices)
         QObject::connect (&loader, SIGNAL(statusChanged(const QString &)),
                           &loader, SLOT(message(const QString &)));
 
-        if (!loader.upload(image, parser.isSet(argWrite),true,true))
+        if (!loader.upload(image, parser.isSet(argWrite), true, true))
             exit(1);
+
         QObject::disconnect (&loader, SIGNAL(statusChanged(const QString &)),
                              &loader, SLOT(message(const QString &)));
     }
 
     if (parser.isSet(argTerm))
-        PropellerTerminal terminal(&manager, device);
+        terminal.exec();
 }
 
 void list()

src/device/propellerdevice.cpp

@@ -14,6 +14,7 @@ PropellerDevice::PropellerDevice()
     _minimum_timeout = 400;
 
     device.setSettingsRestoredOnClose(false);
+    device.setBaudRate(115200);
 
     _reset_defaults["ttyAMA"]   = "gpio";
     _reset_defaults["ttyS"]     = "dtr";
@@ -96,15 +97,7 @@ bool PropellerDevice::open()
 
     if (!device.open(QSerialPort::ReadWrite))
     {
-        qCDebug(pdevice) << "Reattempting device open:" << portName();
-
-        QTimer wait;
-        QEventLoop loop;
-        connect(&wait, SIGNAL(timeout()), &loop, SLOT(quit()));
-        wait.start(1000);
-        loop.exec();
-        disconnect(&wait, SIGNAL(timeout()), &loop, SLOT(quit()));
-
+        close();
         if (!device.open(QSerialPort::ReadWrite))
         {
             qCDebug(pdevice) << "Failed to open device:" << portName();
@@ -113,7 +106,6 @@ bool PropellerDevice::open()
     }
 
     reset();
-    setBaudRate(115200);
 
     return true;
 }
@@ -223,11 +215,27 @@ bool PropellerDevice::reset()
         if (_reset == "rts")
         {
             device.setRequestToSend(true);
+
+            QTimer wait;
+            QEventLoop loop;
+            connect(&wait, SIGNAL(timeout()), &loop, SLOT(quit()));
+            wait.start(20);
+            loop.exec();
+            disconnect(&wait, SIGNAL(timeout()), &loop, SLOT(quit()));
+
             device.setRequestToSend(false);
         }
         else if (_reset == "dtr")
         {
             device.setDataTerminalReady(true);
+
+            QTimer wait;
+            QEventLoop loop;
+            connect(&wait, SIGNAL(timeout()), &loop, SLOT(quit()));
+            wait.start(20);
+            loop.exec();
+            disconnect(&wait, SIGNAL(timeout()), &loop, SLOT(quit()));
+
             device.setDataTerminalReady(false);
         } 
         else
@@ -269,7 +277,15 @@ quint32 PropellerDevice::resetPeriod()
 
 bool PropellerDevice::isOpen()
 {
-    return device.isOpen();
+    if (!device.isOpen())
+    {
+        if (!open())
+        {
+            close();
+            return open();
+        }
+    }
+    return true;
 }
 
 bool PropellerDevice::clear()

src/loader/propellerloader.cpp

@@ -33,7 +33,6 @@ PropellerLoader::PropellerLoader(PropellerManager * manager, const QString & por
     _ack     = 0;
 
     this->session = new PropellerSession(manager, portname);
-    session->setBaudRate(115200);
 
     totalTimeout.setSingleShot(true);
     handshakeTimeout.setSingleShot(true);
@@ -46,20 +45,20 @@ PropellerLoader::PropellerLoader(PropellerManager * manager, const QString & por
     connect(session,&PropellerSession::sendError,
             this,   &PropellerLoader::error);
 
-    QFinalState * s_failure         = new QFinalState();
-    QFinalState * s_success         = new QFinalState();
+    QFinalState * s_failure = new QFinalState();
+    QFinalState * s_success = new QFinalState();
 
     connect(s_success,     SIGNAL(entered()), this, SLOT(success_entry()));
     connect(s_failure,     SIGNAL(entered()), this, SLOT(failure_entry()));
 
-    s_active  = new QState();
+    s_active                = new QState();
 
-    QState * s_start             = new QState(s_active);
-    QState * s_prepare           = new QState(s_active);
-    QState * s_payload           = new QState(s_active);
-    QState * s_verify            = new QState(s_active);
-    QState * s_write             = new QState(s_active);
-    QState * s_verifywrite       = new QState(s_active);
+    QState * s_start        = new QState(s_active);
+    QState * s_prepare      = new QState(s_active);
+    QState * s_payload      = new QState(s_active);
+    QState * s_verify       = new QState(s_active);
+    QState * s_write        = new QState(s_active);
+    QState * s_verifywrite  = new QState(s_active);
 
     s_prepare    ->assignProperty(this, "status", tr("Preparing image..."));
     s_payload    ->assignProperty(this, "status", tr("Downloading to RAM..."));
@@ -72,8 +71,8 @@ PropellerLoader::PropellerLoader(PropellerManager * manager, const QString & por
     s_verifywrite->assignProperty(this, "stat", 3);
 
     s_active->setInitialState(s_start);
-    s_active-> addTransition(this, SIGNAL(failure()), s_failure);
-    s_active-> addTransition(&machine,      SIGNAL(started()), s_prepare);
+    s_active-> addTransition(this,      SIGNAL(failure()), s_failure);
+    s_active-> addTransition(&machine,  SIGNAL(started()), s_prepare);
 
     machine.addState(s_failure);
     machine.addState(s_success);
@@ -106,8 +105,6 @@ PropellerLoader::PropellerLoader(PropellerManager * manager, const QString & por
     connect(s_verifywrite,   SIGNAL(exited()),  this, SLOT(acknowledge_exit()));
 
     s_verifywrite->addTransition(this,  SIGNAL(success()),       s_success);
-
-//    connect(this, SIGNAL(statusChanged(const QString &)), this, SLOT(message(const QString &)));
 }
 
 PropellerLoader::~PropellerLoader()
@@ -116,7 +113,6 @@ PropellerLoader::~PropellerLoader()
     delete session;
 }
 
-
 void PropellerLoader::message(const QString & text)
 {
     qCDebug(ploader) << qPrintable("["+session->portName()+"]") << qPrintable(text);
@@ -178,7 +174,6 @@ void PropellerLoader::prepare_entry()
     _error = NoError;
     _completed = 0;
     m_stat = 0;
-    session->setBaudRate(115200);
 
     _command = 2*_write + _run;
 
@@ -208,7 +203,7 @@ void PropellerLoader::prepare_entry()
 
 void PropellerLoader::handshake_read()
 {
-//    message("BYTES "+QString::number(session->bytesAvailable()));
+//    qDebug() << "BYTES" << session->bytesAvailable();
     if (session->bytesAvailable() == protocol.reply().size() + 4)
     {
         handshakeTimeout.stop();
@@ -247,7 +242,7 @@ void PropellerLoader::sendpayload_entry()
     connect(this,       SIGNAL(handshake_received()),   this, SLOT(upload_status()));
     connect(this,       SIGNAL(payload_sent()),         this, SLOT(upload_status()));
 
-    session->readAll();         // clear mysterious junk data that arrives just before this write().
+    session->clear();         // clear mysterious junk data that arrives just before this write().
     session->write(_payload);
 }
 
@@ -361,6 +356,12 @@ bool PropellerLoader::upload(PropellerImage image, bool write, bool run, bool wa
         return false;
     }
 
+    if (!session->setBaudRate(115200))
+    {
+        error("Couldn't set baud rate");
+        return false;
+    }
+
     _image = image;
     _write = write;
     _run = run;

src/manager/connector.h

@@ -69,24 +69,24 @@ class Connector : public Interface
 
         _target = target;
 
-//        qDebug() << "connecting" << this << "to" << _target;
-
         attachSignals();
 
         _attached = true;
 
+//        qDebug() << "attached" << this << "to" << _target;
+
         return true;
     }
 
     void detach()
     {
         if (!isAttached()) return;
 
-//        qDebug() << "removing" << this << "from" << _target;
-
         detachSignals();
 
         _attached = false;
+
+//        qDebug() << "detached" << this;
     }
 
     bool isOpen()

src/manager/portmonitor.cpp

@@ -1,6 +1,7 @@
 #include "portmonitor.h"
 
 #include "../device/propellerdevice.h"
+#include "../util/logging.h"
 
 PortMonitor::PortMonitor(QObject * parent)
     : QObject(parent)
@@ -34,6 +35,7 @@ void PortMonitor::check()
     if(_ports != newports)
     {
         _ports = newports;
+//        qCDebug(pmanager) << "devices changed:" << _ports;
         emit listChanged();
     }
 }

src/manager/propellermanager.cpp

@@ -21,6 +21,7 @@ PropellerManager::~PropellerManager()
 bool PropellerManager::beginSession(PropellerSession * session)
 {
     if (!session) return false;
+//    qCDebug(pmanager) << "beginning" << session;
 
     SessionInterface * interface = sessions->interface(session);
     session->attach(interface);
@@ -31,6 +32,7 @@ bool PropellerManager::beginSession(PropellerSession * session)
 void PropellerManager::endSession(PropellerSession * session)
 {
     if (!session) return;
+//    qCDebug(pmanager) << "ending" << session;
 
     session->detach();
     sessions->remove(session);
@@ -83,12 +85,14 @@ void PropellerManager::release(PropellerSession * session)
 
 void PropellerManager::setPortName(PropellerSession * session, const QString & name)
 {
-    if (name.isEmpty()) return;
-
     SessionInterface * sessionInterface = sessions->interface(session);
 
+
+    bool exists = devices->exists(name);
     DeviceInterface * deviceInterface = devices->interface(name);
-    connect(deviceInterface,    SIGNAL(readyRead()),    sessions,   SLOT(readyBuffer()));
+
+    if(!exists)
+        connect(deviceInterface,    SIGNAL(readyRead()),    sessions,   SLOT(readyBuffer()));
 
     sessionInterface->detach();
     sessionInterface->attach(deviceInterface);

src/manager/sessioninterface.h

@@ -12,13 +12,15 @@ class SessionInterface : public Connector<DeviceInterface *>
 
     ReadBuffer * _buffer;
     bool _reserved;
+    qint32 _oldbaudrate;
 
 public:
     SessionInterface ()
         : Connector<DeviceInterface *>()
     {
         _buffer = new ReadBuffer();
         _reserved = false;
+        _oldbaudrate = 115200;
     }
 
     ~SessionInterface()
@@ -57,6 +59,16 @@ class SessionInterface : public Connector<DeviceInterface *>
     void setReserved(bool reserved)
     {
         _reserved = reserved;
+
+        if (_reserved)
+        {
+            _oldbaudrate = _target->baudRate();
+        }
+        else
+        {
+//            qDebug() << "restoring baud rate to" << _oldbaudrate << "on" << _target->portName();
+            _target->setBaudRate(_oldbaudrate);
+        }
     }
 
     bool isReserved()