Browse Source

Simpler G92 for SCARA

Scott Lahteine 9 years ago
parent
commit
92b4459f6c
1 changed files with 13 additions and 8 deletions
  1. 13
    8
      Marlin/Marlin_main.cpp

+ 13
- 8
Marlin/Marlin_main.cpp View File

3832
 
3832
 
3833
   LOOP_XYZE(i) {
3833
   LOOP_XYZE(i) {
3834
     if (code_seen(axis_codes[i])) {
3834
     if (code_seen(axis_codes[i])) {
3835
-      float p = current_position[i],
3836
-            v = code_value_axis_units(i);
3835
+      #if IS_SCARA
3836
+        current_position[i] = code_value_axis_units(i);
3837
+        if (i != E_AXIS) didXYZ = true;
3838
+      #else
3839
+        float p = current_position[i],
3840
+              v = code_value_axis_units(i);
3837
 
3841
 
3838
-      current_position[i] = v;
3842
+        current_position[i] = v;
3839
 
3843
 
3840
-      if (i != E_AXIS) {
3841
-        position_shift[i] += v - p; // Offset the coordinate space
3842
-        update_software_endstops((AxisEnum)i);
3843
-        didXYZ = true;
3844
-      }
3844
+        if (i != E_AXIS) {
3845
+          didXYZ = true;
3846
+          position_shift[i] += v - p; // Offset the coordinate space
3847
+          update_software_endstops((AxisEnum)i);
3848
+        }
3849
+      #endif
3845
     }
3850
     }
3846
   }
3851
   }
3847
   if (didXYZ)
3852
   if (didXYZ)

Loading…
Cancel
Save