HG_REPOSITORIES/LPP/INSTRUMENTATION/lppinstru Commit - r1:8ccb7546abb5

Started USB-TMC devices....

Alexis Jeandet -

r1:8ccb7546abb5 default

parent child

Context file:

r1:8ccb7546abb5

Collapse all files

lppinstru/Agilent_34410A.py created 644 +24 0

@@ -0,0 +1,24
	1	#!/usr/bin/env python
	2	#-- coding: utf-8 --
	3	"""Simple python library to communicate with Agilent 34410A over USB-TMC.
	4	"""
	5	import time
	6	import sys
	7	import os
	8	import agilenttmc
	9
	10	__author__ = "Alexis Jeandet"
	11	__copyright__ = "Copyright 2015, Laboratory of Plasma Physics"
	12	__credits__ = []
	13	__license__ = "GPLv2"
	14	__version__ = "1.0.0"
	15	__maintainer__ = "Alexis Jeandet"
	16	__email__ = "alexis.jeandet@member.fsf.org"
	17	__status__ = "Development"
	18
	19	class Agilent3441xA(usbtmc.UsbTmc):
	20	def __init__(self,ref,serial=""):
	21	isnt=usbtmc.findInstrument(ref,serial)
	22	if inst=="":
	23	raise UserWarning("Can't find instrument "+ref)
	24	self.UsbTmc.__init__(isnt)

lppinstru/agilent3441xA.py created 644 +26 0

@@ -0,0 +1,26
	1	#!/usr/bin/env python
	2	#-- coding: utf-8 --
	3	"""Simple python library to communicate with Agilent 34410A over USB-TMC.
	4	"""
	5	import time
	6	import sys
	7	import os
	8	import agilenttmc
	9
	10	__author__ = "Alexis Jeandet"
	11	__copyright__ = "Copyright 2015, Laboratory of Plasma Physics"
	12	__credits__ = []
	13	__license__ = "GPLv2"
	14	__version__ = "1.0.0"
	15	__maintainer__ = "Alexis Jeandet"
	16	__email__ = "alexis.jeandet@member.fsf.org"
	17	__status__ = "Development"
	18
	19	"34410A"
	20
	21	class Agilent3441xA(agilentusbtmc.AgilentUsbTmc):
	22	def __init__(self,serial=""):
	23	isnt=usbtmc.findInstrument("3441[0-1]A",serial)
	24	if inst=="":
	25	raise UserWarning("Can't find instrument "+ref)
	26	self.UsbTmc.__init__(isnt)

lppinstru/agilenttmc.py created 644 +24 0

@@ -0,0 +1,24
	1	#!/usr/bin/env python
	2	#-- coding: utf-8 --
	3	"""Common Agilent USB-TMC/SCPI traits.
	4	"""
	5	import time
	6	import sys
	7	import os
	8	import usbtmc
	9
	10	__author__ = "Alexis Jeandet"
	11	__copyright__ = "Copyright 2015, Laboratory of Plasma Physics"
	12	__credits__ = []
	13	__license__ = "GPLv2"
	14	__version__ = "1.0.0"
	15	__maintainer__ = "Alexis Jeandet"
	16	__email__ = "alexis.jeandet@member.fsf.org"
	17	__status__ = "Development"
	18
	19	class AgilentUsbTmc(usbtmc.UsbTmc):
	20	def __init__(self,ref,serial=""):
	21	isnt=usbtmc.findInstrument(ref,serial)
	22	if inst=="":
	23	raise UserWarning("Can't find instrument "+ref)
	24	self.UsbTmc.__init__(isnt)

lppinstru/usbtmc.py created 644 +55 0

@@ -0,0 +1,55
	1	#!/usr/bin/env python
	2	#-- coding: utf-8 --
	3	"""Simple python library to communicate over USB-TMC protocol with linux's
	4	usbtmc module.
	5	"""
	6	import time
	7	import sys
	8	import os
	9	import glob
	10	import re
	11
	12	__author__ = "Alexis Jeandet"
	13	__copyright__ = "Copyright 2015, Laboratory of Plasma Physics"
	14	__credits__ = []
	15	__license__ = "GPLv2"
	16	__version__ = "1.0.0"
	17	__maintainer__ = "Alexis Jeandet"
	18	__email__ = "alexis.jeandet@member.fsf.org"
	19	__status__ = "Development"
	20
	21
	22	def find_instrument(ref,serial=""):
	23	instruments=glob.glob("/dev/usbtmc[0-9]")
	24	p = re.compile(ref)
	25	for instrument in instruments:
	26	dev=UsbTmc(instrument)
	27	idn=dev.idn().split(",")
	28	if p.match(idn[1]):
	29	if serial=="" or serial == idn[2]:
	30	return instrument
	31	return ""
	32
	33	class UsbTmc():
	34	def __init__(self,dev):
	35	self.__PATH__=dev
	36	self.__FILE__ = os.open(dev, os.O_RDWR)
	37	if self.__FILE__==-1:
	38	raise UserWarning("can't open "+dev)
	39	self.Manufacturer=""
	40	self.Reference=""
	41	self.Serial=""
	42	self.Version=""
	43
	44	def write(self, command):
	45	os.write(self.__FILE__, command);
	46
	47	def read(self, length = 4000):
	48	return os.read(self.__FILE__, length)
	49
	50	def idn(self):
	51	self.write("*IDN?")
	52	return self.read(100)
	53
	54	def __str__(self):
	55	return self.idn() +"\n"+ self.__PATH__

