From 2824b967ffff6349b8c5acaf849732db5f11ba4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 28 Aug 2015 08:20:20 +0200 Subject: [PATCH] Fixed a merge error --- src/octoprint/util/comm.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 8a67f87c..f0572439 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -1557,13 +1557,11 @@ class MachineCom(object): # trigger "sent" phase and use up one "ok" self._process_command_phase("sent", command, command_type, gcode=gcode) - if command_requiring_checksum or (command_allowing_checksum and checksum_enabled): - linenumber = self._currentLine - self._addToLastLines(command) - self._currentLine += 1 - self._doSendWithChecksum(command, linenumber) - else: - self._doSendWithoutChecksum(command) + # we only need to use up a clear if the command we just sent was either a gcode command or if we also + # require ack's for unknown commands + use_up_clear = self._unknownCommandsNeedAck + if gcode is not None: + use_up_clear = True # if we need to use up a clear, do that now if use_up_clear: