From 0198ce3edfa033daefccc20015d5ccf13bf26255 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 22 Oct 2014 12:47:26 -0700
Subject: [PATCH] commit

---
 src/ui/configuration/SerialSettingsDialog.cc |  1 +
 src/ui/px4_configuration/PX4Bootloader.cc    | 49 +++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/ui/configuration/SerialSettingsDialog.cc b/src/ui/configuration/SerialSettingsDialog.cc
index 8056afdcc..e8b48faee 100644
--- a/src/ui/configuration/SerialSettingsDialog.cc
+++ b/src/ui/configuration/SerialSettingsDialog.cc
@@ -148,6 +148,7 @@ void SettingsDialog::fillPortsParameters()
 void SettingsDialog::fillPortsInfo()
 {
     ui->serialPortInfoListBox->clear();
+    QList<QSerialPortInfo> list = QSerialPortInfo::availablePorts();
     foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
         QStringList list;
         list << info.portName()
diff --git a/src/ui/px4_configuration/PX4Bootloader.cc b/src/ui/px4_configuration/PX4Bootloader.cc
index eabd11ffd..51c6d3310 100644
--- a/src/ui/px4_configuration/PX4Bootloader.cc
+++ b/src/ui/px4_configuration/PX4Bootloader.cc
@@ -119,6 +119,12 @@ Again:
 
 bool PX4Bootloader::write(QSerialPort* port, const uint8_t* data, qint64 maxSize)
 {
+    // Make sure we don't overflow output buffer
+    while (port->bytesToWrite() > 50) {
+        int bump = 0;
+        bump++;
+    }
+
     qint64 bytesWritten = port->write((const char*)data, maxSize);
     if (bytesWritten == -1) {
         _errorString = tr("Write failed: %1").arg(port->errorString());
@@ -147,34 +153,35 @@ bool PX4Bootloader::write(QSerialPort* port, const uint8_t byte)
 
 bool PX4Bootloader::read(QSerialPort* port, uint8_t* data, qint64 maxSize, bool warnOnError, int readTimeout)
 {
-    qint64 bytesRead;
-    
-    if (port->bytesAvailable() < maxSize) {
-        if (!port->waitForReadyRead(readTimeout)) {
-            _errorString = tr("Timeout waiting for read bytes available: %1").arg(port->errorString());
+    qint64 bytesToRead = 0;
+    
+    while (bytesToRead < maxSize) {
+        if (port->bytesAvailable() == 0) {
+            if (!port->waitForReadyRead(readTimeout)) {
+                _errorString = tr("Timeout waiting for byte to be available");
+                if (warnOnError) {
+                    qWarning() << _errorString;
+                }
+                return false;
+            }
+            Q_ASSERT(port->bytesAvailable() != 0);
+        }
+        
+        qint64 bytesRead;
+        bytesRead = port->read((char*)&data[bytesToRead], maxSize);
+        
+        if (bytesRead == -1) {
+            _errorString = tr("Read failed: Could not read 1 byte, error: %1").arg(port->errorString());
             if (warnOnError) {
                 qWarning() << _errorString;
             }
             return false;
+        } else {
+            Q_ASSERT(bytesRead != 0);
+            bytesToRead += bytesRead;
         }
     }
     
-    bytesRead = port->read((char*)data, maxSize);
-    if (bytesRead == -1) {
-        _errorString = tr("Read failed: Could not read %1 resonse, error: 12").arg(port->errorString());
-        if (warnOnError) {
-            qWarning() << _errorString;
-        }
-        return false;
-    }
-    if (bytesRead != maxSize) {
-        _errorString = tr("In correct number of bytes returned for read: actual(%1) expected(%2)").arg(bytesRead).arg(maxSize);
-        if (warnOnError) {
-            qWarning() << _errorString;
-        }
-        return false;
-    }
-    
     return true;
 }
 
-- 
2.22.0