mirrors
/
Labrador
mirror of https://github.com/EspoTek/Labrador.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extended last patch to CH2 also.

This commit is contained in:
EspoTek 2017-11-28 15:31:33 +11:00
parent a795603d73
commit 2e803a6f94
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Desktop_Interface/mainwindow.cpp
View File

@ -1693,6 +1693,7 @@ void MainWindow::serialEmergencyDisable(int channel){
//Bring back the lost text.
ui->console1->setVisible(true);
//Warn the user that the wire has been disconnected.
QApplication::beep();
ui->console1->appendPlainText("\n\n***Error:UART is not connected***\n***Serial Decoding has been disabled***");
//Scroll to end of console.
QTextCursor c = ui->console1->textCursor();
@ -1700,7 +1701,18 @@ void MainWindow::serialEmergencyDisable(int channel){
ui->console1->setTextCursor(c);
}
else{
//Disable the serial as if the user turned it off manually.
ui->serialDecodingCheck_CH2->setChecked(false);
//Bring back the lost text.
ui->console2->setVisible(true);
//Warn the user that the wire has been disconnected.
QApplication::beep();
ui->console2->appendPlainText("\n\n***Error:UART is not connected***\n***Serial Decoding has been disabled***");
//Scroll to end of console.
QTextCursor c = ui->console2->textCursor();
c.movePosition(QTextCursor::End);
ui->console2->setTextCursor(c);
}
}

2
Desktop_Interface/uartstyledecoder.cpp
View File

@ -68,7 +68,7 @@ void uartStyleDecoder::serialDecode(double baudRate)
//Not a single stop bit, or idle bit, in the whole stream. Wire must be disconnected.
if(allZeroes){
qDebug() << "Wire Disconnect detected!";
wireDisconnected(1);
wireDisconnected(parent->channel);
parent->stopDecoding = true;
updateTimer->stop();
}