Cleaned up baud rates further, now consistent for all platforms, should compile and run on all

thirdParty/qserialport/include/QtSerialPort/qportsettings.h

@@ -92,11 +92,11 @@ public:
         BAUDR_150,
         BAUDR_200,
         BAUDR_1800,
-        //BAUDR_76800,
+        /* BAUDR_76800, */
 #endif
 #ifdef Q_OS_LINUX
-        //    BAUDR_500000,
-        //    BAUDR_576000,
+//        BAUDR_500000,
+//        BAUDR_576000,
 #endif
 #ifdef TNX_WINDOWS_SERIAL_PORT
         BAUDR_14400,
@@ -104,7 +104,7 @@ public:
         BAUDR_128000,
         BAUDR_256000,
 #endif
-        // baud rates supported by all OSs
+        /* baud rates supported by all OSs */
         BAUDR_110,
         BAUDR_300,
         BAUDR_600,
@@ -120,7 +120,7 @@ public:
         BAUDR_460800,
         BAUDR_500000,
         BAUDR_576000,
-        BAUDR_921600,
+        BAUDR_921600
     };
 
     enum DataBits {
@@ -186,10 +186,6 @@ public:
         case BAUDR_56000: baudRateInt_=56000; break;
         case BAUDR_128000: baudRateInt_=128000; break;
         case BAUDR_256000: baudRateInt_=256000; break;
-#endif
-#if defined(Q_OS_LINUX)
-        case BAUDR_500000: baudRateInt_=500000; break;
-        case BAUDR_576000: baudRateInt_=576000; break;
 #endif
             // baud rates supported by all platforms
         case BAUDR_110: baudRateInt_=110; break;
@@ -205,6 +201,8 @@ public:
         case BAUDR_115200: baudRateInt_=115200; break;
         case BAUDR_230400: baudRateInt_=230400; break;
         case BAUDR_460800: baudRateInt_=460800; break;
+        case BAUDR_500000: baudRateInt_=500000; break;
+        case BAUDR_576000: baudRateInt_=576000; break;
         case BAUDR_921600: baudRateInt_=921600; break;
         default:
             baudRateInt_ = 0; // unknown baudrate

thirdParty/qserialport/src/posix/termioshelper.cpp

@@ -400,18 +400,26 @@ QPortSettings::BaudRate TermiosHelper::baudRate() const
     case 460800:
         return QPortSettings::BAUDR_460800;
 #endif
+#ifdef B500000
+    case B500000:
+        return QPortSettings::BAUDR_500000;
+#else
+    case 500000:
+        return QPortSettings::BAUDR_500000;
+#endif
+#ifdef B576000:
+    case B576000:
+        return QPortSettings::BAUDR_576000;
+#else
+    case 576000:
+        return QPortSettings::BAUDR_576000;
+#endif
 #ifdef B921600
     case B921600:
         return QPortSettings::BAUDR_921600;
 #else
     case 921600:
         return QPortSettings::BAUDR_921600;
-#endif
-#if defined(Q_OS_LINUX)
-    case B500000:
-        return QPortSettings::BAUDR_500000;
-    case B576000:
-        return QPortSettings::BAUDR_576000;
 #endif
     default:
         qWarning() << "TermiosHelper::baudRate(): Unknown baud rate";

thirdParty/qserialport/src/win32/commdcbhelper.cpp

@@ -22,6 +22,14 @@
 #include <QDebug>
 #include "commdcbhelper.h"
 
+/* glue for unsupported windows speeds */
+
+#define CBR_230400	230400
+#define CBR_460800	460800
+#define CBR_500000	500000
+#define CBR_576000	576000
+#define CBR_921600	921600
+
 namespace TNX {
 
 /*!
@@ -316,9 +324,24 @@ void CommDCBHelper::setBaudRate(QPortSettings::BaudRate baudRate)
     case QPortSettings::BAUDR_128000:
         baud = CBR_128000;
         break;
+    case QPortSettings::BAUDR_230400:
+        baud = CBR_230400;
+        break;
     case QPortSettings::BAUDR_256000:
         baud = CBR_256000;
         break;
+    case QPortSettings::BAUDR_460800:
+        baud = CBR_460800;
+        break;
+    case QPortSettings::BAUDR_500000:
+        baud = CBR_500000;
+        break;
+    case QPortSettings::BAUDR_576000:
+        baud = CBR_576000;
+        break;
+    case QPortSettings::BAUDR_921600:
+        baud = CBR_921600;
+        break;
     default:
         qWarning() << "CommDCBHelper::setBaudRate(" << baudRate << "): " \
                       "Unsupported baud rate";
@@ -350,6 +373,8 @@ QPortSettings::BaudRate CommDCBHelper::baudRate() const
         baud = dcb.BaudRate;
     }
 
+
+
     Q_ASSERT(currentAttrs_->BaudRate == baud);
 
     switch ( baud ) {
@@ -381,8 +406,16 @@ QPortSettings::BaudRate CommDCBHelper::baudRate() const
         return QPortSettings::BAUDR_115200;
     case CBR_128000:
         return QPortSettings::BAUDR_128000;
+    case CBR_230400:
+        return QPortSettings::BAUDR_230400;
     case CBR_256000:
         return QPortSettings::BAUDR_256000;
+    case CBR_500000:
+        return QPortSettings::BAUDR_500000;
+    case CBR_576000:
+        return QPortSettings::BAUDR_57600;
+    case CBR_921600:
+        return QPortSettings::BAUDR_921600;
     default:
         qWarning() << "CommDCBHelper::baudRate(): Unknown baud rate";
     }