Yellowfin tweak, improved test program.

- Changed default E-steps for Yellowfin Dual.
- Changes to test code.

Marlin/Conditionals_LulzBot.h

@@ -37,7 +37,7 @@
     #error Must specify model and toolhead. Please see "Configuration_LulzBot.h" for directions.
 #endif
 
-#define LULZBOT_FW_VERSION ".23"
+#define LULZBOT_FW_VERSION ".24"
 
 // Select options based on printer model
 
@@ -544,6 +544,8 @@
     #define LULZBOT_SWAP_EXTRUDERS
     #undef  LULZBOT_INVERT_E1_DIR
     #define LULZBOT_INVERT_E1_DIR                 false
+    #undef  LULZBOT_E_STEPS
+    #define LULZBOT_E_STEPS                        760
     #define LULZBOT_AO_Hexagon
 #endif /* TOOLHEAD_Yellowfin_DualExtruder */
 

tests/gcodeSender.py

@@ -47,7 +47,7 @@ def send_gcode_test(filename, serial):
     gcode = load_gcode(filename)
 
   for i, line in enumerate(gcode):
-    serial.enqueueCommand(line)
+    serial.sendCmdReliable(line)
     while(not serial.clearToSend()):
       serial.readline()
     if(i % 1000 == 0):

tests/pyMarlin/loggingSerialConnection.py

@@ -42,4 +42,8 @@ class LoggingSerialConnection:
       self._log("< Timeout")
     else:
       self._log("< " + data.decode(), end='')
-    return data
+    return data
+
+  @property
+  def in_waiting(self):
+    return self.serial.in_waiting

tests/pyMarlin/marlinSerialProtocol.py

@@ -33,9 +33,9 @@
 # The prototypical use case for this class is as follows:
 #
 #   for line in enumerate(gcode):
-#     serial.enqueueCommand(line)
+#     serial.sendCmdLine(line)
 #     while(not serial.clearToSend()):
-#       serial.readLine()
+#       serial.readline()
 #
 
 import functools
@@ -87,7 +87,10 @@ class MarlinSerialProtocol:
     self.marlinBufSize          = 4
     self.marlinReserve          = 1
     self.history                = GCodeHistory()
+    self.asap              = []
     self.slow_commands          = re.compile(b"M109|M190|G28|G29")
+    self.slow_timeout           = 400
+    self.fast_timeout           = 15
     self.restart()
 
   def _stripCommentsAndWhitespace(self, str):
@@ -113,9 +116,13 @@ class MarlinSerialProtocol:
 
   def _sendToMarlin(self):
     """Sends as many commands as are available and to fill the Marlin buffer.
-       Commands are read from the history. Generally only the most recently
-       appended command is sent; but after a resend request, we may be
-       further back in the history than that"""
+       Commands are first read from the asap queue, then read from the
+       history. Generally only the most recently history command is sent;
+       but after a resend request, we may be further back in the history
+       than that"""
+    while(len(self.asap) and self.marlinBufferCapacity() > 0):
+      cmd = self.asap.pop(0);
+      self._sendImmediate(cmd)
     while(not self.history.atEnd() and self.marlinBufferCapacity() > 0):
       pos, cmd = self.history.getNextCommand();
       self._sendImmediate(cmd)
@@ -158,9 +165,9 @@ class MarlinSerialProtocol:
         self.stallCountdown -= 1
       else:
         self.stallCountdown = 2
-        self._sendImmediate("\nM105*\n")
+        self._sendImmediate(b"\nM105*\n")
     else:
-      estimated_duration = 15 if self.slow_commands.search(line) else 2
+      estimated_duration = self.slow_timeout if self.slow_commands.search(line) else self.fast_timeout
       self.stallCountdown = max(estimated_duration, self.stallCountdown-1)
 
   def _resendFrom(self, position):
@@ -173,15 +180,27 @@ class MarlinSerialProtocol:
     while self.serial.readline() != b"":
       pass
 
-  def enqueueCommand(self, cmd):
-    """Adds a command to the sending queue. Queued commands will only be processed during calls to readLine()"""
-    if isinstance(cmd, str):
-      cmd = cmd.encode()
-    cmd = self._stripCommentsAndWhitespace(cmd)
-    cmd = self._replaceEmptyLineWithM105(cmd)
+  def sendCmdReliable(self, line):
+    """Adds command line (can contain comments or blanks) to the queue for reliable
+       transmission. Queued commands will be processed during calls to readLine() or
+       clearToSend()"""
+    if isinstance(line, str):
+      line = line.encode()
+    line = self._stripCommentsAndWhitespace(line)
+    cmd = self._replaceEmptyLineWithM105(line)
     cmd = self._addPositionAndChecksum(self.history.getAppendPosition(), cmd)
     self.history.append(cmd)
 
+  def sendCmdUnreliable(self, line):
+    """Sends a command (can contain comments or blanks) prior to any other
+       history commands. Commands will be processed during calls to
+       readLine() or clearToSend()"""
+    if isinstance(line, str):
+      line = line.encode()
+    cmd = self._stripCommentsAndWhitespace(line)
+    if cmd:
+      self.asap.append(cmd)
+
   def _gotOkay(self):
     if self.pendingOk > 0:
       self.pendingOk -= 1
@@ -217,9 +236,10 @@ class MarlinSerialProtocol:
     # detects a command with a checksum or line number error.
     resendPos = self._isResendRequest(line) or self._isNoLineNumberErr(line)
     if resendPos:
-      # If we got a resend requests, purge lines until timeout, but watch
-      # for any subsequent resend requests (we must only act on the last).
-      while line != b"":
+      # If we got a resend requests, purge lines until input buffer is empty
+      # or timeout, but watch for any subsequent resend requests (we must
+      # only act on the last).
+      while self.serial.in_waiting and line != b"":
         line = self.serial.readline()
         resendPos = self._isResendRequest(line) or self._isNoLineNumberErr(line) or resendPos
       # Process the last received resend request:
@@ -247,7 +267,7 @@ class MarlinSerialProtocol:
     """Clears all buffers and issues a M110 to Marlin. Call this at the start of every print."""
     self.history.clear()
     self.pendingOk       = 0
-    self.stallCountdown  = 5
+    self.stallCountdown  = self.fast_timeout
     self.gotError        = False
     self._flushReadBuffer()
     self._resetMarlinLineCounter()

tests/pyMarlin/noisySerialConnection.py

@@ -43,6 +43,10 @@ class NoisySerialConnection:
       data = self._corruptData(data)
     return data
 
+  @property
+  def in_waiting(self):
+    return self.serial.in_waiting
+
   def flush(self):
     self.serial.flush()