From f3c325aed08b4bca544fb7080216948c5ec87eaf Mon Sep 17 00:00:00 2001 From: Bernd Porr Date: Sun, 13 May 2012 11:06:37 +0100 Subject: [PATCH] Changed the headers of usbdux, usbduxfast and usbduxsigma so that there are proper comments and actually useful information. Thanks Ian for pointing this out. --- comedi/drivers/usbdux.c | 73 +++++++++++++++++++++++++++++------- comedi/drivers/usbduxfast.c | 34 +++++++++++++++-- comedi/drivers/usbduxsigma.c | 55 ++++++++++++++++++++++++--- 3 files changed, 140 insertions(+), 22 deletions(-) diff --git a/comedi/drivers/usbdux.c b/comedi/drivers/usbdux.c index da0f73da..17a468ee 100644 --- a/comedi/drivers/usbdux.c +++ b/comedi/drivers/usbdux.c @@ -22,23 +22,68 @@ */ /* Driver: usbdux -Description: University of Stirling USB DAQ & INCITE Technology Limited -Devices: [ITL] USB-DUX (usbdux) -Author: Bernd Porr -Updated: 8 Dec 2008 +Description: Driver for USB-DUX-D of INCITE Technology Limited +Devices: [ITL] USB-DUX-D (usbdux) +Author: Bernd Porr +Updated: 13 May 2012 Status: Stable -Configuration options: - You have to upload firmware with the -i option. The - firmware is usually installed under /usr/share/usb or - /usr/local/share/usb or /lib/firmware. -Connection scheme for the counter at the digital port: - 0=/CLK0, 1=UP/DOWN0, 2=RESET0, 4=/CLK1, 5=UP/DOWN1, 6=RESET1. - The sampling rate of the counter is approximately 500Hz. +Supports: + - Analog input + subdevice: 0 + number of channels: 8 + max data value: 4095 + ranges: + all channels: + range = 0 : [-4.096 V,4.096 V] + range = 1 : [-2.048 V,2.048 V] + range = 2 : [0 V,4.096 V] + range = 3 : [0 V,2.048 V] + command: + start: now|int + scan_begin: timer (contains the sampling interval. min is 125us / chan) + convert: now + scan_end: count + stop: none|count + - Analogue output: + subdevice: 1 + number of channels: 4 + max data value: 4095 + ranges: + all channels: + range = 0 : [-4.096 V,4.096 V] + range = 1 : [0 V,4.096 V] + command: + start: now|int + scan_begin: timer (contains the sampling interval. min is 1ms.) + convert: now + scan_end: count + stop: none|count + - Digital I/O + subdevice: 2 + number of channels: 8 + - Counter + subdevice: 3 + number of channels: 4 + max data value: 65535 + Pin assignments on the D-connector: + 0=/CLK0, 1=UP/DOWN0, 2=RESET0, 4=/CLK1, 5=UP/DOWN1, 6=RESET1 + - PWM + subdevice: 4 + number of channels: 8 or 4 + polarity output for H-bridge + (see INSN_CONFIG_PWM_SET_H_BRIDGE where + the first byte is the value and the + second the polarity) + max data value: 512 -Please note that under USB2.0 the length of the channel list determines -the max sampling rate. If you sample only one channel you get 8kHz -sampling rate. If you sample two channels you get 4kHz and so on. +Configuration options: + The device requires firmware which is usually + uploaded automatically by udev/hotplug at the moment + the driver module is loaded. + In case udev/hotplug is not enabled you need to upload + the firmware with comedi_config -i usbdux_firmware.bin. + The firmware is usually installed under /lib/firmware + or can be downloaded form http://www.linux-usb-daq.co.uk. */ /* * I must give credit here to Chris Baugher who diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c index 9377769d..71145678 100644 --- a/comedi/drivers/usbduxfast.c +++ b/comedi/drivers/usbduxfast.c @@ -22,11 +22,39 @@ /* Driver: usbduxfast -Description: ITL USB-DUXfast +Description: Driver for USB-DUX-FAST of INCITE Technology Limited Devices: [ITL] USB-DUX (usbduxfast) -Author: Bernd Porr -Updated: 08 Dec 2008 +Author: Bernd Porr +Updated: 13 May 2012 Status: stable + +Supports: + - Analogue input + subdevice: 0 + number of channels: 16 + max data value: 4096 + ranges: + all channelss: + range = 0 : [-0.75 V,0.75 V] + range = 1 : [-0.5 V,0.5 V] + command: + The channel-list allows 1,2,3 and 16 channels. + start: now|ext|int (external trigger via pin at HD-D connector) + scan_begin: follow|timer|ext + convert: timer|ext (contains the sampling interval. Min interval + for single channel acquisition is 33us + and for multiplexed acquisition 300us) + scan_end: count + stop: none|count + +Configuration options: + The device requires firmware which is usually + uploaded automatically by udev/hotplug at the moment + the driver module is being loaded. + In case udev/hotplug is not enabled you need to upload + the firmware with comedi_config -i usbduxfast_firmware.bin + The firmware is usually installed under /lib/firmware + or can be downloaded form http://www.linux-usb-daq.co.uk. */ /* diff --git a/comedi/drivers/usbduxsigma.c b/comedi/drivers/usbduxsigma.c index d6f6e7a2..561acec0 100644 --- a/comedi/drivers/usbduxsigma.c +++ b/comedi/drivers/usbduxsigma.c @@ -22,11 +22,56 @@ */ /* Driver: usbduxsigma -Description: University of Stirling USB DAQ & INCITE Technology Limited -Devices: [ITL] USB-DUX (usbduxsigma) -Author: Bernd Porr -Updated: 21 Jul 2011 -Status: testing +Description: Driver for USB-DUX-SIGMA of INCITE Technology Limited +Devices: [ITL] USB-DUX-SIGMA (usbduxsigma) +Author: Bernd Porr +Updated: 13 May 2012 +Status: Stable + +Supports: + - Analog input + subdevice: 0 + number of channels: 16 + max data value: 16777215 (0xfffff, 24bits) + ranges: + all channels: [-1.325 V,1.325 V] + command: + start: now|int + scan_begin: timer (contains the sampling interval. min 250us) + convert: now + scan_end: count + stop: none|count + - Analog output + subdevice: 1 + number of channels: 4 + max data value: 255 + ranges: + all channels: [0 V,2.5 V] + command: + start: now|int + scan_begin: timer (contains the sampling interval. min 1ms) + convert: now + scan_end: count + stop: none|count + - Digital I/O + subdevice: 2 + number of channels: 24 (first 8 bits on the D connector, 16 bits int.) + - PWM + subdevice: 3 + number of channels: 8 or 4 + polarity output for H-bridge + (see INSN_CONFIG_PWM_SET_H_BRIDGE where + the first byte is the value and the + second the polarity) + max data value: 512 + +Configuration options: + The device requires firmware which is usually + uploaded automatically by udev/hotplug at the moment + the driver module is loaded. + In case udev/hotplug is not enabled you need to upload + the firmware with comedi_config -i usbdux_firmware.bin. + The firmware is usually installed under /lib/firmware + or can be downloaded form http://www.linux-usb-daq.co.uk. */ /* * I must give credit here to Chris Baugher who -- 2.26.2