Added warning if baudrate set failed
This commit is contained in:
parent
1162748acd
commit
16de411b2d
@ -130,6 +130,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||||||
connect(senderWorker, &Sender::dataRecieved, parserWorker, &Parser::parse, Qt::QueuedConnection);
|
connect(senderWorker, &Sender::dataRecieved, parserWorker, &Parser::parse, Qt::QueuedConnection);
|
||||||
connect(senderWorker, &Sender::dataRecieved, this, &MainWindow::readSerial, Qt::QueuedConnection);
|
connect(senderWorker, &Sender::dataRecieved, 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(this, &MainWindow::setFile, senderWorker, &Sender::setFile);
|
connect(this, &MainWindow::setFile, senderWorker, &Sender::setFile);
|
||||||
connect(this, &MainWindow::startPrinting, senderWorker, &Sender::startPrinting);
|
connect(this, &MainWindow::startPrinting, senderWorker, &Sender::startPrinting);
|
||||||
connect(this, &MainWindow::stopPrinting, senderWorker, &Sender::stopPrinting);
|
connect(this, &MainWindow::stopPrinting, senderWorker, &Sender::stopPrinting);
|
||||||
@ -860,6 +861,14 @@ void MainWindow::updateFileProgress(FileProgress p)
|
|||||||
ui->progressBar->setValue(((float)p.P/p.T) * 100);
|
ui->progressBar->setValue(((float)p.P/p.T) * 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::baudrateSetFailed(int b)
|
||||||
|
{
|
||||||
|
ErrorWindow errorwindow(this, QString("Baudrate set failed:\n" +
|
||||||
|
QString::number(b) +
|
||||||
|
" baud"));
|
||||||
|
errorwindow.show();
|
||||||
|
}
|
||||||
|
|
||||||
//Needed for keypress handling
|
//Needed for keypress handling
|
||||||
bool MainWindow::eventFilter(QObject *obj, QEvent *event)
|
bool MainWindow::eventFilter(QObject *obj, QEvent *event)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -98,6 +98,7 @@ private slots:
|
|||||||
void parseFile(QString filename);
|
void parseFile(QString filename);
|
||||||
void recentClicked();
|
void recentClicked();
|
||||||
void updateFileProgress(FileProgress);
|
void updateFileProgress(FileProgress);
|
||||||
|
void baudrateSetFailed(int b);
|
||||||
|
|
||||||
void xplus();
|
void xplus();
|
||||||
void yplus();
|
void yplus();
|
||||||
|
|||||||
21
sender.cpp
21
sender.cpp
@ -122,25 +122,8 @@ void Sender::openPort(QSerialPortInfo i)
|
|||||||
{
|
{
|
||||||
|
|
||||||
//Moved here to be compatible with Qt 5.2.1
|
//Moved here to be compatible with Qt 5.2.1
|
||||||
switch(baudrate)
|
if(!printer->setBaudRate(baudrate))
|
||||||
{
|
emit baudrateSetFailed(baudrate);
|
||||||
case 4800:
|
|
||||||
printer->setBaudRate(QSerialPort::Baud4800);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 9600:
|
|
||||||
printer->setBaudRate(QSerialPort::Baud9600);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 115200:
|
|
||||||
printer->setBaudRate(QSerialPort::Baud115200);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
printer->setBaudRate(baudrate);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
printer->setFlowControl(QSerialPort::HardwareControl);
|
printer->setFlowControl(QSerialPort::HardwareControl);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1
sender.h
1
sender.h
@ -42,6 +42,7 @@ signals:
|
|||||||
void errorRecieved(QSerialPort::SerialPortError error);
|
void errorRecieved(QSerialPort::SerialPortError error);
|
||||||
void dataRecieved(QByteArray data);
|
void dataRecieved(QByteArray data);
|
||||||
void reportProgress(FileProgress p);
|
void reportProgress(FileProgress p);
|
||||||
|
void baudrateSetFailed(int b);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void openPort(QSerialPortInfo i);
|
void openPort(QSerialPortInfo i);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user