NeoTheFox/RepRaptor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added settings for flow control

Browse Source
This commit is contained in:
NeoTheFox 2015-03-19 19:31:36 +03:00
parent a5a74d5581
commit c94afa3986
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sender.cpp
View File

@ -20,6 +20,7 @@ Sender::Sender(QObject *parent) : QObject(parent)
sendTimer->setInterval(settings.value("core/senderinterval", 2).toInt()); sendTimer->setInterval(settings.value("core/senderinterval", 2).toInt());
sendingChecksum = settings.value("core/checksums", 0).toBool(); sendingChecksum = settings.value("core/checksums", 0).toBool();
dtr = settings.value("core/dtr", 1).toBool(); dtr = settings.value("core/dtr", 1).toBool();
flowcontrol = settings.value("core/flowcontrol", 0).toInt();
sendTimer->start(); sendTimer->start();
@ -125,7 +126,7 @@ void Sender::openPort(QSerialPortInfo i)
printer->setDataTerminalReady(dtr); printer->setDataTerminalReady(dtr);
if(!printer->setBaudRate(baudrate)) if(!printer->setBaudRate(baudrate))
emit baudrateSetFailed(baudrate); emit baudrateSetFailed(baudrate);
//printer->setFlowControl(QSerialPort::HardwareControl); printer->setFlowControl(flowcontrol);
} }
readyReceive = true; readyReceive = true;

1
sender.h
View File

@ -27,6 +27,7 @@ protected:
unsigned int totalLineNum; unsigned int totalLineNum;
unsigned int resendNum; unsigned int resendNum;
unsigned int baudrate; unsigned int baudrate;
int flowcontrol;
bool paused; bool paused;
bool sending; bool sending;
bool dtr; bool dtr;

5
settingswindow.cpp
View File

@ -6,9 +6,13 @@ SettingsWindow::SettingsWindow(QWidget *parent) :
ui(new Ui::SettingsWindow) ui(new Ui::SettingsWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->flowcontrolbox->addItem("No control");
ui->flowcontrolbox->addItem("Hardware control");
ui->flowcontrolbox->addItem("Software control");
//bool firstrun = !settings.value("core/firstrun").toBool(); //firstrun is inverted! //bool firstrun = !settings.value("core/firstrun").toBool(); //firstrun is inverted!
ui->flowcontrolbox->setCurrentIndex(settings.value("core/flowcontrol", 0).toInt());
ui->senderbox->setValue(settings.value("core/senderinterval", 2).toInt()); ui->senderbox->setValue(settings.value("core/senderinterval", 2).toInt());
ui->echobox->setChecked(settings.value("core/echo", 0).toBool()); ui->echobox->setChecked(settings.value("core/echo", 0).toBool());
ui->statusbox->setValue(settings.value("core/statusinterval", 2000).toInt()); ui->statusbox->setValue(settings.value("core/statusinterval", 2000).toInt());
@ -42,6 +46,7 @@ SettingsWindow::~SettingsWindow()
void SettingsWindow::on_buttonBox_accepted() void SettingsWindow::on_buttonBox_accepted()
{ {
settings.setValue("core/flowcontrol", ui->flowcontrolbox->currentIndex());
settings.setValue("core/senderinterval", ui->senderbox->value()); settings.setValue("core/senderinterval", ui->senderbox->value());
settings.setValue("core/statusinterval", ui->statusbox->value()); settings.setValue("core/statusinterval", ui->statusbox->value());
settings.setValue("printer/bedy", ui->bedybox->value()); settings.setValue("printer/bedy", ui->bedybox->value());