quarchpy 2.1.10.dev4__py3-none-any.whl → 2.1.10.dev6__py3-none-any.whl

quarchpy/connection_specific/QPS/~icense/usb4java-license.txt

@@ -0,0 +1,167 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+=================================
+
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms
+and conditions of version 3 of the GNU General Public License, supplemented
+by the additional permissions listed below.
+
+
+### 0. Additional Definitions.
+
+As used herein, "this License" refers to version 3 of the GNU Lesser General
+Public License, and the "GNU GPL" refers to version 3 of the GNU General
+Public License.
+
+"The Library" refers to a covered work governed by this License, other than
+an Application or a Combined Work as defined below.
+
+An "Application" is any work that makes use of an interface provided by the
+Library, but which is not otherwise based on the Library.  Defining a
+subclass of a class defined by the Library is deemed a mode of using an
+interface provided by the Library.
+
+A "Combined Work" is a work produced by combining or linking an Application
+with the Library.  The particular version of the Library with which the
+Combined Work was made is also called the "Linked Version".
+
+The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code for
+portions of the Combined Work that, considered in isolation, are based on
+the Application, and not on the Linked Version.
+
+The "Corresponding Application Code" for a Combined Work means the object
+code and/or source code for the Application, including any data and utility
+programs needed for reproducing the Combined Work from the Application, but
+excluding the System Libraries of the Combined Work.
+
+
+### 1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without
+being bound by section 3 of the GNU GPL.
+
+
+### 2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility
+refers to a function or data to be supplied by an Application that uses the
+facility (other than as an argument passed when the facility is invoked),
+then you may convey a copy of the modified version:
+
+* a) under this License, provided that you make a good faith effort to
+     ensure that, in the event an Application does not supply the function
+     or data, the facility still operates, and performs whatever part of its
+     purpose remains meaningful, or
+
+* b) under the GNU GPL, with none of the additional permissions of this
+     License applicable to that copy.
+
+
+### 3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a
+header file that is part of the Library.  You may convey such object code
+under terms of your choice, provided that, if the incorporated material is
+not limited to numerical parameters, data structure layouts and accessors,
+or small macros, inline functions and templates (ten or fewer lines in
+length), you do both of the following:
+
+* a) Give prominent notice with each copy of the object code that the
+     Library is used in it and that the Library and its use are covered by
+     this License.
+
+* b) Accompany the object code with a copy of the GNU GPL and this license
+     document.
+
+
+### 4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken
+together, effectively do not restrict modification of the portions of the
+Library contained in the Combined Work and reverse engineering for debugging
+such modifications, if you also do each of the following:
+
+* a) Give prominent notice with each copy of the Combined Work that the
+     Library is used in it and that the Library and its use are covered by
+     this License.
+
+* b) Accompany the Combined Work with a copy of the GNU GPL and this license
+     document.
+
+* c) For a Combined Work that displays copyright notices during execution,
+     include the copyright notice for the Library among these notices, as
+     well as a reference directing the user to the copies of the GNU GPL and
+     this license document.
+
+* d) Do one of the following:
+
+    * 0) Convey the Minimal Corresponding Source under the terms of this
+         License, and the Corresponding Application Code in a form suitable
+         for, and under terms that permit, the user to recombine or relink
+         the Application with a modified version of the Linked Version to
+         produce a modified Combined Work, in the manner specified by
+         section 6 of the GNU GPL for conveying Corresponding Source.
+
+    * 1) Use a suitable shared library mechanism for linking with the
+         Library.  A suitable mechanism is one that (a) uses at run time a
+         copy of the Library already present on the user's computer system,
+         and (b) will operate properly with a modified version of the
+         Library that is interface-compatible with the Linked Version.
+
+* e) Provide Installation Information, but only if you would otherwise be
+     required to provide such information under section 6 of the GNU GPL,
+     and only to the extent that such information is necessary to install
+     and execute a modified version of the Combined Work produced by
+     recombining or relinking the Application with a modified version of the
+     Linked Version.  (If you use option 4d0, the Installation Information
+     must accompany the Minimal Corresponding Source and Corresponding
+     Application Code.  If you use option 4d1, you must provide the
+     Installation Information in the manner specified by section 6 of the
+     GNU GPL for conveying Corresponding Source.)
+
+
+### 5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side
+by side in a single library together with other library facilities that are
+not Applications and are not covered by this License, and convey such a
+combined library under terms of your choice, if you do both of the
+following:
+
+* a) Accompany the combined library with a copy of the same work based on
+     the Library, uncombined with any other library facilities, conveyed
+     under the terms of this License.
+
+* b) Give prominent notice with the combined library that part of it is a
+     work based on the Library, and explaining where to find the
+     accompanying uncombined form of the same work.
+
+
+### 6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the
+GNU Lesser General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you
+received it specifies that a certain numbered version of the GNU Lesser
+General Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that published
+version or of any later version published by the Free Software Foundation. 
+If the Library as you received it does not specify a version number of the
+GNU Lesser General Public License, you may choose any version of the GNU
+Lesser General Public License ever published by the Free Software
+Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether
+future versions of the GNU Lesser General Public License shall apply, that
+proxy's public statement of acceptance of any version is permanent
+authorization for you to choose that version for the Library.

