From b4bf8928aa8f1a0437cd818f32b62e917dd4ec6b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 7 Nov 2017 12:10:29 -0600 Subject: [PATCH 1/2] German language updates Corresponding to #8306 --- Marlin/src/lcd/language/language_de.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h index c57605a078..4036a0dcfe 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -53,7 +53,7 @@ #define MSG_LEVEL_BED_WAITING _UxGT("Klick für Start") #define MSG_LEVEL_BED_NEXT_POINT _UxGT("Nächste Koordinate") #define MSG_LEVEL_BED_DONE _UxGT("Fertig") -#define MSG_Z_FADE_HEIGHT _UxGT("Niv. Ausblendhöhe") +#define MSG_Z_FADE_HEIGHT _UxGT("Ausblendhöhe") #define MSG_SET_HOME_OFFSETS _UxGT("Setze Homeversatz") #define MSG_HOME_OFFSETS_APPLIED _UxGT("Homeversatz aktiv") #define MSG_SET_ORIGIN _UxGT("Setze Nullpunkt") //"G92 X0 Y0 Z0" commented out in ultralcd.cpp @@ -77,6 +77,8 @@ #define MSG_MOVE_AXIS _UxGT("Bewegen") #define MSG_BED_LEVELING _UxGT("Bett Nivellierung") #define MSG_LEVEL_BED _UxGT("Bett nivellieren") +#define MSG_LEVEL_CORNERS _UxGT("Ecken nivellieren") +#define MSG_NEXT_CORNER _UxGT("Nächste Ecke") #define MSG_EDITING_STOPPED _UxGT("Netzbearb. angeh.") #define MSG_USER_MENU _UxGT("Benutzer Menü") #define MSG_MOVING _UxGT("In Bewegung...") From 17ef0a513b6a0bd671ea49e57c3d1cb5f56004a0 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 7 Nov 2017 12:25:04 -0600 Subject: [PATCH 2/2] Update G92 for native workspace --- Marlin/src/gcode/geometry/G92.cpp | 41 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp index 89fa120150..535ca37142 100644 --- a/Marlin/src/gcode/geometry/G92.cpp +++ b/Marlin/src/gcode/geometry/G92.cpp @@ -32,10 +32,8 @@ * G92: Set current position to given X Y Z E */ void GcodeSuite::G92() { - bool didXYZ = false, - didE = parser.seenval('E'); - if (!didE) stepper.synchronize(); + stepper.synchronize(); #if ENABLED(CNC_COORDINATE_SYSTEMS) switch (parser.subcode) { @@ -60,27 +58,28 @@ void GcodeSuite::G92() { #define IS_G92_0 true #endif + bool didXYZ = false, didE = false; + if (IS_G92_0) LOOP_XYZE(i) { if (parser.seenval(axis_codes[i])) { - #if IS_SCARA - current_position[i] = parser.value_axis_units((AxisEnum)i); - if (i != E_AXIS) didXYZ = true; - #else - #if HAS_POSITION_SHIFT - const float p = current_position[i]; - #endif - const float v = parser.value_axis_units((AxisEnum)i); - - current_position[i] = v; - - if (i != E_AXIS) { - didXYZ = true; - #if HAS_POSITION_SHIFT - position_shift[i] += v - p; // Offset the coordinate space + const float l = parser.value_axis_units((AxisEnum)i), + 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 + #elif HAS_POSITION_SHIFT + if (i == E_AXIS) + 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); - #endif - } - #endif + } + #else + current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior + #endif + } } }