diff --git a/connections/gvretserial.cpp b/connections/gvretserial.cpp
index 98ecf54..83a53ec 100644
--- a/connections/gvretserial.cpp
+++ b/connections/gvretserial.cpp
@@ -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 */
diff --git a/mainwindow.cpp b/mainwindow.cpp
index be5883c..40df9e7 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -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);
}
diff --git a/ui/mainsettingsdialog.ui b/ui/mainsettingsdialog.ui
index 05c7db9..1b790dd 100644
--- a/ui/mainsettingsdialog.ui
+++ b/ui/mainsettingsdialog.ui
@@ -7,7 +7,7 @@
0
0
965
- 585
+ 591
@@ -272,6 +272,9 @@
-
+
+ false
+
Remote Connection:
diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
index 630c24b..26aa8df 100644
--- a/ui/mainwindow.ui
+++ b/ui/mainwindow.ui
@@ -26,7 +26,7 @@
SavvyCAN
-
+
-
@@ -49,6 +49,47 @@
-
+
-
+
+
+ true
+
+
+ Remote Connection Active:
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ true
+
+
+
+ 1000
+ 50
+
+
+
+
+ 150
+ 50
+
+
+
+ 8
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+ true
+
+
+
-
@@ -159,6 +200,9 @@
-
+
+ false
+
Overwrite Mode