quarchpy/connection_specific/connection_QIS.py

@@ -812,28 +812,6 @@ class QisInterface:
         devString = filter(None, devString) #remove empty elements
         return devString
 
-    def get_list_details(self, sock=None):
-        if sock == None:
-            sock = self.sock
-        scanWait = 2
-        # printText('Scanning for devices and waiting ' + str(scanWait) + ' seconds.')
-        if self.pythonVersion == '3':
-            # devString = self.sendAndReceiveText(sock, '$scan').decode
-            # time.sleep(scanWait)
-            devString = self.sendAndReceiveText(sock, '$list details').decode()
-        else:
-            # devString = self.sendAndReceiveText(sock, '$scan')
-            # time.sleep(scanWait)
-            devString = self.sendAndReceiveText(sock, '$list details')
-
-        devString = devString.replace('>', '')
-        devString = devString.replace(r'\d+\) ', '')
-
-        # printText('"' + devString + '"')
-        devString = devString.split('\r\n')
-        devString = [x for x in devString if x]  # remove empty elements
-        return devString
-
     def scanIP(QisConnection, ipAddress):
         """
         Triggers QIS to look at a specific IP address for a quarch module
@@ -854,11 +832,11 @@ class QisInterface:
         response = "No response from QIS Scan"
         try:
             response = QisConnection.sendCmd(cmd="$scan " + ipAddress, expectedResponse=True)
-            # valid response is "Located device: 192.168.1.2"
-            if "located" in response.lower():
-                logging.debug(response)
-                # return the valid response
-                return response
+            if "qtl" in response.lower():
+                connectionType = ipAddress[:ipAddress.index("::")]
+                qtlNumber = response[response.lower().index("qtl"):]
+                conTarget = connectionType+"::"+qtlNumber
+                return conTarget
             else:
                 logging.warning("No module found at " + ipAddress)
                 logging.warning(response)
@@ -1070,19 +1048,16 @@ class QisInterface:
             if (self.isXmlHeader (streamStatus)):
                # Get the basic averaging rate (V3 header)
                xml_root = self.getStreamXmlHeader (device=device, sock=sock)
-               # Return the time based averaging string               
+               # Return the time based averaging string
                device_period = xml_root.find('.//devicePeriod')
-               time_unit = 'uS'
                if device_period == None:
                    device_period = xml_root.find('.//devicePerioduS')
                    if device_period == None:
                        device_period = xml_root.find('.//mainPeriod')
-                       if ('ns' in  device_period.text):
-                        time_unit = 'nS'
                averageStr = device_period.text
                
-               # Time column always first
-               formatHeader = 'Time ' + time_unit + ','
+               # Time column aleays first
+               formatHeader = 'Time,'
                # Find the channels section of each group and iterate through it to add the channel columns
                for group in xml_root.iter():
                    if (group.tag == "channels"):

quarchpy/connection_specific/connection_QPS.py

@@ -85,7 +85,6 @@ class QpsInterface:
         retVal = self.sendCmdVerbose(cmd)
         #print(cmd+" : "+retVal)
         time.sleep(0.3)
-        return retVal
 
 
     def disconnect(self, targetDevice):

quarchpy/connection_specific/connection_ReST.py

@@ -1,3 +1,5 @@
+import logging
+
 try:
     import httplib as httplib
 except ImportError:
@@ -21,7 +23,20 @@ class ReSTConn:
             if R2.status == 200:
                 Result = R2.read()
                 Result = Result.decode()
+
+                # Debugging to check for empty responses.
+                before_flag = False
+                if not Result or Result == "":
+                    logging.ERROR(f"RESt response to : {Command} returned empty response prior to strip")
+                    before_flag = True
+
                 Result = Result.strip('> \t\n\r')
+
+                # Debugging to check for empty responses
+                if Result == "":
+                    if not before_flag:
+                        logging.ERROR(f"RESt response to : {Command} was empty after string strip ")
+
                 self.Connection.close()
                 return Result
             else:

quarchpy/debug/simple_terminal.py

@@ -14,9 +14,8 @@ Read response
 from quarchpy import *
 from quarchpy.device import *
 from quarchpy.user_interface import*
-from quarchpy._version import __version__ as quarchpyVersion
 def main():
-    print(quarchpyVersion)
+
     moduleStr = userSelectDevice(nice=True, additionalOptions=["rescan","all conn types", "quit"])
     #moduleStr = "TCP:1999-05-005"
     if moduleStr == "quit":