diff --git a/Desktop_Interface/bin/Labrador.exe b/Desktop_Interface/bin/Labrador.exe index 65a1a8ca..304b9289 100644 Binary files a/Desktop_Interface/bin/Labrador.exe and b/Desktop_Interface/bin/Labrador.exe differ diff --git a/Desktop_Interface/isodriver.cpp b/Desktop_Interface/isodriver.cpp index a0234e23..75e68bfb 100644 --- a/Desktop_Interface/isodriver.cpp +++ b/Desktop_Interface/isodriver.cpp @@ -845,6 +845,7 @@ void isoDriver::setSeriesResistance(double resistance){ } void isoDriver::multimeterStats(){ + //qDebug() << "Entering isoDriver::multimeterStats()"; if (!multimeterShow) return; QTimer::singleShot(MULTIMETER_PERIOD, this, SLOT(enableMM())); diff --git a/Desktop_Interface/isodriver.h b/Desktop_Interface/isodriver.h index 9485a3d7..db533e64 100644 --- a/Desktop_Interface/isodriver.h +++ b/Desktop_Interface/isodriver.h @@ -47,7 +47,7 @@ private: bool placingHoriAxes = false, placingVertAxes = false, horiCursorEnabled = false, vertCursorEnabled = false; bool triggerSeeking = true; bool triggerEnabled = false; - bool multimeterShow = false; + bool multimeterShow = true; bool autoMultimeterV = true; bool autoMultimeterI = true; bool forceMillivolts = false; diff --git a/Desktop_Interface/release/buffercontrol.obj b/Desktop_Interface/release/buffercontrol.obj index 18e25e85..9b5b23d2 100644 Binary files a/Desktop_Interface/release/buffercontrol.obj and b/Desktop_Interface/release/buffercontrol.obj differ diff --git a/Desktop_Interface/release/isobuffer.obj b/Desktop_Interface/release/isobuffer.obj index 7f03fd12..d996a0a6 100644 Binary files a/Desktop_Interface/release/isobuffer.obj and b/Desktop_Interface/release/isobuffer.obj differ diff --git a/Desktop_Interface/release/isodriver.obj b/Desktop_Interface/release/isodriver.obj index 28853d70..c1bdac3b 100644 Binary files a/Desktop_Interface/release/isodriver.obj and b/Desktop_Interface/release/isodriver.obj differ diff --git a/Desktop_Interface/release/main.obj b/Desktop_Interface/release/main.obj index d42d7599..1858c648 100644 Binary files a/Desktop_Interface/release/main.obj and b/Desktop_Interface/release/main.obj differ diff --git a/Desktop_Interface/release/mainwindow.obj b/Desktop_Interface/release/mainwindow.obj index 4a34188e..c7753a7e 100644 Binary files a/Desktop_Interface/release/mainwindow.obj and b/Desktop_Interface/release/mainwindow.obj differ diff --git a/Desktop_Interface/release/moc_isodriver.obj b/Desktop_Interface/release/moc_isodriver.obj index d97d52b5..f4352ef0 100644 Binary files a/Desktop_Interface/release/moc_isodriver.obj and b/Desktop_Interface/release/moc_isodriver.obj differ diff --git a/Desktop_Interface/release/moc_mainwindow.obj b/Desktop_Interface/release/moc_mainwindow.obj index cf96d8e9..b47cbe92 100644 Binary files a/Desktop_Interface/release/moc_mainwindow.obj and b/Desktop_Interface/release/moc_mainwindow.obj differ diff --git a/Desktop_Interface/ui_elements/buffercontrol.cpp b/Desktop_Interface/ui_elements/buffercontrol.cpp index e37cdb33..188b4088 100644 --- a/Desktop_Interface/ui_elements/buffercontrol.cpp +++ b/Desktop_Interface/ui_elements/buffercontrol.cpp @@ -37,6 +37,7 @@ void bufferControl::scopeIn_CH1(bool state){ //What about DSR!? scopeUncheck(0); } + //Turn off the DSR when CH1 is disabled. if(!state){ scopeDsrUncheck(0); }