diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-05-01 20:41:41 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-05-01 20:41:41 +0300 |
| commit | 31e191242d78fb96a327f281d7acbf91ad8ba93c (patch) | |
| tree | ef351d907cad72dd93bb5fb9728f6c6076c5072b /src/GCodes/GCodeBuffer/StringParser.cpp | |
| parent | 4751f5bf5ad49e969f2d6a0f092dc517de28dcfb (diff) | |
Fix for G2/3 with K parameter after G18/19
Also: don't allow implicit G2/G3 commands (NIST doesn't support them)
Increased version to 3.3RC1+1
Diffstat (limited to 'src/GCodes/GCodeBuffer/StringParser.cpp')
| -rw-r--r-- | src/GCodes/GCodeBuffer/StringParser.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/GCodes/GCodeBuffer/StringParser.cpp b/src/GCodes/GCodeBuffer/StringParser.cpp index 7db2e7b2..42c7517f 100644 --- a/src/GCodes/GCodeBuffer/StringParser.cpp +++ b/src/GCodes/GCodeBuffer/StringParser.cpp @@ -894,10 +894,8 @@ void StringParser::DecodeCommand() noexcept } else if ( hasCommandNumber && commandLetter == 'G' - && commandNumber <= 3 - && ( strchr(reprap.GetGCodes().GetAxisLetters(), cl) != nullptr - || ((cl == 'I' || cl == 'J') && commandNumber >= 2) - ) + && commandNumber <= 1 + && strchr(reprap.GetGCodes().GetAxisLetters(), cl) != nullptr && ( reprap.GetGCodes().GetMachineType() == MachineType::cnc // Fanuc style CNC || reprap.GetGCodes().GetMachineType() == MachineType::laser // LaserWeb style ) |