melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Screen out G29 E for sled and allen key, allow single probe

Browse Source
This commit is contained in:
Scott Lahteine 2016-06-21 21:01:01 -07:00
parent ccae92588d
commit 5158bd6e93
1 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Marlin/Marlin_main.cpp
View File

@ -2173,11 +2173,6 @@ static void setup_for_endstop_move() {
// this also updates current_position // this also updates current_position
do_blocking_move_to_xy(x - (X_PROBE_OFFSET_FROM_EXTRUDER), y - (Y_PROBE_OFFSET_FROM_EXTRUDER)); do_blocking_move_to_xy(x - (X_PROBE_OFFSET_FROM_EXTRUDER), y - (Y_PROBE_OFFSET_FROM_EXTRUDER));
// Z Sled and Allen Key should never deploy-and-stow
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
if (probe_action == ProbeDeployAndStow) probe_action == ProbeStay;
#endif
if (probe_action & ProbeDeploy) { if (probe_action & ProbeDeploy) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> ProbeDeploy"); if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> ProbeDeploy");
@ -3370,8 +3365,11 @@ inline void gcode_G28() {
return; return;
} }
bool dryrun = code_seen('D'), bool dryrun = code_seen('D');
deploy_probe_for_each_reading = code_seen('E');
#if DISABLED(Z_PROBE_SLED) && DISABLED(Z_PROBE_ALLEN_KEY)
bool deploy_probe_for_each_reading = code_seen('E');
#endif
#if ENABLED(AUTO_BED_LEVELING_GRID) #if ENABLED(AUTO_BED_LEVELING_GRID)
@ -3470,9 +3468,8 @@ inline void gcode_G28() {
setup_for_endstop_or_probe_move(); setup_for_endstop_or_probe_move();
#if HAS_BED_PROBE // Deploy the probe. Servo will raise if needed.
deploy_z_probe(); deploy_z_probe();
#endif
feedrate = homing_feedrate[Z_AXIS]; feedrate = homing_feedrate[Z_AXIS];
@ -3551,15 +3548,19 @@ inline void gcode_G28() {
if (distance_from_center > DELTA_PROBEABLE_RADIUS) continue; if (distance_from_center > DELTA_PROBEABLE_RADIUS) continue;
#endif //DELTA #endif //DELTA
ProbeAction act; #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
if (deploy_probe_for_each_reading) // G29 E - Stow between probes const ProbeAction act = ProbeStay;
act = ProbeDeployAndStow; #else
else if (yCount == 0 && xCount == xStart) ProbeAction act;
act = ProbeDeploy; if (deploy_probe_for_each_reading) // G29 E - Stow between probes
else if (yCount == auto_bed_leveling_grid_points - 1 && xCount == xStop - xInc) act = ProbeDeployAndStow;
act = ProbeStow; else if (yCount == 0 && xCount == xStart)
else act = ProbeDeploy;
act = ProbeStay; else if (yCount == auto_bed_leveling_grid_points - 1 && xCount == xStop - xInc)
act = ProbeStow;
else
act = ProbeStay;
#endif
measured_z = probe_pt(xProbe, yProbe, z_before, act, verbose_level); measured_z = probe_pt(xProbe, yProbe, z_before, act, verbose_level);
@ -3690,12 +3691,16 @@ inline void gcode_G28() {
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> 3-point Leveling"); if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> 3-point Leveling");
#endif #endif
// Actions for each probe #if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
ProbeAction p1, p2, p3; const ProbeAction p1 = ProbeStay, p2 = ProbeStay, p3 = ProbeStay;
if (deploy_probe_for_each_reading) #else
p1 = p2 = p3 = ProbeDeployAndStow; // Actions for each probe
else ProbeAction p1, p2, p3;
p1 = ProbeDeploy, p2 = ProbeStay, p3 = ProbeStow; if (deploy_probe_for_each_reading)
p1 = p2 = p3 = ProbeDeployAndStow;
else
p1 = ProbeDeploy, p2 = ProbeStay, p3 = ProbeStow;
#endif
// Probe at 3 arbitrary points // Probe at 3 arbitrary points
float z_at_pt_1 = probe_pt( ABL_PROBE_PT_1_X + home_offset[X_AXIS], float z_at_pt_1 = probe_pt( ABL_PROBE_PT_1_X + home_offset[X_AXIS],
@ -4189,7 +4194,12 @@ inline void gcode_M42() {
float X_current = current_position[X_AXIS], float X_current = current_position[X_AXIS],
Y_current = current_position[Y_AXIS], Y_current = current_position[Y_AXIS],
Z_start_location = current_position[Z_AXIS] + Z_RAISE_BEFORE_PROBING; Z_start_location = current_position[Z_AXIS] + Z_RAISE_BEFORE_PROBING;
bool deploy_probe_for_each_reading = code_seen('E');
#if ENABLED(Z_PROBE_SLED) || ENABLED(Z_PROBE_ALLEN_KEY)
const bool deploy_probe_for_each_reading = false;
#else
bool deploy_probe_for_each_reading = code_seen('E');
#endif
float X_probe_location = code_seen('X') ? code_value_axis_units(X_AXIS) : X_current + X_PROBE_OFFSET_FROM_EXTRUDER; float X_probe_location = code_seen('X') ? code_value_axis_units(X_AXIS) : X_current + X_PROBE_OFFSET_FROM_EXTRUDER;
#if DISABLED(DELTA) #if DISABLED(DELTA)