Fixed a merge error

This commit is contained in:
Gina Häußge 2015-08-28 08:20:20 +02:00
parent 7b8bf2cf5c
commit 2824b967ff

View file

@ -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: