claibration gui fixed

eez-open · Apr 7, 2020 · 4122f3c · 4122f3c
1 parent 33e25ee
commit 4122f3c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/eez/modules/psu/gui/calibration.cpp b/src/eez/modules/psu/gui/calibration.cpp
@@ -48,6 +48,8 @@ void showCurrentStep();
 ////////////////////////////////////////////////////////////////////////////////
 
 void onStartPasswordOk() {
+    popPage();
+
     channel_dispatcher::outputEnable(*g_channel, false);
 
     g_channel->clearProtection();
@@ -151,7 +153,7 @@ void setLevelValue() {
     options.flags.signButtonEnabled = true;
     options.flags.dotButtonEnabled = true;
 
-    NumericKeypad *numericKeypad = NumericKeypad::start(0, levelValue, options, onSetLevelOk, 0, showCurrentStep);
+    NumericKeypad *numericKeypad = NumericKeypad::start(0, levelValue, options, onSetLevelOk, nullptr, nullptr);
 
     if (levelValue.getFloat() < 1) {
         numericKeypad->switchToMilli();
@@ -221,7 +223,7 @@ void set() {
         options.flags.signButtonEnabled = true;
         options.flags.dotButtonEnabled = true;
 
-        NumericKeypad *numericKeypad = NumericKeypad::start(0, Value(), options, onSetOk, 0, showCurrentStep);
+        NumericKeypad *numericKeypad = NumericKeypad::start(0, Value(), options, onSetOk, nullptr, nullptr);
 
         if (getLevelValue().getFloat() < 0.001) {
             numericKeypad->switchToMicro();