Skip to content

Commit

Permalink
remove test for probe height being above bed in delta strategies
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfmanjm committed Apr 10, 2016
1 parent 48292a0 commit 338cc33
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
4 changes: 0 additions & 4 deletions src/modules/tools/zprobe/DeltaCalibrationStrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@ float DeltaCalibrationStrategy::findBed()

// leave the probe zprobe->getProbeHeight() above bed
float dz= zprobe->getProbeHeight() - zprobe->zsteps_to_mm(s);
if(dz >= 0) {
// probe was not started above bed
return NAN;
}
zprobe->coordinated_move(NAN, NAN, dz, zprobe->getFastFeedrate(), true); // relative move

return zprobe->zsteps_to_mm(s) + deltaz - zprobe->getProbeHeight(); // distance to move from home to 5mm above bed
Expand Down
6 changes: 1 addition & 5 deletions src/modules/tools/zprobe/DeltaGridStrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,8 @@ float DeltaGridStrategy::findBed()

// leave the probe zprobe->getProbeHeight() above bed
zprobe->return_probe(s);
float dz= zprobe->getProbeHeight() - zprobe->zsteps_to_mm(s);
if(dz >= 0) {
// probe was not started above bed
return NAN;
}

float dz= zprobe->getProbeHeight() - zprobe->zsteps_to_mm(s);
zprobe->coordinated_move(NAN, NAN, dz, zprobe->getFastFeedrate(), true); // relative move

return zprobe->zsteps_to_mm(s) + deltaz - zprobe->getProbeHeight(); // distance to move from home to 5mm above bed
Expand Down

0 comments on commit 338cc33

Please sign in to comment.