diff --git a/sender.cpp b/sender.cpp index 7e2cee5..da00742 100644 --- a/sender.cpp +++ b/sender.cpp @@ -19,6 +19,7 @@ Sender::Sender(QObject *parent) : QObject(parent) QSettings settings; sendTimer->setInterval(settings.value("core/senderinterval", 2).toInt()); sendingChecksum = settings.value("core/checksums", 0).toBool(); + dtr = settings.value("core/dtr", 1).toBool(); sendTimer->start(); @@ -121,6 +122,7 @@ void Sender::openPort(QSerialPortInfo i) if(!printer->isOpen() && printer->open(QIODevice::ReadWrite)) { //Moved here to be compatible with Qt 5.2.1 + printer->setDataTerminalReady(dtr); if(!printer->setBaudRate(baudrate)) emit baudrateSetFailed(baudrate); printer->setFlowControl(QSerialPort::HardwareControl); diff --git a/sender.h b/sender.h index 8baf9b8..e456fb3 100644 --- a/sender.h +++ b/sender.h @@ -29,6 +29,7 @@ protected: unsigned int baudrate; bool paused; bool sending; + bool dtr; bool readyRecieve; bool sendingChecksum; bool resending; diff --git a/settingswindow.cpp b/settingswindow.cpp index 2f5dfd9..407b287 100644 --- a/settingswindow.cpp +++ b/settingswindow.cpp @@ -19,6 +19,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : ui->lockbox->setChecked(settings.value("core/lockcontrols", 0).toBool()); ui->checksumbox->setChecked(settings.value("core/checksums", 0).toBool()); ui->sdbox->setChecked(settings.value("core/checksdstatus", 1).toBool()); + ui->dtrbox->setChecked(settings.value("core/dtr", 1).toBool()); ui->firmwarecombo->addItem("Marlin"); //0 ui->firmwarecombo->addItem("Repetier"); //1 @@ -51,5 +52,6 @@ void SettingsWindow::on_buttonBox_accepted() settings.setValue("core/lockcontrols", ui->lockbox->isChecked()); settings.setValue("core/checksums", ui->checksumbox->isChecked()); settings.setValue("core/checksdstatus", ui->sdbox->isChecked()); + settings.setValue("core/dtr", ui->dtrbox->isChecked()); settings.setValue("printer/firmware", ui->firmwarecombo->currentIndex()); } diff --git a/settingswindow.ui b/settingswindow.ui index b89a53d..bffadbe 100644 --- a/settingswindow.ui +++ b/settingswindow.ui @@ -99,7 +99,7 @@ - + Lock controls when printing @@ -113,14 +113,14 @@ - + Check SD printing status - + true @@ -152,6 +152,13 @@ + + + + DTR + + +