quarchpy 2.2.17.dev2__py3-none-any.whl → 2.2.17.dev3__py3-none-any.whl

quarchpy/qps/qpsFuncs.py

@@ -1,6 +1,9 @@
+import socket
+from subprocess import CompletedProcess, Popen
 from threading import Thread, Lock, Event
 from queue import Queue, Empty
 import platform
+from typing import Optional, List, Any, Tuple, Union
 
 import quarchpy_binaries
 
@@ -8,9 +11,11 @@ from quarchpy.install_qps import find_qps
 from quarchpy.qis import isQisRunning, startLocalQis
 from quarchpy.connection_specific.connection_QPS import QpsInterface
 from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
+from quarchpy.qis.qisFuncs import isQisRunningAndResponding
 from quarchpy.user_interface import *
 import subprocess
 import logging
+
 logger = logging.getLogger(__name__)
 
 
@@ -18,7 +23,7 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
     '''
     This func will return true if QPS is running with a working QIS connection.
     '''
-    myQps=None
+    myQps = None
     logger.debug("Checking if QPS is running")
     start = time.time()
     while True:
@@ -34,12 +39,13 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
         logger.debug("QPS is not running")
         return False
 
-    logger.debug("Checking if QPS reports a QIS connection") # "$qis status" returns connected if it has ever had a QIS connection.
-    answer=0
-    counter=0
+    logger.debug(
+        "Checking if QPS reports a QIS connection")  # "$qis status" returns connected if it has ever had a QIS connection.
+    answer = 0
+    counter = 0
     while True:
         answer = myQps.sendCmdVerbose(cmd="$qis status")
-        if answer.lower()=="connected":
+        if answer.lower() == "connected":
             logger.debug("QPS Running With QIS Connected")
             break
         else:
@@ -47,7 +53,7 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
             time.sleep(0.5)
             counter += 1
             if counter > 5:
-                logger.debug("QPS Running QIS NOT found after "+str(counter)+" attempts.")
+                logger.debug("QPS Running QIS NOT found after " + str(counter) + " attempts.")
                 return False
 
     logger.debug("Checking if QPS/QIS comms are running")
@@ -71,122 +77,88 @@ def isQpsRunning(host='127.0.0.1', port=9822, timeout=0):
         return False
 
 
-def startLocalQps(keepQisRunning=False, args=[], timeout=30, startQPSMinimised=True):
-
+def startLocalQps(
+        keepQisRunning: bool = False,
+        args: Optional[List[str]] = [],
+        timeout: int = 30,
+        startQPSMinimised: bool = True,
+        host: str = '127.0.0.1',
+        port: int = 9822,
+        qis_port: int = 9722,
+        qis_rest_port: int = 9780
+) -> Optional['QpsInterface']:
+    """
+    Main entry point to start a local QPS instance.
+    """
+    # 1. Prepare Arguments
+    # We copy the list to avoid modifying the input in place
+    launch_args = args.copy()
+    if not launch_args:
+        launch_args = ""
+
+    # Sync 'port' arg to CLI flags if non-default
+    if port != 9822:
+        # Only add if not already manually present in args
+        if not any("-port=" in arg for arg in launch_args):
+            launch_args.append(f"-port={port}")
+
+    # Sync 'qisport' arg to CLI flags if non-default
+    if qis_port != 9722:
+        if not any("-qisport=" in arg for arg in launch_args):
+            launch_args.append(f"-qisport={qis_port}")
+
+    # Sync 'qisrestport' arg to CLI flags if non-default
+    if qis_rest_port != 9780:
+        if not any("-qisrestport=" in arg for arg in launch_args):
+            launch_args.append(f"-qisrestport={qis_port}")
+
+    # 2. Check if already running on the specific target port
+    if _check_port_open(host, port):
+        logger.debug(f"QPS instance on port {port} is already running. Connecting...")
+        return QpsInterface(host=host, port=port)
+
+    # 3. Check for QPS installation
     if not find_qps():
         logger.error("Unable to find or install QPS... Aborting...")
-        return
+        return None
 
+    # 4. Handle QIS Backend (if required)
     if keepQisRunning:
-        if not isQisRunning():
-            startLocalQis()
+        if not _ensure_qis_running(host, qis_port, qis_rest_port, timeout):
+            return None
 
-    if args.__len__() !=0:
-        args = " ".join(args)
-    else:
-        args=" "
-    if startQPSMinimised == True:
-        if "-ccs" not in args.lower():
-            args +=" -ccs=MIN"
+    # 5. Prepare Command and Environment
+    command, qps_dir = _prepare_qps_launch_env(launch_args, startQPSMinimised)
+    if not command:
+        return None
 
