quarchpy 2.2.14__py2.py3-none-any.whl → 2.2.15__py2.py3-none-any.whl

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.14"
+__version__ = "2.2.15"

quarchpy/connection_specific/connection_QIS.py

@@ -965,6 +965,8 @@ class QisInterface:
         if stripes.endswith("eof\r\n>"):
             is_end_of_block = True
             stripes = stripes.rstrip("eof\r\n>")
+        if stripes.endswith("\r\n>"):
+            stripes= stripes[:-1] # remove the trailing ">"
         # The current reader seems to lose the final line feeds, so check for this
         if len(stripes) > 0:
             if not stripes.endswith("\r\n"):
@@ -1125,12 +1127,13 @@ class QisInterface:
         Returns:
             Command response string or None if no response expected
         """
+        if qis_socket is None:
+            qis_socket = self.sock
+
         if no_response_expected:
             self.send_text(qis_socket, command, device)
             return ""
         else:
-            if qis_socket is None:
-                qis_socket = self.sock
             if not (device == ''):
                 self.device_dict_setup(device)
             res = self.send_and_receive_text(qis_socket, command, device, not no_cursor_expected)

quarchpy/connection_specific/connection_Telnet.py

@@ -1,15 +1,21 @@
-import telnetlib
+from telnetlib import Telnet
 import time
+#from telnetlib3 import Telnet
+
 
 class TelnetConn:
     def __init__(self, ConnTarget):
         self.ConnTarget = ConnTarget
-        self.Connection = telnetlib.Telnet(self.ConnTarget)
+        self.Connection = Telnet(self.ConnTarget)
         time.sleep(1)
         self.Connection.read_very_eager()
 
     def close(self):
         self.Connection.close()
+        # The closed device reports as in use if a connection is opened to it within 0.05s.
+        # This happens during scanning as rest detects the device and shows it as "in use" Putting a sleep here
+        #  allows time for the connection to be close,
+        time.sleep(0.15)
         return True
 
     def sendCommand(self, Command, expectedResponse = True):

quarchpy/device/quarchArray.py

@@ -14,6 +14,7 @@ class quarchArray(quarchDevice):
 
         self.ConType=baseDevice.ConType
         self.connectionObj=baseDevice.connectionObj
+        self.baseDevice = baseDevice
         pass
 
     def getSubDevice(self, port):
@@ -51,23 +52,23 @@ class quarchArray(quarchDevice):
 
         return moduleList
 
-
+    def close_connection(self) -> str:
+        self.baseDevice.close_connection()
      
 
 class subDevice(quarchDevice):
 
     def __init__(self, baseDevice, port):
-        self.port = port
+        self.port = str(port)
         self.connectionObj = baseDevice.connectionObj
         self.ConType = baseDevice.ConType
         self.baseDevice = baseDevice
 
-    def sendCommand(self, CommandString, expectedResponse = True):
-        portNumb = str(self.port)
+    def send_command(self, CommandString, expectedResponse = True):
         returnStr = ''
         
         # Run the base device command
-        respStr = quarchDevice.send_command(self, CommandString + " <" + portNumb + ">")
+        respStr = quarchDevice.send_command(self, CommandString + " <" + str(self.port) + ">")
         # Split into lines, remove the line number sections then reform the string (removing the wanted 'x.y:' section at the start of each line
         respLines = respStr.split('\n')
         for x in respLines:            
@@ -77,3 +78,6 @@ class subDevice(quarchDevice):
         returnStr = returnStr.strip()
         return returnStr
 
+    def close_connection(self) -> str:
+        self.baseDevice.close_connection()
+

quarchpy/docs/CHANGES.rst

@@ -14,6 +14,10 @@ Change Log
 ----------
 
 
+2.2.15
+------
+- Bugfix for ">" appearing in qis output when streaming at max speed
+
 2.2.14
 ------
 - New QPS 1.49 and QIS 1.51