Commit f54815de authored by Andrey Filippov's avatar Andrey Filippov

improving manual goniometer control

parent 7c971fec
...@@ -2602,7 +2602,10 @@ public class CalibrationHardwareInterface { ...@@ -2602,7 +2602,10 @@ public class CalibrationHardwareInterface {
this.targetPosition[motorNumber]=position; this.targetPosition[motorNumber]=position;
this.nanoReferenceTime=System.nanoTime(); this.nanoReferenceTime=System.nanoTime();
this.referencePosition=this.curpos.clone(); this.referencePosition=this.curpos.clone();
commandElphel10364Motors("http://"+this.ipAddress+"/10364.php?m"+(motorNumber+1)+"="+this.targetPosition[motorNumber]+"&enable"); // commandElphel10364Motors("http://"+this.ipAddress+"/10364.php?m"+(motorNumber+1)+"="+this.targetPosition[motorNumber]+"&enable");
// set, wait, enable (to avoid continuing "old" movement that was aborted by disable
commandElphel10364Motors("http://"+this.ipAddress+"/10364.php?m"+(motorNumber+1)+"="+this.targetPosition[motorNumber]+"sleep=1");
enableMotors(true);
nanoETA=System.nanoTime()+((long)(1E9*(Math.abs(this.targetPosition[motorNumber]-this.curpos[motorNumber])*(this.coefficientETA/this.stepsPerSecond)))); nanoETA=System.nanoTime()+((long)(1E9*(Math.abs(this.targetPosition[motorNumber]-this.curpos[motorNumber])*(this.coefficientETA/this.stepsPerSecond))));
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