From c2ed9f3ba3b2fd6bf6caeac3029faa361b2ced32 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Sun, 8 Mar 2015 17:38:08 +0300 Subject: [PATCH] Optimal parsing --- mainwindow.cpp | 4 +++- parser.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index f785dc3..463d6d7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -58,7 +58,7 @@ MainWindow::MainWindow(QWidget *parent) : sdBytes = 0; userCommand = ""; currentLine = 0; - readyRecieve = 0; + readyRecieve = 1; lastRecieved = 0; serialupdate(); @@ -555,6 +555,8 @@ void MainWindow::readSerial() } */ emit recievedData(data); + if(data.startsWith("ok")) readyRecieve++; + else if(data.startsWith("wa")) readyRecieve=1; printMsg(QString(data)); //echo } diff --git a/parser.cpp b/parser.cpp index 019caf1..5c3bf03 100644 --- a/parser.cpp +++ b/parser.cpp @@ -56,6 +56,7 @@ void Parser::parse(QByteArray data) } } + /* if(data.startsWith("ok")) { QStringList tmp = QString(data).split(' '); @@ -63,6 +64,7 @@ void Parser::parse(QByteArray data) emit recievedOkNum(tmp.at(1).toInt()); else emit recievedOkNum(0); } + */ else if(data.startsWith("T:")) { TemperatureReadings r; @@ -76,7 +78,7 @@ void Parser::parse(QByteArray data) emit recievedTemperature(r); } - else if(data.startsWith("wait")) emit recievedOkWait(); + //else if(data.startsWith("wait")) emit recievedOkWait(); else if(data.startsWith("rs") || data.startsWith("Resend")) emit recievedResend(data.split(' ').at(0).toInt()); else if(data.startsWith("!!")) emit recievedError();