quarchpy 2.2.9.dev3__py2.py3-none-any.whl → 2.2.9.dev5__py2.py3-none-any.whl

quarchpy/device/quarchArray.py

@@ -23,7 +23,7 @@ class quarchArray(quarchDevice):
         moduleList = dict()
 
         # Query the attached devices
-        responseText = self.sendCommand("conf:list:mod?")
+        responseText = self.send_command("conf:list:mod?")
         if responseText == "":
             return dict()
         responseList = responseText.split("\n")
@@ -67,7 +67,7 @@ class subDevice(quarchDevice):
         returnStr = ''
         
         # Run the base device command
-        respStr = quarchDevice.sendCommand(self, CommandString + " <" + portNumb + ">")
+        respStr = quarchDevice.send_command(self, CommandString + " <" + portNumb + ">")
         # 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:            

quarchpy/device/quarchPPM.py

@@ -10,7 +10,7 @@ class quarchPPM(quarchDevice):
         self.connectionObj = originObj.connectionObj
         self.ConString = originObj.ConString
         self.ConType = originObj.ConType
-        self.fixture_definition = self.sendCommand("fix:chan:xml?")
+        self.fixture_definition = self.send_command("fix:chan:xml?")
         self.default_channels = None
         numb_colons = self.ConString.count(":")
         if numb_colons == 1:
@@ -18,8 +18,8 @@ class quarchPPM(quarchDevice):
         if not skipDefaultSyntheticChannels and self.ConType[:3].upper() == "QIS" and "FAIL:" not in self.fixture_definition:
             self.create_default_synthetic_channels()
  
-    def startStream(self, fileName='streamData.txt', fileMaxMB=200000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=",", inMemoryData = None):
-        return self.connectionObj.qis.startStream(self.ConString, fileName, fileMaxMB, streamName, streamAverage, releaseOnData, separator, streamDuration, inMemoryData)
+    def startStream(self, fileName='streamData.txt', fileMaxMB=200000, streamName ='Stream With No Name', streamDuration = None, streamAverage = None, releaseOnData = False, separator=",", inMemoryData = None, outputFileHandle = None, useGzip = None):
+        return self.connectionObj.qis.startStream(self.ConString, fileName, fileMaxMB, streamName, streamAverage, releaseOnData, separator, streamDuration, inMemoryData, outputFileHandle, useGzip)
 
     def streamRunningStatus(self):
         return self.connectionObj.qis.streamRunningStatus(self.ConString)
@@ -57,7 +57,7 @@ class quarchPPM(quarchDevice):
     '''
     def setupPowerOutput(myModule):
         # Output mode is set automatically on HD modules using an HD fixture, otherwise we will chose 5V mode for this example
-        outModeStr = myModule.sendCommand("config:output Mode?")
+        outModeStr = myModule.send_command("config:output Mode?")
         if "DISABLED" in outModeStr:
             try:
                 drive_voltage = raw_input(
@@ -66,14 +66,14 @@ class quarchPPM(quarchDevice):
                 drive_voltage = input(
                     "\n Either using an HD without an intelligent fixture or an XLC.\n \n>>> Please select a voltage [3V3, 5V]: ") or "3V3" or "5V"
 
-            myModule.sendCommand("config:output:mode:" + drive_voltage)
+            myModule.send_command("config:output:mode:" + drive_voltage)
 
         # Check the state of the module and power up if necessary
-        powerState = myModule.sendCommand("run power?")
+        powerState = myModule.send_command("run power?")
         # If outputs are off
         if "OFF" in powerState or "PULLED" in powerState:  # PULLED comes from PAM
             # Power Up
-            printText("\n Turning the outputs on:"), myModule.sendCommand("run:power up"), "!"
+            printText("\n Turning the outputs on:"), myModule.send_command("run:power up"), "!"
 
     '''
     Parses the fixture XML and extracts the synthetic channels specified by the instrument defaults.
@@ -123,7 +123,7 @@ class quarchPPM(quarchDevice):
         # Loop through each channel in the provided list of channels
         for channel in channels:
             # Send a command to the device to create a stream with the channel's function
-            result = self.sendCommand("stream create channel " + channel.function)
+            result = self.send_command("stream create channel " + channel.function)
 
             # If the command result is not "OK", raise an exception with an error message
             if result != "OK":
@@ -146,7 +146,7 @@ class quarchPPM(quarchDevice):
 
         # The following commented-out example shows how to manually send a command for a specific synthetic channel.
         # Example: This command calculates the RMS current for the neutral line.
-        # self.sendCommand("stream create channel chan(Neutral_RMS,A) rms(100ms,chan(Neutral,A))")
+        # self.send_command("stream create channel chan(Neutral_RMS,A) rms(100ms,chan(Neutral,A))")
 
 '''
 Class representing a SyntheticChannel.

quarchpy/device/scanDevices.py

@@ -547,7 +547,7 @@ def scanDevices(target_conn="all", lanTimeout=1, scanInArray=True, favouriteOnly
                         myArrayControler = quarchArray(myQuarchDevice)
                         scanDevices = myArrayControler.scanSubModules()
                         foundDevices = mergeDict(foundDevices, scanDevices)
-                        myArrayControler.closeConnection()
+                        myArrayControler.close_connection()
                     except Exception as e:
                         logging.debug(e, exc_info=True)
                         logging.debug("Cannot get serial number. Quarch device may be in use by another program.")