quarchpy 2.2.9.dev4__py2.py3-none-any.whl → 2.2.10.dev1__py2.py3-none-any.whl

quarchpy/debug/SystemTest.py

@@ -1,6 +1,12 @@
-# -*- coding: future_fstrings -*-
+import os
+import platform
+import sys
+import subprocess
+
 from quarchpy import *
 from quarchpy.device import *
+from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
+
 try:
     from importlib.metadata import distribution
 except:
@@ -9,13 +15,13 @@ except:
     except Exception as e:
         print("Failed to import distribution from importlib_metadata")
 
-import os
-import platform
-import sys
-import subprocess
+from quarchpy.device import *
+from quarchpy.connection_specific.jdk_jres.fix_permissions import main as fix_permissions, find_java_permissions
+from quarchpy.qis.qisFuncs import isQisRunning, startLocalQis
+from quarchpy.connection_specific.connection_QIS import QisInterface
 from quarchpy._version import __version__
 
-def test_communication():
+def _test_communication():
     print("")
     print("DEVICE COMMUNICATION TEST")
     print("-------------------------")
@@ -29,13 +35,13 @@ def test_communication():
         return 0
     print("Selected module is: " + moduleStr)
     # Create a device using the module connection string
-    myDevice = getQuarchDevice(moduleStr)
+    myDevice = get_quarch_device(moduleStr)
     QuarchSimpleIdentify(myDevice)
     # Close the module before exiting the script
-    myDevice.closeConnection()
+    myDevice.close_connection()
 
 
-def test_system_info():
+def _test_system_info():
     print("")
     print("SYSTEM INFORMATION")
     print("------------------")
@@ -49,6 +55,11 @@ def test_system_info():
         print(str(bytes(subprocess.check_output(['cat', '/etc/os-release'], stderr=subprocess.STDOUT)).decode()))
     print("Platform Release:  " + platform.release())
 
+    print("\nPYTHON\n------")
+    try:
+        print("Python Version: " + sys.version)
+    except:
+        print("Unable to detect Python version")
     try:
         print("Quarchpy Version: " + get_quarchpy_version())
     except:
@@ -58,14 +69,38 @@ def test_system_info():
     except Exception as e:
         print(e)
         print("Unable to detect Quarchpy location")
+
+    print("python:  ")
     try:
-        print("Python Version: " + sys.version)
-    except:
-        print("Unable to detect Python version")
-    try:
-        print("QIS version number: " + get_QIS_version())
+        temp1 = bytes(subprocess.check_output(['python', '-m', 'pip', 'show', 'quarchpy'], stderr=subprocess.STDOUT)).decode()
+        print(temp1)
     except:
-        print("Unable to detect QIS version")
+        print("Unable to detect Quarchpy at this location")
+
+    if "nt" not in os.name:
+        print("sudo python:  ")
+        try:
+            temp2 = bytes(subprocess.check_output(['sudo', 'python', '-m', 'pip', 'show', 'quarchpy'], stderr=subprocess.STDOUT)).decode()
+            print(temp2)
+        except:
+            print("Unable to detect Quarchpy at this location")
+
+        print("python3:  ")
+        try:
+            temp3 = bytes(subprocess.check_output(['python3', '-m', 'pip', 'show', 'quarchpy'], stderr=subprocess.STDOUT)).decode()
+            print(temp3)
+        except:
+            print("Unable to detect Quarchpy at this location")
+
+        print("sudo python3:  ")
+        try:
+            temp4 = bytes(subprocess.check_output(['sudo', 'python3', '-m', 'pip', 'show', 'quarchpy'], stderr=subprocess.STDOUT)).decode()
+            print(temp4)
+        except:
+            print("Unable to detect Quarchpy at this location")
+
+
+    print("\nJAVA\n----")
     try:
         javaVersion = bytes(subprocess.check_output(['java', '-version'], stderr=subprocess.STDOUT)).decode()
         print("Java Version: " + str(javaVersion))
@@ -79,12 +114,17 @@ def test_system_info():
         print("Unable to detect java location"
               "If Java is not installed then QIS and QPS will NOT run")
     try:
-        find_java_permissions()
+        execute_permissions, message=find_java_permissions()
+        print("Execute Permissions: ",execute_permissions, "\n",message)
     except:
         print("Unable to get j21 java permissions")
+    try:
+        print("\nQIS version number: " + get_QIS_version())
+    except Exception as e:
+        print("\nUnable to detect QIS version. Exception:" +str(e))
 
-    # Scan for all quarch devices on the system
 
