Quellcode durchsuchen

Fix M125 XY parameters, export get_homing_bump_feedrate

Scott Lahteine vor 6 Jahren
Ursprung
Commit
be9a409980

+ 2
- 2
Marlin/src/gcode/feature/pause/M125.cpp Datei anzeigen

61
   point_t park_point = NOZZLE_PARK_POINT;
61
   point_t park_point = NOZZLE_PARK_POINT;
62
 
62
 
63
   // Move XY axes to filament change position or given position
63
   // Move XY axes to filament change position or given position
64
-  if (parser.seenval('X')) park_point.x = parser.linearval('X');
65
-  if (parser.seenval('Y')) park_point.y = parser.linearval('Y');
64
+  if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X'));
65
+  if (parser.seenval('Y')) park_point.y = RAW_X_POSITION(parser.linearval('Y'));
66
 
66
 
67
   // Lift Z axis
67
   // Lift Z axis
68
   if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
68
   if (parser.seenval('Z')) park_point.z = parser.linearval('Z');

+ 2
- 2
Marlin/src/module/motion.cpp Datei anzeigen

294
 #endif // IS_KINEMATIC
294
 #endif // IS_KINEMATIC
295
 
295
 
296
 /**
296
 /**
297
- *  Plan a move to (X, Y, Z) and set the current_position
297
+ * Plan a move to (X, Y, Z) and set the current_position
298
  */
298
  */
299
 void do_blocking_move_to(const float rx, const float ry, const float rz, const float &fr_mm_s/*=0.0*/) {
299
 void do_blocking_move_to(const float rx, const float ry, const float rz, const float &fr_mm_s/*=0.0*/) {
300
   const float old_feedrate_mm_s = feedrate_mm_s;
300
   const float old_feedrate_mm_s = feedrate_mm_s;
1032
 /**
1032
 /**
1033
  * Homing bump feedrate (mm/s)
1033
  * Homing bump feedrate (mm/s)
1034
  */
1034
  */
1035
-inline float get_homing_bump_feedrate(const AxisEnum axis) {
1035
+float get_homing_bump_feedrate(const AxisEnum axis) {
1036
   #if HOMING_Z_WITH_PROBE
1036
   #if HOMING_Z_WITH_PROBE
1037
     if (axis == Z_AXIS) return MMM_TO_MMS(Z_PROBE_SPEED_SLOW);
1037
     if (axis == Z_AXIS) return MMM_TO_MMS(Z_PROBE_SPEED_SLOW);
1038
   #endif
1038
   #endif

+ 1
- 0
Marlin/src/module/motion.h Datei anzeigen

73
  */
73
  */
74
 extern const float homing_feedrate_mm_s[XYZ];
74
 extern const float homing_feedrate_mm_s[XYZ];
75
 FORCE_INLINE float homing_feedrate(const AxisEnum a) { return pgm_read_float(&homing_feedrate_mm_s[a]); }
75
 FORCE_INLINE float homing_feedrate(const AxisEnum a) { return pgm_read_float(&homing_feedrate_mm_s[a]); }
76
+float get_homing_bump_feedrate(const AxisEnum axis);
76
 
77
 
77
 extern float feedrate_mm_s;
78
 extern float feedrate_mm_s;
78
 
79
 

Laden…
Abbrechen
Speichern