From e0bbf71357b07c22e6d43be3cca5c7422163be32 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Sat, 18 Jan 2020 15:21:02 +0000 Subject: Lock ZProbes when accessing them and added more items to OM --- src/GCodes/GCodes.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/GCodes/GCodes.cpp') diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index a926657b..1df814ba 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -2583,7 +2583,8 @@ GCodeResult GCodes::ExecuteG30(GCodeBuffer& gb, const StringRef& reply) { // Do a Z probe at the specified point. gb.SetState(GCodeState::probingAtPoint0); - if (platform.GetCurrentZProbeType() != ZProbeType::none && platform.GetCurrentZProbeType() != ZProbeType::blTouch && !probeIsDeployed) + const ZProbeType t = platform.GetCurrentZProbeType(); + if (t != ZProbeType::none && t != ZProbeType::blTouch && !probeIsDeployed) { DoFileMacro(gb, DEPLOYPROBE_G, false, 30); } @@ -2654,7 +2655,8 @@ GCodeResult GCodes::ProbeGrid(GCodeBuffer& gb, const StringRef& reply) gridXindex = gridYindex = 0; gb.SetState(GCodeState::gridProbing1); - if (platform.GetCurrentZProbeType() != ZProbeType::none && platform.GetCurrentZProbeType() != ZProbeType::blTouch && !probeIsDeployed) + const ZProbeType t = platform.GetCurrentZProbeType(); + if (t != ZProbeType::none && t != ZProbeType::blTouch && !probeIsDeployed) { DoFileMacro(gb, DEPLOYPROBE_G, false, 29); } -- cgit v1.2.3