-    # Record current working directory
+    # 6. Launch QPS Process
     current_dir = os.getcwd()
 
-    # JRE path
-    java_path = quarchpy_binaries.get_jre_home()
-    java_path = "\"" + java_path
-    # Start to build the path towards qps.jar
-    qps_path = os.path.dirname(os.path.abspath(__file__))
-    qps_path, junk = os.path.split(qps_path)
-
-    # Check the current OS
-    current_os = platform.system()
-    current_arch = platform.machine()
-    current_arch = current_arch.lower()  # ensure comparing same case
-
-    # Currently officially unsupported
-    if (current_os in "Linux" and current_arch == "aarch64") or (current_os in "Darwin" and current_arch == "arm64"):
-        logger.warning("The system [" + current_os + ", " + current_arch + "] is not officially supported.")
-        logger.warning("Please contact Quarch support for running QuarchPy on this system.")
-        return
-
-    # ensure the jres folder has the required permissions
-    permissions, message = find_java_permissions()
-    if permissions is False:
-        logger.warning(message)
-        logger.warning("Not having correct permissions will prevent Quarch Java Programs from launching.")
-        logger.warning("Run \"python -m quarchpy.run permission_fix\" to fix this.")
-        user_input = input("Would you like to use auto run this now? (Y/N)")
-        if user_input.lower() == "y":
-            fix_permissions()
-            permissions, message = find_java_permissions()
-            time.sleep(0.5)
-            if permissions is False:
-                logger.warning("Attempt to fix permissions was unsuccessful. Please fix manually.")
-            else:
-                logger.warning("Attempt to fix permissions was successful. Now continuing.")
-
-
-    qps_path = os.path.join(qps_path, "connection_specific", "QPS", "qps.jar")
-
-
-    # Change the working directory to the directory containing qps.jar
-    os.chdir(os.path.dirname(qps_path))
-
-
-    # OS dependency
-    if current_os in "Windows":
-        command = java_path + "\\bin\\java\" -jar qps.jar " + str(args)
-    elif current_os in "Linux" and current_arch == "x86_64":
-        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
-    elif current_os in "Linux" and current_arch == "aarch64":
-        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
-    elif current_os in "Darwin" and current_arch == "x86_64":
-        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
-    elif current_os in "Darwin" and current_arch == "arm64":
-        command = java_path + "/bin/java\" -jar qps.jar " + str(args)
-    else:  # default to windows
-        command = java_path + "\\bin\\java\" -jar qps.jar " + str(args)
-
     if isQpsRunning():
         logger.debug("QPS is already running. Not starting another instance.")
         os.chdir(current_dir)
-        return
-    if "-logging=ON" in str(args): #If logging to a terminal window is on then os.system should be used to keep a window open to view logging.
-        if current_os in "Windows":
-            process = subprocess.Popen(command,shell=True)
-        else:
-            # Add a hold command to keep the terminal open (useful for bash)
-            command_with_pause = command + "; exec bash"
-            process = subprocess.run(command_with_pause, shell=True)
-    else:
-        if sys.version_info[0] < 3:
-            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
-        else:
-            process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, shell=True)
+        return None
 
-        startTime = time.time()
-        while not isQpsRunning():
-            time.sleep(0.2)
-            _get_std_msg_and_err_from_QPS_process(process)
-            if time.time() - startTime > timeout:
-                os.chdir(current_dir)
-                raise TimeoutError("QPS failed to launch within timelimit of " + str(timeout) + " sec.")
-        logger.debug("QPS detected after " + str(time.time() - startTime) + "s")
+    try:
+        os.chdir(qps_dir)  # Switch to QPS dir for launch dependencies
+        process = _launch_process(command, args)
+    finally:
+        os.chdir(current_dir)  # Always return to original dir
 
-        while not isQisRunning():
-            if time.time() - startTime > timeout:
-                raise TimeoutError(
-                    "QPS did launch but QIS did not respond during the timeout time of " + str(timeout) + " sec.")
-            time.sleep(0.2)
-        logger.debug("QIS detected after " + str(time.time() - startTime) + "s")
+    # 7. Wait for QPS to be ready
+    if not _wait_for_service(host, port, timeout, process, args):
+        return None
 
