quarchpy 2.2.7.dev1__py2.py3-none-any.whl → 2.2.8.dev1__py2.py3-none-any.whl

quarchpy/.idea/.name

@@ -0,0 +1 @@
+_version.py

quarchpy/.idea/inspectionProfiles/Project_Default.xml

@@ -1,10 +1,48 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ourVersions">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="3.12" />
+            <item index="1" class="java.lang.String" itemvalue="3.5" />
+            <item index="2" class="java.lang.String" itemvalue="3.11" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="zeroconf" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="E501" />
+          <option value="E302" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N806" />
+          <option value="N812" />
+          <option value="N802" />
+          <option value="N803" />
+        </list>
+      </option>
+    </inspection_tool>
     <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoredIdentifiers">
         <list>
-          <option value="user_interface.user_interface.raw_input" />
+          <option value="MainTests.standardErrors.qisPath" />
         </list>
       </option>
     </inspection_tool>

quarchpy/.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Black">
-    <option name="sdkName" value="Python 2.7 (quarchpy)" />
+    <option name="sdkName" value="Python 3.11" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
 </project>

quarchpy/.idea/quarchpy.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.13" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

quarchpy/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="svn" />
+  </component>
+</project>

quarchpy/.idea/workspace.xml

@@ -4,29 +4,36 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="5dcd7b04-9694-4e54-bb12-84d5f5e7a0cf" name="Changes" comment="" />
+    <list default="true" id="636aab8d-ddf5-4a16-9afb-6ef6a8d53577" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/connection_specific/connection_QIS.py" beforeDir="false" afterPath="$PROJECT_DIR$/connection_specific/connection_QIS.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/qis/qisFuncs.py" beforeDir="false" afterPath="$PROJECT_DIR$/qis/qisFuncs.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/qps/qpsFuncs.py" beforeDir="false" afterPath="$PROJECT_DIR$/qps/qpsFuncs.py" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "customColor": "",
-  "associatedIndex": 5
-}]]></component>
-  <component name="ProjectId" id="2sOq2y2hEq2l9HCfwXokB5wOoky" />
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 0
+}</component>
+  <component name="ProjectId" id="2lheMHpb2GANz9pJUZgtTWz6b3S" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
-    "Python.keithleyTerminal.executor": "Debug",
-    "RunOnceActivity.ShowReadmeOnStart": "true"
+    "Python.Main.executor": "Debug",
+    "Python.QisAcStreamExample.executor": "Debug",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "last_opened_file_path": "P:/Software/Python/QuarchPy/Trunk/quarchpy/run.py",
+    "settings.editor.selected.configurable": "reference.idesettings.quicklists"
   }
 }]]></component>
   <component name="RunManager">
-    <configuration name="keithleyTerminal" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="Main" type="PythonConfigurationType" factoryName="Python">
       <module name="quarchpy" />
       <option name="ENV_FILES" value="" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -35,12 +42,13 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$USER_HOME$/Desktop/BoonCave/Quarch/Python Scripts/Terminal Programs" />
+      <option name="SDK_NAME" value="Python 3.11" />
+      <option name="WORKING_DIRECTORY" value="" />
       <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$USER_HOME$/Desktop/BoonCave/Quarch/Python Scripts/Terminal Programs/keithleyTerminal.py" />
-      <option name="PARAMETERS" value="" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/run.py" />
+      <option name="PARAMETERS" value="qis" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
@@ -48,28 +56,118 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Python.keithleyTerminal" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>
-        <option value="bundled-python-sdk-1b1018131e27-aa17d162503b-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-243.22562.180" />
+        <option value="bundled-python-sdk-0e3be3396995-c546a90a8094-com.jetbrains.pycharm.community.sharedIndexes.bundled-PC-242.23339.19" />
       </set>
     </attachedChunks>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration" cleanupOnStartRun="true">
