More offset storage changes MBI made for 0040 which I'm reverting back

jetty840 · Feb 2, 2013 · f5307c9 · f5307c9
1 parent f35b5a9
commit f5307c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/src/replicatorg/app/Base.java b/src/replicatorg/app/Base.java
@@ -107,7 +107,7 @@ public enum InitialOpenBehavior {
 	/**
 	 * The textual representation of this version (4 digits, zero padded).
 	 */
-	public static final String VERSION_NAME = String.format("Sailfish - %04dr4",VERSION);
+	public static final String VERSION_NAME = String.format("Sailfish - %04dr5",VERSION);
 
 	/**
 	 * The machine controller in use.

diff --git a/src/replicatorg/drivers/gen3/MightyBoard.java b/src/replicatorg/drivers/gen3/MightyBoard.java
@@ -1043,13 +1043,13 @@ public double getToolheadsOffset(int axis) {
       Point5d stepsPerMM = getMachine().getStepsPerMM();
       switch(axis) {
         case 0:
-          val = (val)/stepsPerMM.x()/10.0;
+          val = (val)/stepsPerMM.x();
           break;
         case 1:
-          val = (val)/stepsPerMM.y()/10.0;
+          val = (val)/stepsPerMM.y();
           break;
         case 2:
-          val = (val)/stepsPerMM.z()/10.0;
+          val = (val)/stepsPerMM.z();
           break;
       }
 
@@ -1117,13 +1117,13 @@ public void eepromStoreToolDelta(int axis, double distanceMm) {
       Point5d stepsPerMM = getMachine().getStepsPerMM();
       switch(axis) {
         case 0:
-          offsetSteps = (int)(distanceMm*stepsPerMM.x()*10.0);
+          offsetSteps = (int)(distanceMm*stepsPerMM.x());
           break;
         case 1:
-          offsetSteps = (int)(distanceMm*stepsPerMM.y()*10.0);
+          offsetSteps = (int)(distanceMm*stepsPerMM.y());
           break;
         case 2:
-          offsetSteps = (int)(distanceMm*stepsPerMM.z()*10.0);
+          offsetSteps = (int)(distanceMm*stepsPerMM.z());
           break;
       }
     }else{

diff --git a/src/replicatorg/drivers/gen3/MightySailfish.java b/src/replicatorg/drivers/gen3/MightySailfish.java
@@ -1179,17 +1179,18 @@ public double getToolheadsOffset(int axis) {
 		checkEEPROM();
 
 		double val = read32FromEEPROM(MightySailfish5XEEPROM.TOOLHEAD_OFFSET_SETTINGS + axis*4);
+		Base.logger.fine("Reading tool " + axis + " offset of " + val + " steps");
 
       Point5d stepsPerMM = getMachine().getStepsPerMM();
       switch(axis) {
         case 0:
-          val = (val)/stepsPerMM.x()/10.0;
+		val = (val)/stepsPerMM.x();
           break;
         case 1:
-          val = (val)/stepsPerMM.y()/10.0;
+		val = (val)/stepsPerMM.y();
           break;
         case 2:
-          val = (val)/stepsPerMM.z()/10.0;
+		val = (val)/stepsPerMM.z();
           break;
       }
 		return val;
@@ -1236,15 +1237,16 @@ public void eepromStoreToolDelta(int axis, double distanceMm) {
       Point5d stepsPerMM = getMachine().getStepsPerMM();
       switch(axis) {
         case 0:
-          offsetSteps = (int)(distanceMm*stepsPerMM.x()*10.0);
+          offsetSteps = (int)(distanceMm*stepsPerMM.x());
           break;
         case 1:
-          offsetSteps = (int)(distanceMm*stepsPerMM.y()*10.0);
+          offsetSteps = (int)(distanceMm*stepsPerMM.y());
           break;
         case 2:
-          offsetSteps = (int)(distanceMm*stepsPerMM.z()*10.0);
+          offsetSteps = (int)(distanceMm*stepsPerMM.z());
           break;
       }
+                Base.logger.fine("Sending tool " + axis + " offset of " + offsetSteps + "steps");
 		write32ToEEPROM32(MightySailfish5XEEPROM.TOOLHEAD_OFFSET_SETTINGS + axis*4,offsetSteps);
 	}