Commit Graph

2887 Commits

Author SHA1 Message Date
magnuskarlsson b94cff407f DEMUX and RLE fixes 2014-08-25 01:00:55 +02:00
magnuskarlsson 1e0de84608 added edge triggers 2014-08-25 01:00:55 +02:00
magnuskarlsson 1f9bcd0f94 fixed typos 2014-08-25 01:00:55 +02:00
magnuskarlsson 72716f15be fixed a problem with USB defines 2014-08-25 01:00:55 +02:00
magnuskarlsson 4bd80e1228 added pipistrello-ols
Conflicts:
	configure.ac
	src/hwdriver.c
2014-08-25 01:00:55 +02:00
Soeren Apel 562b7ae513 hameg-hmo / rigol-ds: Restore compatibility with std_dev_clear() 2014-08-24 16:54:38 +02:00
Martin Ling 14e1aa6df0 rigol-ds: Fix duplicated vendor string for Agilent devices. 2014-08-22 20:15:32 +01:00
Bert Vermeulen 81a69107de build: Require libserialport version 0.2.0. 2014-08-20 23:39:27 +02:00
Aurelien Jacobs 01f6e330f8 serial: re-implement sr_serial_find_usb() using new libsp APIs 2014-08-20 17:48:26 +02:00
Bert Vermeulen fdefc40aec output: Fix options enumeration. Again. 2014-08-20 17:33:09 +02:00
Martin Ling aba57f3550 Close zip file at end of sr_session_file_check.
From patch sent to sigrok-devel by jerryxjtu.
2014-08-20 14:48:29 +02:00
Marcus Comstedt 3e27b177c4 configure.ac: Fix jni.h check when cross compiling
Since AX_JNI_INCLUDE_DIR does not work for cross compilation, don't
invoke it when cross compiling.  Also, add a configure option to
set the jni.h include path manually if needed.
2014-08-20 14:42:02 +02:00
Marc Schink 879dd50fb6 output: Allocate additional memory for NULL terminator.
Best regards,
Marc

>From a7228150fdea91a65b5d70359bf51b87d2572edf Mon Sep 17 00:00:00 2001
From: Marc Schink <sigrok-dev@marcschink.de>
Date: Wed, 20 Aug 2014 05:34:57 -0400
Subject: [PATCH] output: Allocate additional memory for NULL terminator.
2014-08-20 14:20:55 +02:00
Marc Schink f817f05aac ikalogic-scanaplus: Free device context to fix memory leak.
Best regards,
Marc

>From 779ef3a1150b3679ab357ceb0e2f50785ad90d28 Mon Sep 17 00:00:00 2001
From: Marc Schink <sigrok-dev@marcschink.de>
Date: Wed, 20 Aug 2014 05:42:07 -0400
Subject: [PATCH] ikalogic-scanaplus: Free device context to fix memory leak.
2014-08-20 14:20:55 +02:00
Bert Vermeulen 9fc318d9ef output: Fix double free. 2014-08-19 00:01:57 +02:00
Bert Vermeulen 499c85dce5 output: Fix output option enumeration. 2014-08-19 00:01:57 +02:00
Uwe Hermann 34f4e3b4e4 unitests: Adapt to recent API changes. 2014-08-18 17:23:07 +02:00
Marcus Comstedt 7754fb4d93 saleae-logic16: Recognize FPGA FIFO overflow status 2014-08-17 16:24:14 +02:00
Marcus Comstedt 0e1a7fe91a Makefile.am: Fix out-of-tree build for Python bindings 2014-08-17 16:05:46 +02:00
Marcus Comstedt 2ba308ecc6 configure.ac: Look for python-2.7.pc as well when making bindings 2014-08-17 12:58:39 +02:00
Marcus Comstedt 33c84e8197 Makefile.am: Fix out-of-tree build for C++ and Java bindings 2014-08-17 12:58:39 +02:00
Marcus Comstedt 7f82ec4d72 Makefile.am: Fix doxygen invocation in out-of-tree build 2014-08-17 12:58:39 +02:00
Marcus Comstedt 55e55a3f92 Fix include paths for out-of-tree builds 2014-08-17 12:58:38 +02:00
Martin Ling 70d3b20ba6 bindings: update for sr_output_options_{get,free} API change. 2014-08-17 11:44:05 +01:00
Bert Vermeulen af7d656d37 output: Constify module options. 2014-08-15 20:24:00 +02:00
Bert Vermeulen fc74643098 output: Actually return a NULL-terminated array.
This returned an array of structs with an NULL-ed element at the end.
The drivers still do this, but the wrappers now make and free a NULL-
terminated array around it.

