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

Merge pull request #7 from J0eC00l/master

Browse Source 
Typo fix + additions to .gitignore
This commit is contained in:
NeoTheFox 2015-03-18 01:06:02 +03:00
commit 61f1fc66c2
7 changed files with 113 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -1 +1,8 @@
./RepRaptor RepRaptor
Makefile
*.user
*.o
ui_*.h
moc_*
qrc_*
*~

38
mainwindow.cpp
View File

@ -110,27 +110,27 @@ MainWindow::MainWindow(QWidget *parent) :
//Parser thread signal-slots and init //Parser thread signal-slots and init
parserWorker->moveToThread(parserThread); parserWorker->moveToThread(parserThread);
connect(parserThread, &QThread::finished, parserWorker, &QObject::deleteLater); connect(parserThread, &QThread::finished, parserWorker, &QObject::deleteLater);
connect(this, &MainWindow::recievedData, parserWorker, &Parser::parse); connect(this, &MainWindow::receivedData, parserWorker, &Parser::parse);
connect(this, &MainWindow::startedReadingEEPROM, parserWorker, &Parser::setEEPROMReadingMode); connect(this, &MainWindow::startedReadingEEPROM, parserWorker, &Parser::setEEPROMReadingMode);
connect(parserWorker, &Parser::recievedTemperature, this, &MainWindow::updateTemperature); connect(parserWorker, &Parser::receivedTemperature, this, &MainWindow::updateTemperature);
connect(parserWorker, &Parser::recievedSDFilesList, this, &MainWindow::initSDprinting); connect(parserWorker, &Parser::receivedSDFilesList, this, &MainWindow::initSDprinting);
connect(parserWorker, &Parser::recievedEEPROMLine, this, &MainWindow::EEPROMSettingRecieved); connect(parserWorker, &Parser::receivedEEPROMLine, this, &MainWindow::EEPROMSettingReceived);
connect(parserWorker, &Parser::recievingEEPROMDone, this, &MainWindow::openEEPROMeditor); connect(parserWorker, &Parser::recievingEEPROMDone, this, &MainWindow::openEEPROMeditor);
connect(parserWorker, &Parser::recievedError, this, &MainWindow::recievedError); connect(parserWorker, &Parser::receivedError, this, &MainWindow::receivedError);
connect(parserWorker, &Parser::recievedSDDone, this, &MainWindow::recievedSDDone); connect(parserWorker, &Parser::receivedSDDone, this, &MainWindow::receivedSDDone);
connect(parserWorker, &Parser::recievedSDUpdate, this, &MainWindow::updateSDStatus); connect(parserWorker, &Parser::receivedSDUpdate, this, &MainWindow::updateSDStatus);
parserThread->start(); parserThread->start();
//Sender thread signal-slots and init //Sender thread signal-slots and init
senderWorker->moveToThread(senderThread); senderWorker->moveToThread(senderThread);
connect(senderThread, &QThread::finished, senderWorker, &QObject::deleteLater); connect(senderThread, &QThread::finished, senderWorker, &QObject::deleteLater);
connect(parserWorker, &Parser::recievedOkNum, senderWorker, &Sender::recievedOkNum); connect(parserWorker, &Parser::receivedOkNum, senderWorker, &Sender::receivedOkNum);
connect(parserWorker, &Parser::recievedOkWait, senderWorker, &Sender::recievedOkWait); connect(parserWorker, &Parser::receivedOkWait, senderWorker, &Sender::receivedOkWait);
connect(parserWorker, &Parser::recievedResend, senderWorker, &Sender::recievedResend); connect(parserWorker, &Parser::receivedResend, senderWorker, &Sender::receivedResend);
connect(parserWorker, &Parser::recievedStart, senderWorker, &Sender::recievedStart); connect(parserWorker, &Parser::receivedStart, senderWorker, &Sender::receivedStart);
connect(senderWorker, &Sender::errorRecieved, this, &MainWindow::serialError); connect(senderWorker, &Sender::errorReceived, this, &MainWindow::serialError);
connect(senderWorker, &Sender::dataRecieved, parserWorker, &Parser::parse, Qt::QueuedConnection); connect(senderWorker, &Sender::dataReceived, parserWorker, &Parser::parse, Qt::QueuedConnection);
connect(senderWorker, &Sender::dataRecieved, this, &MainWindow::readSerial, Qt::QueuedConnection); connect(senderWorker, &Sender::dataReceived, this, &MainWindow::readSerial, Qt::QueuedConnection);
connect(senderWorker, &Sender::reportProgress, this, &MainWindow::updateFileProgress); connect(senderWorker, &Sender::reportProgress, this, &MainWindow::updateFileProgress);
connect(senderWorker, &Sender::baudrateSetFailed, this, &MainWindow::baudrateSetFailed); connect(senderWorker, &Sender::baudrateSetFailed, this, &MainWindow::baudrateSetFailed);
connect(this, &MainWindow::setFile, senderWorker, &Sender::setFile); connect(this, &MainWindow::setFile, senderWorker, &Sender::setFile);
@ -587,7 +587,7 @@ void MainWindow::checkStatus()
//We want to check for few things here: //We want to check for few things here:
//if we are checking temperature at all and //if we are checking temperature at all and
//if the time passed from the time we last //if the time passed from the time we last
//recieved update is more than the check //received update is more than the check
//interval //interval
if(checkingTemperature if(checkingTemperature
&&(sinceLastTemp->elapsed() > statusTimer->interval())) emit injectCommand("M105"); &&(sinceLastTemp->elapsed() > statusTimer->interval())) emit injectCommand("M105");
@ -818,19 +818,19 @@ void MainWindow::sendEEPROMsettings(QStringList changes)
} }
} }
void MainWindow::EEPROMSettingRecieved(QString esetting) void MainWindow::EEPROMSettingReceived(QString esetting)
{ {
EEPROMSettings.append(esetting); EEPROMSettings.append(esetting);
} }
void MainWindow::recievedError() void MainWindow::receivedError()
{ {
//This should be raised if "!!" recieved //This should be raised if "!!" received
ErrorWindow errorwindow(this,"Hardware failure"); ErrorWindow errorwindow(this,"Hardware failure");
errorwindow.exec(); errorwindow.exec();
} }
void MainWindow::recievedSDDone() void MainWindow::receivedSDDone()
{ {
sdprinting=false; sdprinting=false;
ui->progressBar->setValue(0); ui->progressBar->setValue(0);

8
mainwindow.h
View File

@ -94,9 +94,9 @@ private slots:
void openEEPROMeditor(); void openEEPROMeditor();
void sendEEPROMsettings(QStringList changes); void sendEEPROMsettings(QStringList changes);
void updateTemperature(TemperatureReadings r); void updateTemperature(TemperatureReadings r);
void EEPROMSettingRecieved(QString esetting); void EEPROMSettingReceived(QString esetting);
void recievedError(); void receivedError();
void recievedSDDone(); void receivedSDDone();
void parseFile(QString filename); void parseFile(QString filename);
void recentClicked(); void recentClicked();
void updateFileProgress(FileProgress); void updateFileProgress(FileProgress);
@ -149,7 +149,7 @@ private slots:
signals: signals:
void sdReady(); void sdReady();
void eepromReady(); void eepromReady();
void recievedData(QByteArray); void receivedData(QByteArray);
void startedReadingEEPROM(); void startedReadingEEPROM();
void openPort(QSerialPortInfo i); void openPort(QSerialPortInfo i);

26
parser.cpp
View File

@ -33,7 +33,7 @@ void Parser::parse(QByteArray data)
else else
{ {
readingFiles = false; readingFiles = false;
emit recievedSDFilesList(SDFilesList); emit receivedSDFilesList(SDFilesList);
} }
return; return;
} }
@ -44,7 +44,7 @@ void Parser::parse(QByteArray data)
{ {
if(data.startsWith("EPR")) if(data.startsWith("EPR"))
{ {
emit recievedEEPROMLine(QString(data)); emit receivedEEPROMLine(QString(data));
EEPROMReadingStarted = true; EEPROMReadingStarted = true;
} }
else if(EEPROMReadingStarted) else if(EEPROMReadingStarted)
@ -62,8 +62,8 @@ void Parser::parse(QByteArray data)
{ {
QStringList tmp = QString(data).split(' '); QStringList tmp = QString(data).split(' ');
if(tmp.size() > 1) if(tmp.size() > 1)
emit recievedOkNum(tmp.at(1).toInt()); emit receivedOkNum(tmp.at(1).toInt());
else emit recievedOkNum(0); else emit receivedOkNum(0);
} }
*/ */
else if(data.contains("T:")) else if(data.contains("T:"))
@ -79,14 +79,14 @@ void Parser::parse(QByteArray data)
r.raw = QString(data); r.raw = QString(data);
emit recievedTemperature(r); emit receivedTemperature(r);
} }
//else if(data.startsWith("wait")) emit recievedOkWait(); //else if(data.startsWith("wait")) emit receivedOkWait();
else if(data.startsWith("rs") || data.toLower().startsWith("resend")) else if(data.startsWith("rs") || data.toLower().startsWith("resend"))
emit recievedResend(data.split(':').at(1).toInt()); emit receivedResend(data.split(':').at(1).toInt());
else if(data.startsWith("!!")) emit recievedError(); else if(data.startsWith("!!")) emit receivedError();
else if(data.startsWith("Done")) emit recievedSDDone(); else if(data.startsWith("Done")) emit receivedSDDone();
else if(data.startsWith("start")) emit recievedStart(); else if(data.startsWith("start")) emit receivedStart();
else if(data.startsWith("SD pr")) else if(data.startsWith("SD pr"))
{ {
SDProgress p; SDProgress p;
@ -102,7 +102,7 @@ void Parser::parse(QByteArray data)
} }
else return; else return;
emit recievedSDUpdate(p); emit receivedSDUpdate(p);
} }
else if(data.startsWith("Not SD ")); else if(data.startsWith("Not SD "));
@ -111,8 +111,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 receivedFirmware(Repetier);
//else if(data.contains("MARLIN")) emit recievedFirmware(Marlin); //else if(data.contains("MARLIN")) emit receivedFirmware(Marlin);
} }
} }

