josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few cases where rebase overwrote stuff

This commit is contained in:
Guðni Már Gilbert 2022-09-03 08:42:58 +00:00 committed by D.R.racer
parent 0537908d8c
commit 66994d010d
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Firmware/Marlin_main.cpp
View File

@ -2096,9 +2096,8 @@ float raise_z(float delta)
{ {
float travel_z = current_position[Z_AXIS]; float travel_z = current_position[Z_AXIS];
// Z needs raising // Prepare to move Z axis
current_position[Z_AXIS] += travel_z; current_position[Z_AXIS] += delta;
clamp_to_software_endstops(current_position);
#if defined(Z_MIN_PIN) && (Z_MIN_PIN > -1) && !defined(DEBUG_DISABLE_ZMINLIMIT) #if defined(Z_MIN_PIN) && (Z_MIN_PIN > -1) && !defined(DEBUG_DISABLE_ZMINLIMIT)
bool z_min_endstop = (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING); bool z_min_endstop = (READ(Z_MIN_PIN) != Z_MIN_ENDSTOP_INVERTING);
@ -3665,20 +3664,11 @@ void gcode_M701(float fastLoadLength, uint8_t mmuSlotIndex){
if (MMU2::mmu2.Enabled() && mmuSlotIndex < MMU_FILAMENT_COUNT) { if (MMU2::mmu2.Enabled() && mmuSlotIndex < MMU_FILAMENT_COUNT) {
MMU2::mmu2.load_filament_to_nozzle(mmuSlotIndex); MMU2::mmu2.load_filament_to_nozzle(mmuSlotIndex);
} else { } else {
enable_z();
custom_message_type = CustomMsg::FilamentLoading; custom_message_type = CustomMsg::FilamentLoading;
const int feed_mm_before_raising = 30;
static_assert(feed_mm_before_raising <= FILAMENTCHANGE_FIRSTFEED);
lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT)); lcd_setstatuspgm(_T(MSG_LOADING_FILAMENT));
current_position[E_AXIS] += FILAMENTCHANGE_FIRSTFEED - feed_mm_before_raising;
plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence
st_synchronize();
raise_z_above(MIN_Z_FOR_LOAD/*, false*/); current_position[E_AXIS] += fastLoadLength;
current_position[E_AXIS] += feed_mm_before_raising; plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence
plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence
load_filament_final_feed(); // slow sequence load_filament_final_feed(); // slow sequence
st_synchronize(); st_synchronize();
@ -10577,7 +10567,7 @@ void long_pause() //long pause print
setAllTargetHotends(0); setAllTargetHotends(0);
// Lift z // Lift z
raise_z_above(current_position[Z_AXIS] + Z_PAUSE_LIFT/*, true*/); raise_z_above(current_position[Z_AXIS] + Z_PAUSE_LIFT);
// Move XY to side // Move XY to side
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) { if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) {

2
Firmware/ultralcd.cpp
View File

@ -6001,7 +6001,7 @@ void print_stop()
save_statistics(total_filament_used, t); save_statistics(total_filament_used, t);
// lift Z // lift Z
raise_z_above(current_position[Z_AXIS] + 10/*, true*/); raise_z_above(current_position[Z_AXIS] + 10);
// if axis are homed, move to parking position. // if axis are homed, move to parking position.
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) { if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS]) {