7977054d61
scpi_usbtmc_libusb: remove libusb_clear_halt() hack which is not useful anymore
2015-10-24 22:11:38 +02:00
a73665a3fa
transform/scale: Fix g_variant_new() argument.
2015-10-24 21:44:20 +02:00
938bdc25b7
scpi_usbtmc_libusb: set_configuration only if it is not already set
...
This avoids the issues described here:
http://libusb.sourceforge.net/api-1.0/caveats.html#configsel
2015-10-24 21:32:13 +02:00
e40e9ca28d
scpi_usbtmc_libusb: add Rigol DS2000 to the RL1 blacklist
...
The Rigol DS2000 series also give a USB timeout when trying to apply
RL1 lock or unlock.
2015-10-24 21:32:13 +02:00
222fdfd526
Drop unneeded sr_analog_float_to_string().
...
A simple g_strdup_printf() is sufficient, no need for an extra
libsigrok API call here.
2015-10-24 21:21:50 +02:00
a5c38703ee
drivers: Fix behaviour when trying to set an invalid capture ratio.
...
Trying to configure an invalid capture ratio would reset the
previously configured value. Instead, we should just reject the
new value and keep the original one.
2015-10-24 21:10:29 +02:00
087c4d59c0
fx2lafw: Drop obsolete macro usage.
2015-10-24 20:55:40 +02:00
3e91de2bd6
fx2lafw: Add the official fx2lafw sigrok VID/PID pairs.
...
As supported by sigrok-firmware-fx2lafw >= 0.1.3:
- 1D50:608C: fx2lafw-sigrok-fx2-8ch.fw
- 1D50:608D: fx2lafw-sigrok-fx2-16ch.fw
2015-10-22 19:19:40 +02:00
22fb1bffc3
analog.c: Various Doxygen additions and improvements.
2015-10-21 00:29:29 +02:00
5cee3d08e4
analog.c: Return SR_ERR_ARG upon invalid arguments.
...
(instead of segfaulting)
2015-10-21 00:29:29 +02:00
8ea0c90268
sr_analog_float_to_string(): Make 'digits' argument unsigned.
2015-10-21 00:29:29 +02:00
6b71bf1ba0
Add a few unit tests for the analog conversion functions.
2015-10-21 00:29:29 +02:00
dd13d47a9e
bindings: Use SR_DF_ANALOG, drop SR_DF_ANALOG_OLD support.
...
All SR_DF_ANALOG_OLD packets are automatically converted to SR_DF_ANALOG
in the session already.
2015-10-21 00:29:29 +02:00
edb691fced
SR_DF_ANALOG2 and sr_datafeed_analog2 renames.
...
Rename SR_DF_ANALOG2 to SR_DF_ANALOG, and 'struct sr_datafeed_analog2'
to 'struct sr_datafeed_analog'.
2015-10-20 23:32:45 +02:00
5faebab290
SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.
...
Rename SR_DF_ANALOG to SR_DF_ANALOG_OLD, and 'struct sr_datafeed_analog'
to 'struct sr_datafeed_analog_old'.
2015-10-20 23:32:45 +02:00
ca79993bba
session: Convert from SR_DF_ANALOG to SR_DF_ANALOG2 automatically.
...
This fixes bus #640 .
2015-10-20 23:32:45 +02:00
453629c137
output/csv: Support SR_DF_ANALOG2.
2015-10-20 23:32:45 +02:00
b73cac758e
output/wav: Support SR_DF_ANALOG2.
2015-10-20 23:32:45 +02:00
0662a7d083
transform/invert: Support SR_DF_ANALOG2.
2015-10-20 23:32:45 +02:00
b1aa4f34bc
transform/scale: Support SR_DF_ANALOG2.
2015-10-20 23:32:45 +02:00
2d237f3ce8
transform/scale: Use a rational rather than floating point factor.
2015-10-20 23:32:45 +02:00
85aa1b599f
java: Fix SWIG warnings due to dodgy %extend redefinitions.
...
If we're going to %extend these methods, we need to firstly ignore the
originals, and secondly implement all possible argument combinations.
This fixes the rest of bug #417 .
2015-10-20 21:12:29 +01:00
e66728886f
python: Prevent warning about deprecated NumPy API.
...
Without this we get:
/usr/include/python2.7/numpy/npy_1_7_deprecated_api.h:15:2: warning: #warning
"Using deprecated NumPy API, disable it by " "#defining NPY_NO_DEPRECATED_API
NPY_1_7_API_VERSION" [-Wcpp]
As far as I'm aware we're not using any deprecated NumPy C API features.
This fixes part of bug #417 .
2015-10-20 21:12:29 +01:00
fa72105fe6
python: Fix PyObject_CallMethod() arguments
...
Pass nullptr instead of the empty string for format, and remove
the excess varargs argument. Also, avoid NULL in favor of nullptr.
2015-10-17 17:40:42 +02:00
2c3c9b999c
python: Wrap session stop callback
2015-10-17 17:40:42 +02:00
ee9953ef12
session: Make event source injection API private
...
Also remove the corresponding functionality from the bindings.
2015-10-17 17:40:42 +02:00
f91cf612df
C++: Add bindings for session stop notification
2015-10-17 17:40:42 +02:00
2e5e3df4e4
session: Keep reference to main context while running
2015-10-17 17:40:42 +02:00
5de0fc55a6
session: Make sr_session_run() optional
...
Introduce a new API function sr_session_stopped_callback_set()
which can be used to receive notification when a session stops
running. This allows applications to integrate libsigrok event
processing with their own main loop, instead of blocking in
sr_session_run().
2015-10-17 17:40:42 +02:00
45d835edc7
resource: Do not require size to stay valid after close
...
Chalk one up for uber-correctness, just in case.
2015-10-17 17:40:42 +02:00
0a4549ff18
Add support for the Tenma 77-7732 multimeter.
2015-10-17 00:11:32 +02:00
20f9f1fbaa
Add support for the Tenma 77-9380A multimeter.
2015-10-17 00:11:32 +02:00
896fc9c723
build: Require libzip 0.11
...
This is needed for zip_discard().
2015-10-17 00:07:57 +02:00
eaa6a7a3e8
srzip: Avoid recent-ish zip_file_add()
2015-10-16 21:29:28 +02:00
ef2bcf114f
korad-kdxxxxp: Use PRIi64 format for int64_t
2015-10-16 21:28:07 +02:00
b1cadcfbef
drivers: Add support for Tenma 72-7730 multimeter
...
Tested with a 72-7730 device.
Signed-off-by: Karl Palsson <karlp@remake.is>
2015-10-14 17:00:30 +02:00
739a1ec4f8
configure.ac: Korad KDxxxxP depends on libserialport.
2015-10-13 23:26:40 +02:00
d708304275
Initial driver for Korad KDxxxxP (Velleman LABPS3005D)
...
With this driver it is possible to set voltage target and current
limit. Also enabling and disabling the output is possible.
Analog output sends read back values from output. If output is
disabled analog outputs 0.00.
In protocol.c there is a g_usleep() call. This gives almost
every time enough time for PSU to parse and process input.
Multichannel devices aren't supported.
2015-10-13 23:18:49 +02:00
e75ee7de25
korad-kdxxxxp: Initial driver skeleton.
2015-10-13 23:15:33 +02:00
a7da85f529
baylibre-acme: Fix EEPROM fields endianness.
...
Use RB32 instead of RL32 since integer types in probe EEPROM are in network
byte order.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
2015-10-09 15:52:28 +02:00
4c3a4bca32
baylibre-acme: Read EEPROM contents into buffer before processing.
...
Instead of using a non-standard packed attribute, read the contents of the
probe EEPROM into a buffer and then process it using the R* macros.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
2015-10-09 14:55:14 +02:00
453a0c2ece
baylibre-acme: Use fixed-size integer types in struct probe_eeprom.
...
Standard integer types may differ in size on different targets. Use fixed-size
types instead.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
2015-10-09 14:55:14 +02:00
7f4d69305b
C++: Remove leftover Context::begin_save() method
2015-10-04 22:11:39 +02:00
655b116cc1
build: Do not define FIRMWARE_DIR on Windows
...
The hard-coded location is bound to be wrong anyway. Instead, rely
on the new resource lookup code to find the firmware files in a
location relative to the library or executable.
2015-10-03 14:08:32 +02:00
127c9cec82
resource: Make definition of FIRMWARE_DIR optional
2015-10-03 13:58:50 +02:00
2c38a41a60
session-file: Use 32-bit int for channel count
...
SR_CONF_NUM_LOGIC_CHANNELS is defined as SR_T_INT32. Create the
GVariant with the correct type to avoid a type mismatch error in
sr_variant_type_check().
2015-10-02 20:09:46 +02:00
5eff221e8c
usb: Skip add/remove of FD on destroyed source
...
This avoids nasty GLib-CRITICALs on Windows with some drivers.
2015-10-02 01:13:16 +02:00
e2eaf8580a
C++: Wrap resource access API
...
Introduce a ResourceReader delegate class with virtual methods
corresponding to the C callback functions.
2015-10-01 15:44:55 +02:00
8e2d6c9db7
drivers: Load firmware via new resource API
2015-10-01 15:44:55 +02:00
7d89fd60e5
resource: Move sr_file_get_size() to resource.c
2015-10-01 15:44:55 +02:00
Aurelien Jacobs
Uwe Hermann
Tilman Sauerbeck
Martin Ling
Daniel Elstner
Karl Palsson
Hannu Vuolasaho
Bartosz Golaszewski