diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-01-19 02:03:39 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-01-19 02:03:39 +0300 |
| commit | c812ce5e14cf476526d955edbce2effa9d922902 (patch) | |
| tree | da67dc55e46efdd38a0647318977a342da730345 /src/GCodes/GCodes2.cpp | |
| parent | e0bbf71357b07c22e6d43be3cca5c7422163be32 (diff) | |
Major refactoring, bug fixes in function evaluation
Changed all bitmaps to use the bitmap class from RRFLibraries
Fixed bugs in functoin evaluation
Diffstat (limited to 'src/GCodes/GCodes2.cpp')
| -rw-r--r-- | src/GCodes/GCodes2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index 2682321d..d4c68bcb 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -286,7 +286,7 @@ bool GCodes::HandleGcode(GCodeBuffer& gb, const StringRef& reply) return false; } - if ((reprap.GetMove().GetKinematics().AxesToHomeBeforeProbing() & ~axesHomed) != 0) + if (reprap.GetMove().GetKinematics().AxesToHomeBeforeProbing().Intersects(~axesHomed)) { reply.copy("Insufficient axes homed for bed probing"); result = GCodeResult::error; @@ -2387,12 +2387,12 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) break; } - AxesBitmap axisControls = 0; + AxesBitmap axisControls; for (size_t axis = 0; axis < numTotalAxes; axis++) { if (gb.Seen(axisLetters[axis]) && gb.GetIValue() > 0) { - SetBit(axisControls, axis); + axisControls.SetBit(axis); } } |