mirror of https://github.com/EspoTek/Labrador.git
Fixed Multimeter not displaying
This commit is contained in:
parent
642f0c6d7f
commit
ac0dda3d91
Binary file not shown.
|
@ -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()));
|
||||
|
|
|
@ -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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue