diff --git a/mainwindow.cpp b/mainwindow.cpp index a9123c4..045bc1a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -192,6 +192,8 @@ void MainWindow::serialconnect() ui->progressBar->setValue(0); ui->controlBox->setDisabled(false); ui->consoleGroup->setDisabled(false); + commandDone = true; + if(checkingTemperature) injectCommand("M105"); } } @@ -352,10 +354,7 @@ void MainWindow::readSerial() { QByteArray data = printer.readLine(); if(data.startsWith("ok") || data.startsWith("wait")) commandDone = true; //Can send next command - else if(checkingTemperature && data.startsWith("T:")) //Parse temperature readings if any - { - parseStatus(data); - } + else if(checkingTemperature && data.startsWith("T:")) parseStatus(data); //Parse temperature readings if any else if(data.startsWith("Resend")) //Handle resend if requested { if(currentLine > 0) currentLine -= data.split(':')[1].toInt(); @@ -571,3 +570,8 @@ void MainWindow::parseStatus(QByteArray data) sinceLastTemp.restart(); } + +void MainWindow::on_actionPrint_from_SD_triggered() +{ + //TODO +} diff --git a/mainwindow.h b/mainwindow.h index 6715b4c..87d7863 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -98,6 +98,7 @@ private slots: void on_releasebtn_clicked(); void on_actionAbout_triggered(); void serialError(QSerialPort::SerialPortError error); + void on_actionPrint_from_SD_triggered(); }; #endif // MAINWINDOW_H diff --git a/mainwindow.ui b/mainwindow.ui index cbdf684..ed00923 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -129,13 +129,6 @@ - - - - OFF - - - @@ -348,6 +341,13 @@ + + + + OFF + + + @@ -539,7 +539,17 @@ + + + false + + + Tools + + + + @@ -580,6 +590,14 @@ About + + + false + + + Print from SD... + +