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

Allow PSU abort from PSU calibration (#115) 

* Allow PSU abort from PSU calibration

* Fix indentation
This commit is contained in:
jrwwallis 2020-02-18 15:07:26 -08:00 committed by GitHub
parent f6901671f4
commit e7c5e4e687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Desktop_Interface/mainwindow.cpp
View File

@ -2203,6 +2203,13 @@ void MainWindow::on_actionCalibrate_2_triggered()
{
qDebug() << "Calibrating PSU!";
if (!ui->controller_iso->driver->connected) {
calibrationMessages->setStandardButtons(QMessageBox::Ok);
calibrationMessages->setText("You need to connect the board before calibrating it!");
calibrationMessages->exec();
return;
}
//Abort if Scope is uncalibrated
if ((ui->controller_iso->ch1_ref == 1.65) && (ui->controller_iso->ch2_ref == 1.65) && (ui->controller_iso->frontendGain_CH1 == R4/(R3+R4)) && (ui->controller_iso->frontendGain_CH2 == R4/(R3+R4)))\
{
@ -2212,9 +2219,11 @@ void MainWindow::on_actionCalibrate_2_triggered()
return;
}
calibrationMessages->setStandardButtons(QMessageBox::Ok);
calibrationMessages->setStandardButtons(QMessageBox::Ok|QMessageBox::Cancel);
calibrationMessages->setText("Power Supply calibration requires me to control your power supply temporarily. \n\nTO PREVENT BLUE SMOKE DAMAGE, DISCONNECT ANY CIRCUIT ATTACHED TO YOUR POWER SUPPLY NOW.");
calibrationMessages->exec();
if (calibrationMessages->exec() == QMessageBox::Cancel) {
return;
}
qDebug() << "Beginning PSU calibration!";