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

Additional checks

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

13
mainwindow.cpp
View File

@ -467,7 +467,9 @@ void MainWindow::on_haltbtn_clicked()
void MainWindow::readSerial() void MainWindow::readSerial()
{ {
QByteArray data = printer.readLine(); if(printer.canReadLine())
{
QByteArray data = printer.readLine();
/* /*
if(printer.canReadLine()) if(printer.canReadLine())
{ {
@ -554,10 +556,11 @@ void MainWindow::readSerial()
readingFiles = true; //start reading files from SD readingFiles = true; //start reading files from SD
} }
*/ */
emit recievedData(data); emit recievedData(data);
if(data.startsWith("ok")) readyRecieve++; if(data.startsWith("ok")) readyRecieve++;
else if(data.startsWith("wa")) readyRecieve=1; else if(data.startsWith("wa")) readyRecieve=1;
printMsg(QString(data)); //echo printMsg(QString(data)); //echo
}
} }
void MainWindow::printMsg(const char* text) void MainWindow::printMsg(const char* text)

4
parser.cpp
View File

@ -117,8 +117,8 @@ void Parser::parse(QByteArray data)
SDFilesList.clear(); SDFilesList.clear();
readingFiles = true; //start reading files from SD readingFiles = true; //start reading files from SD
} }
else if(data.contains("REPETIER")) emit recievedFirmware(Repetier); //else if(data.contains("REPETIER")) emit recievedFirmware(Repetier);
else if(data.contains("MARLIN")) emit recievedFirmware(Marlin); //else if(data.contains("MARLIN")) emit recievedFirmware(Marlin);
} }
} }