NeoTheFox/RepRaptor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimal parsing

Browse Source
This commit is contained in:
NeoTheFox 2015-03-08 17:38:08 +03:00
parent ed810d23e6
commit c2ed9f3ba3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mainwindow.cpp
View File

@ -58,7 +58,7 @@ MainWindow::MainWindow(QWidget *parent) :
sdBytes = 0; sdBytes = 0;
userCommand = ""; userCommand = "";
currentLine = 0; currentLine = 0;
readyRecieve = 0; readyRecieve = 1;
lastRecieved = 0; lastRecieved = 0;
serialupdate(); serialupdate();
@ -555,6 +555,8 @@ void MainWindow::readSerial()
} }
*/ */
emit recievedData(data); emit recievedData(data);
if(data.startsWith("ok")) readyRecieve++;
else if(data.startsWith("wa")) readyRecieve=1;
printMsg(QString(data)); //echo printMsg(QString(data)); //echo
} }

4
parser.cpp
View File

@ -56,6 +56,7 @@ void Parser::parse(QByteArray data)
} }
} }
/*
if(data.startsWith("ok")) if(data.startsWith("ok"))
{ {
QStringList tmp = QString(data).split(' '); QStringList tmp = QString(data).split(' ');
@ -63,6 +64,7 @@ void Parser::parse(QByteArray data)
emit recievedOkNum(tmp.at(1).toInt()); emit recievedOkNum(tmp.at(1).toInt());
else emit recievedOkNum(0); else emit recievedOkNum(0);
} }
*/
else if(data.startsWith("T:")) else if(data.startsWith("T:"))
{ {
TemperatureReadings r; TemperatureReadings r;
@ -76,7 +78,7 @@ void Parser::parse(QByteArray data)
emit recievedTemperature(r); 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")) else if(data.startsWith("rs") || data.startsWith("Resend"))
emit recievedResend(data.split(' ').at(0).toInt()); emit recievedResend(data.split(' ').at(0).toInt());
else if(data.startsWith("!!")) emit recievedError(); else if(data.startsWith("!!")) emit recievedError();