BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,299 Commits 3 Branches 14 Tags 10 MiB
Commit Graph

2299 Commits

Author SHA1 Message Date
Bert Vermeulen 5f9c4c8a34 Detect non-existent file before libzip does. 2013-12-11 10:49:01 +01:00
Bert Vermeulen 1e7134dc8c std: Don't build serial helpers without libserialport present. 2013-12-11 00:33:11 +01:00
Bert Vermeulen 98582bf53f Make API docs more consistent, avoid tabs to line up comments. 2013-12-09 22:49:12 +01:00
Matthias Heidbrink 5483bb8349 doxygen: Created Doxyfile_internal to extract „everything“ that is possible into a separate directory doxy/html-internal. 2013-12-09 15:17:17 +01:00
Matthias Heidbrink 04cb915716 Improved doxygen docs. 2013-12-09 15:17:17 +01:00
Matthias Heidbrink 86fa0ef594 doxygen: Updated Doxyfile to doxygen 1.8.5. 2013-12-09 15:16:29 +01:00
Bert Vermeulen 854434de0b Use std_serial_dev_open(). 2013-12-07 21:54:08 +01:00
Bert Vermeulen 23dc666166 std: Add std_serial_dev_open(). 2013-12-07 21:26:50 +01:00
Bert Vermeulen 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
Martin Ling 37fa80b4be Disable OLS driver on Windows. 2013-12-07 19:43:47 +00:00
Martin Ling b6eb8252e5 Remove now-unused fd field from struct sr_serial_dev_inst. 2013-12-07 19:43:47 +00:00
Martin Ling bf72f64999 ols: Get fd from sp_get_port_handle() rather than serial struct. 2013-12-07 19:43:47 +00:00
Martin Ling 64ecf7ee52 Eliminate internal usage of serial->fd in serial.c. 2013-12-07 19:43:47 +00:00
Martin Ling a0a4c0fb09 Use sp_get_port_handle to get an fd for adding/removing serial sources. 2013-12-07 19:43:47 +00:00
Martin Ling af473e0eb2 brymen-dmm: Use port name instead of fd in debug message. 2013-12-07 19:43:47 +00:00
Martin Ling 6936af3292 Use sdi->status instead of serial->fd to tell if port needs closing. 2013-12-07 19:43:47 +00:00
Martin Ling bf2c987fde Use std_serial_dev_close() to replace matching dev_close functions. 2013-12-07 19:43:47 +00:00
Martin Ling 043e899a51 Add std_serial_dev_close() function. 2013-12-07 19:43:47 +00:00
Martin Ling 7faa3e8821 Route sr_source_remove for all serial devices through a wrapper. 2013-12-07 19:43:47 +00:00
Martin Ling abc4b3356d Route sr_source_add for all serial devices through a serial_source_add wrapper. 2013-12-07 19:43:47 +00:00
Martin Ling b4936bae0a rigol-ds: close SCPI device after using for scan. 2013-12-07 19:43:47 +00:00
Martin Ling 721fc2272e scpi_serial: Iterate serial_write as necessary to send full commands. 2013-12-07 19:43:47 +00:00
Bert Vermeulen bb9d6116f8 filter.c: Work around const warning. 2013-12-07 18:50:12 +01:00
Marcus Comstedt 764e7bbfec filter.c: Fix endianness bug in sr_filter_probes 2013-12-07 18:27:38 +01:00
Bert Vermeulen c1e45c6511 Minor whitespace fix. 
Really just for testing some git hooks.
 2013-12-07 15:50:46 +01:00
Marvin Schmidt c3e2b08dc9 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
 2013-12-07 12:25:18 +01:00
Martin Ling 0f4a435057 scpi_tcp: must define _WIN32_WINNT to 0x0501 or higher to get getaddrinfo(). 2013-12-06 03:24:30 +00:00
Martin Ling 1c6736ab86 Link against the ws2_32 library on Windows. 2013-12-06 02:26:58 +00:00
Martin Ling 789840741c rigol-ds: Enable for non-Linux, as it now supports other transports. 2013-12-06 03:00:12 +01:00
Martin Ling 987a053084 scpi_tcp: Fix building on Windows. 2013-12-06 02:33:05 +01:00
Russ Dill 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
Russ Dill 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
Russ Dill 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
Russ Dill 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
Russ Dill 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
Russ Dill 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
Bert Vermeulen 7cf1a98d73 rigol-ds: Minor error reporting fix. 2013-12-05 00:21:15 +01:00
Bert Vermeulen 91e406b921 scpi/usbtmc: Prototype fixes. 2013-12-05 00:16:11 +01:00
Bert Vermeulen 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
Martin Ling 962af1a379 rigol-ds: Support VS5000 series devices. 2013-12-04 21:38:05 +00:00
Martin Ling b8705e99e4 scpi_tcp: Adjust to observed protocol for Rigol VS5000 series. 2013-12-04 21:32:47 +00:00
Martin Ling 3520422fc7 rigol-ds: Support TCP connection. 2013-12-04 20:59:24 +00:00
Martin Ling 08a359138b Add implementation for SCPI over TCP. 2013-12-04 20:59:20 +00:00
Martin Ling 56868b5d6b 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.
 2013-12-04 13:31:42 +00:00
Martin Ling 9dfeb81b09 scpi_serial: Flush buffers after opening port. 2013-12-04 13:03:23 +00:00
Martin Ling 0dc7b43eb7 rigol-ds: Support RS232 connection. 
Probing tested OK over RS232 for DS1052E and DS1102D. Capture needs work.
 2013-12-04 12:50:12 +00:00
Martin Ling 4d7a9a14a3 rigol-ds: Eliminate fixed-size buffer in set_cfg. 2013-12-04 10:56:09 +00:00
Martin Ling 87c410830d Add sr_scpi_send_variadic() function. 2013-12-04 10:53:51 +00:00
Martin Ling 17b5b20264 Replace rigol_ds_send() function with sr_scpi_send(). 2013-12-04 10:30:46 +00:00
Martin Ling 504f40a574 Make sr_scpi_send() take printf-style arguments. 2013-12-04 10:30:43 +00:00