Added DTR switch
This commit is contained in:
parent
82b444f066
commit
079594f6dc
@ -19,6 +19,7 @@ Sender::Sender(QObject *parent) : QObject(parent)
|
|||||||
QSettings settings;
|
QSettings settings;
|
||||||
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();
|
||||||
|
|
||||||
sendTimer->start();
|
sendTimer->start();
|
||||||
|
|
||||||
@ -121,6 +122,7 @@ void Sender::openPort(QSerialPortInfo i)
|
|||||||
if(!printer->isOpen() && printer->open(QIODevice::ReadWrite))
|
if(!printer->isOpen() && printer->open(QIODevice::ReadWrite))
|
||||||
{
|
{
|
||||||
//Moved here to be compatible with Qt 5.2.1
|
//Moved here to be compatible with Qt 5.2.1
|
||||||
|
printer->setDataTerminalReady(dtr);
|
||||||
if(!printer->setBaudRate(baudrate))
|
if(!printer->setBaudRate(baudrate))
|
||||||
emit baudrateSetFailed(baudrate);
|
emit baudrateSetFailed(baudrate);
|
||||||
printer->setFlowControl(QSerialPort::HardwareControl);
|
printer->setFlowControl(QSerialPort::HardwareControl);
|
||||||
|
|||||||
1
sender.h
1
sender.h
@ -29,6 +29,7 @@ protected:
|
|||||||
unsigned int baudrate;
|
unsigned int baudrate;
|
||||||
bool paused;
|
bool paused;
|
||||||
bool sending;
|
bool sending;
|
||||||
|
bool dtr;
|
||||||
bool readyRecieve;
|
bool readyRecieve;
|
||||||
bool sendingChecksum;
|
bool sendingChecksum;
|
||||||
bool resending;
|
bool resending;
|
||||||
|
|||||||
@ -19,6 +19,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) :
|
|||||||
ui->lockbox->setChecked(settings.value("core/lockcontrols", 0).toBool());
|
ui->lockbox->setChecked(settings.value("core/lockcontrols", 0).toBool());
|
||||||
ui->checksumbox->setChecked(settings.value("core/checksums", 0).toBool());
|
ui->checksumbox->setChecked(settings.value("core/checksums", 0).toBool());
|
||||||
ui->sdbox->setChecked(settings.value("core/checksdstatus", 1).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("Marlin"); //0
|
||||||
ui->firmwarecombo->addItem("Repetier"); //1
|
ui->firmwarecombo->addItem("Repetier"); //1
|
||||||
@ -51,5 +52,6 @@ void SettingsWindow::on_buttonBox_accepted()
|
|||||||
settings.setValue("core/lockcontrols", ui->lockbox->isChecked());
|
settings.setValue("core/lockcontrols", ui->lockbox->isChecked());
|
||||||
settings.setValue("core/checksums", ui->checksumbox->isChecked());
|
settings.setValue("core/checksums", ui->checksumbox->isChecked());
|
||||||
settings.setValue("core/checksdstatus", ui->sdbox->isChecked());
|
settings.setValue("core/checksdstatus", ui->sdbox->isChecked());
|
||||||
|
settings.setValue("core/dtr", ui->dtrbox->isChecked());
|
||||||
settings.setValue("printer/firmware", ui->firmwarecombo->currentIndex());
|
settings.setValue("printer/firmware", ui->firmwarecombo->currentIndex());
|
||||||
}
|
}
|
||||||
|
|||||||
@ -99,7 +99,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0" colspan="3">
|
<item row="5" column="0" colspan="3">
|
||||||
<widget class="QCheckBox" name="lockbox">
|
<widget class="QCheckBox" name="lockbox">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Lock controls when printing</string>
|
<string>Lock controls when printing</string>
|
||||||
@ -113,14 +113,14 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="0" colspan="3">
|
<item row="6" column="0" colspan="3">
|
||||||
<widget class="QCheckBox" name="sdbox">
|
<widget class="QCheckBox" name="sdbox">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Check SD printing status</string>
|
<string>Check SD printing status</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="6" column="0">
|
<item row="7" column="0">
|
||||||
<widget class="QCheckBox" name="checksumbox">
|
<widget class="QCheckBox" name="checksumbox">
|
||||||
<property name="enabled">
|
<property name="enabled">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@ -152,6 +152,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QCheckBox" name="dtrbox">
|
||||||
|
<property name="text">
|
||||||
|
<string>DTR</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user