]> sigrok.org Git - libsigrok.git/log
libsigrok.git
10 years agoDoxygen fixes: Hide private stuff, document some structs.
Uwe Hermann [Fri, 27 Dec 2013 15:18:28 +0000 (16:18 +0100)]
Doxygen fixes: Hide private stuff, document some structs.

10 years agoDoxyfile/Doxyfile_internal: Ignore doxy/* when creating docs.
Uwe Hermann [Fri, 27 Dec 2013 14:50:27 +0000 (15:50 +0100)]
Doxyfile/Doxyfile_internal: Ignore doxy/* when creating docs.

10 years agoDoxyfile/Doxyfile_internal: Update to same 1.8.5 template, sync them.
Uwe Hermann [Fri, 27 Dec 2013 14:36:22 +0000 (15:36 +0100)]
Doxyfile/Doxyfile_internal: Update to same 1.8.5 template, sync them.

This also makes the diff from Doxyfile to Doxyfile_internal more readable.

Also, put public API docs into doxy/html-api/, private stuff into
doxy/html-internal/.

10 years agolog prefixes: Cosmetics, consistency fixes, typo fixes.
Uwe Hermann [Fri, 27 Dec 2013 12:05:54 +0000 (13:05 +0100)]
log prefixes: Cosmetics, consistency fixes, typo fixes.

10 years agoCentralise duplicated logging helper defines.
Martin Ling [Mon, 23 Dec 2013 03:38:35 +0000 (03:38 +0000)]
Centralise duplicated logging helper defines.

10 years agoteleinfo: Minor cleanups.
Uwe Hermann [Thu, 26 Dec 2013 23:35:42 +0000 (00:35 +0100)]
teleinfo: Minor cleanups.

10 years agoappa-55ii: Minor cosmetics, whitespace fixes.
Uwe Hermann [Thu, 26 Dec 2013 23:22:19 +0000 (00:22 +0100)]
appa-55ii: Minor cosmetics, whitespace fixes.

10 years agogmc-mh-1x-2x: Use standard API callback names for now.
Uwe Hermann [Thu, 26 Dec 2013 12:15:46 +0000 (13:15 +0100)]
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.

10 years agogmc-mh-1x-2x: Don't put driver-specific things in sr/SR namespace.
Uwe Hermann [Thu, 26 Dec 2013 12:02:02 +0000 (13:02 +0100)]
gmc-mh-1x-2x: Don't put driver-specific things in sr/SR namespace.

10 years agogmc-mh-1x-2x: Use 'di' variable to match other drivers.
Uwe Hermann [Thu, 26 Dec 2013 11:55:54 +0000 (12:55 +0100)]
gmc-mh-1x-2x: Use 'di' variable to match other drivers.

10 years agogmc-mh-1x-2x: Fix two compiler warnings.
Uwe Hermann [Thu, 26 Dec 2013 11:52:29 +0000 (12:52 +0100)]
gmc-mh-1x-2x: Fix two compiler warnings.

10 years agogmc-mh-1x-2x: Cosmetics, whitespace, cleanups.
Uwe Hermann [Thu, 26 Dec 2013 11:51:18 +0000 (12:51 +0100)]
gmc-mh-1x-2x: Cosmetics, whitespace, cleanups.

10 years agoappa-55ii: Coding style fixes.
Bert Vermeulen [Mon, 23 Dec 2013 00:53:30 +0000 (01:53 +0100)]
appa-55ii: Coding style fixes.

10 years agoappa-55ii: driver implementation with Live and Memory data source support
Aurelien Jacobs [Wed, 11 Dec 2013 23:22:32 +0000 (00:22 +0100)]
appa-55ii: driver implementation with Live and Memory data source support

10 years agoappa-55ii: Initial driver skeleton.
Aurelien Jacobs [Sun, 1 Dec 2013 00:13:44 +0000 (01:13 +0100)]
appa-55ii: Initial driver skeleton.

10 years agoendian neutral helper macro to read 16/32 bits integer from unaligned memory
Aurelien Jacobs [Wed, 11 Dec 2013 23:20:47 +0000 (00:20 +0100)]
endian neutral helper macro to read 16/32 bits integer from unaligned memory

10 years agoadd support for AVG mqflag
Aurelien Jacobs [Wed, 11 Dec 2013 23:18:00 +0000 (00:18 +0100)]
add support for AVG mqflag

10 years agodemo: Code cleanup.
Bert Vermeulen [Sun, 22 Dec 2013 17:46:45 +0000 (18:46 +0100)]
demo: Code cleanup.

10 years agoWindows usb: don't try to resume thread if shut down in callback.
Martin Ling [Sun, 22 Dec 2013 17:38:24 +0000 (17:38 +0000)]
Windows usb: don't try to resume thread if shut down in callback.

10 years agousb: Enforce that there can only be one USB event source for now.
Martin Ling [Sun, 22 Dec 2013 17:27:13 +0000 (17:27 +0000)]
usb: Enforce that there can only be one USB event source for now.

10 years agoWindows usb: Unlock mutex when shutting down wait thread.
Martin Ling [Sun, 22 Dec 2013 17:10:57 +0000 (17:10 +0000)]
Windows usb: Unlock mutex when shutting down wait thread.

10 years agoWinsock2.h must be included before anything that includes Winsock.h.
Martin Ling [Sun, 22 Dec 2013 14:50:11 +0000 (14:50 +0000)]
Winsock2.h must be included before anything that includes Winsock.h.

10 years agoImplement usb_source_add and usb_source_remove for Windows.
Martin Ling [Sun, 22 Dec 2013 07:16:56 +0000 (07:16 +0000)]
Implement usb_source_add and usb_source_remove for Windows.

10 years agoUse common usb_source_add and usb_source_remove functions.
Martin Ling [Sat, 21 Dec 2013 23:03:24 +0000 (23:03 +0000)]
Use common usb_source_add and usb_source_remove functions.

10 years agoUse new libserialport event set API to make GPollFDs for serial sources.
Martin Ling [Fri, 20 Dec 2013 17:45:46 +0000 (17:45 +0000)]
Use new libserialport event set API to make GPollFDs for serial sources.

10 years agoBump minimum libusb version to 1.0.16
Bert Vermeulen [Thu, 19 Dec 2013 09:45:36 +0000 (10:45 +0100)]
Bump minimum libusb version to 1.0.16

This gets us the libusb version checking mechanism itself, hopefully
making this sort of thing easier in future.

Also hotplug, device tree traversal, and lots of fixes.

10 years agobbcgm-m2110: Minor cosmetics.
Uwe Hermann [Wed, 18 Dec 2013 23:31:26 +0000 (00:31 +0100)]
bbcgm-m2110: Minor cosmetics.

10 years agoserial-dmm: Add BBC Goerz Metrawatt M2110 DMM driver.
Matthias Heidbrink [Wed, 18 Dec 2013 22:37:42 +0000 (23:37 +0100)]
serial-dmm: Add BBC Goerz Metrawatt M2110 DMM driver.

10 years agoserial-dmm: Commented struct dmm_info.
Matthias Heidbrink [Wed, 18 Dec 2013 22:33:45 +0000 (23:33 +0100)]
serial-dmm: Commented struct dmm_info.

10 years agohameg-hmo: Move the declaration of the driver info out of protocol.h
poljar (Damir Jelić) [Mon, 9 Dec 2013 13:35:29 +0000 (14:35 +0100)]
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
10 years agoserial.c: Show both error code and error message.
Uwe Hermann [Tue, 17 Dec 2013 16:46:24 +0000 (17:46 +0100)]
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).

10 years agoDoxygen: Consistently use @ notation everywhere.
Uwe Hermann [Mon, 16 Dec 2013 09:24:32 +0000 (10:24 +0100)]
Doxygen: Consistently use @ notation everywhere.

10 years agoDrop superfluous \n in some debug messages.
Uwe Hermann [Tue, 10 Dec 2013 17:18:58 +0000 (18:18 +0100)]
Drop superfluous \n in some debug messages.

10 years agoFix a few #include guard names.
Uwe Hermann [Tue, 10 Dec 2013 16:39:31 +0000 (17:39 +0100)]
Fix a few #include guard names.

10 years agopython: Use OrderedDict for input formats.
Martin Ling [Tue, 17 Dec 2013 16:25:13 +0000 (16:25 +0000)]
python: Use OrderedDict for input formats.

10 years agopython: Split up Device class and add InputFileDevice class.
Martin Ling [Tue, 17 Dec 2013 16:10:08 +0000 (16:10 +0000)]
python: Split up Device class and add InputFileDevice class.

10 years agopython: Give config keys an auto lowercase name if they have none defined.
Martin Ling [Tue, 17 Dec 2013 13:11:43 +0000 (13:11 +0000)]
python: Give config keys an auto lowercase name if they have none defined.

10 years agopython: Add ConfigKey.info and ConfigKey.<id> shortcuts.
Martin Ling [Tue, 17 Dec 2013 13:01:35 +0000 (13:01 +0000)]
python: Add ConfigKey.info and ConfigKey.<id> shortcuts.

10 years agopython: ConfigInfo: return None from constructor if not available.
Martin Ling [Tue, 17 Dec 2013 13:01:11 +0000 (13:01 +0000)]
python: ConfigInfo: return None from constructor if not available.

10 years agopython: Add ConfigInfo and DataType classes.
Martin Ling [Tue, 17 Dec 2013 12:47:49 +0000 (12:47 +0000)]
python: Add ConfigInfo and DataType classes.

10 years agopython: Finish output format support.
Martin Ling [Tue, 17 Dec 2013 00:42:33 +0000 (00:42 +0000)]
python: Finish output format support.

10 years agopython: Finish input format support.
Martin Ling [Mon, 16 Dec 2013 02:11:42 +0000 (02:11 +0000)]
python: Finish input format support.

10 years agopython: Add initial support for input and output formats.
Martin Ling [Mon, 16 Dec 2013 01:21:39 +0000 (01:21 +0000)]
python: Add initial support for input and output formats.

10 years agopython: fix setting device/probe group configuration.
Martin Ling [Mon, 16 Dec 2013 18:09:57 +0000 (18:09 +0000)]
python: fix setting device/probe group configuration.

10 years agopython: whitespace fix.
Martin Ling [Sun, 15 Dec 2013 20:02:05 +0000 (20:02 +0000)]
python: whitespace fix.

10 years agoDetect non-existent file before libzip does.
Bert Vermeulen [Wed, 11 Dec 2013 09:49:01 +0000 (10:49 +0100)]
Detect non-existent file before libzip does.

10 years agostd: Don't build serial helpers without libserialport present.
Bert Vermeulen [Tue, 10 Dec 2013 23:33:11 +0000 (00:33 +0100)]
std: Don't build serial helpers without libserialport present.

10 years agoMake API docs more consistent, avoid tabs to line up comments.
Bert Vermeulen [Mon, 9 Dec 2013 21:49:12 +0000 (22:49 +0100)]
Make API docs more consistent, avoid tabs to line up comments.

10 years agodoxygen: Created Doxyfile_internal to extract „everything“ that is possible into...
Matthias Heidbrink [Fri, 22 Nov 2013 20:08:49 +0000 (21:08 +0100)]
doxygen: Created Doxyfile_internal to extract „everything“ that is possible into a separate directory doxy/html-internal.

10 years agoImproved doxygen docs.
Matthias Heidbrink [Fri, 22 Nov 2013 19:40:52 +0000 (20:40 +0100)]
Improved doxygen docs.

10 years agodoxygen: Updated Doxyfile to doxygen 1.8.5.
Matthias Heidbrink [Fri, 22 Nov 2013 13:08:04 +0000 (14:08 +0100)]
doxygen: Updated Doxyfile to doxygen 1.8.5.

10 years agoUse std_serial_dev_open().
Bert Vermeulen [Sat, 7 Dec 2013 20:36:27 +0000 (21:36 +0100)]
Use std_serial_dev_open().

10 years agostd: Add std_serial_dev_open().
Bert Vermeulen [Sat, 7 Dec 2013 19:26:15 +0000 (20:26 +0100)]
std: Add std_serial_dev_open().

10 years agostd: Standardize function name.
Bert Vermeulen [Sat, 7 Dec 2013 19:39:55 +0000 (20:39 +0100)]
std: Standardize function name.

std_dev_acquisition_stop_serial() is now std_serial_dev_acquisition_stop().

10 years agoDisable OLS driver on Windows.
Martin Ling [Sat, 7 Dec 2013 19:42:35 +0000 (19:42 +0000)]
Disable OLS driver on Windows.

10 years agoRemove now-unused fd field from struct sr_serial_dev_inst.
Martin Ling [Sat, 7 Dec 2013 19:35:50 +0000 (19:35 +0000)]
Remove now-unused fd field from struct sr_serial_dev_inst.

10 years agools: Get fd from sp_get_port_handle() rather than serial struct.
Martin Ling [Sat, 7 Dec 2013 19:35:13 +0000 (19:35 +0000)]
ols: Get fd from sp_get_port_handle() rather than serial struct.

10 years agoEliminate internal usage of serial->fd in serial.c.
Martin Ling [Sat, 7 Dec 2013 19:29:16 +0000 (19:29 +0000)]
Eliminate internal usage of serial->fd in serial.c.

10 years agoUse sp_get_port_handle to get an fd for adding/removing serial sources.
Martin Ling [Sat, 7 Dec 2013 19:19:20 +0000 (19:19 +0000)]
Use sp_get_port_handle to get an fd for adding/removing serial sources.

10 years agobrymen-dmm: Use port name instead of fd in debug message.
Martin Ling [Sat, 7 Dec 2013 19:17:49 +0000 (19:17 +0000)]
brymen-dmm: Use port name instead of fd in debug message.

10 years agoUse sdi->status instead of serial->fd to tell if port needs closing.
Martin Ling [Sat, 7 Dec 2013 19:16:30 +0000 (19:16 +0000)]
Use sdi->status instead of serial->fd to tell if port needs closing.

10 years agoUse std_serial_dev_close() to replace matching dev_close functions.
Martin Ling [Sat, 7 Dec 2013 18:47:43 +0000 (18:47 +0000)]
Use std_serial_dev_close() to replace matching dev_close functions.

10 years agoAdd std_serial_dev_close() function.
Martin Ling [Sat, 7 Dec 2013 18:41:09 +0000 (18:41 +0000)]
Add std_serial_dev_close() function.

10 years agoRoute sr_source_remove for all serial devices through a wrapper.
Martin Ling [Mon, 2 Dec 2013 13:06:08 +0000 (13:06 +0000)]
Route sr_source_remove for all serial devices through a wrapper.

10 years agoRoute sr_source_add for all serial devices through a serial_source_add wrapper.
Martin Ling [Sat, 30 Nov 2013 12:54:02 +0000 (12:54 +0000)]
Route sr_source_add for all serial devices through a serial_source_add wrapper.

10 years agorigol-ds: close SCPI device after using for scan.
Martin Ling [Sat, 7 Dec 2013 17:54:33 +0000 (17:54 +0000)]
rigol-ds: close SCPI device after using for scan.

10 years agoscpi_serial: Iterate serial_write as necessary to send full commands.
Martin Ling [Sat, 7 Dec 2013 16:11:27 +0000 (16:11 +0000)]
scpi_serial: Iterate serial_write as necessary to send full commands.

10 years agofilter.c: Work around const warning.
Bert Vermeulen [Sat, 7 Dec 2013 17:50:12 +0000 (18:50 +0100)]
filter.c: Work around const warning.

10 years agofilter.c: Fix endianness bug in sr_filter_probes
Marcus Comstedt [Sat, 7 Dec 2013 16:09:06 +0000 (17:09 +0100)]
filter.c: Fix endianness bug in sr_filter_probes

10 years agoMinor whitespace fix.
Bert Vermeulen [Sat, 7 Dec 2013 14:50:25 +0000 (15:50 +0100)]
Minor whitespace fix.

Really just for testing some git hooks.

10 years agoFix test failure
Marvin Schmidt [Tue, 26 Nov 2013 07:50:52 +0000 (08:50 +0100)]
Fix test failure

The GError object has to initialized to NULL before being passed to
g_file_set_contents or it will throw the following critical warning

GLib-CRITICAL **: g_file_set_contents: assertion 'error == NULL || *error == NULL' failed

and return FALSE, which leads to failed assertion and subsequently
to the test failing

10 years agoscpi_tcp: must define _WIN32_WINNT to 0x0501 or higher to get getaddrinfo().
Martin Ling [Fri, 6 Dec 2013 03:20:48 +0000 (03:20 +0000)]
scpi_tcp: must define _WIN32_WINNT to 0x0501 or higher to get getaddrinfo().

10 years agoLink against the ws2_32 library on Windows.
Martin Ling [Fri, 6 Dec 2013 02:26:58 +0000 (02:26 +0000)]
Link against the ws2_32 library on Windows.

10 years agorigol-ds: Enable for non-Linux, as it now supports other transports.
Martin Ling [Fri, 6 Dec 2013 01:55:04 +0000 (01:55 +0000)]
rigol-ds: Enable for non-Linux, as it now supports other transports.

10 years agoscpi_tcp: Fix building on Windows.
Martin Ling [Fri, 6 Dec 2013 01:14:55 +0000 (01:14 +0000)]
scpi_tcp: Fix building on Windows.

10 years agozeroplus: Rework triggerbar/trigger address logic
Russ Dill [Tue, 3 Dec 2013 06:00:30 +0000 (22:00 -0800)]
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.

10 years agozeroplus: Clip sampling sizes larger that our sample memory
Russ Dill [Tue, 3 Dec 2013 05:57:46 +0000 (21:57 -0800)]
zeroplus: Clip sampling sizes larger that our sample memory

Otherwise, we'll return a non-sensical result for our memory_size
enumeration.

10 years agozeroplus: Add support for additional memory sizes
Russ Dill [Tue, 3 Dec 2013 05:57:04 +0000 (21:57 -0800)]
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.

10 years agozeroplus: Rename max_memory_size to max_sample_depth
Russ Dill [Tue, 3 Dec 2013 05:51:53 +0000 (21:51 -0800)]
zeroplus: Rename max_memory_size to max_sample_depth

This private variable is measured in samples, not bytes. Avoid confusion
by renaming it.

10 years agozeroplus: Just wait until not busy on data capture
Russ Dill [Tue, 3 Dec 2013 05:47:14 +0000 (21:47 -0800)]
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.

10 years agozeroplus: Add usb IDs for 32 channel models, but only use 16 channels
Russ Dill [Tue, 3 Dec 2013 05:25:10 +0000 (21:25 -0800)]
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.

10 years agorigol-ds: Minor error reporting fix.
Bert Vermeulen [Wed, 4 Dec 2013 23:21:15 +0000 (00:21 +0100)]
rigol-ds: Minor error reporting fix.

10 years agoscpi/usbtmc: Prototype fixes.
Bert Vermeulen [Wed, 4 Dec 2013 23:16:11 +0000 (00:16 +0100)]
scpi/usbtmc: Prototype fixes.

10 years agoscpi/serial: Use stubs for all SCPI functions.
Bert Vermeulen [Wed, 4 Dec 2013 23:09:34 +0000 (00:09 +0100)]
scpi/serial: Use stubs for all SCPI functions.

Avoids some gcc warnings, since the SCPI prototypes don't exactly
match serial_*.

10 years agorigol-ds: Support VS5000 series devices.
Martin Ling [Wed, 4 Dec 2013 21:38:05 +0000 (21:38 +0000)]
rigol-ds: Support VS5000 series devices.

10 years agoscpi_tcp: Adjust to observed protocol for Rigol VS5000 series.
Martin Ling [Wed, 4 Dec 2013 21:32:47 +0000 (21:32 +0000)]
scpi_tcp: Adjust to observed protocol for Rigol VS5000 series.

10 years agorigol-ds: Support TCP connection.
Martin Ling [Wed, 4 Dec 2013 20:42:22 +0000 (20:42 +0000)]
rigol-ds: Support TCP connection.

10 years agoAdd implementation for SCPI over TCP.
Martin Ling [Wed, 4 Dec 2013 20:23:14 +0000 (20:23 +0000)]
Add implementation for SCPI over TCP.

10 years agorigol-ds: Handle partial analog frame reads.
Martin Ling [Wed, 4 Dec 2013 13:08:49 +0000 (13:08 +0000)]
rigol-ds: Handle partial analog frame reads.

Reading a frame over the DS1xx2 RS232 connection now sometimes works,
but most of the time stalls part way through with g_poll showing the
fd as not ready.

10 years agoscpi_serial: Flush buffers after opening port.
Martin Ling [Wed, 4 Dec 2013 13:03:23 +0000 (13:03 +0000)]
scpi_serial: Flush buffers after opening port.

10 years agorigol-ds: Support RS232 connection.
Martin Ling [Wed, 4 Dec 2013 12:49:38 +0000 (12:49 +0000)]
rigol-ds: Support RS232 connection.

Probing tested OK over RS232 for DS1052E and DS1102D. Capture needs work.

10 years agorigol-ds: Eliminate fixed-size buffer in set_cfg.
Martin Ling [Wed, 4 Dec 2013 10:55:32 +0000 (10:55 +0000)]
rigol-ds: Eliminate fixed-size buffer in set_cfg.

10 years agoAdd sr_scpi_send_variadic() function.
Martin Ling [Wed, 4 Dec 2013 10:53:51 +0000 (10:53 +0000)]
Add sr_scpi_send_variadic() function.

10 years agoReplace rigol_ds_send() function with sr_scpi_send().
Martin Ling [Wed, 4 Dec 2013 10:25:15 +0000 (10:25 +0000)]
Replace rigol_ds_send() function with sr_scpi_send().

10 years agoMake sr_scpi_send() take printf-style arguments.
Martin Ling [Wed, 4 Dec 2013 10:24:52 +0000 (10:24 +0000)]
Make sr_scpi_send() take printf-style arguments.

10 years agoOnly scpi_serial.c functions need HAVE_LIBSERIALPORT, not scpi.c.
Martin Ling [Tue, 3 Dec 2013 23:31:32 +0000 (23:31 +0000)]
Only scpi_serial.c functions need HAVE_LIBSERIALPORT, not scpi.c.

10 years agoRemove SR_INST_USBTMC which is no longer used.
Martin Ling [Tue, 3 Dec 2013 23:29:20 +0000 (23:29 +0000)]
Remove SR_INST_USBTMC which is no longer used.

10 years agoPort rigol-ds driver to use common SCPI functions.
Martin Ling [Tue, 3 Dec 2013 23:19:40 +0000 (23:19 +0000)]
Port rigol-ds driver to use common SCPI functions.

10 years agoAdd sr_scpi_read() operation for reading arbitrary data.
Martin Ling [Tue, 3 Dec 2013 22:56:32 +0000 (22:56 +0000)]
Add sr_scpi_read() operation for reading arbitrary data.

10 years agoImplement SCPI over USBTMC.
Martin Ling [Tue, 3 Dec 2013 22:25:33 +0000 (22:25 +0000)]
Implement SCPI over USBTMC.