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

Apply native workspace fixes for G92, G53-59

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-13 01:50:05 -06:00
parent 04abd8d459
commit 2f73dec077
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/src/gcode/geometry/G53-G59.cpp
View File

@ -27,7 +27,7 @@
#if ENABLED(CNC_COORDINATE_SYSTEMS) #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. * System index -1 is used to specify machine-native.
*/ */
bool GCodeSuite::select_coordinate_system(const int8_t _new) { bool GCodeSuite::select_coordinate_system(const int8_t _new) {
@ -39,16 +39,13 @@
if (WITHIN(_new, 0, MAX_COORDINATE_SYSTEMS - 1)) if (WITHIN(_new, 0, MAX_COORDINATE_SYSTEMS - 1))
COPY(new_offset, coordinate_system[_new]); COPY(new_offset, coordinate_system[_new]);
active_coordinate_system = _new; active_coordinate_system = _new;
bool didXYZ = false;
LOOP_XYZ(i) { LOOP_XYZ(i) {
const float diff = new_offset[i] - old_offset[i]; const float diff = new_offset[i] - old_offset[i];
if (diff) { if (diff) {
position_shift[i] += diff; position_shift[i] += diff;
update_software_endstops((AxisEnum)i); update_software_endstops((AxisEnum)i);
didXYZ = true;
} }
} }
if (didXYZ) SYNC_PLAN_POSITION_KINEMATIC();
return true; return true;
} }

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

@ -58,7 +58,12 @@ void GcodeSuite::G92() {
#define IS_G92_0 true #define IS_G92_0 true
#endif #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 (IS_G92_0) LOOP_XYZE(i) {
if (parser.seenval(axis_codes[i])) { if (parser.seenval(axis_codes[i])) {
@ -66,18 +71,18 @@ void GcodeSuite::G92() {
v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i), v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i),
d = v - current_position[i]; d = v - current_position[i];
if (!NEAR_ZERO(d)) { if (!NEAR_ZERO(d)) {
if (i == E_AXIS) didE = true; else didXYZ = true; #if IS_SCARA || !HAS_POSITION_SHIFT
#if IS_SCARA if (i == E_AXIS) didE = true; else didXYZ = true;
current_position[i] = v; // For SCARA just set the position directly current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior
#elif HAS_POSITION_SHIFT #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 current_position[E_AXIS] = v; // When using coordinate spaces, only E is set directly
}
else { else {
position_shift[i] += d; // Other axes simply offset the coordinate space position_shift[i] += d; // Other axes simply offset the coordinate space
update_software_endstops((AxisEnum)i); update_software_endstops((AxisEnum)i);
} }
#else
current_position[i] = v; // Without workspaces revert to Marlin 1.0 behavior
#endif #endif
} }
} }