Commit 4e085f32 authored by Andrey Filippov's avatar Andrey Filippov

Merge commit 'ff9c8b72'

parents eebf08ba ff9c8b72
...@@ -9940,7 +9940,7 @@ if (MORE_BUTTONS) { ...@@ -9940,7 +9940,7 @@ if (MORE_BUTTONS) {
focusingMotors.addToHistory(ts,focusMeasurementParameters.sensorTemperature,metrics,rFullResults[0]); focusingMotors.addToHistory(ts,focusMeasurementParameters.sensorTemperature,metrics,rFullResults[0]);
// System.out.println("focusMeasurementParameters.lensDistanceWeightK="+focusMeasurementParameters.lensDistanceWeightK); // System.out.println("focusMeasurementParameters.lensDistanceWeightK="+focusMeasurementParameters.lensDistanceWeightK);
// System.out.println("focusMeasurementParameters.lensDistanceWeightY="+focusMeasurementParameters.lensDistanceWeightY); // System.out.println("focusMeasurementParameters.lensDistanceWeightY="+focusMeasurementParameters.lensDistanceWeightY);
if (debugLevel>0){ if ((debugLevel>0) && (metrics!=null)){
// see if lens is calibrated // see if lens is calibrated
double [] resolutions={1.0/metrics[1][6],1.0/metrics[5][6],1.0/metrics[2][6]}; // R,G,B double [] resolutions={1.0/metrics[1][6],1.0/metrics[5][6],1.0/metrics[2][6]}; // R,G,B
double fDistance=focusingMotors.focusingHistory.getLensDistance( double fDistance=focusingMotors.focusingHistory.getLensDistance(
......
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