+# Scan for all quarch devices on the system
 def QuarchSimpleIdentify(device1):
     """
     Prints basic identification test data on the specified module, compatible with all Quarch devices
@@ -93,18 +133,25 @@ def QuarchSimpleIdentify(device1):
     ----------
     device1: quarchDevice
         Open connection to a quarch device
-        
+
     """
     # Print the module name
     print("MODULE IDENTIFY TEST")
     print("--------------------")
     print("")
     print("Module Name: "),
-    print(device1.sendCommand("hello?"))
+    print(device1.send_command("hello?"))
     print("")
     # Print the module identify and version information
     print("Module Identity Information: ")
-    print(device1.sendCommand("*idn?"))
+    idn_info = device1.send_command("*idn?")
+    print(idn_info)
+    if "fixture" in idn_info.lower():
+        print("\nFixture Identity Information: ")
+
+        fixture_info = device1.send_command("fix idn?")
+        print(fixture_info)
+
 
 def get_QIS_version():
     """
@@ -115,16 +162,20 @@ def get_QIS_version():
     -------
     version: str
         String representation of the QIS version number
-        
     """
 
-    qis_version = ""
-    my_close_qis = False
-    if isQisRunning() == False:
+    qis_version = "" # stub
+    my_close_qis = False # Only close QIS if we opened it.
+    try:
+        qisRunning=isQisRunning()
+    except Exception as e:
+        print("Exception occurred while checking if qis was already running. Error:\n"+str(e))
+
+    if qisRunning == False:
         my_close_qis = True
         startLocalQis(headless=True)
-        
-    myQis = qisInterface()
+
+    myQis = QisInterface()
     qis_version = myQis.sendAndReceiveCmd(cmd="$version")
     if "No Target Device Specified" in qis_version:
         qis_version = myQis.sendAndReceiveCmd(cmd="$help").split("\r\n")[0]
@@ -132,6 +183,7 @@ def get_QIS_version():
         myQis.sendAndReceiveCmd(cmd = "$shutdown")
     return qis_version
 
