3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 13:56:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7811 from thinkyhead/bf1_fix_resume_print

Browse Source 
[1.1.x] Fix broken M600 resume_print
This commit is contained in:
Scott Lahteine 2017-10-01 22:54:34 -05:00 committed by GitHub
commit f365448338
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@ -5674,7 +5674,7 @@ void home_all_axes() { gcode_G28(true); }
float a_sum = 0.0; float a_sum = 0.0;
LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis]; LOOP_XYZ(axis) a_sum += delta_tower_angle_trim[axis];
LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0; LOOP_XYZ(axis) delta_tower_angle_trim[axis] -= a_sum / 3.0;
// adjust delta_height and endstops by the max amount // adjust delta_height and endstops by the max amount
const float z_temp = MAX3(endstop_adj[A_AXIS], endstop_adj[B_AXIS], endstop_adj[C_AXIS]); const float z_temp = MAX3(endstop_adj[A_AXIS], endstop_adj[B_AXIS], endstop_adj[C_AXIS]);
home_offset[Z_AXIS] -= z_temp; home_offset[Z_AXIS] -= z_temp;
@ -6369,6 +6369,8 @@ inline void gcode_M17() {
filament_change_beep(max_beep_count, true); filament_change_beep(max_beep_count, true);
#endif #endif
set_destination_to_current();
if (load_length != 0) { if (load_length != 0) {
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
// Show "insert filament" // Show "insert filament"
@ -8580,7 +8582,7 @@ inline void gcode_M205() {
#endif #endif
LOOP_XYZ(i) { LOOP_XYZ(i) {
if (parser.seen(axis_codes[i])) { if (parser.seen(axis_codes[i])) {
if (parser.value_linear_units() * Z_HOME_DIR <= 0) if (parser.value_linear_units() * Z_HOME_DIR <= 0)
endstop_adj[i] = parser.value_linear_units(); endstop_adj[i] = parser.value_linear_units();
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {

4
Marlin/ultralcd_impl_HD44780.h
View File

@ -790,11 +790,11 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(LCD_WIDTH - 8, 1); lcd.setCursor(LCD_WIDTH - 8, 1);
_draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink); _draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
lcd.print(ftostr52sp(FIXFLOAT(current_position[Z_AXIS]))); lcd.print(ftostr52sp(FIXFLOAT(current_position[Z_AXIS])));
#if HAS_LEVELING #if HAS_LEVELING
lcd.write(leveling_is_active() || blink ? '_' : ' '); lcd.write(leveling_is_active() || blink ? '_' : ' ');
#endif #endif
#endif // LCD_HEIGHT > 2 #endif // LCD_HEIGHT > 2
// //