pyinst: usb488.py annotate

annotate usb488.py @ 2:adaff1c4fd6b

Rip out procedural interface and use the OO one.

author	Daniel O'Connor <darius@dons.net.au>
date	Wed, 13 May 2009 15:26:42 +0930
parents	e2089824735a
children	62ffab79227e

rev	line source
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	1 #!/usr/bin/env python
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	2
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	3 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	4 # Spec/info..
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	5 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	6 # http://www.usb.org/developers/devclass_docs/USBTMC_1_006a.zip
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	7 # http://svn.openmoko.org/developers/werner/ahrt/host/tmc/README
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	8 # http://www.home.agilent.com/agilent/redirector.jspx?action=ref&cname=AGILENT_EDITORIAL&ckey=1189335&lc=eng&cc=US&nfr=-35560.0.00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	9 # linux-2.6.29.3/drivers/usb/class/usbtmc.c
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	10 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	11
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	12 import usb
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	13
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	14 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	15 # The usual SCPI commands are wrapped before being sent.
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	16 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	17 # Write:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	18 # Offset Field Size Value Description
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	19 # 0 MsgID 1 0x01 DEV_DEP_MSG_OUT
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	20 # 1 bTag 1 0x01 Varies with each transfer
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	21 # 2 bTagInverse 1 0xfe Inverse of previous field
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	22 # 3 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	23 # 4 TransferSize 4 0x06
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	24 # 5 .. 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	25 # 6 .. 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	26 # 7 .. 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	27 # 8 bmTransferAttr 1 0x01 1 == end of msg
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	28 # 9 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	29 # 10 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	30 # 11 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	31 # 12 Msg itself 1 0x2a '*'
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	32 # 13 1 0x49 'I'
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	33 # 14 1 0x44 'D'
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	34 # 15 1 0x4e 'N'
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	35 # 16 1 0x3f '?'
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	36 # 17 1 0x0a '\n'
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	37 # 18-19 Alignment 2 0x0000 Bring into 4 byte alignment
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	38 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	39 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	40 # Send a read request:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	41 # Offset Field Size Value Description
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	42 # 0 MsgID 1 0x02 REQUEST_DEV_DEP_MSG_IN
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	43 # 1 bTag 1 0x02 Varies with each transfer
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	44 # 2 bTagInverse 1 0xfd Inverse of previous field
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	45 # 3 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	46 # 4 TransferSize 4 0x64
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	47 # 5 .. 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	48 # 6 .. 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	49 # 7 .. 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	50 # 8 bmTransferAttr 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	51 # 9 Term char 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	52 # 10 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	53 # 11 Reserved 1 0x00
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	54
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	55 # Tektronix TDS2024B
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	56 USB_VEND_TEKTRONIX = 1689
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	57 USB_PROD_TEKTORNIX = 874
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	58
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	59 # No libusb versions of these available
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	60 USB_CLASS_APP_SPECIFIC = 254
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	61 USB_SUBCLASS_TMC = 3
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	62 USB_PROTOCOL_488 = 1
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	63
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	64 # USB488 message IDs
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	65 DEV_DEP_MSG_OUT = 1
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	66 REQUEST_DEV_DEP_MSG_IN = 2
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	67 DEV_DEP_MSG_IN = 2
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	68
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	69 class USB488Device(object):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	70 def __init__(self, vendor = None, product = None, serial = None, path = None):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	71 """Search for a USB488 class device, if specified vendor,
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	72 product, serial and path will refine the search"""
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	73
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	74 busses = usb.busses()
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	75
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	76 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	77 # Search for the device we want
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	78 #
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	79 found = False
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	80 for bus in busses:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	81 for dev in bus.devices:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	82 # Skip ones that don't match
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	83 if vendor != None and dev.idVendor != vendor:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	84 continue
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	85 if product != None and dev.idProduct != product:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	86 continue
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	87 if serial != None and dev.idSerialNumber != serial:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	88 continue
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	89 if path != None and dev.filename != path:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	90 continue
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	91
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	92 # The libusb examples say you can check for device
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	93 # class and then open, however in that case you can't
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	94 # find the endpoint number which seems pretty useless
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	95 # unless you want to hard code everything.
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	96 for confidx in xrange(len(dev.configurations)):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	97 for iface in dev.configurations[confidx].interfaces:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	98 for altif in iface:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	99 # Check if this is a USB488 capable interface
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	100 if altif.interfaceClass == USB_CLASS_APP_SPECIFIC and \
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	101 altif.interfaceSubClass == USB_SUBCLASS_TMC and \
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	102 altif.interfaceProtocol == USB_PROTOCOL_488:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	103 found = True
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	104 break
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	105 if found:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	106 break
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	107 if found:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	108 break
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	109 if found:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	110 break
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	111 if found:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	112 break
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	113 if not found:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	114 raise "Could not find a suitable USB device"
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	115
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	116 # Open the device and claim the USB interface that supports the spec
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	117 self.handle = dev.open()
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	118 self.handle.setConfiguration(dev.configurations[confidx].value)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	119 self.handle.claimInterface(altif.interfaceNumber)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	120 self.handle.setAltInterface(altif.alternateSetting)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	121
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	122 # Get some info for humans
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	123 self.vendname = self.handle.getString(dev.iManufacturer, 1024)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	124 self.prodname = self.handle.getString(dev.iProduct, 1024)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	125 self.serial = self.handle.getString(dev.iSerialNumber, 1024)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	126
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	127 # Determine the endpoints for each operation type
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	128 self.intrep = self.bulkinep = self.bulkoutep = None
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	129
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	130 for ep in altif.endpoints:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	131 if ep.type == usb.ENDPOINT_TYPE_INTERRUPT and \
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	132 ep.address & usb.ENDPOINT_IN == usb.ENDPOINT_IN:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	133 self.intrep = ep.address
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	134
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	135 if ep.type == usb.ENDPOINT_TYPE_BULK:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	136 if ep.address & usb.ENDPOINT_IN == usb.ENDPOINT_IN:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	137 self.bulkinep = ep.address
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	138 else:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	139 self.bulkoutep = ep.address
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	140 self.maxPacket = ep.maxPacketSize
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	141
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	142 # Required for 488.2 devices, optional otherwise
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	143 if self.intrep == None:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	144 print "Can't find interrupt endpoint"
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	145
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	146 # Data from the scope (mandatory)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	147 if self.bulkinep == None:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	148 raise "Can't find bulk-in endpoint"
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	149
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	150 # Data to the scope (mandatory)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	151 if self.bulkoutep == None:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	152 raise "Can't find bulk-out endpoint"
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	153
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	154 self.tag = 1
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	155
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	156 def __str__(self):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	157 rtn = "Mfg: %s Prod: %s" % (self.vendname, self.prodname)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	158 if self.serial != "":
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	159 rtn += " S/N: " + self.serial
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	160
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	161 return rtn
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	162
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	163 def incrtag(self):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	164 self.tag += 1
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	165 if self.tag == 0:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	166 self.tag += 1
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	167
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	168 def write(self, data):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	169 """Send data (string) to the scope"""
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	170
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	171 orddata = map(ord, data)
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	172 # The device needs a \n at the end, enfore this
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	173 if orddata[-1] != '\n':
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	174 orddata += [ord('\n')]
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	175 datalen = len(orddata)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	176
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	177 # Build the packet
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	178 pkt = [ DEV_DEP_MSG_OUT, self.tag, ~self.tag & 0xff, 0x00,
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	179 datalen & 0xff, datalen >> 8 & 0xff, datalen >> 16 & 0xff,
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	180 datalen >> 24 & 0xff, 1, 0, 0, 0 ]
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	181
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	182 # Add the data
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	183 pkt = pkt + orddata
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	184
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	185 # Align to 4 bytes
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	186 alignlen = ((len(pkt) / 4) + 1) * 4
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	187 pkt = pkt + [0] * (alignlen - len(pkt))
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	188
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	189 # Bump the tag
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	190 self.incrtag()
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	191
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	192 # Split it up into maxPacket sized chunks and send..
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	193 while len(pkt) > 0:
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	194 chunk = pkt[0:self.maxPacket]
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	195 pkt = pkt[self.maxPacket:]
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	196
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	197 #print "Sending %s bytes of data: %s" % (len(chunk), chunk)
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	198 wrote = self.handle.bulkWrite(self.bulkoutep, chunk)
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	199 if wrote != len(chunk):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	200 raise "Short write, got %d, expected %d" % (wrote, len(chunk))
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	201
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	202 def read(self):
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	203 """Read data from the device"""
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	204
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	205 # Maximum we accept at once
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	206 # Was 2^31 - 1 but that seems to make things take too long to
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	207 # read (perhaps libusb tries to malloc it..)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	208 datalen = 10240
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	209 data = []
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	210
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	211 while True:
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	212 # Ask the device to send us something
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	213 pkt = [ REQUEST_DEV_DEP_MSG_IN, self.tag, ~self.tag & 0xff, 0x00,
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	214 datalen & 0xff, datalen >> 8 & 0xff, datalen >> 16 & 0xff,
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	215 datalen >> 24 & 0xff, 0, 0, 0, 0]
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	216
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	217 # Expected tag
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	218 exptag = self.tag
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	219
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	220 # Bump tag
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	221 self.incrtag()
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	222
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	223 # Send it
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	224 #print "Sending " + str(pkt)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	225 wrote = self.handle.bulkWrite(self.bulkoutep, pkt)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	226 if wrote != len(pkt):
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	227 print "Short write, got %d, expected %d" % (wrote, len(pkt))
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	228
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	229 #print "Reading.."
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	230 read = self.handle.bulkRead(self.bulkinep, datalen)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	231 #print "Read %s bytes: %s" % (len(read), str(read))
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	232
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	233 if read[0] != DEV_DEP_MSG_IN:
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	234 raise "Unexpected Msg ID, got %s expected %d" % (read[0], DEV_DEP_MSG_IN)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	235 if read[1] != exptag:
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	236 raise "Unexpected tag, got %d expected %d" % (read[1], exptag)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	237 if read[2] != ~exptag & 0xff:
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	238 raise "Unexpected tag inverse, got %d expected %d" % (read[1], ~exptag & 0xff)
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	239
1 e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	240 actualdata = read[4] \| read[5] << 8 \| read[6] << 16 \| read[7] << 24
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	241 #print "Computed datalen is %d" % (actualdata)
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	242 data += read[12:12 + actualdata]
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	243 if read[8] & 0x01:
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	244 #print "Breaking out due to EOM"
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	245 break
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	246
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	247 # Stringify result for easier consumption
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	248 result = reduce(lambda x, y: x+y, map(chr, data))
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	249 # Trim off \n if present
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	250 if result[-1] == '\n':
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	251 result = result[0:-1]
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	252
e2089824735a Make the read support work properly & check what the device gives us. Daniel O'Connor <darius@dons.net.au> parents: 0 diff changeset	253 return result
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	254 def main():
2 adaff1c4fd6b Rip out procedural interface and use the OO one. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	255 u = USB488Device()
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	256 print "Found device"
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	257
2 adaff1c4fd6b Rip out procedural interface and use the OO one. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	258 print "ID is.."
adaff1c4fd6b Rip out procedural interface and use the OO one. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	259 u.write("*IDN?")
adaff1c4fd6b Rip out procedural interface and use the OO one. Daniel O'Connor <darius@dons.net.au> parents: 1 diff changeset	260 print u.read()
0 a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	261
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	262 if __name__ == "__main__":
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	263 main()
a43a47dfc902 First stab at code that actually works! Daniel O'Connor <darius@dons.net.au> parents: diff changeset	264

Mercurial > ~darius > hgwebdir.cgi > pyinst

annotate usb488.py @ 2:adaff1c4fd6b