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

typo

Browse Source
This commit is contained in:
Joe Cool 2015-03-17 22:51:15 +01:00
parent 376428070c
commit 7bc963e526
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
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);
@ -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();
@ -132,6 +132,18 @@ void Sender::openPort(QSerialPortInfo i)
printer->setBaudRate(QSerialPort::Baud9600); printer->setBaudRate(QSerialPort::Baud9600);
break; break;
case 19200:
printer->setBaudRate(QSerialPort::Baud19200);
break;
case 38400:
printer->setBaudRate(QSerialPort::Baud38400);
break;
case 57600:
printer->setBaudRate(QSerialPort::Baud57600);
break;
case 115200: case 115200:
printer->setBaudRate(QSerialPort::Baud115200); printer->setBaudRate(QSerialPort::Baud115200);
break; break;
@ -186,17 +198,17 @@ void Sender::injectCommand(QString command)
void Sender::receivedOkWait() void Sender::receivedOkWait()
{ {
readyRecieve = true; readyReceive = true;
} }
void Sender::receivedOkNum(int) void Sender::receivedOkNum(int)
{ {
readyRecieve = true; readyReceive = true;
} }
void Sender::receivedStart() void Sender::receivedStart()
{ {
readyRecieve = true; readyReceive = true;
} }
void Sender::flushInjectionBuffer() void Sender::flushInjectionBuffer()
@ -222,7 +234,7 @@ void Sender::receivedData()
if(data == "") return; if(data == "") return;
emit dataReceived(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;
} }
} }

2
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;