bc059b42a2
zeroplus: Always set DONT_CARE_TRIGGERBAR to 1
...
Experimentation with the windows driver has found no situation where
this is set to anything other than 1. The zerominus software also never
sets this to anything other than one. Revert the code change made in
0ab0cb942f
2014-01-03 15:09:10 +01:00
4c1433d172
zeroplus: Ignore capture ratio if there is no trigger
...
If there is no trigger, don't try to capture anything before it. There
won't be any because we trigger immediately.
Signed-off-by: Russ Dill <Russ.Dill@gmail.com>
2014-01-03 15:09:10 +01:00
05f853b5c3
zeroplus: Add missing config_get for SR_CONF_CAPTURE_RATIO
...
Without this, latest pulseview gets an assert and dies.
Signed-off-by: Russ Dill <Russ.Dill@gmail.com>
2014-01-03 15:09:10 +01:00
5db0c668fa
zeroplus: Support all 32 channels of 32 channel models
...
This will need some additional work when support is added for compression
modes since group D is disabled for RLE compression and C and D are
disabled for "double" compression.
Signed-off-by: Russ Dill <Russ.Dill@gmail.com>
2014-01-03 15:09:10 +01:00
1d4a283928
gmc_mh_1x_2x: Fixed sign and AC/DC for current measurements with Metrahit <= 16.
2014-01-02 19:38:52 +01:00
124c548de8
serial-dmm: Increase timeout when scanning for DMMs.
...
We have to wait a bit longer than 1s for a valid DMM packet to arrive,
since for various DMMs some modes (Hz/% for example) the packets will
arrive a lot less often than in other modes. If the waiting period is
too short detection of the DMM will fail.
2014-01-02 14:25:06 +01:00
7fb5f0a0f5
serial-dmm: Drop obsolete function prototypes.
2014-01-02 02:48:13 +01:00
d327972b97
Add initial support for the V&A VA40B multimeter.
2014-01-02 01:46:15 +01:00
79bc9924d7
uni-t-dmm: Fix incorrect order which breaks UT61B/C.
2014-01-01 16:40:36 +01:00
7cb69b1870
Add support for the UNI-T UT61B multimeter.
2014-01-01 15:28:44 +01:00
162a48bfc7
teleinfo: Fix a compiler warning (clang).
...
CC libsigrok_hw_teleinfo_la-protocol.lo
protocol.c:62:41: warning: missing field 'num_samples' initializer
[-Wmissing-field-initializers]
struct sr_datafeed_analog analog = { 0 };
^
2013-12-31 19:22:16 +01:00
42f2f8a533
gmc-mh-1x-2x: Fix compiler warning (clang).
...
CC libsigrok_hw_gmc_mh_1x_2x_la-protocol.lo
protocol.c:133:32: warning: equality comparison with extraneous
parentheses
[-Wparentheses-equality]
} else if ((devc->scale1000 == 2)) {
~~~~~~~~~~~~~~~~^~~~
protocol.c:133:32: note: remove extraneous parentheses around the
comparison to
silence this warning
} else if ((devc->scale1000 == 2)) {
~ ^ ~
2013-12-31 19:21:04 +01:00
35b904a792
es519xx.c: Fix a few compiler warnings (clang).
...
CC libsigrok_hw_common_dmm_la-es519xx.lo
es519xx.c:632:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
es519xx.c:659:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
es519xx.c:688:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
es519xx.c:717:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
es519xx.c:746:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
es519xx.c:773:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
es519xx.c:800:33: warning: missing field 'is_voltage' initializer
[-Wmissing-field-initializers]
struct es519xx_info info = { 0 };
^
7 warnings generated.
2013-12-31 19:20:51 +01:00
264c99eda2
ols: Use serial source management wrappers.
2013-12-30 14:19:39 +01:00
9f5d4c3cc3
ols: Mark all serial calls as blocking or nonblocking.
2013-12-30 14:19:39 +01:00
9a47421157
Add blocking and nonblocking versions of serial_read and serial_write.
2013-12-30 14:19:39 +01:00
cb410697fb
remove the es51922 protocol parser, superseded by the es519xx protocol parser
2013-12-29 18:46:08 +01:00
d97824e52e
switch the UNI-T UT61E driver to the new es519xx parser
2013-12-29 18:46:08 +01:00
29bad967a4
es519xx: correctly handle the VAHZ function
...
This handles the frequency and duty cycle display in voltage or current mode.
2013-12-29 18:46:08 +01:00
c3e871dc8e
es519xx: apply the proper fixed factor in duty cycle mode
2013-12-29 18:46:08 +01:00
e1f9f1e1f2
es519xx: fix switching between frequency and duty cycle mode on 14 bytes chips
...
Here is what the datasheet says about this:
"If judge bit is 1, it means frequency mode. If judge bit is 0,
it means duty cycle mode."
But this is plain wrong. Reality proves this is the other way around.
2013-12-29 18:46:08 +01:00
4d2630e63a
es519xx: correctly handle the voltage factor in diode mode
2013-12-29 18:46:08 +01:00
a7c01629f6
es519xx: fix continuity mode handling
...
Depending on the chip, the limit value for the buzzer is between 25 and 35 Ω,
so this code set the limit for continuity to 25 Ω to be on the safe side.
2013-12-29 18:46:03 +01:00
5f985df23c
Add support for the UNI-T UT61C multimeter.
2013-12-29 17:35:51 +01:00
683fd16137
fx2lafw: Fix incorrect unitsize when a trigger fires.
...
The unitsize was always being set to 2, regardless of whether an fx2lafw
device with 8 or 16 probes was used.
This fixes bug #182 .
2013-12-29 14:18:51 +01:00
87b545fba4
fx2lafw: Minor cleanups.
2013-12-29 14:18:51 +01:00
0709197deb
rigol-ds: Correct usage of NUM_TIMEBASE and NUM_VDIV config keys.
2013-12-29 13:22:32 +01:00
bc7b7eb196
scpi: Strip trailing newline from *IDN response if present.
2013-12-29 13:22:31 +01:00
b178c79d35
victor-dmm: Fix MIN/MAX always being reported.
...
This fixes bug #228 .
2013-12-29 12:33:10 +01:00
8b2d41edb3
demo: Analog probe support.
2013-12-29 10:58:56 +01:00
c07f60e73d
demo: User-configurable number of probes.
...
The sigrok and incremental patterns repeat every 8 probes, shifted by
one probe.
2013-12-29 10:58:56 +01:00
05c644ea08
Revise SCPI read API to allow backend-independent data handling.
2013-12-29 04:26:36 +01:00
227a0981c0
rigol-ds: Support the rest of the DSO1000 range.
2013-12-29 01:39:49 +01:00
821fbcadcc
rigol-ds: Support 4 analog channels.
2013-12-29 01:34:58 +01:00
0d9f5a12cb
rigol-ds: Use correct live waveform size for Agilent DSO1000 series.
2013-12-29 00:35:09 +01:00
10afee13a3
rigol-ds: Add support for Agilent DSO1014A.
2013-12-29 00:27:11 +01:00
77c16c0463
scpi: Log IDN? result.
2013-12-29 00:26:54 +01:00
07ccb2b3f1
rigol-ds: Fix rigol_ds_channel_start() for digital channels.
2013-12-28 14:05:56 +01:00
9e4b7d9833
rigol-ds: Use correct analog frame size for VS5000 series.
2013-12-28 14:05:56 +01:00
6396b0a76b
rigol-ds: Use set_cfg wrapper for capture setup commands.
2013-12-28 14:05:56 +01:00
1fed20cb38
rigol-ds: Select channels before issuing RUN command.
2013-12-28 14:05:55 +01:00
48460c6f3e
rigol-ds: Unify partial read handling.
2013-12-27 22:47:42 +01:00
f80a0bf232
rigol-ds: Unify code for counting expected incoming bytes.
2013-12-27 22:47:42 +01:00
677f85d00b
rigol-ds: Use rigol_ds_channel_start() function for legacy protocol too.
2013-12-27 22:47:42 +01:00
0d87bd93eb
rigol-ds: Rename and document some confusingly named variables.
2013-12-27 22:47:42 +01:00
c36923b03b
asix-sigma: fix incorrect pointer cast (non-aligned memory and endiannes issue)
...
This fixes the following warning:
asix-sigma.c: In function 'receive_data':
asix-sigma.c:1064:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
devc->state.lastts = *(uint16_t *) buf - 1;
^
2013-12-27 17:36:08 +01:00
9ee78f2347
appa-55ii: Don't use _t suffix for a typedef.
...
Names ending with _t are reserved for POSIX.
http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html
(last line in table 2)
2013-12-27 17:27:52 +01:00
53cd1c78f5
hameg-hmo: Support DC LINE coupling.
2013-12-27 16:28:42 +01:00
b95dd7619d
log prefixes: Cosmetics, consistency fixes, typo fixes.
2013-12-27 13:17:20 +01:00
3544f848e0
Centralise duplicated logging helper defines.
2013-12-27 12:54:05 +01:00
dafafb0e94
teleinfo: Minor cleanups.
2013-12-27 12:27:52 +01:00
76b4d4f422
appa-55ii: Minor cosmetics, whitespace fixes.
2013-12-27 12:27:52 +01:00
27fd2eaacb
gmc-mh-1x-2x: Use standard API callback names for now.
...
If multiple functions need to be differentiated later, we can bring
back more specific names.
2013-12-27 12:27:49 +01:00
873e0c1295
gmc-mh-1x-2x: Don't put driver-specific things in sr/SR namespace.
2013-12-27 12:27:49 +01:00
3a6095d005
gmc-mh-1x-2x: Use 'di' variable to match other drivers.
2013-12-27 12:27:49 +01:00
ec29a878e0
gmc-mh-1x-2x: Fix two compiler warnings.
2013-12-27 12:27:49 +01:00
fc348b770a
gmc-mh-1x-2x: Cosmetics, whitespace, cleanups.
2013-12-27 12:27:49 +01:00
7574e58c1a
appa-55ii: Coding style fixes.
2013-12-23 01:53:30 +01:00
81a9ab725f
appa-55ii: driver implementation with Live and Memory data source support
2013-12-23 01:21:52 +01:00
5e7a8e57d4
appa-55ii: Initial driver skeleton.
2013-12-23 01:21:51 +01:00
61c39f54bb
demo: Code cleanup.
2013-12-22 23:47:50 +01:00
34ea7f9695
Windows usb: don't try to resume thread if shut down in callback.
2013-12-22 17:38:24 +00:00
6640324f7f
usb: Enforce that there can only be one USB event source for now.
2013-12-22 17:27:13 +00:00
b5328e1dfa
Windows usb: Unlock mutex when shutting down wait thread.
2013-12-22 17:10:57 +00:00
589edd9b81
Winsock2.h must be included before anything that includes Winsock.h.
2013-12-22 14:59:43 +00:00
5321ac6b52
Implement usb_source_add and usb_source_remove for Windows.
2013-12-22 07:16:56 +00:00
6c60facc19
Use common usb_source_add and usb_source_remove functions.
2013-12-21 23:09:23 +00:00
ba1949f583
Use new libserialport event set API to make GPollFDs for serial sources.
2013-12-21 19:38:45 +00:00
95ecc76546
bbcgm-m2110: Minor cosmetics.
2013-12-19 00:40:31 +01:00
825da8b20f
serial-dmm: Add BBC Goerz Metrawatt M2110 DMM driver.
2013-12-19 00:40:31 +01:00
5d03743096
serial-dmm: Commented struct dmm_info.
2013-12-19 00:40:31 +01:00
e9a6213976
hameg-hmo: Move the declaration of the driver info out of protocol.h
...
This fixes duplicate symbol error on Mac OS X.
BugLink: http://sigrok.org/bugzilla/show_bug.cgi?id=216
2013-12-18 22:17:30 +01:00
cb7b165b3d
serial.c: Show both error code and error message.
...
This is helpful in many cases, e.g. when trying to identify which of the
16000 system error codes from
http://msdn.microsoft.com/en-us/library/ms681381%28VS.85%29.aspx
has been encountered (which is not trivial if you only have an,
e.g. German, string message alone).
2013-12-17 17:46:24 +01:00
04cb915716
Improved doxygen docs.
2013-12-09 15:17:17 +01:00
854434de0b
Use std_serial_dev_open().
2013-12-07 21:54:08 +01:00
d43b090816
std: Standardize function name.
...
std_dev_acquisition_stop_serial() is now std_serial_dev_acquisition_stop().
2013-12-07 21:23:39 +01:00
b6eb8252e5
Remove now-unused fd field from struct sr_serial_dev_inst.
2013-12-07 19:43:47 +00:00
bf72f64999
ols: Get fd from sp_get_port_handle() rather than serial struct.
2013-12-07 19:43:47 +00:00
64ecf7ee52
Eliminate internal usage of serial->fd in serial.c.
2013-12-07 19:43:47 +00:00
a0a4c0fb09
Use sp_get_port_handle to get an fd for adding/removing serial sources.
2013-12-07 19:43:47 +00:00
af473e0eb2
brymen-dmm: Use port name instead of fd in debug message.
2013-12-07 19:43:47 +00:00
bf2c987fde
Use std_serial_dev_close() to replace matching dev_close functions.
2013-12-07 19:43:47 +00:00
7faa3e8821
Route sr_source_remove for all serial devices through a wrapper.
2013-12-07 19:43:47 +00:00
abc4b3356d
Route sr_source_add for all serial devices through a serial_source_add wrapper.
2013-12-07 19:43:47 +00:00
b4936bae0a
rigol-ds: close SCPI device after using for scan.
2013-12-07 19:43:47 +00:00
721fc2272e
scpi_serial: Iterate serial_write as necessary to send full commands.
2013-12-07 19:43:47 +00:00
0f4a435057
scpi_tcp: must define _WIN32_WINNT to 0x0501 or higher to get getaddrinfo().
2013-12-06 03:24:30 +00:00
987a053084
scpi_tcp: Fix building on Windows.
2013-12-06 02:33:05 +01:00
b9a5614dbf
zeroplus: Rework triggerbar/trigger address logic
...
This reworks the triggerbar/trigger address logic to match the values sent
by the windows app for all models (The zerominus tool was used to reprogram
the USB device ID on a single device). Additionally, the DONT_CARE_TRIGGERBAR
register is always set by the windows app and does not seem to indicate that
these registers are "don't care"'s.
2013-12-05 01:09:51 +01:00
c38e64c742
zeroplus: Clip sampling sizes larger that our sample memory
...
Otherwise, we'll return a non-sensical result for our memory_size
enumeration.
2013-12-05 01:09:51 +01:00
3e43da1f70
zeroplus: Add support for additional memory sizes
...
The zeroplus can have up to a 8M SRAM. Avoid some extensive if/else
blocks by noting that all sizes except the first are related by their power
of 2.
2013-12-05 01:09:51 +01:00
e93fb98b8a
zeroplus: Rename max_memory_size to max_sample_depth
...
This private variable is measured in samples, not bytes. Avoid confusion
by renaming it.
2013-12-05 01:09:51 +01:00
d20844e28b
zeroplus: Just wait until not busy on data capture
...
While captures using a trigger do set the STATUS_READY bit, immediate
captures do not set the STATUS_READY bit, they just clear the STATUS_BUSY
bit. This was confirmed with packet captures using the "official" driver/app.
2013-12-05 00:41:22 +01:00
60cc6f8579
zeroplus: Add usb IDs for 32 channel models, but only use 16 channels
...
The code needs some work to support 32 channels. Until then, support
the 32 channel models, but only allow the use of 16 channels.
2013-12-05 00:41:22 +01:00
7cf1a98d73
rigol-ds: Minor error reporting fix.
2013-12-05 00:21:15 +01:00
91e406b921
scpi/usbtmc: Prototype fixes.
2013-12-05 00:16:11 +01:00
bc03a7cc2c
scpi/serial: Use stubs for all SCPI functions.
...
Avoids some gcc warnings, since the SCPI prototypes don't exactly
match serial_*.
2013-12-05 00:09:34 +01:00
962af1a379
rigol-ds: Support VS5000 series devices.
2013-12-04 21:38:05 +00:00
b8705e99e4
scpi_tcp: Adjust to observed protocol for Rigol VS5000 series.
2013-12-04 21:32:47 +00:00
3520422fc7
rigol-ds: Support TCP connection.
2013-12-04 20:59:24 +00:00
Russ Dill
Matthias Heidbrink
Uwe Hermann
Martin Ling
Aurelien Jacobs
Bert Vermeulen
poljar (Damir Jelić)
Matthias Heidbrink