zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix M125 XY parameters, export get_homing_bump_feedrate

Browse source
This commit is contained in:
Scott Lahteine 2019-02-14 05:25:29 -06:00
parent ce40c2e87c
commit be9a409980
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/gcode/feature/pause/M125.cpp
View file

@ -61,8 +61,8 @@ void GcodeSuite::M125() {
point_t park_point = NOZZLE_PARK_POINT; point_t park_point = NOZZLE_PARK_POINT;
// Move XY axes to filament change position or given position // Move XY axes to filament change position or given position
if (parser.seenval('X')) park_point.x = parser.linearval('X'); if (parser.seenval('X')) park_point.x = RAW_X_POSITION(parser.linearval('X'));
if (parser.seenval('Y')) park_point.y = parser.linearval('Y'); if (parser.seenval('Y')) park_point.y = RAW_X_POSITION(parser.linearval('Y'));
// Lift Z axis // Lift Z axis
if (parser.seenval('Z')) park_point.z = parser.linearval('Z'); if (parser.seenval('Z')) park_point.z = parser.linearval('Z');

4
Marlin/src/module/motion.cpp
View file

@ -294,7 +294,7 @@ void buffer_line_to_destination(const float fr_mm_s) {
#endif // IS_KINEMATIC #endif // IS_KINEMATIC
/** /**
* Plan a move to (X, Y, Z) and set the current_position * Plan a move to (X, Y, Z) and set the current_position
*/ */
void do_blocking_move_to(const float rx, const float ry, const float rz, const float &fr_mm_s/*=0.0*/) { void do_blocking_move_to(const float rx, const float ry, const float rz, const float &fr_mm_s/*=0.0*/) {
const float old_feedrate_mm_s = feedrate_mm_s; const float old_feedrate_mm_s = feedrate_mm_s;
@ -1032,7 +1032,7 @@ void prepare_move_to_destination() {
/** /**
* Homing bump feedrate (mm/s) * 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 HOMING_Z_WITH_PROBE
if (axis == Z_AXIS) return MMM_TO_MMS(Z_PROBE_SPEED_SLOW); if (axis == Z_AXIS) return MMM_TO_MMS(Z_PROBE_SPEED_SLOW);
#endif #endif

1
Marlin/src/module/motion.h
View file

@ -73,6 +73,7 @@ extern float cartes[XYZ];
*/ */
extern const float homing_feedrate_mm_s[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]); } 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; extern float feedrate_mm_s;