lppinstru/__init__.py +1 -1

             __version__ = "1.0.0"
             __maintainer__ = "Alexis Jeandet"
             __email__ = "alexis.jeandet@member.fsf.org"
-            __status__ = "Production"
+            __status__ = "Development"

lppinstru/discovery.py +23 -21

             opened=True
-            class discoveryLimits():
+            class DiscoveryLimits():
                 class limitRange():
                     def __init__(self,Min,Max,name="Unknow",unit=""):
                         self.Min  = Min
                             return self.Max
                         return value
-                    def printme(self):
+                    def __str__(self):
-                        print(self.name + ":\n     Min="+str(self.Min)+" "+self.unit+",Max="+str(self.Max)+" "+self.unit)
+                        return self.name + ":\n     Min="+str(self.Min)+" "+self.unit+",Max="+str(self.Max)+" "+self.unit
                 errors = {0: RuntimeError("No card opened"),
 : UserWarning("Parameter out of bound"),
                 def genBuffSize(self, value):
                     return self.GEN_BUFF.conform(value)
-                def printme(self):
+                def __str__(self):
+                    res=str()
                     for i in self.limits:
-                        i.printme()
+                        res+=i.__str__()+"\n"
-                    print("ACQ Input ranes: "+str(self.ACQ_IN_RANGES))
+                    res+="ACQ Input ranes: "+str(self.ACQ_IN_RANGES)
+                    return res
-            class discovery():
+            class Discovery():
                 errors = {0: RuntimeError("No card opened"),
 : UserWarning("Parameter out of bound"),
                         print(szerr.value)
                         print("failed to open device")
                         self.__opened=False
-                    self.__limits=discoveryLimits(self.__libdwf,self.__hdwf)
+                    self.__limits=DiscoveryLimits(self.__libdwf,self.__hdwf)
-                    self.__limits.printme()
+                    print(self.__limits)
                 @property
                 def opened(self):
             #############################################################
             #        Power Supply
             #############################################################
-                def setPower(self,fiveVolt=1,minusFiveVolt=1,master=True):
+                def set_power(self,fiveVolt=1,minusFiveVolt=1,master=True):
                     if not self.__opened:
                         raise self.errors.get(0)
                     # enable positive supply
                     # master enable
                     return self.__libdwf.FDwfAnalogIOEnableSet(self.__hdwf, master)
-                def getPower(self):
+                def get_power(self):
                     if not self.__opened:
                         raise self.errors.get(0)
                     supplyVoltage = c_double()
             #############################################################
             #        AnalogIn
             #############################################################
-                def analogInRead(self,ch1=True,ch2=True,frequency=100000000,samplesCount=100,ch1range=5.0,ch2range=5.0,trigger=trigsrcNone):
+                def analog_in_read(self,ch1=True,ch2=True,frequency=100000000,samplesCount=100,ch1range=5.0,ch2range=5.0,trigger=trigsrcNone):
                     if not self.__opened:
                         raise self.errors.get(0)
                     cnt=self.__limits.acqBufSize(samplesCount)
                     self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(0), c_double(ch1range))
                     self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(1), c_bool(ch2))
                     self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(1), c_double(ch2range))
-                    self.setAnaloInTrigger(trigger)
+                    self.set_analog_in_trigger(trigger)
                     self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))
                     status = c_byte()
                     while True:
                         return [np.array([ch2data]),frequency]
-                def setAnaloInTrigger(self,trigger=trigAuto,autoTimeout=0.0):
+                def set_analog_in_trigger(self,trigger=trigAuto,autoTimeout=0.0):
                     if not self.__opened:
                         raise self.errors.get(0)
                     if trigger == trigAuto:
             #############################################################
             #        AnalogOut
             #############################################################