22
parser.h
View File

@ -26,18 +26,18 @@ protected:
bool EEPROMReadingStarted; bool EEPROMReadingStarted;
signals: signals:
void recievedTemperature(TemperatureReadings); void receivedTemperature(TemperatureReadings);
void recievedSDUpdate(SDProgress); void receivedSDUpdate(SDProgress);
void recievedEEPROMLine(QString); void receivedEEPROMLine(QString);
void recievingEEPROMDone(); void recievingEEPROMDone();
void recievedSDFilesList(QStringList); void receivedSDFilesList(QStringList);
void recievedOkWait(); void receivedOkWait();
void recievedOkNum(int); void receivedOkNum(int);
void recievedStart(); void receivedStart();
void recievedResend(int); void receivedResend(int);
void recievedError(); void receivedError();
void recievedFirmware(int); void receivedFirmware(int);
void recievedSDDone(); void receivedSDDone();
public slots: public slots:
void parse(QByteArray data); void parse(QByteArray data);

67
sender.cpp
View File

@ -11,7 +11,7 @@ Sender::Sender(QObject *parent) : QObject(parent)
sendingChecksum=false; sendingChecksum=false;
paused=false; paused=false;
sending=false; sending=false;
readyRecieve = false; readyReceive = false;
printer = new QSerialPort(this); printer = new QSerialPort(this);
sendTimer = new QTimer(this); sendTimer = new QTimer(this);
@ -22,8 +22,8 @@ Sender::Sender(QObject *parent) : QObject(parent)
sendTimer->start(); sendTimer->start();
connect(printer, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(recievedError(QSerialPort::SerialPortError))); connect(printer, SIGNAL(error(QSerialPort::SerialPortError)), this, SLOT(receivedError(QSerialPort::SerialPortError)));
connect(printer, &QSerialPort::readyRead, this, &Sender::recievedData); connect(printer, &QSerialPort::readyRead, this, &Sender::receivedData);
connect(sendTimer, &QTimer::timeout, this, &Sender::sendNext); connect(sendTimer, &QTimer::timeout, this, &Sender::sendNext);
} }
@ -36,7 +36,7 @@ Sender::~Sender()
//Mainloop of sending //Mainloop of sending
void Sender::sendNext() void Sender::sendNext()
{ {
if(printer->isWritable() && readyRecieve) if(printer->isWritable() && readyReceive)
{ {
if(sendingChecksum && resending) if(sendingChecksum && resending)
{ {
@ -62,7 +62,7 @@ void Sender::sendNext()
if(!userCommands.isEmpty()) //Inject user command if(!userCommands.isEmpty()) //Inject user command
{ {
sendLine(userCommands.dequeue()); sendLine(userCommands.dequeue());
readyRecieve = false; readyReceive = false;
return; return;
} }
else if(sending && !paused) //Send line of gcode else if(sending && !paused) //Send line of gcode
@ -82,7 +82,7 @@ void Sender::sendNext()
} }
sendLine(gcode.at(currentLine)); sendLine(gcode.at(currentLine));
currentLine++; currentLine++;
readyRecieve=false; readyReceive=false;
p.P = currentLine; p.P = currentLine;
p.T = gcode.size(); p.T = gcode.size();
@ -121,6 +121,37 @@ void Sender::openPort(QSerialPortInfo i)
if(!printer->isOpen() && printer->open(QIODevice::ReadWrite)) if(!printer->isOpen() && printer->open(QIODevice::ReadWrite))
{ {
//Moved here to be compatible with Qt 5.2.1 //Moved here to be compatible with Qt 5.2.1
switch(baudrate)
{
case 4800:
printer->setBaudRate(QSerialPort::Baud4800);
break;
case 9600:
printer->setBaudRate(QSerialPort::Baud9600);
break;
case 19200:
printer->setBaudRate(QSerialPort::Baud19200);
break;
case 38400:
printer->setBaudRate(QSerialPort::Baud38400);
break;
case 57600:
printer->setBaudRate(QSerialPort::Baud57600);
break;
case 115200:
printer->setBaudRate(QSerialPort::Baud115200);
break;
default:
printer->setBaudRate(baudrate);
break;
}
if(!printer->setBaudRate(baudrate)) if(!printer->setBaudRate(baudrate))
emit baudrateSetFailed(baudrate); emit baudrateSetFailed(baudrate);
printer->setFlowControl(QSerialPort::HardwareControl); printer->setFlowControl(QSerialPort::HardwareControl);
@ -168,19 +199,19 @@ void Sender::injectCommand(QString command)
if(!userCommands.contains(command)) userCommands.enqueue(command); if(!userCommands.contains(command)) userCommands.enqueue(command);
} }
void Sender::recievedOkWait() void Sender::receivedOkWait()
{ {
readyRecieve = true; readyReceive = true;
} }
void Sender::recievedOkNum(int) void Sender::receivedOkNum(int)
{ {
readyRecieve = true; readyReceive = true;
} }
void Sender::recievedStart() void Sender::receivedStart()
{ {
readyRecieve = true; readyReceive = true;
} }
void Sender::flushInjectionBuffer() void Sender::flushInjectionBuffer()
@ -188,7 +219,7 @@ void Sender::flushInjectionBuffer()
userCommands.clear(); userCommands.clear();
} }
void Sender::recievedResend(int r) void Sender::receivedResend(int r)
{ {
if(sendingChecksum) if(sendingChecksum)
{ {
@ -198,23 +229,23 @@ void Sender::recievedResend(int r)
else currentLine--; else currentLine--;
} }
void Sender::recievedData() void Sender::receivedData()
{ {
if(printer->canReadLine()) if(printer->canReadLine())
{ {
QByteArray data = printer->readLine(); QByteArray data = printer->readLine();
if(data == "") return; if(data == "") return;
emit dataRecieved(data); emit dataReceived(data);
//Yeah, yeah, I know. This class is called "Sender", but checking this here is faster. //Yeah, yeah, I know. This class is called "Sender", but checking this here is faster.
if(data.startsWith("ok") || data.startsWith("wa")) readyRecieve=true; if(data.startsWith("ok") || data.startsWith("wa")) readyReceive=true;
} }
} }
void Sender::recievedError(QSerialPort::SerialPortError error) void Sender::receivedError(QSerialPort::SerialPortError error)
{ {
if(error > 0) if(error > 0)
{ {
closePort(); closePort();
emit errorRecieved(error); emit errorReceived(error);
} }
} }

18
sender.h
View File

@ -29,7 +29,7 @@ protected:
unsigned int baudrate; unsigned int baudrate;
bool paused; bool paused;
bool sending; bool sending;
bool readyRecieve; bool readyReceive;
bool sendingChecksum; bool sendingChecksum;
bool resending; bool resending;
QQueue <QString> userCommands; QQueue <QString> userCommands;
@ -39,8 +39,8 @@ protected:
bool sendLine(QString s); bool sendLine(QString s);
signals: signals:
void errorRecieved(QSerialPort::SerialPortError error); void errorReceived(QSerialPort::SerialPortError error);
void dataRecieved(QByteArray data); void dataReceived(QByteArray data);
void reportProgress(FileProgress p); void reportProgress(FileProgress p);
void baudrateSetFailed(int b); void baudrateSetFailed(int b);
@ -55,15 +55,15 @@ public slots:
void injectCommand(QString); void injectCommand(QString);
void flushInjectionBuffer(); void flushInjectionBuffer();
void recievedOkWait(); void receivedOkWait();
void recievedOkNum(int); void receivedOkNum(int);
void recievedStart(); void receivedStart();
void recievedResend(int r); void receivedResend(int r);
void sendNext(); void sendNext();
void recievedData(); void receivedData();
void recievedError(QSerialPort::SerialPortError error); void receivedError(QSerialPort::SerialPortError error);
}; };
#endif // SENDER_H #endif // SENDER_H