t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
Collin Kidder
2018-04-23 20:28:12 -04:00
parent 1659e37be4
commit 827754aa1c
4 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/gvretserial.cpp
+6 -6
View File
@@ -303,17 +303,17 @@ void GVRetSerial::connectDevice()
/* configure */ /* configure */
serial->setDataBits(serial->Data8); serial->setDataBits(serial->Data8);
//serial->setFlowControl(serial->HardwareControl); //this is important though serial->setFlowControl(serial->HardwareControl); //this is important though
serial->setFlowControl(serial->NoFlowControl); //serial->setFlowControl(serial->NoFlowControl);
serial->setBaudRate(1000000); serial->setBaudRate(1000000);
if (!serial->open(QIODevice::ReadWrite)) if (!serial->open(QIODevice::ReadWrite))
{ {
qDebug() << serial->errorString(); qDebug() << serial->errorString();
} }
serial->setDataTerminalReady(false); //you do need to set these or the fan gets dirty //serial->setDataTerminalReady(false); //you do need to set these or the fan gets dirty
serial->setRequestToSend(false); //serial->setRequestToSend(false);
//serial->setDataTerminalReady(true); //you do need to set these or the fan gets dirty serial->setDataTerminalReady(true); //you do need to set these or the fan gets dirty
//serial->setRequestToSend(true); serial->setRequestToSend(true);
debugOutput("Opened Serial Port"); debugOutput("Opened Serial Port");
/* connect reading event */ /* connect reading event */
mainwindow.cpp
+7
View File
@@ -135,6 +135,8 @@ MainWindow::MainWindow(QWidget *parent) :
ui->statusBar->addWidget(&lbStatusConnected); ui->statusBar->addWidget(&lbStatusConnected);
ui->statusBar->addWidget(&lbStatusFilename); ui->statusBar->addWidget(&lbStatusFilename);
//ui->statusBar->addWidget(&lbStatusDatabase); //ui->statusBar->addWidget(&lbStatusDatabase);
ui->lblRemoteConn->setVisible(false);
ui->lineRemoteKey->setVisible(false);
ui->lbFPS->setText("0"); ui->lbFPS->setText("0");
ui->lbNumFrames->setText("0"); ui->lbNumFrames->setText("0");
@@ -168,6 +170,11 @@ MainWindow::MainWindow(QWidget *parent) :
connectionWindow = new ConnectionWindow(); connectionWindow = new ConnectionWindow();
connect(this, SIGNAL(suspendCapturing(bool)), connectionWindow, SLOT(setSuspendAll(bool))); 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); installEventFilter(this);
} }
ui/mainsettingsdialog.ui
+4 -1
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>965</width> <width>965</width>
<height>585</height> <height>591</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -272,6 +272,9 @@
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_8"> <widget class="QGroupBox" name="groupBox_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="title"> <property name="title">
<string>Remote Connection:</string> <string>Remote Connection:</string>
</property> </property>
ui/mainwindow.ui
+45 -1
View File
@@ -26,7 +26,7 @@
<string>SavvyCAN</string> <string>SavvyCAN</string>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0">
<item> <item>
<widget class="QTableView" name="canFramesView"> <widget class="QTableView" name="canFramesView">
<property name="font"> <property name="font">
@@ -49,6 +49,47 @@
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <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> <item>
<widget class="QLabel" name="lblContMsg"> <widget class="QLabel" name="lblContMsg">
<property name="font"> <property name="font">
@@ -159,6 +200,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="cbOverwrite"> <widget class="QCheckBox" name="cbOverwrite">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Overwrite Mode</string> <string>Overwrite Mode</string>
</property> </property>