sr_output_options_free() now takes the pointer returned by
sr_output_options_get(), instead of the module owning it.
2014-08-15 20:23:52 +02:00
Soeren Apel db81fbb582 hameg-hmo: Make sure the enabled_channels list is empty before populating it
Previous runs of dev_acquisition_start() keep the enabled_channels list
populated if they fail. This means that once an invalid channel
configuration was detected, it will be detected again even if the channel
configuration was changed. With this change, the list will be cleared
before being populated so that any stale entries are removed.
2014-08-14 22:43:57 +02:00
Bert Vermeulen 3c1cafebb3 session: Remove irrelevant logging. 2014-08-13 14:34:55 +02:00
Bert Vermeulen 441e9eae58 output/wav: Minor code cleanup. 2014-08-13 14:34:55 +02:00
Bert Vermeulen 63f6df68c6 output: Deal properly with NULL (no) options on a new output instance. 2014-08-13 14:34:55 +02:00
Uwe Hermann 98de0c7874 tests: Factor out srtest_setup() and srtest_teardown(). 2014-08-11 13:20:50 +02:00
Uwe Hermann 41de54ffb1 sr_session_new(): Return SR_ERR_ARG upon invalid argument.
(instead of segfaulting)
2014-08-11 13:15:43 +02:00
Uwe Hermann 4172352914 Add a small set of unit tests for session handling. 2014-08-11 13:04:07 +02:00
Uwe Hermann 508ddda2a3 session_file.c: Drop left-over extern. 2014-08-11 12:31:01 +02:00
Uwe Hermann 15aa3b0d0c Doxygen: Exclude more non-public files and directories. 2014-08-10 18:59:16 +02:00
Uwe Hermann 9fcc286604 trigger.c: Add Doxygen @file and @defgroup tags. 2014-08-10 18:59:16 +02:00
Uwe Hermann 071b93d9ed Makefile.am: Silence some more Doxygen output.
This silences stuff like this (among others), depending on the
Doxygen version used:

  Warning: Tag `XML_SCHEMA' at line 1814 of file `Doxyfile' has become
  obsolete. To avoid this warning please remove this line from your
  configuration file or upgrade it using "doxygen -u"
2014-08-10 18:57:58 +02:00
Uwe Hermann ac0db24ad4 Doxygen: Silence Doxygen warnings by default.
This allows for a clean build per default. Developers can enable
those switches while writing documentation to get a few useful
warnings.
2014-08-10 18:16:07 +02:00
Uwe Hermann 7efe889e7a Doxygen: Add a few missing @param lines for sessions.
This fixes a bunch of Doxygen warnings.
2014-08-10 17:31:33 +02:00
Martin Ling 5cad31c708 bindings: Transfer C++ method parameter documentation to Python/Java bindings. 2014-08-10 15:47:14 +02:00
Martin Ling b6f411ac4e C++: Add parameter documentation and additional method descriptions. 2014-08-10 15:47:14 +02:00
Martin Ling 8a314e90ff java: Add documentation generation. 2014-08-10 15:47:14 +02:00
Martin Ling 6a8c1d6879 python: Add documentation generation. 2014-08-10 15:47:13 +02:00
Martin Ling bd4fda2407 bindings: Transfer C++ documentation strings to Python and Java wrappers. 2014-08-10 15:47:13 +02:00
Martin Ling 84c870852a C++ bindings: Attach documentation to enum wrapper classes. 2014-08-10 15:47:13 +02:00
Martin Ling 3532ed0125 C++ bindings: Reimplement enums.py using doxygen XML output instead of gccxml. 2014-08-10 15:47:13 +02:00
Soeren Apel b4e31d2aac Fix typo in the Hameg HMO driver and add some error message for when the float comparison breaks 2014-08-08 17:12:58 +02:00
Uwe Hermann 375340a724 configure.ac: Don't build BeagleLogic where a build would fail.
The BeagleLogic driver needs sys/mman.h and sys/ioctl.h in order to
build, so disable the driver if those headers aren't available.

This is the case (for example) on MinGW.
2014-08-05 17:32:28 +02:00
Bert Vermeulen e336c0413c output/vcd: Drop obsolete string. 2014-08-03 14:09:04 +02:00
Bert Vermeulen 226363c4e8 hameg-hmo: Implement SR_CONF_SCAN_OPTIONS. 2014-08-03 14:00:07 +02:00