Merge pull request #8399 from thinkyhead/bf2_fix_M428

[2.0] Improve and clarify M428 code
This commit is contained in:
Scott Lahteine 2017-11-13 03:06:41 -06:00 committed by GitHub
commit 98efc18f2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 34 deletions

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;
} }

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
} }
} }

View File

@ -47,7 +47,6 @@ void GcodeSuite::M206() {
if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_linear_units()); // Psi if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_linear_units()); // Psi
#endif #endif
SYNC_PLAN_POSITION_KINEMATIC();
report_current_position(); report_current_position();
} }
@ -63,32 +62,27 @@ void GcodeSuite::M206() {
* Use M206 to set these values directly. * Use M206 to set these values directly.
*/ */
void GcodeSuite::M428() { void GcodeSuite::M428() {
bool err = false; if (axis_unhomed_error()) return;
float diff[XYZ];
LOOP_XYZ(i) { LOOP_XYZ(i) {
if (axis_homed[i]) { diff[i] = base_home_pos((AxisEnum)i) - current_position[i];
const float base = (current_position[i] > (soft_endstop_min[i] + soft_endstop_max[i]) * 0.5) ? base_home_pos((AxisEnum)i) : 0, if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
diff = base - current_position[i]; diff[i] = -current_position[i];
if (WITHIN(diff, -20, 20)) { if (!WITHIN(diff[i], -20, 20)) {
set_home_offset((AxisEnum)i, diff); SERIAL_ERROR_START();
} SERIAL_ERRORLNPGM(MSG_ERR_M428_TOO_FAR);
else { LCD_ALERTMESSAGEPGM("Err: Too far!");
SERIAL_ERROR_START(); BUZZ(200, 40);
SERIAL_ERRORLNPGM(MSG_ERR_M428_TOO_FAR); return;
LCD_ALERTMESSAGEPGM("Err: Too far!");
BUZZ(200, 40);
err = true;
break;
}
} }
} }
if (!err) { LOOP_XYZ(i) set_home_offset((AxisEnum)i, diff[i]);
SYNC_PLAN_POSITION_KINEMATIC(); report_current_position();
report_current_position(); LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED);
LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED); BUZZ(100, 659);
BUZZ(100, 659); BUZZ(100, 698);
BUZZ(100, 698);
}
} }
#endif // HAS_M206_COMMAND #endif // HAS_M206_COMMAND

View File

@ -173,6 +173,7 @@ void clean_up_after_endstop_or_probe_move();
|| ENABLED(NOZZLE_CLEAN_FEATURE) \ || ENABLED(NOZZLE_CLEAN_FEATURE) \
|| ENABLED(NOZZLE_PARK_FEATURE) \ || ENABLED(NOZZLE_PARK_FEATURE) \
|| (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)) \ || (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)) \
|| HAS_M206_COMMAND \
) || ENABLED(NO_MOTION_BEFORE_HOMING) ) || ENABLED(NO_MOTION_BEFORE_HOMING)
#if HAS_AXIS_UNHOMED_ERR #if HAS_AXIS_UNHOMED_ERR