Commit Graph

2285 Commits

Author SHA1 Message Date
Uwe Hermann 56d0d24535 Rename sr_probe_new() to sr_channel_new().
This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
Uwe Hermann ba7dd8bbb8 Replace 'probe' with 'channel' in most places.
Also, consistently use 'ch' for channel variables. This matches how we
consistently use sdi, devc, and so on all over the code-base.

This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
Uwe Hermann 91aea754aa Rename 'struct sr_probe' to 'struct sr_channel' everywhere.
This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
Uwe Hermann 53b4680fce Consistently use 'cg' for channel group variables.
This matches how we consistently use sdi, devc, and so on all over
the code-base.

This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
Uwe Hermann a68bf88e3a Replace channel_group.probes with channel_group.channels.
This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
Uwe Hermann 40fd0264f9 Replace some 'pg' with 'cg'.
(since 'probe groups' are now called 'channel groups')

This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
Uwe Hermann 660e398fe9 Replace 'probe group' with 'channel group' everywhere.
The name 'probe' (and thus 'probe group') is a relic from the times when
sigrok was mostly about logic analyzers. Nowadays we support a lot more
device types where 'probe' is not really a good term and 'channel' is
much better suited.

This fixes parts of bug #259.
2014-03-25 20:58:54 +01:00
poljar (Damir Jelić) 3fd2dca207 hameg-hmo: Add missing cases in config_get(). 2014-03-25 20:48:58 +01:00
poljar (Damir Jelić) bbabdaf1e2 hameg-hmo: Add the TRIGGER_SLOPE entry to config_list(). 2014-03-25 20:48:58 +01:00
poljar (Damir Jelić) 422a1c0d58 hameg-hmo: Fix the logic for the horizontal trigger position in config_set()
This patch fixes the logic calculating the trigger position as well as the
(hopefully) last remaining locale issue.
2014-03-25 20:48:58 +01:00
Matthias Heidbrink e83437ae20 serial-dmm: Implemented support for Voltcraft M-3650CR (driver voltcraft-m3650cr). 2014-03-24 22:57:27 +01:00
Matthias Heidbrink 1656e47def serial-dmm: Implemented support for Voltcraft ME-42 (driver voltcraft-me42). 2014-03-24 17:42:52 +01:00
Uwe Hermann 36cf5b5445 Makefile.am: Add missing vxi.h.
If it's not listed as SOURCE, it won't end up in the tarball and a build
from tarball would thus break.
2014-03-20 13:10:53 +01:00
Uwe Hermann 67bd805523 Switch to a non-recursive automake setup.
Instead of >= 44 Makefile.am's we now only have one top-level
Makefile.am, and use the 'subdir-objects' automake option to
handle the build via non-recursive (auto)make.

