bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix MKS H43 compile (#21619)

Browse Source
This commit is contained in:
Sola 2021-04-15 17:45:30 +08:00 committed by Scott Lahteine
parent 713e606b28
commit 643f04681c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp
View File

@ -72,20 +72,23 @@ void MKS_reset_settings() {
} }
xyz_pos_t position_before_pause; xyz_pos_t position_before_pause;
constexpr feedRate_t park_speed_xy = TERN(NOZZLE_PARK_FEATURE, NOZZLE_PARK_XY_FEEDRATE, 100),
park_speed_z = TERN(NOZZLE_PARK_FEATURE, NOZZLE_PARK_Z_FEEDRATE, 5);
void MKS_pause_print_move() { void MKS_pause_print_move() {
queue.exhaust(); queue.exhaust();
position_before_pause = current_position; position_before_pause = current_position;
destination.z = _MIN(current_position.z + mks_park_pos.z, Z_MAX_POS); destination.z = _MIN(current_position.z + mks_park_pos.z, Z_MAX_POS);
prepare_internal_move_to_destination(NOZZLE_PARK_Z_FEEDRATE); prepare_internal_move_to_destination(park_speed_z);
destination.set(X_MIN_POS + mks_park_pos.x, Y_MIN_POS + mks_park_pos.y); destination.set(X_MIN_POS + mks_park_pos.x, Y_MIN_POS + mks_park_pos.y);
prepare_internal_move_to_destination(NOZZLE_PARK_XY_FEEDRATE); prepare_internal_move_to_destination(park_speed_xy);
} }
void MKS_resume_print_move() { void MKS_resume_print_move() {
destination.set(position_before_pause.x, position_before_pause.y); destination.set(position_before_pause.x, position_before_pause.y);
prepare_internal_move_to_destination(NOZZLE_PARK_XY_FEEDRATE); prepare_internal_move_to_destination(park_speed_xy);
destination.z = position_before_pause.z; destination.z = position_before_pause.z;
prepare_internal_move_to_destination(NOZZLE_PARK_Z_FEEDRATE); prepare_internal_move_to_destination(park_speed_z);
} }
float z_offset_add = 0; float z_offset_add = 0;

2
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp
View File

@ -1271,7 +1271,7 @@ void GcodeSuite::M1002() {
#endif #endif
const uint8_t old_axis_relative = axis_relative; const uint8_t old_axis_relative = axis_relative;
set_e_relative(true); // M83 set_e_relative(); // M83
{ {
char buf[20]; char buf[20];
snprintf_P(buf, 20, PSTR("G1E%dF%d"), parser.intval('E'), parser.intval('F')); snprintf_P(buf, 20, PSTR("G1E%dF%d"), parser.intval('E'), parser.intval('F'));