From 227b96b28b847fa573970dac9d9543b81d68e5a6 Mon Sep 17 00:00:00 2001 From: RowanMeara Date: Sun, 12 Nov 2017 20:13:23 -0800 Subject: [PATCH 1/2] Fix M428 This fixes the old implementation of M428 which was broken, did not match the website, and made no sense. --- Marlin/Marlin.h | 1 + Marlin/Marlin_main.cpp | 38 +++++++++++++++++--------------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index bcbf3181b..5e2dd347b 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -439,6 +439,7 @@ void do_blocking_move_to_xy(const float &x, const float &y, const float &fr_mm_s || ENABLED(NOZZLE_CLEAN_FEATURE) \ || ENABLED(NOZZLE_PARK_FEATURE) \ || (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)) \ + || HAS_M206_COMMAND \ ) || ENABLED(NO_MOTION_BEFORE_HOMING) #if HAS_AXIS_UNHOMED_ERR diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 34a4016e9..a75cc78f2 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -9959,31 +9959,27 @@ void quickstop_stepper() { * Use M206 to set these values directly. */ inline void gcode_M428() { - bool err = false; + if (axis_unhomed_error()) return; + + float diff[XYZ]; LOOP_XYZ(i) { - if (axis_homed[i]) { - const float base = (current_position[i] > (soft_endstop_min[i] + soft_endstop_max[i]) * 0.5) ? base_home_pos((AxisEnum)i) : 0, - diff = base - current_position[i]; - if (WITHIN(diff, -20, 20)) { - set_home_offset((AxisEnum)i, diff); - } - else { - SERIAL_ERROR_START(); - SERIAL_ERRORLNPGM(MSG_ERR_M428_TOO_FAR); - LCD_ALERTMESSAGEPGM("Err: Too far!"); - BUZZ(200, 40); - err = true; - break; - } + diff[i] = base_home_pos((AxisEnum)i) - current_position[i]; + if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0) + diff[i] = -current_position[i]; + if (!WITHIN(diff[i], -20, 20)) { + SERIAL_ERROR_START(); + SERIAL_ERRORLNPGM(MSG_ERR_M428_TOO_FAR); + LCD_ALERTMESSAGEPGM("Err: Too far!"); + BUZZ(200, 40); + return; } } - if (!err) { - report_current_position(); - LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED); - BUZZ(100, 659); - BUZZ(100, 698); - } + LOOP_XYZ(i) set_home_offset((AxisEnum)i, diff[i]); + report_current_position(); + LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED); + BUZZ(100, 659); + BUZZ(100, 698); } #endif // HAS_M206_COMMAND From 25ec0fecfa172bd8eaaf7d85c3ae78f587901b5f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 13 Nov 2017 01:52:56 -0600 Subject: [PATCH 2/2] Apply native workspace fixes to G92, G53-59 --- Marlin/Marlin_main.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index a75cc78f2..cf65e4280 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -3653,7 +3653,7 @@ inline void gcode_G4() { #if ENABLED(CNC_COORDINATE_SYSTEMS) /** - * Select a coordinate system and update the current position. + * Select a coordinate system and update the workspace offset. * System index -1 is used to specify machine-native. */ bool select_coordinate_system(const int8_t _new) { @@ -3664,16 +3664,13 @@ inline void gcode_G4() { if (WITHIN(_new, 0, MAX_COORDINATE_SYSTEMS - 1)) COPY(new_offset, coordinate_system[_new]); active_coordinate_system = _new; - bool didXYZ = false; LOOP_XYZ(i) { const float diff = new_offset[i] - old_offset[i]; if (diff) { position_shift[i] += diff; update_software_endstops((AxisEnum)i); - didXYZ = true; } } - if (didXYZ) SYNC_PLAN_POSITION_KINEMATIC(); return true; } @@ -6257,7 +6254,12 @@ inline void gcode_G92() { #define IS_G92_0 true #endif - bool didXYZ = false, didE = false; + bool didE = false; + #if IS_SCARA || !HAS_POSITION_SHIFT + bool didXYZ = false; + #else + constexpr bool didXYZ = false; + #endif if (IS_G92_0) LOOP_XYZE(i) { if (parser.seenval(axis_codes[i])) { @@ -6265,18 +6267,18 @@ inline void gcode_G92() { v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i), d = v - current_position[i]; if (!NEAR_ZERO(d)) { - if (i == E_AXIS) didE = true; else didXYZ = true; - #if IS_SCARA - current_position[i] = v; // For SCARA just set the position directly + #if IS_SCARA || !HAS_POSITION_SHIFT + if (i == E_AXIS) didE = true; else didXYZ = true; + current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior #elif HAS_POSITION_SHIFT - if (i == E_AXIS) + if (i == E_AXIS) { + didE = true; current_position[E_AXIS] = v; // When using coordinate spaces, only E is set directly + } else { position_shift[i] += d; // Other axes simply offset the coordinate space update_software_endstops((AxisEnum)i); } - #else - current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior #endif } }