Fix M125 XY parameters, export get_homing_bump_feedrate
This commit is contained in:
parent
ce40c2e87c
commit
be9a409980
@ -61,8 +61,8 @@ void GcodeSuite::M125() {
|
||||
point_t park_point = NOZZLE_PARK_POINT;
|
||||
|
||||
// Move XY axes to filament change position or given position
|
||||
if (parser.seenval('X')) park_point.x = parser.linearval('X');
|
||||
if (parser.seenval('Y')) park_point.y = parser.linearval('Y');
|
||||
if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X'));
|
||||
if (parser.seenval('Y')) park_point.y = RAW_X_POSITION(parser.linearval('Y'));
|
||||
|
||||
// Lift Z axis
|
||||
if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
|
||||
|
@ -1032,7 +1032,7 @@ void prepare_move_to_destination() {
|
||||
/**
|
||||
* Homing bump feedrate (mm/s)
|
||||
*/
|
||||
inline float get_homing_bump_feedrate(const AxisEnum axis) {
|
||||
float get_homing_bump_feedrate(const AxisEnum axis) {
|
||||
#if HOMING_Z_WITH_PROBE
|
||||
if (axis == Z_AXIS) return MMM_TO_MMS(Z_PROBE_SPEED_SLOW);
|
||||
#endif
|
||||
|
@ -73,6 +73,7 @@ extern float cartes[XYZ];
|
||||
*/
|
||||
extern const float homing_feedrate_mm_s[XYZ];
|
||||
FORCE_INLINE float homing_feedrate(const AxisEnum a) { return pgm_read_float(&homing_feedrate_mm_s[a]); }
|
||||
float get_homing_bump_feedrate(const AxisEnum axis);
|
||||
|
||||
extern float feedrate_mm_s;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user