-                def analogOutGen(self,frequency=1000, shape='Sine', channel=0, amplitude=1.0, offset=0.0):
+                def analog_out_gen(self,frequency=1000, shape='Sine', channel=0, amplitude=1.0, offset=0.0):
                     self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))
                     self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True))
                     self.__libdwf.FDwfAnalogOutNodeFunctionSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier,  c_int(shapes.get(shape)))
                     self.__libdwf.FDwfAnalogOutNodeOffsetSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(self.__limits.genOffset(offset)))
                     self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True))
-                def analogOutGenArbit(self,samplesBuffer ,repeatingFrequency=100, channel=0, amplitude=1.0, offset=0.0):
+                def analog_out_gen_arbit(self,samplesBuffer ,repeatingFrequency=100, channel=0, amplitude=1.0, offset=0.0):
                     self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))
                     cnt=self.__limits.genBuffSize(len(samplesBuffer))
                     buf=(c_double*cnt)()
             if __name__ == '__main__':
                 print("open first dev")
-                test = discovery()
+                test = Discovery()
-                test.setPower()
+                test.set_power()
                 for i in range(2):
                     time.sleep(0.2)
-                    print(test.getPower())
+                    print(test.get_power())
-                test.analogOutGen()
+                test.analog_out_gen()
-                res=test.analogInRead(frequency=1000000,samplesCount=1000)
+                res=test.analog_in_read(frequency=1000000,samplesCount=1000)
                 print(res)
                 plt.plot(range(len(res[0][0])),res[0][0])
                 plt.plot(range(len(res[0][0])),res[0][1])

lppinstru/gpd_xxx.py +13 -15

@@ -1,19 +1,7
		1	#!/usr/bin/env python
1	#-- coding: utf-8 --	2	#-- coding: utf-8 --
2	#Copyright 2015 Alexis Jeandet	3	"""Simple python library to communicate with GW Instek GPD-Series power supplies.
3	#This file is part of lppinstru.	4	"""
4
5	#lppinstru is free software: you can redistribute it and/or modify
6	#it under the terms of the GNU General Public License as published by
7	#the Free Software Foundation, either version 3 of the License, or
8	#(at your option) any later version.
9
10	#pydiscovery is distributed in the hope that it will be useful,
11	#but WITHOUT ANY WARRANTY; without even the implied warranty of
12	#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	#GNU General Public License for more details.
14
15	#You should have received a copy of the GNU General Public License
16	#along with pydiscovery. If not, see <http://www.gnu.org/licenses/>.
17	import time	5	import time
18	import sys	6	import sys
19	import os	7	import os
@@ -21,6 +9,16 import matplotlib.pyplot as plt
21	import numpy as np	9	import numpy as np
22	import serial	10	import serial
23		11
		12	__author__ = "Alexis Jeandet"
		13	__copyright__ = "Copyright 2015, Laboratory of Plasma Physics"
		14	__credits__ = []
		15	__license__ = "GPLv2"
		16	__version__ = "1.0.0"
		17	__maintainer__ = "Alexis Jeandet"
		18	__email__ = "alexis.jeandet@member.fsf.org"
		19	__status__ = "Development"
		20
		21
24	class gpd_xxx():	22	class gpd_xxx():
25	conf = {"GPD-3303S" : (2,0.0,30.0),	23	conf = {"GPD-3303S" : (2,0.0,30.0),
26	"GPD-3303" : (),	24	"GPD-3303" : (),

lppinstru/transfertFunction.py +3 -3

             __version__ = "1.0.0"
             __maintainer__ = "Alexis Jeandet"
             __email__ = "alexis.jeandet@member.fsf.org"
-            __status__ = "Production"
+            __status__ = "Development"
                 return [signalFreq,mod,arg]
             def __step(device,freq,offset=0.0,maxAmp=5.0,lastAmp=1.0):
-                device.analogOutGen(freq, shape='Sine', channel=0, amplitude=lastAmp, offset=offset)
+                device.analog_out_gen(freq, shape='Sine', channel=0, amplitude=lastAmp, offset=offset)
                 samplesCount=8192
                 if freq > 500000:
                     FS=freq*samplesCount/500.0
                     FS=freq*samplesCount/50.0
                 else:
                     FS=freq*samplesCount/10.0
-                res=device.analogInRead(ch1=True,ch2=True,frequency=FS,samplesCount=samplesCount,ch1range=5.0,ch2range=5.0)
+                res=device.analog_in_read(ch1=True,ch2=True,frequency=FS,samplesCount=samplesCount,ch1range=5.0,ch2range=5.0)
                 FFTi=fftpack.fft(res[0][0])
                 FFTo=fftpack.fft(res[0][1])
                 return __parseFFT(FFTi,FFTo,freq,res[1])

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages