From 5fc539d3003ebffa483ef2d7de135dba991a1185 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Mon, 2 Mar 2015 15:29:56 +0300 Subject: [PATCH] Initial resend handling --- mainwindow.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 6b52afd..c651340 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -213,7 +213,7 @@ void MainWindow::xplus() void MainWindow::xminus() { - QString command = "G91\n G1 X-" + ui->stepspin->text() + "\n G90"; + QString command = "G91\nG1 X-" + ui->stepspin->text() + "\nG90"; sendLine(command); } @@ -224,7 +224,7 @@ void MainWindow::xhome() void MainWindow::yplus() { - QString command = "G91\n G1 Y" + ui->stepspin->text() + "\n G90"; + QString command = "G91\nG1 Y" + ui->stepspin->text() + "\nG90"; sendLine(command); } @@ -241,13 +241,13 @@ void MainWindow::yhome() void MainWindow::zplus() { - QString command = "G91\n G1 Z" + ui->stepspin->text() + "\n G90"; + QString command = "G91\nG1 Z" + ui->stepspin->text() + "\nG90"; sendLine(command); } void MainWindow::zminus() { - QString command = "G91\n G1 Z-" + ui->stepspin->text() + "\n G90"; + QString command = "G91\nG1 Z-" + ui->stepspin->text() + "\nG90"; sendLine(command); } @@ -364,6 +364,12 @@ void MainWindow::readSerial() ui->bedlcd->display(btmp.toDouble()); sinceLastTemp.restart(); } + else if(data.startsWith("Resend")) + { + if(currentLine > 0) currentLine -= data.split(':')[1].toInt(); + if(currentLine < 0) currentLine = 0; + commandDone = true; + } else if(data.startsWith("ok") || data.startsWith("wait")) commandDone = true; printMsg(QString(data)); }