Fixed Multimeter not displaying

This commit is contained in:
EspoTek 2017-04-09 15:38:39 +10:00
parent 642f0c6d7f
commit ac0dda3d91
11 changed files with 3 additions and 1 deletions

Binary file not shown.

View File

@ -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()));

View File

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

Binary file not shown.

View File

@ -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);
}