+
 def get_java_location():
     """
     Returns the location of java.
@@ -149,14 +201,16 @@ def get_java_location():
         location = "Unable to detect OS to check java version."
     return location
 
+
 def get_quarchpy_version():
     try:
        return __version__
     except:
         return "Unknown"
 
+
 def fix_usb():
-    content_to_write = "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\"" \
+    content_to_write = "SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\"\n" \
                        "SUBSYSTEM==\"usb_device\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\""
 
     if "centos" in str(platform.platform()).lower():
@@ -195,9 +249,10 @@ def main (args=None):
     if bool_fixusb:
         fix_usb()
     if bool_test_system_info:
-        test_system_info()
+        _test_system_info()
     if bool_test_communication:
-        test_communication()
+        _test_communication()
+
 
 
 if __name__ == "__main__":

quarchpy/debug/module_debug.py

@@ -1,4 +1,3 @@
-# -*- coding: future_fstrings -*-
 '''
 ########### REQUIREMENTS ###########
 
@@ -66,7 +65,7 @@ def main(filepath=None):
 
     # Create a device using the module connection string
     logText("\n\nConnecting to the selected device")
-    my_device = getQuarchDevice(moduleStr)
+    my_device = get_quarch_device(moduleStr)
 
     file = None
     try:
@@ -75,7 +74,7 @@ def main(filepath=None):
         file = get_config_path_for_module(module_connection=my_device)
     except FileNotFoundError as err:
         logging.error(f"Config file not found for module : {moduleStr}\nExiting Script")
-        my_device.closeConnection()
+        my_device.close_connection()
         return
 
     # Parse the file to get the device capabilities
@@ -83,7 +82,7 @@ def main(filepath=None):
 
     if not dev_caps:
         logging.error(f"Could not parse config file for {moduleStr}\nExiting Script")
-        my_device.closeConnection()
+        my_device.close_connection()
         return
     logText("\nCONFIG FILE LOCATED:")
     logText(file)
@@ -94,34 +93,34 @@ def main(filepath=None):
 
     # Print the module identify and version information
     logText("\nModule Identity Information:\n")
-    logText(my_device.sendCommand("*IDN?"))
+    logText(my_device.send_command("*IDN?"))
     logText("\n")
 
     # Print the test state of the module
     logText("\nModule Self Test:")
-    logText(my_device.sendCommand("*TST?"))
+    logText(my_device.send_command("*TST?"))
     logText("\n")
 
     # Print the power state of the module
     logText("Power State of Module:")
-    logText(my_device.sendCommand("RUN:POWER?"))
+    logText(my_device.send_command("RUN:POWER?"))
     logText("\n")
 
     for key, value in dev_caps.get_general_capabilities().items():
         if key == "GlitchState_Read_Present" and value == "true":
             # Print glitch status of the module
             logText("Glitch Status:")
-            logText(my_device.sendCommand("run:glitch?"))
+            logText(my_device.send_command("run:glitch?"))
             logText("\n")
 
             # Print additional glitch information
             logText("\nGlitch Engine\n===================\n")
             logText("Glitch Length: ", "end")
-            logText(my_device.sendCommand("glitch:length?"))
+            logText(my_device.send_command("glitch:length?"))
             logText("\nGlitch Cycle Length: ", "end")
-            logText(my_device.sendCommand("glitch:cycle:length?"))
+            logText(my_device.send_command("glitch:cycle:length?"))
             logText("\nPRBS Ratio: ", "end")
-            logText(my_device.sendCommand("glitch:prbs?"))
+            logText(my_device.send_command("glitch:prbs?"))
             logText("\n")
         if key == "SignalMonitor_Present" and value == "true":
             logText("\nSignal Monitoring\n===================\n")
@@ -129,8 +128,8 @@ def main(filepath=None):
                 for key, value in sig.parameters.items():
                     if key == "SignalMonitor_Present" and value == "true":
                         logText(sig.name, "end")
-                        logText(", Host Monitor: " + my_device.sendCommand("sig:{}:stat:host?".format(sig.name)), "end")
-                        logText(", Device Monitor: " + my_device.sendCommand("sig:{}:stat:dev?".format(sig.name)), "end")
+                        logText(", Host Monitor: " + my_device.send_command("sig:{}:stat:host?".format(sig.name)), "end")
+                        logText(", Device Monitor: " + my_device.send_command("sig:{}:stat:dev?".format(sig.name)), "end")
                         logText("\n")
 
     # Print the list of signals on the module, and the capability flags for each signal
@@ -139,21 +138,21 @@ def main(filepath=None):
     for sig in dev_caps.get_signals():
         logText(sig.name, "end")
         for key, value in sig.parameters.items():
-            logText(", Source:" + my_device.sendCommand("sig:{}:sour?".format(sig.name)), "end")
+            logText(", Source:" + my_device.send_command("sig:{}:sour?".format(sig.name)), "end")
             if key == "GlitchEnable_Present" and value == "true":
-                logText(", Glitch Enable: " + my_device.sendCommand("sig:{}:glit:ena?".format(sig.name)), "end")
+                logText(", Glitch Enable: " + my_device.send_command("sig:{}:glit:ena?".format(sig.name)), "end")
             if key == "SignalDrive_Present" and value == "true":
-                logText(", Drive Open:" + my_device.sendCommand("sig:{}:dri:ope?".format(sig.name)), "end")
-                logText(", Drive Closed:" + my_device.sendCommand("sig:{}:dri:clo?".format(sig.name)), "end")
+                logText(", Drive Open:" + my_device.send_command("sig:{}:dri:ope?".format(sig.name)), "end")
+                logText(", Drive Closed:" + my_device.send_command("sig:{}:dri:clo?".format(sig.name)), "end")
         logText("\n")
     logText("\n")
 
     logText("\nVoltage Measurements\n===================\n")
     for volt in dev_caps.get_voltage_measurements():
         if volt.type == "Voltage":
-            logText(volt.name + ": " + my_device.sendCommand("meas:volt {}".format(volt.name + "?")), "end")
+            logText(volt.name + ": " + my_device.send_command("meas:volt {}".format(volt.name + "?")), "end")
         else:
-            logText(volt.name + " Self Test: " + my_device.sendCommand("meas:volt:self {}".format(volt.name + "?")), "end")
+            logText(volt.name + " Self Test: " + my_device.send_command("meas:volt:self {}".format(volt.name + "?")), "end")
         logText("\n")
     logText("\n")
 
@@ -163,20 +162,20 @@ def main(filepath=None):
         for key, value in source.parameters.items():
             sourcename = source.name[7:]
             if key == "Type" and value == "TIMED":
-                logText(", Delay: " + my_device.sendCommand("sour:" + sourcename + ":delay?"), "end")
+                logText(", Delay: " + my_device.send_command("sour:" + sourcename + ":delay?"), "end")
             if key == "SourceEnable_Present" and value == "true":
-                logText(", Source: " + my_device.sendCommand("sour:" + sourcename + ":state?"), "end")
+                logText(", Source: " + my_device.send_command("sour:" + sourcename + ":state?"), "end")
             if key == "SourceBounce_Present" and value == "true":
-                logText(", Bounce: " + my_device.sendCommand("sour:" + sourcename + ":boun:mode?"), "end")
-                logText(", Bounce-Length: " + my_device.sendCommand("sour:" + sourcename + ":boun:len?"), "end")
-                logText(", Bounce-Period: " + my_device.sendCommand("sour:" + sourcename + ":boun:per?"), "end")
-                logText(", Bounce-Duty: " + my_device.sendCommand("sour:" + sourcename + ":boun:duty?"), "end")
+                logText(", Bounce: " + my_device.send_command("sour:" + sourcename + ":boun:mode?"), "end")
+                logText(", Bounce-Length: " + my_device.send_command("sour:" + sourcename + ":boun:len?"), "end")
+                logText(", Bounce-Period: " + my_device.send_command("sour:" + sourcename + ":boun:per?"), "end")
+                logText(", Bounce-Duty: " + my_device.send_command("sour:" + sourcename + ":boun:duty?"), "end")
         logText("\n")
 
     logText("Finished script. \nClosing module connection.")
     if fp != "":
         f.close()
-    my_device.closeConnection()
+    my_device.close_connection()
 
 """
     Logs text to terminal and file (if specified)

