stv0g/comedi-www
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of git://comedi.org/git/comedi/comedi-www

Browse source
This commit is contained in:
Ian Abbott 2012-05-11 10:48:21 +01:00
commit 2c2f62bf45
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -11,10 +11,12 @@ all: $(htmlfiles)
push:
rsync -a --files-from=files . \
www.comedi.org:/srv/comedi.org/www
bporr@www.comedi.org:/srv/comedi.org/www
hardware.html: devices.xml
devices.xml:
perl make_device_table.pl < devices.txt > devices.xml
clean:
rm -f $(htmlfiles) devices.xml

6
applications.xml
View file

@ -18,12 +18,6 @@
A simple program to record data from a Comedi device.
Uses the Trolltech Qt widget library.
</dd>
<dt>
<a href="http://www.linux-usb-daq.co.uk/software2/comedi-wave/">Qt-Wave</a>
</dt>
<dd>
Waveform generator using Trolltech Qt widget library.
</dd>
<dt>
<a href="http://ktimetrace.sourceforge.net/">KTimeTrace</a>
</dt>

1
devices.txt
View file

@ -172,6 +172,7 @@ ICP P16R16DIO acl7225b p16r16dio
Inova ICP_MULTI icp_multi icp_multi
Intelligent Instrumentation PCI-20001C ii_pci20kc ii_pci20kc
IOTech DAQBoard/2000 daqboard2000 daqboard2000
ITL USB-DUX usbduxsigma usbduxsigma.o
ITL USB-DUX usbduxfast usbduxfast.o
ITL USB-DUX usbduxsigma usbduxsigma.o
ITL USB-DUX usbdux usbdux.o