From 0df6db27749c3b61601792834222bafae0faa46c Mon Sep 17 00:00:00 2001 From: LM Date: Fri, 27 May 2011 09:34:01 +0200 Subject: [PATCH] Updated qserialport --- .../qserialport/include/QtSerialPort/qportsettings.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/thirdParty/qserialport/include/QtSerialPort/qportsettings.h b/thirdParty/qserialport/include/QtSerialPort/qportsettings.h index 810304f59..390a93e1f 100644 --- a/thirdParty/qserialport/include/QtSerialPort/qportsettings.h +++ b/thirdParty/qserialport/include/QtSerialPort/qportsettings.h @@ -99,14 +99,13 @@ public: BAUDR_460800, BAUDR_500000, BAUDR_576000, + BAUDR_921600, #endif #ifdef TNX_WINDOWS_SERIAL_PORT BAUDR_14400, BAUDR_56000, BAUDR_128000, - BAUDR_230400, BAUDR_256000, - BAUDR_460800, #endif // baud rates supported by all OSs BAUDR_110, @@ -119,8 +118,7 @@ public: BAUDR_19200, BAUDR_38400, BAUDR_57600, - BAUDR_115200, - BAUDR_921600 + BAUDR_115200 }; enum DataBits { @@ -186,14 +184,13 @@ public: case BAUDR_56000: baudRateInt_=56000; break; case BAUDR_128000: baudRateInt_=128000; break; case BAUDR_256000: baudRateInt_=256000; break; - case BAUDR_230400: baudRateInt_=230400; break; - case BAUDR_460800: baudRateInt_=460800; break; #endif #if defined(Q_OS_LINUX) 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; #endif // baud rates supported by all platforms case BAUDR_110: baudRateInt_=110; break; @@ -207,7 +204,6 @@ public: case BAUDR_38400: baudRateInt_=38400; break; case BAUDR_57600: baudRateInt_=57600; break; case BAUDR_115200: baudRateInt_=115200; break; - case BAUDR_921600: baudRateInt_=921600; break; default: baudRateInt_ = 0; // unknown baudrate } -- 2.22.0