From ab09b8906f51e094e699d9894b769f0de2b4ec43 Mon Sep 17 00:00:00 2001
From: Alden Hart <alden08@harts.org>
Date: Mon, 2 Jan 2017 10:24:29 -0500
Subject: [PATCH] Fixes and regressions for G28/G30 operating in
 absolute_distance_mode; Most of the files are the change from ABSOLUTE_MODE
 to ABSOLUTE_DISTANCE_MODE and similar for INCREMENTAL_MODE.

---
 g2core/canonical_machine.cpp                  | 56 ++++++++++---------
 g2core/canonical_machine.h                    |  8 +--
 g2core/cycle_homing.cpp                       |  2 +-
 g2core/cycle_jogging.cpp                      |  2 +-
 g2core/cycle_probing.cpp                      |  4 +-
 g2core/gcode_parser.cpp                       |  8 +--
 g2core/plan_arc.cpp                           |  4 +-
 g2core/settings/settings_Printrbot_Play.h     |  2 +-
 g2core/settings/settings_Printrbot_Plus.h     |  2 +-
 .../settings/settings_Printrbot_Simple_1403.h |  2 +-
 .../settings/settings_Printrbot_Simple_1608.h |  2 +-
 g2core/settings/settings_Ultimaker.h          |  2 +-
 g2core/settings/settings_default.h            |  2 +-
 g2core/settings/settings_makeblock.h          |  2 +-
 g2core/settings/settings_othermill.h          |  2 +-
 g2core/settings/settings_othermill_test.h     |  2 +-
 g2core/settings/settings_probotixV90.h        |  2 +-
 g2core/settings/settings_shapeoko2.h          |  2 +-
 g2core/settings/settings_shopbot_sbv300.h     |  2 +-
 g2core/settings/settings_shopbot_test.h       |  2 +-
 g2core/settings/settings_test.h               |  2 +-
 21 files changed, 57 insertions(+), 55 deletions(-)
 mode change 100755 => 100644 g2core/cycle_homing.cpp
 mode change 100755 => 100644 g2core/cycle_jogging.cpp
 mode change 100755 => 100644 g2core/cycle_probing.cpp
 mode change 100755 => 100644 g2core/settings/settings_Printrbot_Play.h
 mode change 100755 => 100644 g2core/settings/settings_Printrbot_Plus.h
 mode change 100755 => 100644 g2core/settings/settings_Printrbot_Simple_1403.h
 mode change 100755 => 100644 g2core/settings/settings_Printrbot_Simple_1608.h
 mode change 100755 => 100644 g2core/settings/settings_Ultimaker.h
 mode change 100755 => 100644 g2core/settings/settings_othermill.h
 mode change 100755 => 100644 g2core/settings/settings_othermill_test.h
 mode change 100755 => 100644 g2core/settings/settings_probotixV90.h
 mode change 100755 => 100644 g2core/settings/settings_shapeoko2.h
 mode change 100755 => 100644 g2core/settings/settings_shopbot_sbv300.h
 mode change 100755 => 100644 g2core/settings/settings_shopbot_test.h
 mode change 100755 => 100644 g2core/settings/settings_test.h