+    <configuration>C:\Users\nghayyda\AppData\Roaming\Subversion</configuration>
+    <supportedVersion>125</supportedVersion>
+  </component>
+  <component name="SvnFileUrlMappingImpl">
+    <option name="myMappingRoots">
+      <list>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Cable_Modules" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Card_Modules" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Drive_Modules" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Power_Margining" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Switch_Modules" />
+        </SvnCopyRootSimple>
+      </list>
+    </option>
+    <option name="myMoreRealMappingRoots">
+      <list>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Cable_Modules" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Card_Modules" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Drive_Modules" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Power_Margining" />
+        </SvnCopyRootSimple>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy" />
+          <option name="myCopyRoot" value="P:\Software\Python\QuarchPy\Trunk\quarchpy\config_files\Switch_Modules" />
+        </SvnCopyRootSimple>
+      </list>
+    </option>
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="5dcd7b04-9694-4e54-bb12-84d5f5e7a0cf" name="Changes" comment="" />
-      <created>1738336765628</created>
+      <changelist id="636aab8d-ddf5-4a16-9afb-6ef6a8d53577" name="Changes" comment="" />
+      <created>1725636685995</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1738336765628</updated>
+      <updated>1725636685995</updated>
+    </task>
+    <task id="LOCAL-00001" summary="Quarchpy power class now automatically creates the default synthetic channels.">
+      <option name="closed" value="true" />
+      <created>1728642843471</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1728642843471</updated>
     </task>
+    <task id="LOCAL-00002" summary="Fixed arguments not being passed correctly to QPS.">
+      <option name="closed" value="true" />
+      <created>1728648255650</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1728648255650</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="Quarchpy power class now automatically creates the default synthetic channels." />
+    <MESSAGE value="Fixed arguments not being passed correctly to QPS." />
+    <option name="LAST_COMMIT_MESSAGE" value="Fixed arguments not being passed correctly to QPS." />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://C:/Python311/Lib/site-packages/quarchpy/qis/qisFuncs.py</url>
+          <line>183</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>

quarchpy/_version.py

@@ -1 +1 @@
-__version__ = "2.2.7.dev1"
+__version__ = "2.2.8.dev1"

quarchpy/connection_specific/QPS/win-amd64/InstallType.dat

@@ -0,0 +1 @@
+InstallType=Installer

quarchpy/connection_specific/QPS/win-amd64/qis/myFile.csv

@@ -0,0 +1,50 @@
+Time uS,5V mV,5V uA,12V mV,12V uA,5V uW,12V uW,Tot uW,
+0,2808,2229,6777,2742,6259,18582,24841
+100000,2808,2229,6777,2742,6259,18582,24841
+200000,2808,2229,6777,2742,6259,18582,24841
+300000,2808,2229,6777,2742,6259,18582,24841
+400000,2808,2229,6777,2742,6259,18582,24841
+500000,2808,2229,6777,2742,6259,18582,24841
+600000,2808,2229,6777,2742,6259,18582,24841
+700000,2808,2229,6777,2742,6259,18582,24841
+800000,2808,2229,6777,2742,6259,18582,24841
+900000,2808,2229,6777,2742,6259,18582,24841
+1000000,2808,2229,6777,2742,6259,18582,24841
+1100000,2808,2229,6777,2742,6259,18582,24841
+1200000,2808,2228,6777,2742,6256,18582,24838
+1300000,2808,2229,6777,2742,6259,18582,24841
+1400000,2808,2229,6777,2742,6259,18582,24841
+1500000,2808,2229,6777,2742,6259,18582,24841
+1600000,2808,2229,6777,2742,6259,18582,24841
+1700000,2808,2229,6777,2742,6259,18582,24841
+1800000,2808,2229,6777,2742,6259,18582,24841
+1900000,2808,2228,6777,2742,6256,18582,24838
+2000000,2808,2229,6777,2742,6259,18582,24841
+2100000,2808,2229,6777,2742,6259,18582,24841
+2200000,2808,2229,6777,2742,6259,18582,24841
+2300000,2808,2228,6777,2742,6256,18582,24838
+2400000,2808,2229,6777,2742,6259,18582,24841
+2500000,2808,2229,6777,2742,6259,18582,24841
+2600000,2808,2229,6777,2742,6259,18582,24841
+2700000,2808,2229,6777,2742,6259,18582,24841
+2800000,2808,2229,6777,2742,6259,18582,24841
+2900000,2808,2229,6777,2742,6259,18582,24841
+3000000,2808,2229,6777,2742,6259,18582,24841
+3100000,2808,2229,6777,2742,6259,18582,24841
+3200000,2808,2229,6777,2742,6259,18582,24841
+3300000,2808,2229,6777,2742,6259,18582,24841
+3400000,2808,2229,6777,2742,6259,18582,24841
+3500000,2808,2229,6777,2742,6259,18582,24841
+3600000,2808,2228,6777,2742,6256,18582,24838
+3700000,2808,2229,6777,2742,6259,18582,24841
+3800000,2808,2229,6777,2742,6259,18582,24841
+3900000,2808,2228,6777,2742,6256,18582,24838
+4000000,2808,2229,6777,2742,6259,18582,24841
+4100000,2808,2229,6777,2742,6259,18582,24841
+4200000,2808,2229,6777,2742,6259,18582,24841
+4300000,2808,2229,6777,2742,6259,18582,24841
+4400000,2808,2229,6777,2742,6259,18582,24841
+4500000,2808,2229,6777,2742,6259,18582,24841
+4600000,2808,2229,6777,2742,6259,18582,24841
+4700000,2808,2229,6777,2742,6259,18582,24841
+4800000,2808,2229,6777,2742,6259,18582,24841