-    # return current working directory
-    os.chdir(current_dir)
-    return
+    # 8. Return Connected Interface
+    try:
+        return QpsInterface(host=host, port=port)
+    except Exception as e:
+        logger.error(f"QPS started, but failed to create interface object: {e}")
+        return None
 
 
-def reader(stream, q, source, lock,stop_flag):
+def reader(stream, q, source, lock, stop_flag):
     '''
     Used to read output and place it in a queue for multithreaded reading
     :param stream:
@@ -222,7 +194,7 @@ def _get_std_msg_and_err_from_QPS_process(process):
     t2.start()
     counter = 0
     # check for stderr or stdmsg from the queue
-    while counter <= 3: # If 3 empty reads from the queue then move on to see if QPS is running.
+    while counter <= 3:  # If 3 empty reads from the queue then move on to see if QPS is running.
         try:
             source, line = q.get(timeout=1)  # Wait for 1 second for new lines
             counter = 0
@@ -232,73 +204,197 @@ def _get_std_msg_and_err_from_QPS_process(process):
                 printText(f"{source}: {line}")
         except Empty:
             counter += 1
-    stop_flag.set() #Close the threads and return to the main loop where QPS is check to see if its started yet
+    stop_flag.set()  #Close the threads and return to the main loop where QPS is check to see if its started yet
 
 
 def closeQps(host='127.0.0.1', port=9822):
     myQps = QpsInterface(host, port)
     myQps.sendCmdVerbose("$shutdown")
     del myQps
-    time.sleep(1) #needed as calling "isQpsRunning()" will throw an error if it ties to connect while shutdown is in progress.
+    time.sleep(
+        1)  #needed as calling "isQpsRunning()" will throw an error if it ties to connect while shutdown is in progress.
+
+
+def GetQpsModuleSelection(QpsConnection: 'QpsInterface', favouriteOnly=True,
+                          additionalOptions=['rescan', 'all con types', 'ip scan'], scan=True):
+    """
+    Deprecated: use QpsInterface.get_module_selection instead.
+    This function will return a module selection list from QPS.
+
+    """
+    return (
+        QpsConnection.get_qps_module_selection(preferred_connection_only=favouriteOnly,
+                                               additional_options=additionalOptions, scan=scan)
+    )
+
+
+# ==========================================
+#           HELPER FUNCTIONS
+# ==========================================
+
+def _parse_ports(args: List[str]) -> Tuple[int, int, int]:
+    """Extracts QPS and QIS ports from the argument list."""
+    qps_port = 9822
+    qis_port = 9722
+    qis_rest_port = 9780
+
+    for arg in args:
+        arg_lower = arg.lower()
+        if "-port=" in arg_lower:
+            try:
+                qps_port = int(arg.split('=')[1])
+            except (IndexError, ValueError):
+                pass
+        elif "-qisport=" in arg_lower:
+            try:
+                qis_port = int(arg.split('=')[1])
+            except (IndexError, ValueError):
+                pass
+        elif "-qisrestport=" in arg_lower:
+            try:
+                qis_rest_port = int(arg.split('=')[1])
+            except (IndexError, ValueError):
+                pass
+
+    return qps_port, qis_port, qis_rest_port
+
+
+def _ensure_qis_running(host: str, qis_port: int, qis_rest_port: int, timeout: int) -> bool:
+    """Checks if QIS is running on the target port, starts it if not."""
+    if _check_port_open(host, qis_port):
+        return True
 
-def GetQpsModuleSelection(QpsConnection, favouriteOnly=True, additionalOptions=['rescan', 'all con types', 'ip scan'], scan=True):
-    favourite = favouriteOnly
-    ip_address = None
-    while True:
-        printText("QPS scanning for devices")
-        tableHeaders = ["Module"]
-        # Request a list of all USB and LAN accessible power modules
-        if ip_address == None:
-            devList = QpsConnection.getDeviceList(scan=scan)
-        else:
-            devList = QpsConnection.getDeviceList(scan=scan, ipAddress=ip_address)
-        if "no device" in devList[0].lower() or "no module" in devList[0].lower():
-            favourite = False  # If no device found conPref wont match and will bugout
-
-        # Removes rest devices
-        devList = [x for x in devList if "rest" not in x]
-        message = "Select a quarch module"
-
-        if (favourite):
-            index = 0
-            sortedDevList = []
-            conPref = ["USB", "TCP", "SERIAL", "REST", "TELNET"]
-            while len(sortedDevList) < len(devList):
-                for device in devList:
-                    if conPref[index] in device.upper():
-                        sortedDevList.append(device)
-                index += 1
-            devList = sortedDevList
-
-            # new dictionary only containing one favourite connection to each device.
-            favConDevList = []
-            index = 0
-            for device in sortedDevList:
-                if (favConDevList == [] or not device.split("::")[1] in str(favConDevList)):
-                    favConDevList.append(device)
-            devList = favConDevList
-
-        if User_interface.instance != None and User_interface.instance.selectedInterface == "testcenter":
-            tempString = ""
-            for module in devList:
-                tempString+=module+"="+module+","
-            devList = tempString[0:-1]
-
-
-        myDeviceID = listSelection(title=message, message=message, selectionList=devList,
-                                   additionalOptions=additionalOptions, nice=True, tableHeaders=tableHeaders, indexReq=True)
-
-        if myDeviceID in 'rescan':
-            ip_address = None
-            favourite = True
-            continue
-        elif myDeviceID in 'all con types':
-            printText('Displaying all conection types...')
-            favourite = False
-            continue
-        elif myDeviceID in 'ip scan':
-            ip_address = requestDialog("Please input IP Address of the module you would like to connect to: ")
-            favourite = False
-            continue
+    logger.debug(f"Starting QIS on ports {qis_port}/{qis_rest_port}...")
+    qis_args = [f'-port={qis_port}', f'-restport={qis_rest_port}']
+    startLocalQis(args=qis_args)
+
+    # Wait for QIS
+    start_time = time.time()
+    while not _check_port_open(host, qis_port):
+        if time.time() - start_time > timeout:
+            logger.error(f"QIS failed to start on port {qis_port} within timeout.")
+            return False
+        time.sleep(0.5)
+
+    while isQisRunningAndResponding():
+        time.sleep(0.5)
+
+    return True
+
+
+def _prepare_qps_launch_env(args: List[str], startQPSMinimised: bool) -> Tuple[Optional[str], Optional[str]]:
+    """Resolves paths using quarchpy_binaries, checks permissions, and builds command."""
+
+    # 1. Check OS Support
+    current_os = platform.system()
+    current_arch = platform.machine().lower()
+
+    # 2. Handle Permissions
+    _handle_java_permissions()
+
+    # 3. Resolve Paths using quarchpy_binaries
+    if 'quarchpy_binaries' not in globals() and 'quarchpy_binaries' not in locals():
+        # Fallback if module isn't imported or available
+        logger.error("quarchpy_binaries module not found. Cannot locate JRE.")
+        return None, None
+
+    try:
+        java_home = quarchpy_binaries.get_jre_home()
+    except Exception as e:
+        logger.error(f"Failed to get JRE home: {e}")
+        return None, None
+
+    # Resolve QPS Jar Path
+    qps_root = os.path.dirname(os.path.abspath(__file__))
+    qps_root, _ = os.path.split(qps_root)  # Up one level
+    qps_jar_path = os.path.join(qps_root, "connection_specific", "QPS", "qps.jar")
+    qps_dir = os.path.dirname(qps_jar_path)
+
+    # 4. Construct Command
+    # Determine separator based on OS (Windows uses \, Linux/Mac use /)
+
+    java_bin = "bin/java"
+    if current_os == "Windows":
+        java_bin = r"bin\java"
+
+    # Full path to java executable
+    java_exe = os.path.join(java_home, java_bin)
+
+    # Wrap java path in quotes for safety
+    java_exe_quoted = f'"{java_exe}"'
+
+    # Prepare Args String
+    args_str = " ".join(args) if args else " "
+    if startQPSMinimised and "-ccs" not in args_str.lower():
+        args_str += " -ccs=MIN"
+
+    # Build Final Command
+    command = f'{java_exe_quoted} -jar qps.jar {args_str}'
+
+    return command, qps_dir
+
+
+def _handle_java_permissions() -> None:
+    """Checks and attempts to fix Java execution permissions."""
+    permissions, message = find_java_permissions()
+    if not permissions:
+        logger.warning(message)
+        printText("Not having correct permissions will prevent Quarch Java Programs from launching.")
+        printText('Run "python -m quarchpy.run permission_fix" to fix this.')
+        printText("Would you like quarchpy to attempt to fix the permissions now? (Y/N)")
+        try:
+            user_input = requestDialog(">>> ")
+        except EOFError:
+            user_input = "N"
+        if user_input.strip().lower() in ['y', 'yes']:
+            fix_permissions()
+
+
+def _launch_process(command: str, args: List[str]) -> Union[Popen, CompletedProcess]:
+    """Launches the subprocess, handling logging flags."""
+    args_str = " ".join(args) if args else ""
+
+    if "-logconsole=ON" in args_str:
+        if platform.system() == "Windows":
+            return subprocess.Popen(command, shell=True)
         else:
-            return myDeviceID
+            return subprocess.run(command + "; exec bash", shell=True)
+    else:
+        # Use text=True for Python 3.7+
+        text_mode = True if sys.version_info >= (3, 7) else False
+        # Fallback for 3.6 if needed (universal_newlines=True)
+        return subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=text_mode, shell=True)
+
+
+def _wait_for_service(host: str, port: int, timeout: int, process: Optional[subprocess.Popen], args: List[str]) -> bool:
+    """Polls the port until open, checking process output for errors."""
+    start_time = time.time()
+    args_str = " ".join(args) if args else ""
+    logging_on = "-logconsole=ON" in args_str
+
+    while True:
+        if _check_port_open(host, port):
+            logger.debug(f"QPS detected on port {port} after {time.time() - start_time:.2f}s")
+            return True
+
+        # If hidden, drain pipes to prevent deadlock and check for crashes
+        if not logging_on and process:
+            _get_std_msg_and_err_from_QPS_process(process)
+
+        if time.time() - start_time > timeout:
+            logger.error(f"QPS failed to launch on port {port} within timelimit of {timeout} sec.")
+            return False
+
+        time.sleep(0.2)
+
+
+def _check_port_open(host: str, port: int) -> bool:
+    """Simple TCP connect check."""
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.settimeout(1)
+    try:
+        s.connect((host, int(port)))
+        s.close()
+        return True
+    except (socket.timeout, ConnectionRefusedError, OSError):
+        return False

quarchpy/run.py

@@ -240,7 +240,7 @@ def _run_qps_function(args=[]):
                     printText("QPS is not running")
 
     if not shutdown:
-        startLocalQps(args=args)
+        startLocalQps(args=args, startQPSMinimised=False)
 
 
 def _run_calibration_function(args=[]):

{quarchpy-2.2.17.dev2.dist-info → quarchpy-2.2.17.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quarchpy
-Version: 2.2.17.dev2
+Version: 2.2.17.dev3
 Summary: This packpage offers Python support for Quarch Technology modules.
 Author: Quarch Technology ltd
 Author-email: support@quarch.com
@@ -18,6 +18,7 @@ Classifier: Topic :: System
 Classifier: Topic :: System :: Power (UPS)
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
 Requires-Dist: zeroconf>=0.23.0
 Requires-Dist: numpy
 Requires-Dist: pandas
@@ -25,6 +26,8 @@ Requires-Dist: requests
 Requires-Dist: packaging
 Requires-Dist: quarchpy-binaries
 Requires-Dist: typing-extensions
+Requires-Dist: libusb-package
+Requires-Dist: telnetlib-313-and-up; python_version >= "3.13"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -32,6 +35,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{quarchpy-2.2.17.dev2.dist-info → quarchpy-2.2.17.dev3.dist-info}/RECORD

@@ -1,11 +1,11 @@
 quarchpy/LICENSE.rst,sha256=SmYK6o5Xs2xRaUwYT-HqNDRu9eygu6y9QwweXNttiRc,3690
 quarchpy/QuarchPy Function Listing.xlsx,sha256=NE68cZPn7b9P3wcnCsnQr3H6yBkt6D5S6dH6457X520,31245
 quarchpy/README.txt,sha256=-LbrJ5rCPGSxoBmvr9CxJVokQUDwZSjoHa43eN8bWck,980
-quarchpy/__init__.py,sha256=Tcy5E_CYPeI9gZIXo8HGFU8EEFAHy_iLLLGGvJY0LII,4827
-quarchpy/_version.py,sha256=C7lcL4wEmssyY-yDgX28o5czgs4xOCFShHls1_F6jIs,28
+quarchpy/__init__.py,sha256=Qox6pyz_dPX-N5mMraLgur7v9-u8NAUyigvbGCjefco,5003
+quarchpy/_version.py,sha256=_FVcSU9SQj97J4Jk9e2K-JYMHsTCEl3ptgFdZH3NtjI,28
 quarchpy/connection.py,sha256=9lPIUP4LCWkFAedc8CWorDY-3ujdAA-cyeNkSBdIv9E,2226
 quarchpy/install_qps.py,sha256=SA5apEma3MOAZUibgwZD7tzQZw8VExTIfBKIFpdhPK0,14276
-quarchpy/run.py,sha256=CXclGxRDuXzFKw7jNM0f_ooF-s7TaPxbubnYOYg2BRk,10550
+quarchpy/run.py,sha256=CnvsKWamSSCpSlLA4yhWBeRx7wTHGqn22CrQwft2jxs,10575
 quarchpy/config_files/__init__.py,sha256=bP9FM5hjP0r7s8qmWqcsVjAfHM0B4XY7cz5sTpe2HDA,290
 quarchpy/config_files/quarch_config_parser.py,sha256=U3zLFrBcOzUjGXnLy68x5OTzXjdcri2T-oebUFBSku0,28909
 quarchpy/config_files/Cable_Modules/QTL1253-01 - Mini SAS Module Config v3.5 c1.3.qfg,sha256=ouKaSi7fSp2fjgDKZYXDWXck1WUENPjtz4Ur-GPZlTI,4727
@@ -220,12 +220,12 @@ quarchpy/config_files/Switch_Modules/QTL1564-xx - 12 Port Mini SAS HD MUX Module
 quarchpy/config_files/Switch_Modules/QTL1584-xx - 1-4 ExpressCard MUX Module Config v4.000.qfg,sha256=EKF_xwQ8EltFothcCRYphSK_Q19Ow1Dg2hmkg6--jfQ,1439
 quarchpy/connection_specific/StreamChannels.py,sha256=_xBEgDpTCeQue-bsv3fwO3aN1JPWvbuvK3ZwTgvXB4c,601
 quarchpy/connection_specific/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quarchpy/connection_specific/connection_QIS.py,sha256=FY8Vm0qQosZujgn5s6Px8CzoZAEcICpANBCYfjdeKdg,66408
-quarchpy/connection_specific/connection_QPS.py,sha256=U-XnbnhkUFwJyV07YQr-btTsE4E9tJLaW2lGrZEGew8,9847
+quarchpy/connection_specific/connection_QIS.py,sha256=W_Oqwvq14hzLI5XqbvTsKIzEYy3O8kZ11vC91u2pgZI,66216
+quarchpy/connection_specific/connection_QPS.py,sha256=K9ei0DhIVvF3krQw-Bheh0AUd6NTprE0O-jkmAcwOoQ,14228
 quarchpy/connection_specific/connection_ReST.py,sha256=rYcC-wv2kO2365_ltyAyN99afTPi1JWb9B5JFRPg5F0,1727
 quarchpy/connection_specific/connection_Serial.py,sha256=j0KTxOX7c5rmu09s68sqOzHpVV2TyB0WnPc-Cv5YstI,1834
 quarchpy/connection_specific/connection_TCP.py,sha256=hkKJC9QkopBaaWnWB9xz9LRlvcvGAwvz9w3RxRDXfgc,2427
-quarchpy/connection_specific/connection_Telnet.py,sha256=yY6TbkEIEHy-HhXuJbbEjgpX0oPvzlX1EdHa9BNlyLI,1000
+quarchpy/connection_specific/connection_Telnet.py,sha256=n-UJxxaz-Jmehn3uO7fXGvdbjAZ3_swuVaBOTGFtA30,1631
 quarchpy/connection_specific/connection_USB.py,sha256=PRpYCt_dPIOWneOUPIx_-8NL3BPQ6ps1ZOoZT_M0VWk,26180
 quarchpy/connection_specific/mDNS.py,sha256=yzI6jkskuW-Ror6wovQc9e9V1Ma2x5AEA-O1k45galE,5739
 quarchpy/connection_specific/QPS/InstallType.dat,sha256=HsQ1rDwJ3gtYiDSbNQyrtFNHXPBnApYwQpDWyMOv0Vk,21
@@ -573,7 +573,7 @@ quarchpy/connection_specific/QPS/resources/profiles/3_PHASE_PAM_AC_FULL.rcf,sha2
 quarchpy/connection_specific/QPS/resources/profiles/3_PHASE_PAM_AC_FULL.scf,sha256=4QhGAeC0XqEZXq6r5SBE9oJ-O7b-CjsK4wUwYBg8zQ4,9955
 quarchpy/connection_specific/QPS/resources/profiles/PAM_EXAMPLE_CONFIG.rcf,sha256=TbQXrBOKkU8pIWNar5Yg7opUZfLZnDEMxvDuLP5rLa0,8269
 quarchpy/connection_specific/jdk_jres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quarchpy/connection_specific/jdk_jres/fix_permissions.py,sha256=PD9MvYomVhhg74BRMikKaln9Urmn7nknwNmAWM1ShaU,1720
+quarchpy/connection_specific/jdk_jres/fix_permissions.py,sha256=WonVdbVH9VQBW3YGeats-vNyEsbu_XC1fjL931_xA2Y,1645
 quarchpy/connection_specific/serial/__init__.py,sha256=2MXI5_UH-k_ebcv8Gx5LwIBTv4ysX3AyNt6RpYEeTTE,3165
 quarchpy/connection_specific/serial/rfc2217.py,sha256=RyONj4vDqVjCGqoq1Atu1H_SwHOlPNo_xQqjxYwI4_E,59394
 quarchpy/connection_specific/serial/rs485.py,sha256=O2YbxLMlziEX1N39WOukrlhMWcYzVwiP95FBhMmUIHc,3265
@@ -601,21 +601,21 @@ quarchpy/connection_specific/serial/urlhandler/protocol_rfc2217.py,sha256=886ex7
 quarchpy/connection_specific/serial/urlhandler/protocol_socket.py,sha256=iqC8W0kphMlEbVZDYpKuAX4_TT1uWw7Lty9ROHRr6jg,14087
 quarchpy/connection_specific/serial/urlhandler/protocol_spy.py,sha256=BoFWB9CJHdYjM4kdvxhYAnAJLqy8aiWyhTbtuFioA9w,8847
 quarchpy/connection_specific/usb_libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quarchpy/connection_specific/usb_libs/libusb1.py,sha256=hwqR1G1G2dtla9_TQipz43hT1VHDANnjwIqdes_2qCg,50528
+quarchpy/connection_specific/usb_libs/libusb1.py,sha256=fBsmVtR1-nU_6i4pQhTsXLoey3LnElXwSzkdR1NYL0U,51202
 quarchpy/connection_specific/usb_libs/usb1.py,sha256=1y8hNPFLiDpU2uwPkrGHASsBxqQzZ4Rbb9nlFHq0T9Y,83376
 quarchpy/connection_specific/usb_libs/MS32/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quarchpy/connection_specific/usb_libs/MS32/libusb-1.0.dll,sha256=I-lcEsC7bWOoTGACmNzenKnKlZxeOXv_fs4O2UqDwuo,97280
 quarchpy/connection_specific/usb_libs/MS64/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quarchpy/connection_specific/usb_libs/MS64/libusb-1.0.dll,sha256=kkMfbwPZWak7xgeZH4IYcxc6xXd764fgqQF5T_9z8yg,116224
-quarchpy/debug/SystemTest.py,sha256=aJx-FKcY3jvBsSKciKBqe_2goqqbBMHvOwt3zyYiVng,10270
+quarchpy/debug/SystemTest.py,sha256=rUnzas3HOoXvUmGFny_2-dwCfFVuQvrvhfw6DcCQ5vI,12470
 quarchpy/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quarchpy/debug/__main__.py,sha256=-7ofWPl6ihnVHs1xWyYzpIwzc2-qpW9GhUYV09_xl-k,48
-quarchpy/debug/module_debug.py,sha256=zCL4zIfM_N7W43LeqbhpXwldr7pvT_HU8Y4Tvcopg0I,9316
+quarchpy/debug/module_debug.py,sha256=17rWsjMkTG1aYn0GPzvCR0MEWBy5mhrUJVNlqreFogA,9733
 quarchpy/debug/simple_terminal.py,sha256=FzAdoDluGgW6z_K864SVyyc13TU8ayGBlt_JfUdrQEk,2164
 quarchpy/debug/upgrade_quarchpy.py,sha256=V_a04-MqhA1dxJEoKy0kWwtIEC6kyvQHBdqOk6pRygc,4235
 quarchpy/debug/versionCompare.py,sha256=1s6w0tkoKd_1byOb312UqOIwF_1S3C66fqN2YkxIHlE,2434
 quarchpy/device/__init__.py,sha256=TrJ-62vByGipaYMHZ0_-NT6w10WCFrGcBgC6SFj7gx4,971
-quarchpy/device/device.py,sha256=SVlulpT129ulFiBC8vXqMlN5EghheBLZboAmoxFSiC8,65870
+quarchpy/device/device.py,sha256=yTi0Z9DhyKIokC_GO1Lb0PxCsZgNA26105rkTdcdLRo,68075
 quarchpy/device/device_fixture_idn_info.py,sha256=NnvbTsrYqX6Gx98UwQ5WbPij2rTuJMDdriSw28J4jug,311
 quarchpy/device/device_idn_info.py,sha256=Iv5NPo8s1P2YE6-R954Z5rcm5v6M2E0iXdgwgd5iEPI,3670
 quarchpy/device/device_network_info.py,sha256=6OV9bmJMnZbv0x_VN3Z7Fah2ru6ThOjGC_cgtqarLOQ,728
@@ -624,7 +624,7 @@ quarchpy/device/packet_processing.py,sha256=PX9-nRi9pzuruc_t0gvXxHF5pT1PXir2ILTH
 quarchpy/device/quarchArray.py,sha256=kq3cuOV89Yd3xPoW3_i1_6FpTk4Kh6gxeInNF2wknZs,3001
 quarchpy/device/quarchPPM.py,sha256=mQxXu49p8ww8s89oehqCEQ_jEb7uCpyt3Y0PK1P00WU,16891
 quarchpy/device/quarchQPS.py,sha256=cbIh2xgadgeC1MUq1O80d_MChF07ql2cu-0Ihd7vN7g,35939
-quarchpy/device/scanDevices.py,sha256=c8_szYUdMx1jhpA2DGnXeiFV1ZZFf17HiJm_ynW0N58,32387
+quarchpy/device/scanDevices.py,sha256=UEbhsIsf_E5Oop7l94s0xM5uRfCJ8PhOWMCBEd7VWcY,33890
 quarchpy/disk_test/AbsDiskFinder.py,sha256=QhtekaSSKubikGM7aqZ916u7Cc22FLEB7CqGiEvdByc,377
 quarchpy/disk_test/DiskTargetSelection.py,sha256=BY3zc7mg7FPxEp9OB2yRkyYIHRwrAB6U0XrsSWZrKU4,925
 quarchpy/disk_test/__init__.py,sha256=3-LXyQMX5macnPaHc8J3mcJQ7faTInycD8-skQYyFbE,59
@@ -747,9 +747,9 @@ quarchpy/iometer/gen_iometer_template.py,sha256=f0YM786dG4c1Bioq6zeclG83r8HBaffO
 quarchpy/iometer/iometerFuncs.py,sha256=qc0GK2SiCUHU_7mGL0z35MyNCdTcfSEf2wR1zti6KDY,14178
 quarchpy/qis/StreamHeaderInfo.py,sha256=InbVGRGrLCcIISZHb-IMmLu3gLx5RkAO1tUnEqM-pHM,8185
 quarchpy/qis/__init__.py,sha256=QRVPy96G7RUx6ldofcD-xNN4NHeNjkasSu8DXkyRB0k,307
-quarchpy/qis/qisFuncs.py,sha256=oVrGmGzfwv0xy4GV4jPPs44SqWd5ywA5of78WzSqQAk,13219
+quarchpy/qis/qisFuncs.py,sha256=KRlpISvCpTnqqhaEFpsT5eG0ELglZhGTU-XWOEZ2w0w,16239
 quarchpy/qps/__init__.py,sha256=Kq5Ae1hy6c0nw26OwY1X31e72-wZ4C8RraTku6pvEfw,270
-quarchpy/qps/qpsFuncs.py,sha256=8a29CzMSi6AmJnHhPP2B4seYPnm2I-8yoVSu1i00nwc,12244
+quarchpy/qps/qpsFuncs.py,sha256=d8FP4XT7F7MyryBl0cu7ErSLwC8BxtsM7myjqaRRCa8,14320
 quarchpy/user_interface/__init__.py,sha256=ix0icQvmKUTRgvfhXK3PxiDGyITkPYY-08hFjuhbupo,298
 quarchpy/user_interface/user_interface.py,sha256=NvN-9yL8jMn6DwY9KN1oQKXELDa3v3iVvqblsi9ZZVQ,29586
 quarchpy/utilities/BitManipulation.py,sha256=vLw2PF5z-d-2MY_yEU0l9FEBYTlCklM336XU2vPKAas,1016
@@ -757,7 +757,8 @@ quarchpy/utilities/TestCenter.py,sha256=5D63n-Wh1ADR5XSzxq1PAfynSEW-eN7fy9yMo3fI
 quarchpy/utilities/TimeValue.py,sha256=GJ5uxMkcnpRMFst5hoArZiPsUqLieLcKhMn_OdOmZwI,2192
 quarchpy/utilities/Version.py,sha256=i57qRgHwGSXf2wPVVNUZfG9Tu6f5hWxZLPy7XCw2WkQ,1578
 quarchpy/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quarchpy-2.2.17.dev2.dist-info/METADATA,sha256=uOp1z1MyIk2ZnF7sK5bXeYuJwA-3xsplwH_GOu566Rk,10982
-quarchpy-2.2.17.dev2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-quarchpy-2.2.17.dev2.dist-info/top_level.txt,sha256=Vc7qsvkVax7oeBaBy_e7kvJvqb_VAAJcW_MuDMmi5W8,9
-quarchpy-2.2.17.dev2.dist-info/RECORD,,
+quarchpy-2.2.17.dev3.dist-info/licenses/LICENSE.txt,sha256=J7M5LonAD_ayP8wONOX7bcr5ByY463vuNYbjI23Xo4M,1076
+quarchpy-2.2.17.dev3.dist-info/METADATA,sha256=m2sBb8ikREqRaBx0vxZprWBIE7WtnK6K64FB2qkqRTI,11122
+quarchpy-2.2.17.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+quarchpy-2.2.17.dev3.dist-info/top_level.txt,sha256=Vc7qsvkVax7oeBaBy_e7kvJvqb_VAAJcW_MuDMmi5W8,9
+quarchpy-2.2.17.dev3.dist-info/RECORD,,