Browse Source

Fix MKS H43 compile (#21619)

Sola 3 years ago
parent
commit
3cdf363cce
No account linked to committer's email address

+ 7
- 4
Marlin/src/lcd/extui/lib/dgus/mks/DGUSDisplayDef.cpp View File

@@ -72,20 +72,23 @@ void MKS_reset_settings() {
72 72
 }
73 73
 
74 74
 xyz_pos_t position_before_pause;
75
+constexpr feedRate_t park_speed_xy = TERN(NOZZLE_PARK_FEATURE, NOZZLE_PARK_XY_FEEDRATE, 100),
76
+                     park_speed_z  = TERN(NOZZLE_PARK_FEATURE, NOZZLE_PARK_Z_FEEDRATE,    5);
77
+
75 78
 void MKS_pause_print_move() {
76 79
   queue.exhaust();
77 80
   position_before_pause = current_position;
78 81
   destination.z = _MIN(current_position.z + mks_park_pos.z, Z_MAX_POS);
79
-  prepare_internal_move_to_destination(NOZZLE_PARK_Z_FEEDRATE);
82
+  prepare_internal_move_to_destination(park_speed_z);
80 83
   destination.set(X_MIN_POS + mks_park_pos.x, Y_MIN_POS + mks_park_pos.y);
81
-  prepare_internal_move_to_destination(NOZZLE_PARK_XY_FEEDRATE);
84
+  prepare_internal_move_to_destination(park_speed_xy);
82 85
 }
83 86
 
84 87
 void MKS_resume_print_move() {
85 88
   destination.set(position_before_pause.x, position_before_pause.y);
86
-  prepare_internal_move_to_destination(NOZZLE_PARK_XY_FEEDRATE);
89
+  prepare_internal_move_to_destination(park_speed_xy);
87 90
   destination.z = position_before_pause.z;
88
-  prepare_internal_move_to_destination(NOZZLE_PARK_Z_FEEDRATE);
91
+  prepare_internal_move_to_destination(park_speed_z);
89 92
 }
90 93
 
91 94
 float z_offset_add = 0;

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp View File

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

Loading…
Cancel
Save