quarchpy/connection_specific/connection_QIS.py

@@ -1682,6 +1682,7 @@ class QisInterface:
 
         except Exception as e:
             #something went wrong during send qis cmd
+            logging.error("Error! Unable to retrieve response from QIS. Command: " + sentText)
             logging.error(e)
             raise e
         finally:

quarchpy/debug/SystemTest.py

@@ -1,5 +1,6 @@
 from quarchpy import *
 from quarchpy.device import *
+from quarchpy.connection_specific.jdk_j21_jres.fix_permissions import main as fix_permissions, find_java_permissions
 try:
     from importlib.metadata import distribution
 except:
@@ -48,6 +49,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:
@@ -57,14 +63,8 @@ def test_system_info():
     except Exception as e:
         print(e)
         print("Unable to detect Quarchpy location")
-    try:
-        print("Python Version: " + sys.version)
-    except:
-        print("Unable to detect Python version")
-    try:
-        print("QIS version number: " + get_QIS_version())
-    except:
-        print("Unable to detect QIS version")
+
+    print("\nJAVA\n----")
     try:
         javaVersion = bytes(subprocess.check_output(['java', '-version'], stderr=subprocess.STDOUT)).decode()
         print("Java Version: " + str(javaVersion))
@@ -78,12 +78,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
@@ -92,7 +97,7 @@ def QuarchSimpleIdentify(device1):
     ----------
     device1: quarchDevice
         Open connection to a quarch device
-        
+
     """
     # Print the module name
     print("MODULE IDENTIFY TEST")
@@ -105,6 +110,7 @@ def QuarchSimpleIdentify(device1):
     print("Module Identity Information: ")
     print(device1.sendCommand("*idn?"))
 
+
 def get_QIS_version():
     """
     Returns the version of QIS.  This is the version of QIS currenty running on the local system if one exists.
@@ -114,15 +120,20 @@ def get_QIS_version():
     -------
     version: str
         String representation of the QIS version number
-        
+
     """
 
     qis_version = ""
     my_close_qis = False
-    if isQisRunning() == False:
+    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()
     qis_version = myQis.sendAndReceiveCmd(cmd="$version")
     if "No Target Device Specified" in qis_version:
@@ -131,6 +142,7 @@ def get_QIS_version():
         myQis.sendAndReceiveCmd(cmd = "$shutdown")
     return qis_version
 
+
 def get_java_location():
     """
     Returns the location of java.
@@ -148,12 +160,14 @@ 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\"" \
                        "SUBSYSTEM==\"usb_device\", ATTRS{idVendor}==\"16d0\", MODE=\"0666\""
@@ -199,6 +213,7 @@ def main (args=None):
         test_communication()
 
 
+
 if __name__ == "__main__":
     main([])
     #find_java_permissions()