This has the advantage of fewer (boilerplate or other) files and less
clutter in general, as well as performance advantages since the new
setup can build many files in parallel (with 'make -j'), not only 2 or 3
files within the same (e.g. hardware/xxxx/* subdirectory) and also since
we no longer need to build intermediate libtool helper libs per subdirectory.

A quick, non-scientific test build on a quad-core laptop with 'make -j 4'
yields a build time reduction from 35s to 19s.

All autotools features that worked before are still intact without any
regressions, including the Make targets 'install', 'uninstall', 'check',
'dist', 'clean', 'distclean' and so on, as well as all the usual portability
handling (build works on any OS, with any Make implementation such as
GNU Make or BSD Make, with any shell such as sh/ksh/zsh/bash/dash, etc. etc.)
and features such as out-of-tree build support, cross-compile support,
testsuite support (also with colored output), "silent make rules", etc. etc.
2014-03-20 13:10:05 +01:00
Uwe Hermann 9ad05e6cd2 scpi_usbtmc_libusb.c: Fix two error checks.
Two error checks had a missing "ret = ", which lead to an incorrect
value being passed to libusb_error_name().

Also, lower the level for those messages from sr_err() to sr_dbg()
since they're not fatal.
2014-03-11 19:48:47 +01:00
Uwe Hermann d8cbd659ce scpi_usbtmc_libusb.c: Consistently check for < 0 (libusb calls). 2014-03-11 19:48:00 +01:00
Uwe Hermann a84f6ad389 Fix 'aquisition' typo in a few places. 2014-03-11 19:42:20 +01:00
Aurelien Jacobs 846fb172db brymen-bm86x: disable driver when libusb is not present 2014-03-09 23:09:47 +01:00
Matthias Heidbrink 7f7f6a2e0c gmc-mh-1x-2x: Whitespace fixes (cosmetic). 2014-03-08 11:04:27 +01:00
Matthias Heidbrink dc05dd6069 visa: Fixed missing header warnings/uninitialized variable. 2014-03-08 10:56:16 +01:00
Matthias Heidbrink d1d3b7dff9 gmc-mh-1x-2x: Cosmetic fixes for Metrahit 25S. 2014-03-08 10:50:21 +01:00
Matthias Heidbrink c6c63b08af gmc-mh-1x-2x: Fixed 300 µA range scaling. 2014-03-08 10:40:38 +01:00
Fabio 0bc3ab92e6 Fluke189 support
I can confirm that the 189 uses the same "QM" command as the 187:
<-- QM\r
--> QM,+03.225 mV AC
2014-03-05 12:33:14 +01:00
Joel Holdsworth 8c9d4d67f8 Fixed session_driver so that it can run more than one session. 2014-03-01 11:23:08 +00:00
Uwe Hermann 0ab702601d brymen-bm86x: Remove std_dev_clear() wrapper. 2014-02-28 13:13:09 +01:00
Uwe Hermann 1b950bc79c configure.ac: Move Brymen BM86X snippet to correct place. 2014-02-28 13:08:53 +01:00
Aurelien Jacobs ecaa89af0e brymen-bm86x: actual driver implementation 2014-02-27 22:50:09 +01:00
Aurelien Jacobs 8d9c8554a5 brymen-bm86x: Initial driver skeleton. 2014-02-27 22:50:09 +01:00
Daniel Elstner 8bbdd364d3 session: Always read a whole number of samples. 2014-02-26 21:38:41 +01:00
Bert Vermeulen a66307424e Remove std_dev_clear() wrappers from drivers. 2014-02-26 21:37:18 +01:00
Bert Vermeulen 824fba0341 session: Implement dev_clear(). 2014-02-26 21:35:33 +01:00
Bert Vermeulen 8102cee4d4 device: sr_dev_clear() now always works.
If the driver does not provide a dev_clear() function, the wrapper
now calls std_dev_clear() instead.
2014-02-26 21:34:58 +01:00
Uwe Hermann 0294a409b8 conrad-digi-35-cpu: Add missing Makefile.am, minor cosmetics. 2014-02-12 15:29:14 +01:00
Matthias Heidbrink c6a2843a58 conrad-digi-35-cpu: Implemented driver. 2014-02-12 15:10:07 +01:00
Matthias Heidbrink 823b4e5817 conrad-digi-35-cpu: Initial driver framework. 2014-02-12 15:10:06 +01:00
Uwe Hermann a90061e5d1 gmc-mh-1x-2x: Shorten driver names a bit. 2014-02-12 15:04:54 +01:00
Matthias Heidbrink fadd07072b gmc-mh-1x-2x: Support for interface SI232-II with driver gmc-mh-2x-bd232. 2014-02-11 18:05:25 +01:00
Matthias Heidbrink c90beca780 gmc-mh-1x-2x: Added new driver gmc-mh-2x-bd232. 2014-02-11 18:05:25 +01:00
Matthias Heidbrink 67eb6bcbe6 hwdriver.c: Update/extend some Doxygen comments. 2014-02-11 18:05:00 +01:00
Matthias Heidbrink 6392d5992b gmc-mh-1x-2x: Cleanup, docs, minor fixes. 2014-02-11 18:04:54 +01:00
Matthias Heidbrink 813aab691b Update/extend some Doxygen comments. 2014-02-11 18:04:46 +01:00
Daniel Elstner d8b6b28b80 scpi_visa: Add missing callback parameter.
(scpi_visa_dev_inst_new): Fix serious compiler warning due to
missing drvc parameter in prototype.
2014-02-07 20:20:20 +01:00
Uwe Hermann 52f6951c4e scpi_usbtmc_libusb: Consistent libusb error handling. 2014-02-07 19:42:27 +01:00
Uwe Hermann ed840c8612 scpi: Disable scpi_usbtmc in favor of scpi_usbtmc_libusb for now.
Having both in the list will "find" the same device twice.
2014-02-07 19:01:45 +01:00
Aurelien Jacobs 2a0f6924d2 usb: remove unused sr_usb_find_usbtmc() 2014-02-07 18:53:04 +01:00
Aurelien Jacobs 20ed3ceee7 scpi: add a libusb based implementation of usbtmc 2014-02-07 18:53:04 +01:00
Aurelien Jacobs ca28abd6a5 hameg-hmo: use the new scpi scan API 2014-02-07 18:53:04 +01:00
Aurelien Jacobs 9d3ae01b37 rigol-ds: use the new scpi scan API 2014-02-07 18:53:04 +01:00
Aurelien Jacobs b541f8376d scpi: add a generic scan API and implement it in usbtmc and serial transport
note that sr_usb_find_serial() is copied from the hameg-hmo driver
2014-02-07 18:53:04 +01:00
Aurelien Jacobs 17bdda5868 scpi: add a struct drv_context parameter to scpi_dev_inst_new() 2014-02-07 18:53:04 +01:00