diff --git a/g2core/canonical_machine.cpp b/g2core/canonical_machine.cpp
index 2740d814..1d07d2ae 100644
--- a/g2core/canonical_machine.cpp
+++ b/g2core/canonical_machine.cpp
@@ -610,7 +610,7 @@ void cm_set_model_target(const float target[], const bool flags[])
         if (!flags[axis] || cm.a[axis].axis_mode == AXIS_DISABLED) {
             continue;        // skip axis if not flagged for update or its disabled
         } else if ((cm.a[axis].axis_mode == AXIS_STANDARD) || (cm.a[axis].axis_mode == AXIS_INHIBITED)) {
-            if (cm.gm.distance_mode == ABSOLUTE_MODE) {
+            if (cm.gm.distance_mode == ABSOLUTE_DISTANCE_MODE) {
                 cm.gm.target[axis] = cm_get_active_coord_offset(axis) + _to_millimeters(target[axis]);
             } else {
                 cm.gm.target[axis] += _to_millimeters(target[axis]);
@@ -624,7 +624,7 @@ void cm_set_model_target(const float target[], const bool flags[])
         } else {
             tmp = _calc_ABC(axis, target);
         }
-        if (cm.gm.distance_mode == ABSOLUTE_MODE) {
+        if (cm.gm.distance_mode == ABSOLUTE_DISTANCE_MODE) {
             cm.gm.target[axis] = tmp + cm_get_active_coord_offset(axis); // sacidu93's fix to Issue #22
         } else {
             cm.gm.target[axis] += tmp;
@@ -719,7 +719,7 @@ void canonical_machine_reset()
     cm_select_plane(cm.default_select_plane);
     cm_set_path_control(MODEL, cm.default_path_control);
     cm_set_distance_mode(cm.default_distance_mode);
-    cm_set_arc_distance_mode(INCREMENTAL_MODE);     // always the default
+    cm_set_arc_distance_mode(INCREMENTAL_DISTANCE_MODE); // always the default
     cm_set_feed_rate_mode(UNITS_PER_MINUTE_MODE);   // always the default
     cm_reset_overrides();                           // set overrides to initial conditions
 
@@ -1327,39 +1327,41 @@ stat_t cm_straight_traverse(const float target[], const bool flags[])
 }
 
 /*
- * cm_set_g28_position()  - G28.1
- * cm_goto_g28_position() - G28
- * cm_set_g30_position()  - G30.1
- * cm_goto_g30_position() - G30
+ * cm_set_g28_position()   - G28.1
+ * cm_goto_g28_position()  - G28
+ * cm_set_g30_position()   - G30.1
+ * cm_goto_g30_position()  - G30
+ * _goto_stored_position() - helper
  */
 
-stat_t _goto_stored_position(const float stored_position[],         // always in mm
-                             const float intermediate_target[],     // in current units
-                             const bool flags[])                    // all false if no intermediate move
+stat_t _goto_stored_position(const float stored_position[],     // always in mm
+                             const float intermediate_target[], // in current units (G20/G21)
+                             const bool flags[])                // all false if no intermediate move
 {
     // Go through intermediate point if one is provided
-    while (mp_planner_is_full());                   // Make sure you have available buffers
-    ritorno(cm_straight_traverse(intermediate_target, flags));
+    while (mp_planner_is_full());                               // Make sure you have available buffers
+    ritorno(cm_straight_traverse(intermediate_target, flags));  // w/no action if no axis flags
 
-    float target[AXES];                             // need a local stored position as it gets modified
+    // If G20 adjust stored position (always in mm) to inches so traverse will be correct
+    float target[AXES]; // make a local stored position as it may be modified
     copy_vector(target, stored_position);
+    if (cm.gm.units_mode == INCHES) {
+        for (uint8_t i=0; i<AXES; i++) {
+            target[i] *= INCHES_PER_MM;
+        }
+    }
     
-    if (cm.gm.units_mode == INCHES) {               // If G28 or G30 are called in inches mode (G20)
-        for (uint8_t i=0; i<AXES; i++) {            // ...the stored position must be adjusted
-            target[i] *= INCHES_PER_MM;             // ...to inches so the traverse will be correct.
-        }
-    }
-    if (cm.gm.distance_mode == INCREMENTAL_MODE) {  // Subtract out any movement already performed
-        for (uint8_t i=0; i<AXES; i++) {            // if in incremental distance mode
-            target[i] -= intermediate_target[i];
-        }
-    }
-    bool flags2[] = { 1,1,1,1,1,1 };
-
+    // Run the stored position move
     while (mp_planner_is_full());                           // Make sure you have available buffers
+
+    uint8_t saved_distance_mode = cm_get_distance_mode(MODEL);
     cm_set_absolute_override(MODEL, ABSOLUTE_OVERRIDE_ON);  // Position was stored in absolute coords
-    stat_t status = cm_straight_traverse(target, flags2);  // Go to programmed endpoint
+    cm_set_distance_mode(ABSOLUTE_DISTANCE_MODE);           // Must run in absolute distance mode
+
+    bool flags2[] = { 1,1,1,1,1,1 };
+    stat_t status = cm_straight_traverse(target, flags2);   // Go to stored position
     cm_set_absolute_override(MODEL, ABSOLUTE_OVERRIDE_OFF);
+    cm_set_distance_mode(saved_distance_mode);              // Restore distance mode
     return (status);
 }
 
@@ -1928,7 +1930,7 @@ static void _exec_program_finalize(float *value, bool *flag)
         cm_set_coord_system(cm.default_coord_system);   // reset to default coordinate system
         cm_select_plane(cm.default_select_plane);       // reset to default arc plane
         cm_set_distance_mode(cm.default_distance_mode);
-        cm_set_arc_distance_mode(INCREMENTAL_MODE);     // always the default
+        cm_set_arc_distance_mode(INCREMENTAL_DISTANCE_MODE); // always the default
         cm_spindle_off_immediate();                     // M5
         cm_coolant_off_immediate();                     // M9
         cm_set_feed_rate_mode(UNITS_PER_MINUTE_MODE);   // G94
diff --git a/g2core/canonical_machine.h b/g2core/canonical_machine.h
index bc881234..13e0e1b3 100644
--- a/g2core/canonical_machine.h
+++ b/g2core/canonical_machine.h
@@ -253,8 +253,8 @@ typedef enum {              // G Modal Group 13
 } cmPathControl;
 
 typedef enum {
-    ABSOLUTE_MODE = 0,      // G90 / G90.1
-    INCREMENTAL_MODE        // G91 / G91.1
+    ABSOLUTE_DISTANCE_MODE = 0, // G90 / G90.1
+    INCREMENTAL_DISTANCE_MODE   // G91 / G91.1
 } cmDistanceMode;
 
 typedef enum {
@@ -368,8 +368,8 @@ typedef struct GCodeState {             // Gcode model state - used by model, pl
         select_plane = CANON_PLANE_XY;
         units_mode = INCHES;
         path_control = PATH_EXACT_PATH;
-        distance_mode = ABSOLUTE_MODE;
-        arc_distance_mode = ABSOLUTE_MODE;
+        distance_mode = ABSOLUTE_DISTANCE_MODE;
+        arc_distance_mode = ABSOLUTE_DISTANCE_MODE;
         absolute_override = ABSOLUTE_OVERRIDE_OFF;
         coord_system = ABSOLUTE_COORDS;
         tool = 0;
diff --git a/g2core/cycle_homing.cpp b/g2core/cycle_homing.cpp
old mode 100755
new mode 100644
index a66f3a20..8058213a
--- a/g2core/cycle_homing.cpp
+++ b/g2core/cycle_homing.cpp
@@ -162,7 +162,7 @@ stat_t cm_homing_cycle_start(void) {
 
     // set working values
     cm_set_units_mode(MILLIMETERS);
-    cm_set_distance_mode(INCREMENTAL_MODE);
+    cm_set_distance_mode(INCREMENTAL_DISTANCE_MODE);
     cm_set_coord_system(ABSOLUTE_COORDS);  // homing is done in machine coordinates
     cm_set_feed_rate_mode(UNITS_PER_MINUTE_MODE);
     hm.set_coordinates = true;
diff --git a/g2core/cycle_jogging.cpp b/g2core/cycle_jogging.cpp
old mode 100755
new mode 100644
index fa2c3e2b..bd0b6da5
--- a/g2core/cycle_jogging.cpp
+++ b/g2core/cycle_jogging.cpp
@@ -93,7 +93,7 @@ stat_t cm_jogging_cycle_start(uint8_t axis) {
 
     // set working values
     cm_set_units_mode(MILLIMETERS);
-    cm_set_distance_mode(ABSOLUTE_MODE);
+    cm_set_distance_mode(ABSOLUTE_DISTANCE_MODE);
     cm_set_coord_system(ABSOLUTE_COORDS);  // jogging is done in machine coordinates
     cm_set_feed_rate_mode(UNITS_PER_MINUTE_MODE);
 
diff --git a/g2core/cycle_probing.cpp b/g2core/cycle_probing.cpp
old mode 100755
new mode 100644
index c6ac4dba..3bb194e8
--- a/g2core/cycle_probing.cpp
+++ b/g2core/cycle_probing.cpp
@@ -228,7 +228,7 @@ static uint8_t _probing_init() {
     pb.saved_distance_mode = cm_get_distance_mode(ACTIVE_MODEL);
 
     // set working values
-    cm_set_distance_mode(ABSOLUTE_MODE);
+    cm_set_distance_mode(ABSOLUTE_DISTANCE_MODE);
     cm_set_coord_system(ABSOLUTE_COORDS);  // probing is done in machine coordinates
 
     // initialize the axes - save the jerk settings & switch to the jerk_homing settings
@@ -319,7 +319,7 @@ static stat_t _probe_axis_move(const float target[], bool exact_position) {
     if (exact_position) {
         cm_set_absolute_override(MODEL, ABSOLUTE_OVERRIDE_ON);  // Position was stored in absolute coords
         cm.gm.units_mode    = MILLIMETERS;
-        cm.gm.distance_mode = ABSOLUTE_MODE;
+        cm.gm.distance_mode = ABSOLUTE_DISTANCE_MODE;
     }
 
     for (uint8_t axis = AXIS_X; axis < AXES; axis++) {  // set all positions
diff --git a/g2core/gcode_parser.cpp b/g2core/gcode_parser.cpp
index c9521e46..674a7028 100644
--- a/g2core/gcode_parser.cpp
+++ b/g2core/gcode_parser.cpp
@@ -501,16 +501,16 @@ static stat_t _parse_gcode_block(char *buf, char *active_comment)
                 case 80: SET_MODAL (MODAL_GROUP_G1, motion_mode,  MOTION_MODE_CANCEL_MOTION_MODE);
                 case 90: {
                     switch (_point(value)) {
-                        case 0: SET_MODAL (MODAL_GROUP_G3, distance_mode, ABSOLUTE_MODE);
-                        case 1: SET_MODAL (MODAL_GROUP_G3, arc_distance_mode, ABSOLUTE_MODE);
+                        case 0: SET_MODAL (MODAL_GROUP_G3, distance_mode, ABSOLUTE_DISTANCE_MODE);
+                        case 1: SET_MODAL (MODAL_GROUP_G3, arc_distance_mode, ABSOLUTE_DISTANCE_MODE);
                         default: status = STAT_GCODE_COMMAND_UNSUPPORTED;
                     }
                     break;
                 }
                 case 91: {
                     switch (_point(value)) {
-                        case 0: SET_MODAL (MODAL_GROUP_G3, distance_mode, INCREMENTAL_MODE);
-                        case 1: SET_MODAL (MODAL_GROUP_G3, arc_distance_mode, INCREMENTAL_MODE);
+                        case 0: SET_MODAL (MODAL_GROUP_G3, distance_mode, INCREMENTAL_DISTANCE_MODE);
+                        case 1: SET_MODAL (MODAL_GROUP_G3, arc_distance_mode, INCREMENTAL_DISTANCE_MODE);
                         default: status = STAT_GCODE_COMMAND_UNSUPPORTED;
                     }
                     break;
diff --git a/g2core/plan_arc.cpp b/g2core/plan_arc.cpp
index fc07678d..6ee047e3 100644
--- a/g2core/plan_arc.cpp
+++ b/g2core/plan_arc.cpp
@@ -175,7 +175,7 @@ stat_t cm_arc_feed(const float target[], const bool target_f[],     // target en
         }
     } 
     else {  // test that center format absolute distance mode arcs have both offsets specified
-        if (cm.gm.arc_distance_mode == ABSOLUTE_MODE) {
+        if (cm.gm.arc_distance_mode == ABSOLUTE_DISTANCE_MODE) {
             if (!(offset_f[arc.plane_axis_0] && offset_f[arc.plane_axis_1])) {  // if one or both offsets are missing
                 return (STAT_ARC_OFFSETS_MISSING_FOR_SELECTED_PLANE);
             }
@@ -222,7 +222,7 @@ stat_t cm_arc_feed(const float target[], const bool target_f[],     // target en
     arc.offset[OFS_J] = _to_millimeters(offset[OFS_J]);
     arc.offset[OFS_K] = _to_millimeters(offset[OFS_K]);
 
-    if (arc.gm.arc_distance_mode == ABSOLUTE_MODE) {    // adjust offsets if in absolute mode
+    if (arc.gm.arc_distance_mode == ABSOLUTE_DISTANCE_MODE) {   // adjust offsets if in absolute mode
          arc.offset[OFS_I] -= arc.position[AXIS_X];
          arc.offset[OFS_J] -= arc.position[AXIS_Y];
          arc.offset[OFS_K] -= arc.position[AXIS_Z];
diff --git a/g2core/settings/settings_Printrbot_Play.h b/g2core/settings/settings_Printrbot_Play.h
old mode 100755
new mode 100644
index 43e1bac8..09d996ef
--- a/g2core/settings/settings_Printrbot_Play.h
+++ b/g2core/settings/settings_Printrbot_Play.h
@@ -87,7 +87,7 @@
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G54      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 
 // *** motor settings ************************************************************************************
diff --git a/g2core/settings/settings_Printrbot_Plus.h b/g2core/settings/settings_Printrbot_Plus.h
old mode 100755
new mode 100644
index f395a79c..4ca7db27
--- a/g2core/settings/settings_Printrbot_Plus.h
+++ b/g2core/settings/settings_Printrbot_Plus.h
@@ -87,7 +87,7 @@
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G54      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 
 // *** motor settings ************************************************************************************
diff --git a/g2core/settings/settings_Printrbot_Simple_1403.h b/g2core/settings/settings_Printrbot_Simple_1403.h
old mode 100755
new mode 100644
index bb91c3b4..c32c4739
--- a/g2core/settings/settings_Printrbot_Simple_1403.h
+++ b/g2core/settings/settings_Printrbot_Simple_1403.h
@@ -83,7 +83,7 @@
 #define GCODE_DEFAULT_PLANE         CANON_PLANE_XY          // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM  G54                     // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL  PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 
 // *** motor settings ************************************************************************************
diff --git a/g2core/settings/settings_Printrbot_Simple_1608.h b/g2core/settings/settings_Printrbot_Simple_1608.h
old mode 100755
new mode 100644
index 88c022b1..a24510b6
--- a/g2core/settings/settings_Printrbot_Simple_1608.h
+++ b/g2core/settings/settings_Printrbot_Simple_1608.h
@@ -84,7 +84,7 @@
 #define GCODE_DEFAULT_PLANE         CANON_PLANE_XY          // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM  G54                     // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL  PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 
 // *** motor settings ************************************************************************************
diff --git a/g2core/settings/settings_Ultimaker.h b/g2core/settings/settings_Ultimaker.h
old mode 100755
new mode 100644
index 129ee401..bbc0d500
--- a/g2core/settings/settings_Ultimaker.h
+++ b/g2core/settings/settings_Ultimaker.h
@@ -77,7 +77,7 @@
 #define GCODE_DEFAULT_PLANE         CANON_PLANE_XY          // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM  G54                     // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL  PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 
 // *** motor settings ************************************************************************************
diff --git a/g2core/settings/settings_default.h b/g2core/settings/settings_default.h
index 749080c3..37ad7848 100644
--- a/g2core/settings/settings_default.h
+++ b/g2core/settings/settings_default.h
@@ -190,7 +190,7 @@
 #endif
 
 #ifndef GCODE_DEFAULT_DISTANCE_MODE
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE           // {gdi: ABSOLUTE_MODE, INCREMENTAL_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE  // {gdi: ABSOLUTE_DISTANCE_MODE, INCREMENTAL_DISTANCE_MODE
 #endif
 
 
diff --git a/g2core/settings/settings_makeblock.h b/g2core/settings/settings_makeblock.h
index 650c3603..1e5b55cc 100644
--- a/g2core/settings/settings_makeblock.h
+++ b/g2core/settings/settings_makeblock.h
@@ -76,7 +76,7 @@
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G54      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 // *** motor settings ************************************************************************************
 
diff --git a/g2core/settings/settings_othermill.h b/g2core/settings/settings_othermill.h
old mode 100755
new mode 100644
index 07e7bb5b..98799bcc
--- a/g2core/settings/settings_othermill.h
+++ b/g2core/settings/settings_othermill.h
@@ -86,7 +86,7 @@
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G55      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 // *** motor settings ************************************************************************************
 
diff --git a/g2core/settings/settings_othermill_test.h b/g2core/settings/settings_othermill_test.h
old mode 100755
new mode 100644
index 6d16733e..c61977f7
--- a/g2core/settings/settings_othermill_test.h
+++ b/g2core/settings/settings_othermill_test.h
@@ -98,7 +98,7 @@ constexpr float H3_DEFAULT_D = 100.0;
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G55      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 // *** motor settings ************************************************************************************
 
diff --git a/g2core/settings/settings_probotixV90.h b/g2core/settings/settings_probotixV90.h
old mode 100755
new mode 100644
index 5d43ec63..33549c86
--- a/g2core/settings/settings_probotixV90.h
+++ b/g2core/settings/settings_probotixV90.h
@@ -76,7 +76,7 @@
 #define GCODE_DEFAULT_PLANE         CANON_PLANE_XY          // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM  G54                     // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL  PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 // *** motor settings ************************************************************************************
 
diff --git a/g2core/settings/settings_shapeoko2.h b/g2core/settings/settings_shapeoko2.h
old mode 100755
new mode 100644
index e4d118b5..04439013
--- a/g2core/settings/settings_shapeoko2.h
+++ b/g2core/settings/settings_shapeoko2.h
@@ -78,7 +78,7 @@
 #define GCODE_DEFAULT_PLANE         CANON_PLANE_XY          // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM  G54                     // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL  PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 // *** motor settings ************************************************************************************
 
diff --git a/g2core/settings/settings_shopbot_sbv300.h b/g2core/settings/settings_shopbot_sbv300.h
old mode 100755
new mode 100644
index 200d8032..6442b5b6
--- a/g2core/settings/settings_shopbot_sbv300.h
+++ b/g2core/settings/settings_shopbot_sbv300.h
@@ -73,7 +73,7 @@
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G55      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 constexpr float H1_DEFAULT_P = 7.0;
 constexpr float H1_DEFAULT_I = 0.2;
diff --git a/g2core/settings/settings_shopbot_test.h b/g2core/settings/settings_shopbot_test.h
old mode 100755
new mode 100644
index e35e411c..679f755c
--- a/g2core/settings/settings_shopbot_test.h
+++ b/g2core/settings/settings_shopbot_test.h
@@ -81,7 +81,7 @@
 #define GCODE_DEFAULT_PLANE CANON_PLANE_XY  // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM G55      // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 constexpr float H1_DEFAULT_P = 7.0;
 constexpr float H1_DEFAULT_I = 0.2;
diff --git a/g2core/settings/settings_test.h b/g2core/settings/settings_test.h
old mode 100755
new mode 100644
index 9669240b..0f69fedc
--- a/g2core/settings/settings_test.h
+++ b/g2core/settings/settings_test.h
@@ -79,7 +79,7 @@
 #define GCODE_DEFAULT_PLANE         CANON_PLANE_XY          // CANON_PLANE_XY, CANON_PLANE_XZ, or CANON_PLANE_YZ
 #define GCODE_DEFAULT_COORD_SYSTEM  G54                     // G54, G55, G56, G57, G58 or G59
 #define GCODE_DEFAULT_PATH_CONTROL  PATH_CONTINUOUS
-#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_MODE
+#define GCODE_DEFAULT_DISTANCE_MODE ABSOLUTE_DISTANCE_MODE
 
 // *** motor settings ************************************************************************************