Remove some changes that only applied in a very specific circumstance, remove prototype and non general purpose entries from menus (you won't miss them)
This commit is contained in:
@@ -303,17 +303,17 @@ void GVRetSerial::connectDevice()
|
||||
|
||||
/* configure */
|
||||
serial->setDataBits(serial->Data8);
|
||||
//serial->setFlowControl(serial->HardwareControl); //this is important though
|
||||
serial->setFlowControl(serial->NoFlowControl);
|
||||
serial->setFlowControl(serial->HardwareControl); //this is important though
|
||||
//serial->setFlowControl(serial->NoFlowControl);
|
||||
serial->setBaudRate(1000000);
|
||||
if (!serial->open(QIODevice::ReadWrite))
|
||||
{
|
||||
qDebug() << serial->errorString();
|
||||
}
|
||||
serial->setDataTerminalReady(false); //you do need to set these or the fan gets dirty
|
||||
serial->setRequestToSend(false);
|
||||
//serial->setDataTerminalReady(true); //you do need to set these or the fan gets dirty
|
||||
//serial->setRequestToSend(true);
|
||||
//serial->setDataTerminalReady(false); //you do need to set these or the fan gets dirty
|
||||
//serial->setRequestToSend(false);
|
||||
serial->setDataTerminalReady(true); //you do need to set these or the fan gets dirty
|
||||
serial->setRequestToSend(true);
|
||||
|
||||
debugOutput("Opened Serial Port");
|
||||
/* connect reading event */
|
||||
|
||||
@@ -135,6 +135,8 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
ui->statusBar->addWidget(&lbStatusConnected);
|
||||
ui->statusBar->addWidget(&lbStatusFilename);
|
||||
//ui->statusBar->addWidget(&lbStatusDatabase);
|
||||
ui->lblRemoteConn->setVisible(false);
|
||||
ui->lineRemoteKey->setVisible(false);
|
||||
|
||||
ui->lbFPS->setText("0");
|
||||
ui->lbNumFrames->setText("0");
|
||||
@@ -168,6 +170,11 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
connectionWindow = new ConnectionWindow();
|
||||
connect(this, SIGNAL(suspendCapturing(bool)), connectionWindow, SLOT(setSuspendAll(bool)));
|
||||
|
||||
ui->actionFirmware_Update->setVisible(false);
|
||||
ui->actionMotorControlConfig->setVisible(false);
|
||||
ui->actionSignal_Viewer->setVisible(false);
|
||||
ui->actionSingle_Multi_State_2->setVisible(false);
|
||||
|
||||
installEventFilter(this);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>965</width>
|
||||
<height>585</height>
|
||||
<height>591</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -272,6 +272,9 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_8">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Remote Connection:</string>
|
||||
</property>
|
||||
|
||||
+45
-1
@@ -26,7 +26,7 @@
|
||||
<string>SavvyCAN</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralWidget">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
|
||||
<item>
|
||||
<widget class="QTableView" name="canFramesView">
|
||||
<property name="font">
|
||||
@@ -49,6 +49,47 @@
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lblRemoteConn">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Remote Connection Active:</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="lineRemoteKey">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>1000</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="baseSize">
|
||||
<size>
|
||||
<width>150</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maxLength">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="lblContMsg">
|
||||
<property name="font">
|
||||
@@ -159,6 +200,9 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="cbOverwrite">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Overwrite Mode</string>
|
||||
</property>
|
||||
|
||||
Reference in New Issue
Block a user