diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-11-02 23:03:41 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-11-02 23:03:41 +0300 |
| commit | aa850feea05f552cc915abbc13e6870df31df3f2 (patch) | |
| tree | 9d95b49fa54268cbf849b76141390b324731187f /src/GCodes/GCodes4.cpp | |
| parent | e7892b8a2d4609a687fe9acde367fe2ce07e33e2 (diff) | |
Removed heightmap code for SBC mode
Removed various bits that were previously needed for heightmap handling in SBC mode
Diffstat (limited to 'src/GCodes/GCodes4.cpp')
| -rw-r--r-- | src/GCodes/GCodes4.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/GCodes/GCodes4.cpp b/src/GCodes/GCodes4.cpp index bb8292b3..663d1fb5 100644 --- a/src/GCodes/GCodes4.cpp +++ b/src/GCodes/GCodes4.cpp @@ -727,7 +727,6 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept } else if (zp->Stopped()) { - reprap.GetMove().heightMapLock.ReleaseWriter(); reprap.GetHeat().SuspendHeaters(false); gb.LatestMachineState().SetError("Probe already triggered before probing move started"); gb.SetState(GCodeState::checkError); @@ -740,7 +739,6 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept SetMoveBufferDefaults(); if (!platform.GetEndstops().EnableZProbe(currentZProbeNumber) || !zp->SetProbing(true)) { - reprap.GetMove().heightMapLock.ReleaseWriter(); gb.LatestMachineState().SetError("Failed to enable probe"); gb.SetState(GCodeState::checkError); RetractZProbe(gb); @@ -774,7 +772,6 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept zp->SetProbing(false); if (!zProbeTriggered) { - reprap.GetMove().heightMapLock.ReleaseWriter(); gb.LatestMachineState().SetError("Probe was not triggered during probing move"); gb.SetState(GCodeState::checkError); RetractZProbe(gb); @@ -848,7 +845,6 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept } else { - reprap.GetMove().heightMapLock.ReleaseWriter(); gb.LatestMachineState().SetError("Z probe readings not consistent"); gb.SetState(GCodeState::checkError); RetractZProbe(gb); @@ -909,14 +905,9 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept reply.printf("%" PRIu32 " points probed, min error %.3f, max error %.3f, mean %.3f, deviation %.3f\n", numPointsProbed, (double)minError, (double)maxError, (double)deviation.GetMean(), (double)deviation.GetDeviationFromMean()); #if HAS_MASS_STORAGE -# if HAS_SBC_INTERFACE - if (!reprap.UsingSbcInterface()) -# endif + if (TrySaveHeightMap(DefaultHeightMapFile, reply)) { - if (TrySaveHeightMap(DefaultHeightMapFile, reply)) - { - stateMachineResult = GCodeResult::error; - } + stateMachineResult = GCodeResult::error; } #endif reprap.GetMove().AccessHeightMap().ExtrapolateMissing(); @@ -931,7 +922,6 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept { gb.LatestMachineState().SetError("Too few points probed"); } - reprap.GetMove().heightMapLock.ReleaseWriter(); } if (stateMachineResult == GCodeResult::ok) { |