quarchpy/debug/simple_terminal.py

@@ -11,42 +11,47 @@ Select the module you would like to talk to.
 Type desired command
 Read response
 """
+from typing import Optional
+
 from quarchpy import *
 from quarchpy.device import *
-from quarchpy.user_interface import*
+from quarchpy.user_interface import *
 from quarchpy._version import __version__ as quarchpyVersion
+from typing import Union
+
+
 def main():
-    printText("Quarchpy v"+str(quarchpyVersion))
-    myDevice =""
-    while myDevice != "shutdown": #Main loop
-        moduleStr = userSelectDevice(nice=True, additionalOptions=["Rescan","All Conn Types", "Specify IP Address", "Quit"])
+    printText("Quarchpy v" + str(quarchpyVersion))
+    myDevice: Union[quarchDevice, subDevice, str] = ""
+    while myDevice != "shutdown":  #Main loop
+        moduleStr = userSelectDevice(nice=True, additionalOptions=["Rescan", "All Conn Types", "Specify IP Address", "Quit"])
         #moduleStr = "TCP:1999-05-005"
         if moduleStr == "quit":
             return 0
         printText("Selected module is: " + moduleStr)
         # Create a device using the module connection string
-        #moduleStr = "REST:1995-05-005"
-        myDevice = getQuarchDevice(moduleStr)
+        # moduleStr = "REST:1995-05-005"
+        myDevice = get_quarch_device(moduleStr)
 
-        while myDevice !=None and myDevice!="shutdown": # CMD parsing loop
-            user_input = requestDialog("","Send command to " + str(moduleStr) + " :")
-            #Dollar commands are to be handled by the terminal
+        while myDevice is not None and myDevice != "shutdown":  # CMD parsing loop
+            user_input = requestDialog("", "Send command to " + str(moduleStr) + " :")
+            # Dollar commands are to be handled by the terminal
             if user_input.startswith("$"):
-                if "$shutdown" == user_input.lower().replace(" ","").strip():
+                if "$shutdown" == user_input.lower().replace(" ", "").strip():
                     printText("Have a nice day!")
-                    myDevice="shutdown"
+                    myDevice = "shutdown"
                 elif "$close connection" == user_input.lower().strip():
-                    myDevice.closeConnection()
-                    myDevice=None
+                    myDevice.close_connection()
+                    myDevice = ""
                 elif "$rst module" == user_input.lower().strip():
-                    printText("Reset successfull :"+str(myDevice.resetDevice()))
+                    printText("Reset successful :" + str(myDevice.reset_device()))
                 pass
 
             #All other commands are passed to the module
             else:
-                printText(myDevice.sendCommand(user_input))
-
+                printText(myDevice.send_command(user_input))
+    return None
 
 
 if __name__ == "__main__":
-        main()
+    main()

quarchpy/device/__init__.py

@@ -1,8 +1,8 @@
-__all__ = ['quarchDevice','quarchArray','subDevice','quarchPPM','quarchQPS','quarchStream','qpsNowStr','scanDevices','listDevices','userSelectDevice','getQuarchDevice', 'get_connection_target', 'getSerialNumberFromConnectionTarget']
+__all__ = ['quarchDevice', 'quarchArray', 'subDevice', 'quarchPPM', 'quarchQPS', 'quarchStream', 'qpsNowStr', 'scanDevices', 'listDevices',
+           'userSelectDevice', 'getQuarchDevice', 'get_connection_target', 'getSerialNumberFromConnectionTarget', 'get_quarch_device']
 
-from .device import quarchDevice, getQuarchDevice
+from .device import quarchDevice, getQuarchDevice, get_quarch_device
 from .quarchArray import quarchArray, subDevice
 from .quarchPPM import quarchPPM
 from .quarchQPS import quarchQPS, quarchStream, qpsNowStr
-from .scanDevices import scanDevices, listDevices, userSelectDevice, get_connection_target,getSerialNumberFromConnectionTarget
-
+from .scanDevices import scanDevices, listDevices, userSelectDevice, get_connection_target, getSerialNumberFromConnectionTarget