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

XY_TRAVEL_SPEED => XY_PROBE_SPEED

Browse Source
This commit is contained in:
Scott Lahteine
2016-06-22 02:38:50 -07:00
parent 88dc543584
commit 2798499b71
23 changed files with 64 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@@ -367,11 +367,11 @@ static uint8_t target_extruder;
#endif
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
int xy_travel_speed = XY_TRAVEL_SPEED;
int xy_probe_speed = XY_PROBE_SPEED;
bool bed_leveling_in_progress = false;
#define XY_TRAVEL_FEEDRATE xy_travel_speed
#define XY_PROBE_FEEDRATE xy_probe_speed
#else
#define XY_TRAVEL_FEEDRATE (min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60)
#define XY_PROBE_FEEDRATE (min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60)
#endif
#if ENABLED(Z_DUAL_ENDSTOPS) && DISABLED(DELTA)
@@ -1636,7 +1636,7 @@ static void setup_for_endstop_move() {
#if ENABLED(DELTA)
feedrate = XY_TRAVEL_FEEDRATE;
feedrate = XY_PROBE_FEEDRATE;
destination[X_AXIS] = x;
destination[Y_AXIS] = y;
@@ -1655,7 +1655,7 @@ static void setup_for_endstop_move() {
line_to_current_position();
stepper.synchronize();
feedrate = XY_TRAVEL_FEEDRATE;
feedrate = XY_PROBE_FEEDRATE;
current_position[X_AXIS] = x;
current_position[Y_AXIS] = y;
@@ -2973,7 +2973,7 @@ inline void gcode_G28() {
destination[Y_AXIS] = round(Z_SAFE_HOMING_Y_POINT - (Y_PROBE_OFFSET_FROM_EXTRUDER));
destination[Z_AXIS] = current_position[Z_AXIS]; //z is already at the right height
feedrate = XY_TRAVEL_FEEDRATE;
feedrate = XY_PROBE_FEEDRATE;
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) {
@@ -3395,7 +3395,7 @@ inline void gcode_G28() {
}
#endif
xy_travel_speed = code_seen('S') ? (int)code_value_linear_units() : XY_TRAVEL_SPEED;
xy_probe_speed = code_seen('S') ? (int)code_value_linear_units() : XY_PROBE_SPEED;
int left_probe_bed_position = code_seen('L') ? (int)code_value_axis_units(X_AXIS) : LEFT_PROBE_BED_POSITION,
right_probe_bed_position = code_seen('R') ? (int)code_value_axis_units(X_AXIS) : RIGHT_PROBE_BED_POSITION,
@@ -6556,8 +6556,8 @@ inline void gcode_T(uint8_t tmp_extruder) {
}
else {
feedrate =
#ifdef XY_TRAVEL_SPEED
XY_TRAVEL_SPEED
#ifdef XY_PROBE_SPEED
XY_PROBE_SPEED
#else
min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60
#endif