Commit 3baaf73a authored by Bryant Mairs's avatar Bryant Mairs

Reverted qportsettings.h changes. Instead we duplicate the OS-specific baud...

Reverted qportsettings.h changes. Instead we duplicate the OS-specific baud rate settings here within SerialLink.cc.
parent 01243837
......@@ -95,8 +95,11 @@ public:
//BAUDR_76800,
#endif
#ifdef Q_OS_LINUX
BAUDR_230400,
BAUDR_460800,
BAUDR_500000,
BAUDR_576000,
BAUDR_921600,
#endif
#ifdef TNX_WINDOWS_SERIAL_PORT
BAUDR_14400,
......@@ -115,10 +118,7 @@ public:
BAUDR_19200,
BAUDR_38400,
BAUDR_57600,
BAUDR_115200,
BAUDR_230400,
BAUDR_460800,
BAUDR_921600
BAUDR_115200
};
enum DataBits {
......@@ -186,8 +186,11 @@ public:
case BAUDR_256000: baudRateInt_=256000; 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;
......@@ -201,9 +204,6 @@ public:
case BAUDR_38400: baudRateInt_=38400; break;
case BAUDR_57600: baudRateInt_=57600; break;
case BAUDR_115200: baudRateInt_=115200; break;
case BAUDR_230400: baudRateInt_=230400; break;
case BAUDR_460800: baudRateInt_=460800; break;
case BAUDR_921600: baudRateInt_=921600; break;
default:
baudRateInt_ = 0; // unknown baudrate
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment