13cd8197eb
Update for libserialport v0.1 API.
2013-11-22 02:14:16 +01:00
c4650aca12
Suppress compile warning
2013-11-20 22:06:01 +01:00
61bab807f4
DT4000ZC/TP4000ZC: Force DTR=1 on the serial port.
...
This fixes the driver e.g. on NetBSD.
2013-11-20 00:42:08 +01:00
4403c39fe4
ols: Always open serial port in nonblocking mode.
...
The scan() function was opening the port in non-blocking mode, the dev_open()
function however was not using the SERIAL_NONBLOCK flag. This led to hangs
in certain situations.
This fixes the OLS e.g. on NetBSD.
2013-11-19 23:22:46 +01:00
1a54044299
serial.c: Minor cosmetic fix.
2013-11-19 20:09:59 +01:00
a82635f252
Use new sp_port_config fields.
2013-11-19 14:26:18 +01:00
e385e2ed90
serial: Use new sp_set_config instead of sp_set_params.
2013-11-19 14:26:18 +01:00
066d42b1c8
serial: Fix leak in serial_open.
...
A new sp_port is created every time we call serial_open (sp_get_port_by_name
implicitly creates one for us), so free it every time we call serial_close.
2013-11-19 10:29:24 +01:00
1130e4229b
rigol-ds1xx2: Send a SR_DF_END packet before acquisition stop.
...
Without a SR_DF_END samples could be cached in the internal buffer of an output
module and never flushed, therefore they would be missing in the final output.
By sending a SR_DF_END packet we force the output to be flushed.
2013-11-15 17:00:07 +01:00
449cc16bb2
serial.c: Temporary quickfix until a libserialport fix is done.
2013-11-15 12:23:09 +01:00
26e0361cc6
uni-t-dmm: Drop unused packet_request callback.
2013-11-15 09:36:51 +01:00
c4f2dfd0f0
configure.ac: libserialport is optional.
...
Disable drivers that need serial port support if libserialport is not found.
Also, disable building various other serial port related code in that case.
2013-11-15 09:36:51 +01:00
6a76efebc1
serial.c: Fix a few return values.
2013-11-14 23:48:28 +01:00
a0dfaa6c4c
serial.c: Cosmetics, coding-style.
2013-11-14 23:48:28 +01:00
0d4405ce5e
Update for renamed libserialport header file.
2013-11-14 23:48:16 +01:00
c9bc57b6bc
Update to new libserialport API.
2013-11-14 23:48:16 +01:00
a9bce5a561
Use libserialport for serial port access.
2013-11-14 23:48:16 +01:00
58f4336963
rigol-ds1xx2: Unbreak listing of _VDIV and _COUPLING
2013-11-08 01:03:19 +01:00
5f77dffc02
rigol-ds1xx2: Unbreak listing of SR_CONF_DEVICE_OPTIONS
2013-11-08 01:03:19 +01:00
be60a9e4a9
rigol-ds1xx2: Better error reporting when probe groups are required
2013-11-08 01:03:19 +01:00
78bcc55afa
rigol-ds1xx2: Minor coding style fixes
2013-11-08 01:03:19 +01:00
d3c74a6fb0
probe_groups: API changes required to implement probe groups.
2013-11-08 01:03:18 +01:00
ba358ffd83
rigol-ds1xx2: fix bitrot in device cleanup code
2013-11-08 01:03:18 +01:00
e43fdd8d4f
rigol-ds1xx2: Don't assume valid sdi
2013-11-08 01:03:18 +01:00
45311368de
rigol-ds1xx2: Skip obsolete fields
2013-11-08 01:03:18 +01:00
f48e0249b4
rigol-ds1xx2: implement probe group specific options.
2013-11-08 01:03:17 +01:00
3d3a601e80
rigol-ds1xx2: create probe groups.
2013-11-08 01:03:17 +01:00
8f996b8948
probe_groups: API changes required to implement probe groups.
2013-11-08 01:03:16 +01:00
b775d753e3
rigol-ds1xx2: detect Rigol DS1xx2 with upgraded bandwith
...
The bandwith in Rigol DS1xx2D/E scopes can be upgraded to 150 MHz in software.
So detect also scopes with the upgraded bandwith.
using libsigrok-0.2.1 + this change + commit da970d24ec
2013-11-03 14:20:47 +01:00
3a8cad9137
metex14: Handle a few missing cases for overflow.
2013-10-31 13:47:30 +01:00
88f544f27e
Add support for the Metex M-4650CR.
...
(the Voltcraft M-4650CR is a rebadged Metex M-4650CR)
2013-10-30 14:44:44 +01:00
2b83d7fee1
Add support for the Voltcraft M-4650CR.
2013-10-30 14:44:44 +01:00
e790bd5cda
norma-dmm: Minor cosmetics, coding-style, consistency fixes.
...
Also, add a missing "%" in an sr_err() and a missing parameter in
another sr_err().
2013-10-25 21:25:26 +02:00
f8e76e2e74
norma dmm: Implemented driver.
2013-10-25 21:25:26 +02:00
bfd48770fc
norma dmm: Initial driver skeleton.
2013-10-25 21:25:26 +02:00
50a9aba21b
serial: Removed flag OPOST (turn off all output processing).
2013-10-25 19:11:15 +02:00
a510d55571
serial: Added flags CLOCAL (ignore modem status lines) and CREAD (start receiver).
2013-10-25 19:11:15 +02:00
1b943b6d8b
serial: Added flag IXANY (any char will restart) to XON/XOFF handshaking.
2013-10-25 19:11:14 +02:00
0c30b35fce
saleae-logic16: claim device before using it
...
The kernel warns:
[ 7461.925685] usb 2-4: usbfs: process 11303 (sigrok-cli) did not claim interface 0 before use
2013-10-24 16:01:46 +01:00
5542bee61b
teleinfo: actual parser implementation
2013-10-24 15:41:11 +01:00
8e796cb438
teleinfo: Initial driver skeleton.
2013-10-24 15:41:11 +01:00
c02dc3e261
metex14: Add support for pF (picofarad).
...
This is used on some Metex DMMs.
2013-10-23 18:41:13 +02:00
ee6cb5a417
metex14: Use case-insensitive string compares.
...
This allows some other DMMs to be supported that use e.g. "kOhm" vs.
"KOhm", and so on.
2013-10-23 18:07:54 +02:00
1a807c13fc
metex14: Support DMMs with slightly different protocol.
...
This adds support for DMMs with 5 digits in the protocol (instead of 4)
and some more whitespace variants.
2013-10-23 18:06:15 +02:00
71f1302b4b
metex14: Support DMMs with whitespace differences.
...
Most Metex DMMs use e.g. " mV" as unit field, others use "mV ",
though. Support these (and other) whitespace variants by stripping all
spaces and only comparing non-space characters.
2013-10-23 17:31:14 +02:00
b21d7eebe2
serial: Changed order of flags PARENB and PARODD in deletion to same order as in setting (cosmetic).
2013-10-18 16:58:33 +02:00
df6b0f99af
ISO-TECH IDM103N: remove the useless -ser postfix
2013-10-13 14:54:54 +02:00
94e9021b3e
es519xx: correct initialization of es519xx_info structure
2013-10-13 14:54:54 +02:00
93d719cde6
es519xx: Fix incorrect packet size, and a typo.
2013-10-07 00:36:18 +02:00
72e1672fc9
es519xx: Cosmetics, coding style, minor fixes.
2013-10-07 00:36:18 +02:00
de737bfc11
add ISO-TECH IDM103N serial-dmm driver
2013-10-07 00:36:18 +02:00
c01bdebc57
add cyrustek es519xx generic protocol parser
2013-10-07 00:36:18 +02:00
2f9376117c
fx2lafw: Organize driver into api.c / protocol.[ch].
...
This now matches the naming conventions of the other drivers.
2013-10-06 22:28:45 +02:00
fbf07e0209
agilent-dmm: Fix SEGV during incomplete reply from meter.
...
If buf contains exactly the string "Agilent Technologies" (for example if
there are bugs in the timeout logic or serial driver causing the reply from
the meter to be abridged) then this code will SEGV. This is because tokens[1]
is NULL but only tokens[2] and tokens[3] (both of which are undefined) are
NULL checked.
Can be trivially corrected by NULL checking tokens[1] as well.
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2013-10-04 13:30:49 +02:00
5715e84fe3
serial: Only sleep when no characters are received.
...
g_usleep(XX) sleeps for *at least* XX microseconds but may sleep for
longers (on older kernels the sleep will typically be 10000us). Thus
byte receive loops containing an unconditional sleep will perform
very poorly (for example it causes the scan in agilent-dmm to timeout
prematurely).
Even on modern kernels serial_readline() has a 2ms sleep per byte which
means it will read at a maximum rate of half a character per millisecond
(~4800baud).
This is fixed by only sleeping when read() returns no data.
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
2013-09-26 14:57:37 +02:00
45c0841b25
uni-t-ut32x: Shorten dev_list().
2013-09-25 14:26:35 +02:00
6ebe003985
ols: fixed demux mode disable noise filter
...
Demux flag wasn't getting set off if one non-demux sample was ran
beforehand.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-09-07 20:17:16 +02:00
6a53bde671
ols: Moved FLAG_FILTER to demux check
...
Demux mode was having filter mode set which it doesn't
support per FPGA demon core docs.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-09-06 11:42:25 +02:00
e52bb9be83
Voltcraft VC-830: Fix diode mode handling.
...
This DMM is not using the standard bits in the FS9922 protocol/structure
to indicate the "volt" and "diode mode" flags. Instead, it only sets the
user-defined bit "z1" to indicate both "diode mode" and "volt".
This fixes #142 .
2013-09-01 15:27:21 +02:00
a6ed50f405
es51922/fs9721/fs9922/metex14: Use diode MQFLAG.
...
This fixes #141 .
2013-09-01 15:27:07 +02:00
98494dc8a3
fs9922: Fix typo.
2013-09-01 13:41:13 +02:00
045e9a9918
serial.c: Drop unneeded <glob.h>.
...
This is no longer used, and also it is not available on Android and thus
breaks cross-compilation for Android.
Thanks Marcus Comstedt <marcus@mc.pp.se> for reporting.
2013-08-30 16:35:56 +02:00
b1de040700
ols: fixed channel limit check
...
For demux mode we half the channels. Previous check method broke
the OLS randomly and but it in a bad state.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-30 13:58:36 +02:00
da970d24ec
rigol-ds1xx2: newer Linux kernels have USBTMC in /sys/class/usbmisc
2013-08-30 13:57:45 +02:00
f51acd69d7
ols: combine demux samples
...
demux mode allows DDR sampling which disables group 2 & 3
and thus samples group 0 & 1 to sample on rising and falling of
the clock.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-28 10:21:59 +02:00
7b0a57fd1c
ols: add swap channels feature
...
Allow channel groups to be swapped. This is useful
for demux at 200mhz with the unbuffered channels.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-28 10:21:59 +02:00
de52409982
ols: Display noise filter flag
...
Show if noise filter is on. This is important to be
sure is off for demux mode.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-28 10:21:59 +02:00
00d04d3b0e
ols: Fix RLE count handling
...
The high bit of the sample, denoting this is a count, was not getting
properly cleared. This resulted in an inevitably negative count, and
corruption of the sample buffer before it was transferred to the
frontend.
2013-08-27 00:33:20 +02:00
abb39e6b8c
ols: Properly initialize entire single-sample buffer before start
...
The single sample buffer, up to 4 bytes long, was not getting initialized
on (every) acquisition start, only after the first full sample was in.
This caused the first sample to potentially hold garbage.
2013-08-26 23:42:09 +02:00
eb1b610b12
ols: add external clock support
...
Add external clock support that allows you to use the tracing
targets bus clock line for sampling.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-26 10:28:45 +02:00
967760a893
ols: add test mode support
...
ols allows both external and internal test patterns at ~20khz
which are helpful for unit tests and demos.
pattern=internal -> route pattern internally to all 32 pins
(input otherwise disabled)
pattern=external -> generates pattern on unbuffered pins 16:31
(which can be looped back to the buffered pins 0:15)
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-26 09:52:24 +02:00
503133bb5f
ols: fixed parallel stage triggers
...
Stage count was always getting incremented one more than
actual stages, and this caused a extra stage with zero'ed data
probe lines to have the start bit field.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
2013-08-26 09:48:41 +02:00
d0107565c1
saleae-logic16: Drop unneeded NUM_PROBES.
2013-08-21 11:41:21 +02:00
87b537ced0
saleae-logic16: Shorten dev_list() implementation.
2013-08-21 11:37:40 +02:00
96484e22b4
saleae-logic16: Whitespace fixes, cosmetics.
2013-08-21 11:33:37 +02:00
186dde8d72
saleae-logic16: Cleanup the prime_fpga function
...
The driver should now work on any Logic16.
2013-08-20 19:55:57 +02:00
fec7aa6a44
saleae-logic16: Update copyright blurbs.
...
Copied copyright lines from fx2lafw driver, since much of the code is
taken from there.
2013-08-20 19:55:57 +02:00
db11d7d2d0
saleae-logic16: Add voltage threshold conf.
2013-08-20 19:55:57 +02:00
b117363ad7
saleae-logic16: Declare confs.
2013-08-20 19:55:57 +02:00
7b5daad45c
saleae-logic16: Implemented acquisition.
2013-08-20 19:55:57 +02:00
15abcf0f58
saleae-logic16: Initialize the FPGA.
...
The map_eeprom_data function is currently unknown. The map entries
provided were observed via bus-snooping of the vendor software on my
device. Other devices may need additional values.
2013-08-20 19:55:57 +02:00
5eea4305ad
saleae-logic16: Reworked scan/open to handle FW upload.
...
The new code is based on code from the fx2lafw driver.
2013-08-20 19:55:57 +02:00
f6a21fa50c
saleae-logic16: Detect the hardware.
2013-08-20 19:55:57 +02:00
c463dcf06c
saleae-logic16: Initial driver skeleton.
2013-08-20 19:55:22 +02:00
56e76981bc
uni-t-dmm: Require conn parameter for scan
...
Since the uni-t-ut32x series handles devices with the same USB VID.PID,
which is linked to the WCH CH9325 USB/HID-UART interface chip, this
driver can no longer assume it can handle anything with this VID.PID.
2013-08-11 10:52:43 +02:00
d6ff054ae5
uni-t-ut32x: Full acquisition support
2013-08-11 10:46:36 +02:00
6513f97fbe
uni-t-ut32x: Flesh out driver
2013-08-11 10:46:36 +02:00
3877dde43a
uni-t-ut32x: Initial driver skeleton.
2013-08-11 10:46:36 +02:00
4a8bbed76d
center-3xx: Initial Center 309 / Voltcraft K204 support.
2013-08-08 19:59:49 +02:00
4433145f48
center-3xx: Initial driver skeleton.
2013-08-08 19:58:48 +02:00
ce95428cca
Consistent use of "IKALOGIC" spelling.
...
The company name is written all-caps pretty consistently on the
vendor website and docs, so use that spelling everywhere.
2013-08-07 16:21:57 +02:00
b07b42f319
Cosmetics, typos.
2013-08-07 16:21:57 +02:00
e11a1ebacc
alsa: Fix double-free issue.
...
This fixes bug #129 .
2013-08-07 16:21:56 +02:00
4d7ddff75b
uni-t-dmm: Fix UT61E bug related to the UNI-T UD-D04 cable.
...
This fixes bug #136 .
2013-08-06 23:36:16 +02:00
c51bbdec34
Drop nexus-osciprime skeleton for now.
...
This is mostly just a skeleton driver framework at the moment, we'll
bring it back when the driver is fully implemented.
2013-08-05 12:59:23 +02:00
c93ebace30
uni-t-dmm: Drop DMM table (comment).
...
This info is in the wiki already, no need to duplicate in the code.
2013-08-02 01:02:03 +02:00
faf720246a
ols: Workaround for mac os X stray events
2013-08-01 19:48:07 +02:00
ce4d26ddf9
Various cosmetics, whitespace, consistency fixes.
2013-07-31 13:09:48 +02:00
2b691be806
serial-dmm/uni-t-dmm: Drop Tecpel DMM-8060.
...
The Tecpel DMM-8060 was added since we assumed it would be a rebadged
Voltcraft VC-820 (since we know the Tecpel DMM-8061 is a rebadged VC-840).
However, according to the vendor webpage it doesn't have PC connectivity
at all, so drop it for now (until someone can confirm that it does or does
not actually have RS232/USB connectivity).
2013-07-18 12:43:07 +02:00
e84e0096db
Fix build
2013-07-16 17:18:20 +02:00
b979d0c9cb
kecheng-kc-330b: Code cleanup
2013-07-16 17:17:54 +02:00
d406dccd6a
lascar-el-usb: Don't close device after acquisition
2013-07-16 16:08:38 +02:00
85ed4ab3ba
kecheng-kc-330b: Acquisition from stored logs
2013-07-16 16:08:38 +02:00
f336618c3d
kecheng-kc-330b: Check device status before acquisition
...
Can't really count on it either way though, the device is just
too flaky to conclude whether it's going to work or not, regardless
of the status returned.
2013-07-16 16:08:38 +02:00
df03552894
kecheng-kc-330b: Live SPL acquisition
2013-07-16 16:08:38 +02:00
bc7be4a9f4
kecheng-kc-330b: Implement all SR_CONF options
2013-07-16 16:08:38 +02:00
a8806f032c
kecheng-kc-330b: Flesh out driver, add scan functionality
2013-07-16 16:08:38 +02:00
ed759a0835
kecheng-kc-330b: Initial driver skeleton.
2013-07-16 16:08:38 +02:00
ab4bb6eb7c
ikalogic-scanaplus: Initial driver implementation.
2013-07-16 01:01:11 +02:00
fdf4a1f5a0
ikalogic-scanaplus: Initial driver skeleton.
2013-07-15 12:20:53 +02:00
a7a163a795
Support for UNI-T UT60A/E multimeters via RS232 or USB
2013-07-09 22:57:55 +02:00
fb8d593cfe
Use GET_REPORT request for device to host transfer.
2013-07-05 14:01:06 +02:00
c134574938
uni-t-dmm: Add support for the Voltcraft VC-830.
2013-06-23 10:23:21 +02:00
6045b91aa4
serial-dmm: Add support for the Voltcraft VC-830.
2013-06-23 10:23:21 +02:00
cea26f6e9f
cem-dt-885x: Support for retrieving stored samples
2013-06-20 14:35:34 +02:00
662172d4f4
cem-dt-885x: Support for SR_CONF_DATA_SOURCE
...
This device can do both live and memory-based acquisition.
2013-06-19 12:23:30 +02:00
4c22355f04
cem-dt-885x: Support for powering off the device
2013-06-17 16:17:39 +02:00
f157b2eebb
cem-dt-885x: Support for sound pressure level measurement range
2013-06-17 16:17:39 +02:00
0cd9107dfb
cem-dt-885x: Fix datalog on/off setting in max/min hold mode
...
As it turns out, the device randomly decides to send no logging state
info when max hold or min hold mode is enabled.
2013-06-17 16:17:39 +02:00
a90e480cdc
cem-dt-885x: Support for max/min hold modes
2013-06-17 16:17:39 +02:00
1487ce4fbc
cem-dt-885x: Support for changing time weighting
2013-06-17 16:17:39 +02:00
be73391982
cem-dt-885x: Support for changing frequency weighting
2013-06-17 16:17:39 +02:00
e1af0e85b9
cem-dt-885x: Support for turning data logging on/off
2013-06-17 16:17:38 +02:00
5f2a4aff4b
added Voltcraft M-3650D Multimeter
2013-06-14 01:03:29 +02:00
14cf708fef
cem-dt-885x: Send last measurement at normal rate in hold mode
...
The device only sends the "hold" token otherwise, which clashes somewhat
with other devices. This makes the device more predictable for frontends.
2013-06-12 18:34:42 +02:00
bc1143280f
cem-dt-885x: Hold off measurements in max/min hold mode
2013-06-12 18:34:42 +02:00
e37c4b3959
cem-dt-885x: Live SPL acquisition
2013-06-12 18:34:42 +02:00
7fb8279c9b
cem-dt-885x: Flesh out driver, add scan functionality
2013-06-12 18:34:42 +02:00
8fa9368eb4
cem-dt-885x: Initial driver skeleton.
2013-06-12 18:34:42 +02:00
28083961fb
scanalogic2: Only print actual state changes in the log.
2013-06-11 18:39:55 +02:00
9526f2d4f8
scanalogic2: Replace %i with %s where needed.
2013-06-11 18:39:54 +02:00
79914b3a62
scanalogic2: Shorten a few function name prefixes.
...
The driver-private helper functions in protocol.c can have a shorter
prefix to make the code look nicer.
2013-06-11 18:39:54 +02:00
c824eb6323
scanalogic2: Cosmetics, whitespace, typos, etc.
2013-06-11 18:39:54 +02:00
e52e712d05
Initial driver for IKALOGIC Scanalogic-2
2013-06-11 18:39:54 +02:00
16e76baec9
ikalogic-scanalogic2: Initial driver skeleton.
2013-06-11 18:39:54 +02:00
eea49cf10d
ols/link-mso19: Consistency fixes.
...
Use the same setup/ordering/naming for the cleanup/dev_clear functions
as all other drivers do.
2013-06-02 17:03:40 +02:00
1c2d542df2
demo: Use std_dev_clear().
2013-06-02 16:57:07 +02:00
3b412e3a30
s/clear_instances/dev_clear/.
...
Consistently use the same name for the dev_clear() API callback
everywhere.
2013-06-02 16:56:41 +02:00
f6beaac55c
std: Drop hw_ from function names.
...
The per-driver API calls no longer have a hw_ prefix (e.g. hw_init()
became init() and so on), so drop the 'hw_' from the std versions
for those API callbacks too.
2013-06-02 16:46:18 +02:00
3678cf73fe
asix-sigma: Use std_dev_clear().
2013-06-02 16:46:18 +02:00
c43cf4d40e
alsa: Use std_dev_clear().
2013-06-02 16:46:17 +02:00
fa85f37630
rigol-ds1xx2: Use std_dev_clear().
2013-06-02 13:52:40 +02:00
dec6c583a2
hantek-dso: Simplify cleanup().
2013-06-02 13:52:40 +02:00
658636f1c9
nexus-osciprime: Use std_dev_clear().
2013-06-02 13:52:40 +02:00
c9d622a420
lascar-el-usb: Use std_dev_clear().
2013-06-02 13:52:40 +02:00
771bd216fa
fluke-dmm: Use std_dev_clear().
2013-06-02 13:52:39 +02:00
732899f8cf
colead-slm: Use std_dev_clear().
2013-06-02 13:52:39 +02:00
676c28a846
agilent-dmm: Use std_dev_clear().
2013-06-02 13:52:39 +02:00
8d18d266f5
victor-dmm: Use std_dev_clear().
2013-06-02 13:52:39 +02:00
40bbc64293
brymen-dmm: Use std_dev_clear().
2013-06-02 13:52:39 +02:00
6078d2c996
Use consistent API callback function names.
...
This now matches what the 'new-driver' tool generates.
2013-05-10 20:01:37 +02:00
8111446ae0
zeroplus: Properly set inst_type to SR_INST_USB.
2013-05-10 19:16:25 +02:00
d6445cb0da
zeroplus: Use std_dev_clear().
2013-05-10 19:06:47 +02:00
8dca646ef9
uni-t-dmm: Use std_dev_clear().
2013-05-10 18:59:46 +02:00
3f0513bac1
serial-dmm: Use std_dev_clear().
2013-05-10 18:53:42 +02:00
9790079961
chronovu-la8: Use std_dev_clear().
2013-05-10 18:40:13 +02:00
decfe89d4e
Drop some lines that are no longer needed.
2013-05-10 18:30:32 +02:00
0bdb4f2e4a
tondaj-sl-814: Use std_dev_clear().
2013-05-10 17:56:53 +02:00
25e7adada7
mic-985xx: Use std_dev_clear().
2013-05-10 17:54:53 +02:00
2a052cc4d6
Use consistent naming for internal libtool helper libs.
...
This now also matches what the 'new-driver' tool generates.
2013-05-10 17:44:01 +02:00
9e165e742f
Use consistent HW_ name prefixes everywhere.
...
Older drivers used LA_* previously, we now use HW_* everywhere though.
2013-05-10 17:18:42 +02:00
7ab89f4827
Re-enable link-mso19 and nexus-osciprime drivers.
2013-05-08 16:40:45 +02:00
9dc7a75e3d
fx2lafw: Fix memory leak
2013-05-06 20:44:26 +02:00
03f4de8cf2
ols: Code cleanup
...
This also fixes a memory leak.
2013-05-06 00:42:18 +02:00
26aec7fdc4
Drop link-mso19/nexus-osciprime in preparation for release.
...
These two drivers are currently unfinished and don't work, so disable
and "unhook" them for now in preparation of the next libsigrok release.
They're still in the git repository, but not hooked up to the build
system, so that they won't get detected or built, and also don't end up
in the release tarball.
Since link-mso19 is the only driver that currently requires libudev,
drop any reference to that, too.
It should be relatively easy to apply this patch in reverse after the
release to bring back both drivers.
2013-05-04 15:59:40 +02:00
c5ffac4148
uni-t-dmm: Add missing SR_CONF_LIMIT_MSEC support.
2013-05-04 00:13:25 +02:00
29a27196a1
s/DRIVER_LOG_DOMAIN/LOG_PREFIX/.
...
This is more correct anyway, and also a bit shorter and more readable.
2013-05-03 21:59:32 +02:00
06c45a66f7
Minor whitespace fixes.
2013-05-03 14:03:49 +02:00
c2fa697afa
serial-dmm: Add Tecpel DMM-8060 support.
2013-05-01 03:16:47 +02:00
b38e08fbb7
serial-dmm: Add Tecpel DMM-8061 support.
2013-05-01 03:13:43 +02:00
4554314c4f
uni-t-dmm: Add Tecpel DMM-8060 support.
...
This is _very_ likely to be a rebadged Voltcraft VC-820, treating as such.
2013-05-01 03:04:46 +02:00
b6bad47c91
uni-t-dmm: Add Tecpel DMM-8061 support.
2013-05-01 03:00:41 +02:00
2451a20ff5
fs9721: Factor out common code from serial-dmm.
...
These functions are FS9721 specific (and DMM specific), and can be used
from various drivers (e.g. serial-dmm or uni-t-dmm or possibly others).
2013-05-01 02:16:55 +02:00
4853559466
uni-t-dmm/serial-dmm: Handle Voltcraft VC-840 temperature.
2013-05-01 01:58:42 +02:00
ad00a54da6
fs9922: Fix beep mode.
2013-05-01 01:02:46 +02:00
649a4cd672
fs9922: Fix diode mode parsing.
2013-05-01 01:00:54 +02:00
767aae30ed
uni-t-dmm: Fix incorrect UNI-T UT61D baudrate.
2013-04-30 20:22:18 +02:00
695d0e1efa
uni-t-dmm: Add support for the Voltcraft VC-840.
...
This DMM is already supported via the serial-dmm driver when using the
RS232 cable. The uni-t-dmm support makes it usable with the USB/HID
cable too.
2013-04-30 20:22:17 +02:00
bbef5e326d
uni-t-dmm: Add support for the UNI-T UT61E.
...
This DMM is already supported via the serial-dmm driver when using the
RS232 cable. The uni-t-dmm support makes it usable with the USB/HID
cable too.
2013-04-30 20:22:17 +02:00
ae3a59de62
serial-dmm: Add support for the UNI-T UT61D.
...
This DMM is already supported via the uni-t-dmm driver when using the
USB/HID cable. The serial-dmm support makes it usable with the RS232
cable too.
2013-04-30 20:22:17 +02:00
3ece1dff6c
uni-t-dmm: Use sr_dev_inst to store connection handle.
2013-04-30 20:22:17 +02:00
d9a7c349ed
brymen-dmm: Use sr_dev_inst to store connection handle.
2013-04-30 20:22:17 +02:00
0a7da5f8c9
fx2lafw: Keep track of our own libusb fds
2013-04-30 09:55:44 +02:00
2a67abfe34
fx2lafw: Properly initialize operational state before acquisition
2013-04-29 19:02:26 +02:00
0f75d6f5a9
ols: Don't close serial port after acquisition is done
2013-04-29 12:39:26 +02:00
a5e44c3247
tondaj-sl-814: Use sr_dev_inst to store connection handle.
2013-04-27 21:22:15 +02:00
50c604f50b
Don't automatically clear known instances from USB drivers on scan
...
This invalidates previously returned sr_dev_inst pointers, which a
frontend may be holding. It's the frontend's responsibility to clear
the list of instances a driver keeps track of by calling
sr_dev_clear(driver);
if it wants a completely new scan done.
2013-04-27 18:27:32 +02:00
b9470914d0
Remove sr_rational
2013-04-26 22:51:12 +02:00
bc653a5678
uni-t-dmm: Do proper detection of packets in the stream.
...
Also, various fixups in the driver.
2013-04-26 20:54:21 +02:00
c885268777
uni-t-dmm: Make driver more similar to serial-dmm.
2013-04-26 20:05:44 +02:00
7381251e33
common/dmm: Drop obsolete *is_packet_start() functions.
2013-04-26 20:05:44 +02:00
913abe8321
fs9922: Use common DMM API.
...
Use the same functions and structs as the other DMM protocol parsers
in hardware/common/dmm. Among other things, this allows the functions
to be used from drivers in a generic way, e.g. in serial-dmm, uni-t-dmm,
and possibly other drivers.
2013-04-26 20:05:44 +02:00
695f32d89d
Bring back link-mso19/nexus-osciprime for now.
...
This patch will be re-introduced later.
2013-04-26 10:47:34 +02:00
9d1164f9a1
Drop link-mso19/nexus-osciprime in preparation for release.
...
These two drivers are currently unfinished and don't work, so disable
and "unhook" them for now in preparation of the next libsigrok release.
They're still in the git repository, but not hooked up to the build
system, so that they won't get detected or built, and also don't end up
in the release tarball.
Since link-mso19 is the only driver that currently requires libudev,
drop any reference to that, too.
It should be relatively easy to apply this patch in reverse after the
release to bring back both drivers.
2013-04-25 19:16:13 +02:00
e73ffd4238
Enforce open device before config_set()/dev_acquisition_start()
2013-04-24 22:03:50 +02:00
46a743c1fa
Whitespace fixes
...
Damn editor.
2013-04-24 19:07:46 +02:00
a31a4d371f
fx2lafw: Minor cleanup
2013-04-24 03:23:23 +02:00
294dbac724
hantek-dso: Support conn scan parameter
2013-04-24 03:23:23 +02:00
cc9fd2d29c
rigol-ds1xx2: Code cleanup
2013-04-24 03:23:11 +02:00
9bd4c95606
rigol-ds1xx2: Use common serial code.
2013-04-24 02:10:25 +02:00
ca55277ca8
rigol-ds1xx2: Accept SR_CONF_CONN.
2013-04-24 02:10:25 +02:00
886bd5e056
mic-985xx: Use sr_dev_inst to store connection handle.
2013-04-23 23:06:02 +02:00
31e5377250
Fix minor warning with some compilers.
2013-04-23 22:54:02 +02:00
50985c2019
GPL headers: Use correct project name.
2013-04-23 22:24:30 +02:00
1e1bfcd0fe
serial-dmm: Use sr_dev_inst to store connection handle.
2013-04-23 20:55:04 +02:00
609bfd753c
zeroplus-logic-cube: Use sr_dev_inst to store connection handle
2013-04-22 15:00:04 +02:00
459a0f2623
ols: Use sr_dev_inst to store connection handle
2013-04-22 13:40:40 +02:00
2e5b73c00c
ols: Fix stack clobbering at start of acquisition
...
This off-by-one was clobbering the stack since introduced in a803c0db4d
2013-04-22 13:33:31 +02:00
919681f0e8
fluke-dmm: Use sr_dev_inst to store connection handle
2013-04-22 01:07:35 +02:00
aa7066353c
colead-slm: Use sr_dev_inst to store connection handle
2013-04-22 01:01:10 +02:00
fb3a150599
agilent-dmm: Use sr_dev_inst to store connection handle
2013-04-21 21:49:15 +02:00
e31d410d26
rigol-ds1xx2: fix delay time.
2013-04-21 20:42:22 +01:00
d2e0b1fa71
rigol-ds1xx2: better error handling in hw_scan.
2013-04-21 19:48:34 +01:00
8bb2981df0
victor-dmm: Allow configuration before the device is opened
2013-04-20 15:26:16 +02:00
ac046ef8cf
victor-dmm: Support SR_CONF_CONN
2013-04-18 22:48:29 +02:00
0f1506497b
lascar-el-usb: Support SR_CONF_CONN
2013-04-18 22:48:29 +02:00
e2033d4917
hantek-dso: Consistently return SR_ERR_ARG if sdi is needed
2013-04-18 22:48:29 +02:00
38ab8dbec8
fx2lafw: Consistently return SR_ERR_ARG if sdi is needed
2013-04-18 22:48:29 +02:00
624f5b4c1e
hantek-dso: Support config_get(SR_CONF_CONN)
2013-04-18 01:24:42 +02:00
89befd46a8
fx2lafw: Support config_get(SR_CONF_CONN)
...
This generates a bus.address conn string which can be used to
uniquely identify the given sr_dev_inst.
2013-04-18 01:24:42 +02:00
d0eec1eea1
hantek-dso: Mark connection as USB
2013-04-17 01:08:18 +02:00
949b3dc091
hantek-dso: Use std_dev_clear()
2013-04-17 00:49:41 +02:00
72f9d6dc5e
fx2lafw: No device context internals to clear
2013-04-17 00:49:41 +02:00
c118080b1d
hantek-dso: Store USB connection in sr_dev_inst
2013-04-17 00:49:41 +02:00
415e6389ce
chronovu-la8: Fix incorrect 0Hz samplerate being reported.
...
This closes bug #93 .
2013-04-16 22:35:17 +02:00
250a78c7d5
fx2lafw: Use standard dev_clear() instead
2013-04-16 17:57:08 +02:00
bd6fbf628a
drivers: return SR_ERR_NA on unsupported config key
...
Fixes bug 89.
2013-04-16 11:00:55 +02:00
72cd99b876
ols: Report when a device doesn't support metadata
...
Not an error, but it does mean it's either a really old or really
basic device, and will help us to debug people's problems with
these.
Fixes bug 92.
2013-04-16 00:23:34 +02:00
754b5ff2b4
fx2lafw: Support conn scan parameter
...
This takes a USB specification. Fixes bug 82.
2013-04-15 23:56:33 +02:00
1eb0a0df66
usb: Fix bus.address format detection
2013-04-15 23:47:04 +02:00
e5d15bd2a2
ols: Allow configuration before the device is opened
2013-04-15 20:05:43 +02:00
a7be14ada2
rigol-ds1xx2: Don't assume there's a valid sdi
2013-04-15 18:45:38 +02:00
bf25678359
ols: Properly initialize operational state before start
2013-04-15 18:28:43 +02:00
e45ad6e24f
demo: Fix compiler warning, cosmetics.
2013-04-15 12:27:55 +02:00
1d16675769
lascar-el-usb: Use two probes for temp/humidity loggers
2013-04-15 01:30:24 +02:00
2150a69b76
demo: Unref the IO channel when it is no longer used
2013-04-14 23:39:15 +02:00
ed20a42803
demo: Free dev_contexts
2013-04-14 23:39:15 +02:00
a76842947f
demo: Moved demo configuration variables into dev_context
2013-04-14 23:39:15 +02:00
33ef757383
demo: Keep a pointer to dev_context in sr_dev_inst and vice-versa
2013-04-14 23:39:15 +02:00
e053204700
demo: Only one GIOChannel is needed
2013-04-14 23:39:15 +02:00
bbd7ef0f18
demo: Fixed glitching in increment signal
2013-04-14 23:39:15 +02:00
f0b6ae19a8
alsa: Set the probe index
2013-04-14 23:39:15 +02:00
9e5670d0ab
zeroplus-logic-cube: add USB ID for LAP-16128U
2013-04-14 17:06:57 +02:00
6bb192bc05
rigol-ds1xx2: support digital channels.
2013-04-14 16:57:02 +02:00
a789b61087
rigol-ds1xx2: doesn't actually support SR_CONF_LIMIT_SAMPLES
2013-04-14 16:57:01 +02:00
ee7e9bee5d
rigol-ds1xx2: fix handling of partial frames.
2013-04-14 16:57:01 +02:00
0c05591abf
ols: Support get/set/list on all device options
...
Where it makes sense: _LOGIC_ANALYZER and _TRIGGER_TYPE don't have much
use for all of them.
2013-04-14 00:36:05 +02:00
8f35be72b4
rigol-ds1xx2: Use g_usleep() for portability
2013-04-12 19:42:44 +02:00
169dbe8577
rigol-ds1xx2: Whitespace, minor fix.
...
Return SR_ERR_MALLOC for failed malloc, not SR_ERR.
2013-04-12 18:44:28 +02:00
ff08a52a0f
Fix two minor compiler warnings.
2013-04-12 17:45:01 +02:00
254dd102e8
rigol-ds1xx2: Support for all channels, proper defaults
...
Since this driver supports devices with a control panel and display,
we take the defaults from the device -- not a set of sensible
defaults as usual.
2013-04-11 18:32:08 +02:00
88e429c97f
rigol-ds1xx2: fix channel numbers
...
Copyright bump, too.
2013-04-11 18:32:08 +02:00
a3df166f02
rigol-ds1xx2: better debugging
2013-04-11 18:32:08 +02:00
75d8a4e576
rigol-ds1xx2: properly send frame begin/end packets
2013-04-11 18:32:08 +02:00
7991784841
hantek-dso: Support SR_CONF_NUM_TIMEBASE/SR_CONF_NUM_VDIV
2013-04-11 18:32:08 +02:00
d62d7ad151
rigol-ds1xx2: Support SR_CONF_NUM_TIMEBASE/SR_CONF_NUM_VDIV
2013-04-11 18:32:08 +02:00
861c447bfb
rigol-ds1xx2: SR_CONF_TIMEBASE and _VDIVS lists are now an array of tuples
2013-04-11 18:32:08 +02:00
3973ee26f5
hantek-dso: SR_CONF_TIMEBASE and _VDIVS lists are now an array of tuples
2013-04-11 18:32:08 +02:00
034accb512
hantek-dso: move buffer sizes to device context
...
There are only two sizes for every device: 10k and the complete
per-channel buffer size. This can be doubled if one channel is disabled.
2013-04-11 18:32:08 +02:00
fe9ac25250
ols: Get rid of gcc warnings
2013-04-11 18:32:08 +02:00
1bec72d2ac
chronovu-la8: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
afdf6d6a20
tondaj-sl-814: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
7d93a62ea3
uni-t-dmm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
ede25f4e6f
serial-dmm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
f6a0ac9f62
rigol-ds1xx2: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
2c2be40189
mic-985xx: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
a9ed6877f7
link-mso19: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
510b3e692a
brymen-dmm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
2c9c0df86e
asix-sigma: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
aa0dbd683c
alsa: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
3316e149d0
zeroplus-logic-cube: fix samplerate setting
2013-04-11 18:32:07 +02:00
8386096f01
zeroplus-logic-cube: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
c8733a2bbb
nexus-osciprime: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
e44ac12a29
agilent-dmm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
a59b4eef55
victor-dmm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
70424328c1
fluke-dmm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
dccda194db
colead-slm: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
7faf69da10
lascar-el-usb: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:07 +02:00
d40073113b
hantek-dso: Small debug fix
2013-04-11 18:32:07 +02:00
86bb3f4a86
hantek-dso: deprecate struct sr_rational
2013-04-11 18:32:07 +02:00
d00088ca6d
demo: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:06 +02:00
f627afd65b
hantek-dso: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:06 +02:00
aeea057220
ols: allow for disabling of RLE as well
2013-04-11 18:32:06 +02:00
e46aa4f611
ols: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:06 +02:00
d6836bf129
fx2lafw: Adjust to GVariant-based sr_config_* functions
2013-04-11 18:32:06 +02:00
13d8e03c4f
Bump copyright year
2013-04-11 18:32:06 +02:00
3fd1d0ee1c
configure.ac: Improve USB/EZUSB/serial checks.
...
- If libusb-1.0 is not found, do not compile in ezusb.c and usb.c since
they require libusb.h. The respective hardware drivers that use
libusb-1.0, and usb.c and/or ezusb.c will be excluded from the build
elsewhere in configure.ac. Rename NEED_EZUSB to NEED_USB.
- Drop the NEED_SERIAL check and always compile in serial.c. This is a
very small chunk of code, it does not depend on any external
libraries that might be missing, and it compiles on all architectures.
Thus there's no need to conditionally include or exclude it.
2013-04-09 17:49:13 +02:00
3f98bf7017
Fix kernel driver attached check
...
The check is really only broken on darwin, but useful on all other
platforms, even if only Linux can actually detach a driver.
2013-04-07 14:14:16 +02:00
8c971b6e5c
hantek-dso: cosmetics
2013-04-07 14:01:03 +02:00
7b78b2f78f
hantek-dso: use per-device firmware filenames
2013-04-02 14:20:29 +02:00
3ebce226a2
s/sr_config_make/sr_config_new/.
...
This matches the naming of other/similar functions better.
2013-03-23 14:16:00 +01:00
333bf022e3
rigol-ds1xx2: Use ARRAY_SIZE.
2013-03-23 14:14:58 +01:00
3864648bb6
serial-dmm: Add support for RadioShack 22-805
...
Protocol-wise, this is identical to the 22-168, except that it communicates at
600 baud instead of 1200 baud.
2013-03-20 20:36:56 -05:00
cc840ab618
serial.c: FreeBSD and OpenBSD don't have OFILL either.
2013-03-17 15:07:50 +01:00
8e77bc20b9
lascar-el-usb: push samplerate before data log
2013-03-16 21:52:02 +01:00
361d15110c
lascar-el-usb: support for SR_CONF_DATALOG
2013-03-11 16:37:02 +01:00
9857276261
ols: use ptr to int dereference for SR_T_BOOL
...
This mad ptr to int casting has to go.
2013-03-11 16:37:02 +01:00
2474d87e8c
demo: sync get/set options
2013-03-03 21:21:08 +01:00
365f04d61f
mso-19: Initial analog probe support (unfinished).
...
- Added the analog probe (unfinished).
- Reset trigger to state to 0 before capture, just incase the scope is in
the middle of a capture.
2013-03-03 17:59:06 +01:00
5952553f56
mso-19: Fixed warning.
2013-03-03 17:58:46 +01:00
ff17e6ba50
mic985xx: Add missing memset().
2013-02-11 18:23:17 +01:00
6f3e5335ad
mic-985xx: Add support for the MIC 98581.
...
This device only supports temperature measurements, no humidity.
2013-02-11 16:53:28 +01:00
be6db330f8
hantek-dso: minor fixes
2013-02-10 17:06:56 +01:00
8421ffa44d
asix-sigma: don't try to free static storage
2013-02-10 17:06:56 +01:00
cd2f0fe22c
Add/use std_hw_dev_acquisition_stop_serial().
2013-02-08 23:32:45 +01:00
17548571cc
zeroplus: Only report supported samplerates.
...
The currently supported model LAP-C(16032) doesn't support the
samplerates 150MHz and 200MHz which some of the other models have.
Thus, do not report these samplerates to the frontends. E.g. sigrok-cli
should not show them via --show and GUIs should not list them in their
"Samplerates" drop-down.
2013-02-08 23:19:50 +01:00
e495a676eb
zeroplus: Cosmetics, small fixes, drop unneeded stuff.
2013-02-08 23:19:50 +01:00
58c5f2ed17
zeroplus: Split into api.c and protocol.c.
2013-02-08 21:53:50 +01:00
3e9b7f9c77
Rename session_dev_id to cb_data everywhere.
...
We use 'cb_data' in all drivers these days, make the few remaining ones
that use 'session_dev_id' consistent.
2013-02-07 11:26:02 +01:00
6fab7b8f53
Driver struct cleanups.
...
- Explicitly list .config_get in all drivers for consistency, and set it
to NULL if unused (whether or not a driver implements it is optional).
- List all 'struct sr_dev_driver' entries in the same order in all drivers.
- Move the check whether .config_set/.config_list exist (i.e., are non-NULL)
into sanity_check_all_drivers().
2013-02-07 10:58:35 +01:00
4afdfd4628
Add and use std_session_send_df_header().
...
This is a small helper function which sends the SR_DF_HEADER packet that
drivers usually emit in their hw_dev_acquisition_start() API callback.
It simplifies and shortens the hw_dev_acquisition_start() functions
quite a bit.
It also simplifies the input modules which send an SR_DF_HEADER packet, too.
This patch also automatically removes some unneeded malloc/free in some
drivers for the 'packet' and 'header' structs used for SR_DF_HEADER.
2013-02-07 10:46:28 +01:00
961009b0c4
hw_dev_close(): Move common checks to wrapper.
...
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.
2013-02-05 18:46:33 +01:00
0e94d524c1
Shorten/simplify hw_dev_list() implementations.
2013-02-05 18:27:05 +01:00
7c8a9e1e0f
serial-dmm: Drop unneeded g_try_malloc0().
2013-02-02 12:34:25 +01:00
c5d6f5cc1c
brymen-dmm: Cosmetics, coding-style, consistency.
...
Also, name the driver "brymen-bm857" in preparation to doing "subdrivers"
for other Brymen models later (similar to serial-dmm).
2013-02-02 12:07:45 +01:00
943e94f567
brymen-dmm: Use std_hw_init().
2013-02-02 11:19:27 +01:00
601fb67cc4
brymen-dmm: Add support for Brymen BM857
...
This patch might also work for a number of other Brymen models
-- 859(a), 867, 869---
including their respective rebadges from Greenlee, Extech, and Amprobe.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-02-02 11:19:27 +01:00
20cbc7854d
brymen-dmm: Initial driver skeleton.
2013-02-02 11:19:27 +01:00
0cd8e23140
Initial driver implementation for MIC 98583.
...
This is a USB/serial (Prolific) based temperature and humidity logger.
2013-02-02 11:13:45 +01:00
7ec5b54955
mic-985xx: Initial driver skeleton.
2013-02-01 23:52:57 +01:00
6d1161142d
zeroplus: Use message logging helpers.
2013-02-01 00:24:40 +01:00
d3b38ad389
Drivers: Explicitly list sr_samplerates fields.
...
This makes it a bit easier to understand which value means what, just
from looking at the driver code.
2013-01-29 12:56:02 +01:00
063e7aef6d
Factor out common hw_init() driver code.
...
Most drivers do pretty much the same things in their hw_init()
right now, so factor out that code to std_hw_init() in std.c.
2013-01-29 12:56:02 +01:00
4b97c74e0b
sr_driver_scan(): Improve checks.
...
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.
Also, do some minor whitespace and consistency improvements.
2013-01-29 12:56:02 +01:00
c0eea11c45
sr_driver_init(): Improve checks.
...
Check the relevant arguments for != NULL before calling the actual
driver-specific function, so that the driver can safely assume those
arguments are non-NULL. This removes the need to duplicate these
checks in every driver.
Also, change one SR_ERR to the more correct SR_ERR_MALLOC, and assign
sr_ctx in the rigol-ds1xx2's hw_init() function, like all the other
drivers do.
2013-01-29 12:56:02 +01:00
cbc6f3b253
hantek-dso: Use message logging helpers.
2013-01-29 12:56:02 +01:00
7d4abe5a77
serial.c: NetBSD doesn't have OFILL.
2013-01-27 01:23:01 +01:00
6a4710fac2
drivers: Trim unused config_get() calls
...
None of the driver config_get/set/list calls are required.
2013-01-25 16:05:48 +01:00
0d485e30c6
Deprecate SR_DI_HWOPTS.
...
This is replaced by SR_CONF_SCAN_OPTIONS.
2013-01-25 15:09:20 +01:00
9a6517d14b
Deprecate SR_DI_HWCAPS.
...
This is replaced by SR_CONF_DEVICE_OPTIONS.
2013-01-25 15:01:49 +01:00
c50277a6ec
Deprecate SR_DI_TRIGGER_TYPES.
...
This is replaced by SR_CONF_TRIGGER_TYPE.
2013-01-25 11:52:27 +01:00
328bafabd4
Deprecate SR_DI_TRIGGER_SOURCES.
...
This is replaced by SR_CONF_TRIGGER_SOURCE.
2013-01-25 11:25:32 +01:00
41f5bd09b0
Deprecate SR_DI_TIMEBASES.
...
This is replaced by SR_CONF_TIMEBASE.
2013-01-25 11:22:20 +01:00
6e1fbcc41b
Deprecate SR_DI_FILTERS.
...
This is replaced by SR_CONF_FILTER.
2013-01-25 11:19:12 +01:00
e4f2b2adc1
Deprecate SR_DI_VDIVS.
...
This is replaced by SR_CONF_VDIV.
2013-01-25 11:13:49 +01:00
2a7b113d13
Deprecate SR_DI_COUPLING.
...
This is replaced by SR_CONF_COUPLING.
2013-01-25 11:04:27 +01:00
6d1ceffa95
Deprecate SR_DI_BUFFERSIZES.
...
This is replaced by SR_CONF_BUFFERSIZE.
2013-01-25 10:58:37 +01:00
dd96ea9879
Deprecate SR_DI_PATTERNS.
...
This is replaced by SR_CONF_PATTERN_MODE.
2013-01-25 03:38:44 +01:00
123e131383
Deprecate SR_DI_CUR_SAMPLERATE.
...
This is replaced by SR_CONF_SAMPLERATE.
2013-01-25 03:17:36 +01:00
fbec8bd2f3
deprecate SR_DI_SAMPLERATES
...
This is replaced by a call to config_list() with id SR_CONF_SAMPLERATE.
2013-01-25 02:39:58 +01:00
a1c743fc51
drivers: implement config_list()
2013-01-25 02:37:26 +01:00
035a1078fd
drivers: rename and reorganize config get/set
...
The driver API calls info_get() and dev_config_set() have been renamed
to config_get() and config_set(), respectively.
2013-01-24 19:19:09 +01:00
69e19dd769
Always interleave analog data with all enabled probes.
...
The new "probes" field in sr_datafeed_analog contains a copy
of all enabled struct sr_probe.
2013-01-23 03:40:44 +01:00
b1a051544d
serial: more serial processing flags to turn off
2013-01-23 02:32:58 +01:00
431ec7ca4a
uni-t-dmm: use new sr_config struct
2013-01-21 23:40:09 +01:00
1953564a96
Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*
2013-01-21 23:32:50 +01:00
d8e3685c47
free USB config descriptor after use
2013-01-21 23:32:49 +01:00
1987b8d63e
drivers: use new sr_config struct
...
Sending an SR_DF_META packet at the start of every stream is not
mandatory; the frontend should ask for what it needs, and any extra
information the driver wants to send will come in due time.
2013-01-21 23:32:49 +01:00
86c02e6554
serial.c: Fix copy-paste error.
...
Thanks Bert Vermeulen for reporting.
2013-01-21 01:47:30 +01:00
9d8fde40c3
uni-t-dmm: Quickfix for UNI-T UT61D.
...
This is a temporary fix only, since a major rework of uni-t-dmm is being
done at the moment, soon to be merged.
2013-01-21 01:45:02 +01:00
5edc02c77c
Add missing "ULL" suffixes.
...
These numbers are larger than 32bit, mark them as ULL to avoid compile
failures on 32bit systems.
2013-01-20 20:39:18 +01:00
73365eaed0
uni-t-dmm: Expose hwopts.
2013-01-20 19:57:04 +01:00
388f9d3e25
uni-t-dmm: Fix scanning, properly use new sr_usb_find().
2013-01-20 19:55:33 +01:00
4ebd48b352
Remove non-error hw_info_get() messages.
...
Currently hw_info_get() can receive requests for entries (info_id) that
the specific driver doesn't support. That is (right now) a valid
use-case and not an error (might change later, though).
Thus, for now, don't output messages for such requests at all (certainly
not as sr_err() where they show up in e.g. sigrok-cli output per default).
2013-01-20 18:48:02 +01:00
b97cbca6c9
serial.c: OpenBSD doesn't have B460800.
2013-01-19 15:55:22 +01:00
3d6de074a4
alsa: Silence ALSA scanning process.
...
Errors while opening or configuring ALSA devices during scan for devices
should not be shown by default (i.e., no sr_err() usage). Non-working
or non-accessible devices (due to permissions or other reasons) will
simply not show up in frontends. Use sr_dbg() instead of sr_err().
2013-01-16 00:02:24 +01:00
6b8d6f93bb
Get rid of obsolete SR_DI_NUM_PROBES and SR_DI_PROBE_NAMES.
...
Frontends should use the probe list in the device's sr_dev_inst
to get this information.
2013-01-15 17:42:23 +01:00
512bb890df
rigol-ds1xx2: More selective Rigol DS1xx2 scan
...
Patch submitted by Martin Ling.
2013-01-13 22:42:21 +01:00
cbc80f8f8a
fx2lafw: Say if chip is old FX2 or FX2LP
...
Look at the extracted REVID, and print out if it is an FX2 (non-LP), or FX2LP.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-01-08 03:44:36 +01:00
a24e9d0484
link-mso19: Use more portable g_htons().
...
Not all systems provide <arpa/inet.h> and/or htons(). Use portable and
always available g_htons() from glib instead.
2013-01-08 03:13:45 +01:00
753d722f34
link-mso19: Fix a bunch of compiler warnings.
2013-01-08 03:13:14 +01:00
00b44ccb8b
link-mso19: Fix white-space, cosmetics, coding-style.
...
Fix the bare minumum of whitespace/indentation/coding-style via
automatic 'indent' run, followed by some minor manual fixes.
Some more fixes and cleanups might follow later.
2013-01-08 03:13:08 +01:00
f48cef7897
link-mso19: Fix (C) lines.
...
Bring back the original (C) lines from before the split into api.c
and protocol.[ch].
Add "Copyright (C) 2013 Lior Elazary <lelazary@yahoo.com>" since there
were nontrivial changes to those files.
2013-01-08 02:30:40 +01:00
eb913174ab
Added limit samples Eveything seems to work find up to 1024 samples
2013-01-08 01:00:14 +01:00
087a9161ff
Rewrote the trigger config. Added trigger position and trigger slope
2013-01-08 01:00:14 +01:00
5a24e89ca4
Eveything seems to work now except for triggers.
2013-01-08 01:00:14 +01:00
4db2aaffe7
More cleanup. Communication with mso19 is working, but its not triggering. Need to check why.
2013-01-08 01:00:13 +01:00
26ddb5baca
Added flow control to serial configuration to support xon/xoff for link-mso19
2013-01-08 01:00:13 +01:00
4b719338cc
Added missing mso functions
2013-01-08 01:00:13 +01:00
def5c35c4c
Removing the old link-mso19 files and changing makefile
2013-01-08 01:00:13 +01:00
df92e5cf6b
Rewrote the link-mso19.c into api and protocol. Still need to test and cleanup some more
2013-01-08 01:00:13 +01:00
29d957ceae
rigol-ds1xx2: Cosmetics, whitespace.
2013-01-03 19:04:11 +01:00
fb6e5ba8c7
rigol-ds1xx2: Autoprobe for usbtmc devices on Linux.
2013-01-03 18:41:29 +01:00
4e108ace13
rigol-ds1xx2: Fix setting trigger parameters.
2013-01-03 18:41:29 +01:00
542843f76f
rigol-ds1xx2: Assorted parameter setting fixes.
2013-01-03 18:41:29 +01:00
e0b7d23ce8
rigol-ds1xx2: First working version.
...
Currently hardcoded to use /dev/usbtmc1. Analog data readout works.
2013-01-03 18:41:29 +01:00
f4816ac6cc
rigol-ds1xx2: Initial driver skeleton.
2013-01-03 18:41:28 +01:00
aeabd30820
ols: Implement SR_DI_HWOPTS.
2013-01-03 02:15:27 +01:00
986fde755d
serial-dmm: Add UNI-T UT61E support (UT-D02 cable).
2013-01-03 01:13:57 +01:00
fe0c0b98c6
Add Cyrustek ES51922 DMM chip parser.
2013-01-03 01:13:06 +01:00
21d3d4ee87
alsa: Add some more samplerates.
...
Add some more samplerates that seem to be supported by some devices
(found via random grepping of alsa and kernel sources).
2013-01-01 00:37:18 +01:00
a1b9a9bf44
alsa: Add missing % for PRIu64.
2013-01-01 00:37:17 +01:00
52ba6e05d5
alsa: Improved error reporting.
2013-01-01 00:37:17 +01:00
721ecf3d97
alsa: Cosmetics, coding style, typos.
2013-01-01 00:37:17 +01:00
65faa197ae
alsa: Find supported samplerates during device scan
...
Since we are using the 'hw' interface of ALSA, we don't have the luxury of
samplerate conversion, given by the 'plughw' interface. If we try to set a
samplerate that is not supported, ALSA will just throw an error.
We can test for the supported samplerates, and create a list of supported
samplerates, then limit the selection to only those values. The frontend can
query the list of supported samplerates.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-01-01 00:37:17 +01:00
729850c9e7
alsa: Fix sample acquisition and send normalized values
...
The alsa driver requested signed 16-bit integers from ALSA, but casted them to
to an unsigned 16bit before finally casting them to a float. The end result was
that half of the wave would be clipped off.
We also requested data in little endian format. ALSA can be instructed to send
data with the correct endianness for the platform, without needing to worry
about what that is.
This patch attempts three points, which, together, fix the acquisition:
1) Request data from ALSA without specifying endianness; ALSA will handle the
endianness.
2) Simplify the int16_t to float loop by using straightforward indexes.
3) Normalize every value before sending it on the session bus.
NOTE: If testing with PulseView, it will appear as if sigrok is sending all
zeroes. sigrok is sending correct data, but since the data is normalized,
PulseView will incorrectly plot it as a straight line.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-01-01 00:37:17 +01:00
6944b2d02f
alsa: Scan all soundcards and create a sigrok device per input
...
The alsa driver only works with device "default". This limits the driver's
scope to whatever device ALSA deems to be "default". It is desirable to have
access to all ALSA devices from sigrok.
Change the alsa device scan so that:
Each alsa device (not alsa card) gets its own sigrok device
For example,
hw:1,0 == sigrok device 0
hw:1,1 == sigrok device 1
hw:2,0 == sigrok device 2
hw:2,1 == sigrok device 3
hw:2,2 == sigrok device 4
[...]
We don't currently look at alsa subdevices. We only use subdevice 0.
Every input device will have its own channels (left, right, etc). Each of
those channels gets mapped to a different sigrok probe. A device with 4
channels will have 4 probes from sigrok's perspective.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-01-01 00:37:17 +01:00
0d6ff10394
alsa: Do not use snd_pcm_hw_params_set_rate_near()
...
snd_pcm_hw_params_set_rate_near() will try to use the samplerate closest to the
given value, potentially starting the acquisition with a different samplerate
than the one specified.
Instead, use snd_pcm_hw_params_set_rate(). It will return an error if the
samplerate is not supported by the hardware, which is arguably better than
collecting data with a different samplerate than the one specified.
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2013-01-01 00:37:17 +01:00
cbc8cbd8bb
rs9lcd: Add missing 'break;'
...
A break was missing for "case MODE_AMP_WIDTH:" in sr_rs9lcd_parse().
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
2012-12-31 22:26:43 +01:00
f4abaa9f6b
asix-sigma: Fix two compiler warnings.
...
asix-sigma.c:648:9: warning: 'ret' may be used uninitialized in this
function [-Wmaybe-uninitialized]
asix-sigma.c:1337:20: warning: 'triggerselect' may be used uninitialized
in this function [-Wmaybe-uninitialized]
2012-12-31 21:21:39 +01:00
6375e1c3eb
victor-dmm: Fix compiler warning.
...
protocol.c:106:10: warning: 'factor' may be used uninitialized in this
function [-Wmaybe-uninitialized]
2012-12-31 21:03:45 +01:00
f057272cac
nexus-osciprime: Fix compiler warning.
...
protocol.c:26:46: warning: unused parameter 'fd' [-Wunused-parameter]
2012-12-31 21:02:14 +01:00
811155da46
uni-t-dmm: Fix compiler warning.
...
protocol.c:84:5: warning: 'ret' may be used uninitialized in this
function [-Wmaybe-uninitialized]
2012-12-31 21:01:53 +01:00
6e9d545cf4
rs9lcd: Fix compiler warning.
...
rs9lcd.c:289:19: warning: 'rawval' may be used uninitialized in this
function [-Wmaybe-uninitialized]
2012-12-31 20:58:14 +01:00
9116262931
add USBTMC device search helper
2012-12-30 01:44:58 +01:00
80bc663296
tondaj-sl-814: remove unneeded debugging
2012-12-29 11:19:19 +01:00
2239728c43
ols: Add missing 'extern'.
2012-12-28 17:13:20 +01:00
1476661970
serial-dmm: Rename VOLTCRAFT_VC820 to VOLTCRAFT_VC820_SER.
...
This matches the _ser suffix of the other functions/variables for this
device ("ser" denotes that it is used with the serial UNI-T UT-D02 cable
as opposed the USB/HID based cables which are handled by the uni-t-dmm driver).
But more importantly, the _SER suffix for the enum value will prevent
name clashes later, when the uni-t-dmm driver gets a VOLTCRAFT_VC820 enum.
Do the same for VOLTCRAFT_VC840.
2012-12-26 02:11:00 +01:00
35e199da50
Fix limit_samples check in various drivers.
...
Check whether a sample limit was actually set (> 0) before checking if
that sample limit is reached. This also fixes continuous acquisition mode
for drivers which have that.
2012-12-26 02:11:00 +01:00
7869340103
Shorten probe_names[] arrays everywhere.
...
Also, NULL-terminate all of them.
2012-12-26 00:16:07 +01:00
Martin Ling
Bert Vermeulen
Uwe Hermann
poljar (Damir Jelić)
Dan Horák
Matthias Heidbrink
Sean Young
Aurelien Jacobs
Daniel Thompson
Matt Ranostay
Marcus Comstedt
Florian Knodt
Marc Schink
Florian Steinhardt
Joel Holdsworth
Jan Luebbe
Alexandru Gagniuc
lelazary