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

Cleanup and comments

Browse Source
This commit is contained in:
NeoTheFox 2015-03-14 18:19:44 +03:00
parent 53283605e0
commit a5a8dc662b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parser.cpp
View File

@ -3,15 +3,17 @@
Parser::Parser(QObject *parent): Parser::Parser(QObject *parent):
QObject(parent) QObject(parent)
{ {
this->setParent(parent); //Init regexp
temperatureRegxp.setCaseSensitivity(Qt::CaseInsensitive); temperatureRegxp.setCaseSensitivity(Qt::CaseInsensitive);
temperatureRegxp.setPatternSyntax(QRegExp::RegExp); temperatureRegxp.setPatternSyntax(QRegExp::RegExp);
temperatureRegxp.setPattern("\\d+\\.\\d+"); // Find float in string temperatureRegxp.setPattern("\\d+\\.\\d+"); // Find float in string
//Init values
readingFiles = false; readingFiles = false;
readingEEPROM = false; readingEEPROM = false;
EEPROMReadingStarted = false; EEPROMReadingStarted = false;
//Load settings
QSettings settings; QSettings settings;
firmware = settings.value("printer/firmware").toInt(); firmware = settings.value("printer/firmware").toInt();
} }
@ -23,9 +25,9 @@ Parser::~Parser()
void Parser::parse(QByteArray data) void Parser::parse(QByteArray data)
{ {
if(!data.isEmpty()) if(!data.isEmpty()) //Dont need to process empty strings
{ {
if(readingFiles) if(readingFiles) //SD files list reading mode
{ {
if(!data.contains("End file list")) SDFilesList.append(data); if(!data.contains("End file list")) SDFilesList.append(data);
else else
@ -36,7 +38,7 @@ void Parser::parse(QByteArray data)
return; return;
} }
if(readingEEPROM) if(readingEEPROM) // EEPROM reading mode
{ {
if(firmware == Repetier) if(firmware == Repetier)
{ {
@ -55,7 +57,6 @@ void Parser::parse(QByteArray data)
return; return;
} }
} }
/* /*
if(data.startsWith("ok")) if(data.startsWith("ok"))
{ {

2
parser.h
View File

@ -19,11 +19,11 @@ public:
protected: protected:
QByteArray data; QByteArray data;
QStringList SDFilesList; QStringList SDFilesList;
QRegExp temperatureRegxp;
int firmware; int firmware;
bool readingFiles; bool readingFiles;
bool readingEEPROM; bool readingEEPROM;
bool EEPROMReadingStarted; bool EEPROMReadingStarted;
QRegExp temperatureRegxp;
signals: signals:
void recievedTemperature(TemperatureReadings); void recievedTemperature(TemperatureReadings);