Commit 0315a283 authored by Andrey Filippov's avatar Andrey Filippov

bug fixes

parent d4ce4ae9
...@@ -4005,7 +4005,7 @@ if (MORE_BUTTONS) { ...@@ -4005,7 +4005,7 @@ if (MORE_BUTTONS) {
if (label.equals("Scan Calib LMA")) { if (label.equals("Scan Calib LMA")) {
DEBUG_LEVEL=MASTER_DEBUG_LEVEL; DEBUG_LEVEL=MASTER_DEBUG_LEVEL;
checkSerialAndRestore(); // returns true if did not change or was restored checkSerialAndRestore(); // returns true if did not change or was restored
if (FOCUS_MEASUREMENT_PARAMETERS.showScanningSetup("Setup scanning parameters for LMA")) return; if (!FOCUS_MEASUREMENT_PARAMETERS.showScanningSetup("Setup scanning parameters for LMA")) return;
MOTORS.setHysteresis(FOCUS_MEASUREMENT_PARAMETERS.motorHysteresis); MOTORS.setHysteresis(FOCUS_MEASUREMENT_PARAMETERS.motorHysteresis);
MOTORS.setDebug(FOCUS_MEASUREMENT_PARAMETERS.motorDebug); MOTORS.setDebug(FOCUS_MEASUREMENT_PARAMETERS.motorDebug);
double[] range= ScanFocusTilt( double[] range= ScanFocusTilt(
......
...@@ -1376,8 +1376,8 @@ public class LensAdjustment { ...@@ -1376,8 +1376,8 @@ public class LensAdjustment {
this.scanTiltRangeY= (int) gd.getNextNumber(); this.scanTiltRangeY= (int) gd.getNextNumber();
this.scanTiltStepsX= (int) gd.getNextNumber(); this.scanTiltStepsX= (int) gd.getNextNumber();
this.scanTiltStepsY= (int) gd.getNextNumber(); this.scanTiltStepsY= (int) gd.getNextNumber();
this.compensateHysteresis= gd.getNextBoolean(); this.motorHysteresis= (int) gd.getNextNumber();
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment