886a52b6fb
Return SR_ERR_MALLOC upon allocation errors.
...
Add some TODOs.
2012-10-30 20:25:54 +01:00
6f22a8ef2c
Factor out serial_readline() to serial.c.
...
Only one (slightly different) variant remains in agilent-dmm, this will
be merged soon too, though.
2012-10-30 19:59:21 +01:00
2980cc2494
genericdmm/victor-dmm: Use message logging helpers.
2012-10-30 19:43:46 +01:00
dccbd0ede0
radioshack-dmm: Use message logging helpers.
2012-10-30 19:43:45 +01:00
38d326e879
agilent-dmm: Use message logging helpers.
2012-10-30 19:35:35 +01:00
31d84da3a2
fluke-dmm: Use message logging helpers.
2012-10-30 19:28:37 +01:00
6ac5f8922e
uni-t-dmm: Simplify subdriver setup.
...
So far, it seems we can make this work with just hw_init() needing to
be subdriver-specific (it will point 'di' to the respective per-subdriver
entry), the rest of the API functions can then use a strcmp() on di->name to
learn which subdriver they belong to.
2012-10-30 14:23:05 +01:00
fdbcb86dba
Draft: Make UT61D and VC-820 "first-class" drivers.
...
The 'uni-t-dmm' driver/directory will not appear as a "driver" to
frontends anymore, it's just an internal thing.
The frontends will see a uni-t-ut61d and voltcraft-vc820 driver now,
with the correct names and parsers etc. attached to them.
This is not fully finished yet, but it's a start (and works mostly):
$ sigrok-cli -D
The following devices were found:
UNI-T UT61D with 1 probe: P1
Voltcraft VC-820 with 1 probe: P1
$ sigrok-cli --driver voltcraft-vc820 -D
The following devices were found:
Voltcraft VC-820 with 1 probe: P1
$ sigrok-cli --driver uni-t-ut61d -D
The following devices were found:
UNI-T UT61D with 1 probe: P1
# Now attaching a UNI-T UT61D device via USB.
$ sigrok-cli --driver uni-t-ut61d --samples 3 -O analog
P1: -0.017800 V DC
P1: -0.017600 V DC
P1: -0.017700 V DC
# Now attaching a Voltcraft VC-820 device via USB instead.
$ sigrok-cli --driver voltcraft-vc820 --samples 3 -O analog
P1: -0.319200 V DC
P1: -0.319300 V DC
P1: -0.319300 V DC
2012-10-30 13:11:27 +01:00
4ca378df88
don't use deprecated g_thread_init/_create
2012-10-29 22:10:05 +01:00
015f1508ad
uni-t-dmm: Voltcraft VC-820 draft support.
...
This is commented out so far, will be implemented properly soon.
2012-10-29 15:20:17 +01:00
6c701476ad
Add protocol parser for FS9721_LP3/FS9721B.
...
The Fortune Semiconductor FS9721_LP3 and FS9721B/Q100 DMM chips are very
similar and the protocol looks identical.
Tested on a Voltcraft VC-820 (FS9721_LP3) with the uni-t-dmm driver
(needs some small changes, tbd).
2012-10-29 15:17:17 +01:00
a28dac0a73
fluke-dmm: code cleanup
2012-10-29 11:54:20 +01:00
2c04dede20
Fluke 287/289: support for dBu/dBV measurement units
2012-10-29 11:50:34 +01:00
79081ec80c
Initial support for UNI-T DMMs.
...
This is not yet fully finished, but works for most use-cases.
Tested with a UNI-T UT61D using the UT-D04 USB/HID cable (new version).
2012-10-27 23:17:30 +02:00
45e080b60b
la8: Rename driver.[ch] to protocol.[ch].
2012-10-27 22:36:34 +02:00
f3a35908ef
la8: Adapt to new driver conventions.
2012-10-27 22:36:19 +02:00
bbabddbd64
tekpower-dmm: Cosmetics, coding-style, consistency fixes.
2012-10-27 22:25:04 +02:00
7dc55d930f
Add support for the TekPower TP4000ZC DMM.
...
Also known as Digitek DT4000ZC.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-27 22:25:04 +02:00
545f978639
config.h usage cleanups.
...
- Drop config.h #include from files that don't actually use any of
its contents (at the moment).
- Add comment for those that do need it.
2012-10-24 00:41:21 +02:00
589a10135a
clean up autoconf/autobuild scripts
2012-10-22 01:48:39 +02:00
7c41dc4774
radioshack-dmm: Implement support for "LOGIC" mode
...
LOGIC mode sends the following data:
V < 0 : actual voltage
0 <= V < 1 : LOW
1 <= V < 2 : actual voltage
2 <= V : HIGH
We follow the same idea, and set our unit to BOOLEAN for the crazy
case (HIGH or LOW).
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-20 23:03:51 +02:00
0f70830194
libsigrok: (Trivial) Add support for 2400 baud
...
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-20 23:02:14 +02:00
fe31f8b9f9
fluke-dmm: add support for Fluke 187
2012-10-16 23:33:54 +02:00
be8dbf3ab2
radioshack-dmm: (Trivial) Convenience fixes
...
While testing the new radioshack-dmm driver with pulseview, I found
a few inconvenients.
1. Print an info message when a port is probed, and when a device is
found. This makes it easy to tell if and where the driver is looking.
2. num_samples was not reset after the first aquisition, so the
second aquisition would quit right away. Reset num_samples at start
of a new aquisition.
3. There's no need to open the serial port RW, so change O_RDWR to
O_RDONLY when opening the port.
These changes are too trivial to split into different patches.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-16 11:16:41 +02:00
7b0a85c81c
radioshack-dmm: build fixes
2012-10-15 18:25:48 +02:00
d375b3c3ec
radioshack-dmm: Add support for Radioshack 22-812 DMM
...
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-15 17:32:58 +02:00
e8e9dcdd70
serial: (Trivial) add support for 4800 baud
...
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-10-15 17:32:58 +02:00
a2e222d24f
sr: struct drv_context is global now.
2012-09-27 23:29:33 +02:00
d38d2ef0ce
fluke-dmm: support for all basic 287 functionality
2012-09-25 19:53:05 +02:00
f46a36ad80
fluke-dmm: definitely use CR as line terminator
2012-09-25 19:53:05 +02:00
acd29accb3
fluke-dmm: add Fluke 287 to supported list
2012-09-25 19:53:05 +02:00
fb9d3bf9cc
sr: always turn off ICRNL on serial ports
...
It does rather screw with protocols that use CR.
2012-09-25 19:53:05 +02:00
d3f8f1415c
fluke-dmm: flesh out the driver API
2012-09-25 19:53:05 +02:00
4129832014
fluke-dmm: auto-discover serial bitrate if not provided
2012-09-25 19:53:05 +02:00
bc41e012e6
fluke-dmm: don't log anything if no conn params given
2012-09-25 19:53:05 +02:00
fb480d578e
fluke-dmm: fix discovery
2012-09-25 19:53:05 +02:00
5c51e09868
sr: turn off canonical mode and echo ion serial ports by default
2012-09-25 19:53:05 +02:00
e7edd64f45
fluke-dmm: build fixes
2012-09-25 19:53:05 +02:00
4f958423d1
fluke-dmm: basic scan functionality
2012-09-25 19:53:05 +02:00
883a2e9e71
fluke-dmm: initial driver skeleton
2012-09-25 19:53:05 +02:00
c2016fa0eb
agilent-dmm: don't log anything if no conn params given
2012-09-17 00:00:27 +02:00
e9022f596d
sr: make struct drv_context global
2012-09-11 21:27:26 +02:00
f5cfe894ec
fx2lafw: use default libusb context
2012-09-11 21:20:50 +02:00
19b0cce312
hantek-dso: use default libusb context
2012-09-11 21:16:16 +02:00
b186aa78b8
agilent-dmm: fix model identifiers
2012-09-10 21:27:50 +02:00
8c0152f29b
agilent-dmm: tentative support for all U123x and U125x models
...
Only tested on U1233A, but it just might work.
The U125x protocol decoding only supports voltage, current, resistance,
capacitance and diode measurements for now.
2012-09-10 01:00:48 +02:00
a4394fb3d9
agilent-dmm: code cleanup
...
This should make it easier to support other Agilent U12xx models
2012-09-10 00:13:26 +02:00
e066c32a25
agilent-dmm: fix AC/DC mode detection
2012-09-09 22:49:07 +02:00
f2e86bbfa6
agilent-dmm: make parser deal with input better
2012-09-09 22:48:22 +02:00
81599cc55b
agilent-dmm: remove IDN check at 1Hz, we just don't need it.
...
Some debug message cleanup.
2012-09-08 14:53:49 +02:00
e6b021f377
agilent-dmm: support for submodes
2012-09-08 03:06:45 +02:00
69a7402490
genericdmm/victor-70c: fix resistance and frequency measurements
2012-09-08 02:28:41 +02:00
c0d93341cb
generic-dmm: cosmetics
2012-09-02 15:42:56 +02:00
f6b8ffa6c0
genericdmm/victor-70c: warn if detaching kernel driver fails
2012-09-02 15:42:56 +02:00
e93cdf428c
sr: mostly finished Agilent DMM driver
2012-09-02 15:42:56 +02:00
792fc68658
serial: add serial_set_paramstr()
2012-09-02 15:42:56 +02:00
f38b9763fa
serial: fix flow control setting
2012-09-02 15:42:56 +02:00
6a6e23abf5
serial: set speed in both directions
2012-09-02 15:42:56 +02:00
6ac0db19f3
sr: add new agilent-dmm driver (Agilent U12xxA multimeters)
2012-09-02 15:42:56 +02:00
b84c13d700
genericdmm: Victor 70C multimeter support
2012-08-18 16:23:08 +02:00
3c6ce226de
genericdmm: finish basic USB support
2012-08-18 16:23:08 +02:00
811deee4af
sr/drivers: add API calls sr_dev_inst_list() and sr_dev_inst_clear()
...
These are used to list the device instances currently known to the driver,
and clear that list.
Drivers that don't necessarily clear their list of instances on every scan,
such as genericdmm, need to provide these to the frontend to keep instance
management sane.
2012-08-06 00:59:25 +02:00
014359e329
sr/drivers: obsolete SR_HWCAP_PROBECONFIG
...
Since probes now live in a struct sr_dev_inst owned by the driver, it
already knows about them. Instead of a frontend telling the driver to
configure probes, all driver now do this just before starting acquisition.
2012-08-05 18:56:12 +02:00
fabe59b326
sr: drivers using sr_usb_dev_inst_new() must free it properly as well
...
sr_usb_dev_inst_free() doesn't really do anything, but it might one
day.
2012-08-04 12:21:02 +02:00
228b2cccaf
asix-sigma: fix double free
2012-08-03 14:19:00 +02:00
8012ae1e3b
chronovu-la8: fix double free
2012-08-03 14:18:02 +02:00
afc8831938
chronovu-la8: code cleanup
2012-08-03 14:06:52 +02:00
7021f98596
chronovu-la8: remove session source when done
2012-08-03 11:29:01 +02:00
503c4afbb4
asix-sigma: remove session source when done
2012-08-03 11:29:01 +02:00
7fd3e85961
demo: remove sources from session when done
2012-08-03 11:29:01 +02:00
a3508e33f9
hantek-dso: remove sources from session when done
2012-08-03 11:29:01 +02:00
26bf9d56c0
ols: remove serial source from session when done
2012-08-03 11:29:01 +02:00
310e9e9be4
zeroplus: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
fefc4b858e
ols: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
301a5e4c4a
genericdmm: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
b4750a3a93
demo: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
b9636cf4dc
fx2lafw: minor cleanup
2012-08-03 11:29:00 +02:00
cf1ebd5446
chronovu-la8: don't try to clean up unless we've initialized
2012-08-03 11:29:00 +02:00
b32503cccd
asix-sigma: properly init driver-private storage
2012-08-03 11:29:00 +02:00
1644fb2473
chronovu-la8: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
0e1357e896
asix-sigma: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
dc9dbe949a
fx2lafw: use driver-private storage for instances and libusb_context
2012-08-03 11:29:00 +02:00
269971ddce
hantek-dso: use driver-private storage for instances and libusb_context
2012-08-03 11:29:00 +02:00
6f57fd9694
sr: remove obsolete SR_DI_INST
2012-08-03 11:29:00 +02:00
87ca93c504
sr/drivers: add proper probe list to instances of all drivers
2012-08-03 11:29:00 +02:00
b35c829306
sr/drivers: fix off-by-one if frontend-initiated probe configuration
2012-08-03 11:29:00 +02:00
9e90dcba9c
sr/drivers: remove driver API call dev_status_get()
...
It's obsolete: no frontend ever used it, and neither did libsigrok.
The sdi->status field is only used internally by some drivers, and
should probably be moved to the driver-specific context structs.
2012-08-03 11:27:31 +02:00
5d9ed643e9
ols: change driver dev_acquisition_start/_stop calls to use sdi
...
...yeah, forgot OLS.
2012-08-03 11:27:31 +02:00
c4a1de59f8
genericdmm: cosmetic change
2012-08-03 11:27:31 +02:00
3f848bb7a9
zeroplus: comment out 32-probe models for now
2012-08-03 11:27:31 +02:00
428edbe13d
zeroplus-logic-cube: fix scan to correctly find model
2012-08-03 11:27:31 +02:00
3ffb6964a1
sr/drivers: change driver dev_acquisition_start/_stop calls to use sdi
2012-08-03 11:27:31 +02:00
25a0f108f4
sr/drivers: change driver dev_open/dev_close calls to use sdi
2012-08-03 11:27:31 +02:00
6f4b1868e8
sr/drivers: use sr_dev_inst instead of device index for dev_config_set()
...
All driver API calls using device index as a parameter will instead use a
const struct sr_dev_inst.
2012-08-03 10:27:39 +02:00
9c4311c524
chronovu-la8: adjust to multi-vid/pid patch
2012-08-03 10:27:39 +02:00
444adea232
zeroplus-logic-cube: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
2ca4465b3d
ols: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
2ce9f04629
hantek-dso: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
cbd798f400
fx2lafw: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
46c7a4daa7
demo: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
7566601c21
chronovu-la8: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
b2b5445c30
asix-sigma: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
2efc5948b6
ols: scan fix
2012-08-03 10:27:39 +02:00
b0c8d7ac7f
hantek-dso: scan/info_get fixes
2012-08-03 10:27:39 +02:00
7dfcf010a0
demo: scan/info_get fixes
2012-08-03 10:27:39 +02:00
cfe8a84dd7
chronovu-la8: scan/info_get fixes
2012-08-03 10:27:39 +02:00
d7bbecfdb9
asix-sigma: scan/info_get fixes
2012-08-03 10:27:39 +02:00
626409abfb
zeroplus-logic-cube: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
dddfb3dbf0
ols: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
0b79bcbb9d
hantek-dso: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
dfb0fa1a66
demo: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
6a2761fd99
chronovu-la8: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
4147960558
asix-sigma: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
eec944c5b8
asix-sigma: don't attempt to free static struct
...
Added more debugging as well.
2012-08-03 10:27:38 +02:00
067d07166b
demo: use new scan API
2012-08-03 10:27:38 +02:00
7da6f9d54a
zeroplus-logic-cube: init and scan fixes
...
libusb context needs to be initialized only once, not ever scan.
Every scan invalidates the last one, so clean up any previous run's
results first.
2012-08-03 10:27:38 +02:00
4ca3898445
zeroplus-logic-cube: use new scan API
2012-08-03 10:27:38 +02:00
39cfdd75f9
hantek-dso: use new scan API
2012-08-03 10:27:38 +02:00
0448d11097
asix-sigma: use new scan API + fixes
...
Now freeing FTDI context and driver-private context.
2012-08-03 10:27:38 +02:00
c4f3ed4bb0
chronovu-la8: use new scan API + fixes
...
Now freeing FTDI context and driver-private context.
2012-08-03 10:27:38 +02:00
f8c617cf4c
hantek-dso: instance list fix
2012-08-03 10:27:38 +02:00
10e5cbede8
ols: use new scan API
2012-08-03 10:27:38 +02:00
ed300b9f6a
asix-sigma: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
765ef2f725
chronovu-la8: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
dcf03d6dbd
demo: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
3275654708
zeroplus-logic-cube: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
982947f7a2
hantek-dso: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
e5e81856b4
ols: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
d6db79a48c
genericdmm: device scan fixes
2012-08-03 10:27:38 +02:00
f1a14ea7ab
genericdmm: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:37 +02:00
6910bf6bf6
genericdmm: use new driver info_get() API call
2012-08-03 10:27:37 +02:00
a27999e657
fx2lafw: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:37 +02:00
c5e82ca5e3
fx2lafw: device scan fixes
2012-08-03 10:27:37 +02:00
f69b47f0f8
fx2lafw: a device scan always invalidates any previous scans
2012-08-03 10:27:37 +02:00
6e9339aae2
fx2lafw: use new driver info_get() API call
2012-08-03 10:27:37 +02:00
3a0fe4023d
genericdmm: use new scan API
2012-08-03 10:27:37 +02:00
bbb40871c8
genericdmm: more flexible device discovery
2012-08-03 10:27:37 +02:00
75337758d8
genericdmm: use driver struct-based device instance list
2012-08-03 10:27:37 +02:00
a8cc8e44b9
fx2lafw: use driver struct-based device instance list
2012-08-03 10:27:37 +02:00
06717a8a60
fx2lafw: use new instance-based probe list
2012-08-03 10:27:37 +02:00
3a7a22cb07
fx2lafw: use new init/scan API
2012-08-03 10:27:37 +02:00
633b2fac75
genericdmm: better subdriver API arguments
2012-08-03 10:27:37 +02:00
1ef445b3d6
genericdmm/fs9922: no initialization needed
2012-08-03 10:27:36 +02:00
7fc754a0db
genericdmm: allow for default options in DMM profiles
...
Much better than the special-cased USB vid.pid
2012-08-03 10:27:36 +02:00
7356a55db8
genericdmm: use vid.pid as USB conn spec
...
: is just too hard for the CLI
2012-08-03 10:27:36 +02:00
db1352007d
genericdmm: fix header guard
2012-08-03 10:27:36 +02:00
61136ea603
sr: add new driver API call: scan()
...
This changes the semantics of the init() call as well. That now only
initializes the driver -- an administrative affair, no hardware gets
touched during this call. It returns a standard SR_OK or SR_ERR* code.
The scan() call does a discovery run for devices it knows, and returns
the number found. It can be called at any time.
2012-08-03 10:27:36 +02:00
40dda2c3a5
sr: remove unused argument from hardware driver function init()
...
It was actually used in one way: the session file loaded abused it for
passing in the filename -- something it definitely wasn't intended for.
This now uses the proper way to pass arguments to a driver: the new
SR_HWCAP_SESSIONFILE.
The OLS driver could also use it as an indication of the serial port to
use instead of actively probing all serial ports on the system, but there
wasn't any frontend code that passed in such a parameter, making it
entirely useless. That will soon be handled differently with the new
scan() API call, regardless.
2012-08-03 10:27:36 +02:00
0e8d0e24d0
sr: fx2lafw: Add 16bit support for USBee DX and clones
...
gnuplot script support only 8 channels
2012-08-03 00:25:37 +02:00
c9166745f2
sr: fx2lafw: Add basic support for USBee DX and clones
2012-08-01 00:12:00 +04:00
Uwe Hermann
Bert Vermeulen
Alexandru Gagniuc
Ivan Fedorov