CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update G92 for native workspace

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-07 12:25:04 -06:00
parent b4bf8928aa
commit 17ef0a513b
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Marlin/src/gcode/geometry/G92.cpp
View File

@ -32,10 +32,8 @@
* G92: Set current position to given X Y Z E * G92: Set current position to given X Y Z E
*/ */
void GcodeSuite::G92() { void GcodeSuite::G92() {
bool didXYZ = false,
didE = parser.seenval('E');
if (!didE) stepper.synchronize(); stepper.synchronize();
#if ENABLED(CNC_COORDINATE_SYSTEMS) #if ENABLED(CNC_COORDINATE_SYSTEMS)
switch (parser.subcode) { switch (parser.subcode) {
@ -60,27 +58,28 @@ void GcodeSuite::G92() {
#define IS_G92_0 true #define IS_G92_0 true
#endif #endif
bool didXYZ = false, didE = false;
if (IS_G92_0) LOOP_XYZE(i) { if (IS_G92_0) LOOP_XYZE(i) {
if (parser.seenval(axis_codes[i])) { if (parser.seenval(axis_codes[i])) {
#if IS_SCARA const float l = parser.value_axis_units((AxisEnum)i),
current_position[i] = parser.value_axis_units((AxisEnum)i); v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i),
if (i != E_AXIS) didXYZ = true; d = v - current_position[i];
#else if (!NEAR_ZERO(d)) {
#if HAS_POSITION_SHIFT if (i == E_AXIS) didE = true; else didXYZ = true;
const float p = current_position[i]; #if IS_SCARA
#endif current_position[i] = v; // For SCARA just set the position directly
const float v = parser.value_axis_units((AxisEnum)i); #elif HAS_POSITION_SHIFT
if (i == E_AXIS)
current_position[i] = v; current_position[E_AXIS] = v; // When using coordinate spaces, only E is set directly
else {
if (i != E_AXIS) { position_shift[i] += d; // Other axes simply offset the coordinate space
didXYZ = true;
#if HAS_POSITION_SHIFT
position_shift[i] += v - p; // Offset the coordinate space
update_software_endstops((AxisEnum)i); update_software_endstops((AxisEnum)i);
#endif }
} #else
#endif current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior
#endif
}
} }
} }