diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-06 04:11:10 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-07-06 04:11:10 +0200 |
commit | 57e6eeffb0b87570fc60d1d29d5d72b848deb620 (patch) | |
tree | b5b0cdb505f752536c99c815755dfc5449c4fc3d | |
parent | ec1f3617195df60e6375603eb4dd0d33f978b01f (diff) |
tracker/hatire: remove explicit workaround optin
Tested-by: @Ec0nomist
cf. https://github.com/opentrack/opentrack/issues/327#issuecomment-402288929
-rw-r--r-- | tracker-hatire/ftnoir_hatcontrols.ui | 34 | ||||
-rw-r--r-- | tracker-hatire/ftnoir_tracker_hat_dialog.cpp | 2 | ||||
-rw-r--r-- | tracker-hatire/ftnoir_tracker_hat_settings.h | 3 |
3 files changed, 2 insertions, 37 deletions
diff --git a/tracker-hatire/ftnoir_hatcontrols.ui b/tracker-hatire/ftnoir_hatcontrols.ui index c9a449b1..aa84758b 100644 --- a/tracker-hatire/ftnoir_hatcontrols.ui +++ b/tracker-hatire/ftnoir_hatcontrols.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>389</width> - <height>528</height> + <height>488</height> </rect> </property> <property name="minimumSize"> @@ -129,38 +129,6 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="serial_bug_workaround"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> - <horstretch>6</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Buggy serial port uses too much CPU</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_6"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>3</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="maximumSize"> - <size> - <width>65536</width> - <height>16777215</height> - </size> - </property> - <property name="text"> - <string>Workaround</string> - </property> - </widget> - </item> </layout> </widget> </item> diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp index 6fb17361..ecea7eaa 100644 --- a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp +++ b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp @@ -98,8 +98,6 @@ dialog_hatire::dialog_hatire() : theTracker(nullptr), timer(this) tie_setting(s.pParity, ui.QCB_Serial_parity); tie_setting(s.pStopBits, ui.QCB_Serial_stopBits); - tie_setting(s.serial_bug_workaround, ui.serial_bug_workaround); - tie_setting(s.QSerialPortName, ui.cbSerialPort); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); diff --git a/tracker-hatire/ftnoir_tracker_hat_settings.h b/tracker-hatire/ftnoir_tracker_hat_settings.h index 7e9f7244..a41f906d 100644 --- a/tracker-hatire/ftnoir_tracker_hat_settings.h +++ b/tracker-hatire/ftnoir_tracker_hat_settings.h @@ -22,7 +22,7 @@ struct TrackerSettings : opts value<int> DelayInit, DelayStart, DelaySeq; - value<bool> BigEndian, EnableLogging, serial_bug_workaround; + value<bool> BigEndian, EnableLogging; value<QString> QSerialPortName; @@ -63,7 +63,6 @@ struct TrackerSettings : opts DelaySeq(b, "after-start-delay", 0), BigEndian(b, "is-big-endian", false), EnableLogging(b, "enable-logging", false), - serial_bug_workaround(b, "serial-bug-workaround", false), QSerialPortName(b, "serial-port-name", ""), pBaudRate(b, "baud-rate", QSerialPort::Baud115200), pDataBits(b, "data-bits", QSerialPort::Data8), |