Commit Graph

219 Commits

Author SHA1 Message Date
Uwe Hermann 52ff4f6a04 Rename libsigrokxx to the more common libsigrokcxx. 2015-01-17 18:52:43 +01:00
Jiří Pinkava 84b448ee06 Do not check for JDK headers if Java bindings are disabled.
This removes an unnecessary build dependency on JDK and fixes
build troubles on systems where javac is present but JDK is not
installed and Java bindings are disabled by ./configure --disable-java.
2014-11-23 17:58:21 +01:00
Uwe Hermann b71356d631 bindings: Re-enable Java, but ignore create_analog_packet().
This will need some fixing.
2014-11-14 16:58:38 +01:00
Uwe Hermann 57621c6d60 configure.ac: Temporarily disable Java bindings.
Those need a bugfix to make them build again:

  bindings/java/org/sigrok/core/classes/Context.java:92: error: method Context_create_analog_packet in class classesJNI cannot be applied to given types;
        long cPtr = classesJNI.Context_create_analog_packet(swigCPtr, this, ChannelVector.getCPtr(tempchannels), SWIGTYPE_p_float.getCPtr(data_pointer), num_samples, Quantity.getCPtr(mq), mq, Unit.getCPtr(unit), unit, QuantityFlagVector.getCPtr(mqflags), mqflags);
                              ^
    required: long,Context,Vector<Channel>,long,long,long,Quantity,long,Unit,long,QuantityFlagVector
    found: long,Context,long,long,long,long,Quantity,long,Unit,long,QuantityFlagVector
    reason: actual argument long cannot be converted to Vector<Channel> by method invocation conversion
  1 error
  Makefile:3352: recipe for target 'bindings/java/sigrok-core.jar' failed
2014-11-13 18:51:33 +01:00
Uwe Hermann 3982b93840 configure.ac: Drop ols Windows exception, should be obsolete.
(see #205)
2014-10-13 16:23:48 +02:00
Janne Huttunen b50891952d Add driver for DER EE DE-5000 LCR meter.
Add a driver for the DER EE DE-5000 LCR meter. This meter is based on
the Cyrustek ES51919/ES51920 chipset and communicates with the host
computer via an optional connectivity kit.

The kit uses an optoisolated unidirectional link to connect to the
meter and an USB cable on the host side. Internally the connection is
using the FTDI FT232R USB UART chip i.e. from the host computer point
of view the meter is connected into an RS-232 serial port.

This driver implements just a thin shim layer for registering the
driver and uses the es51919 module for all the actual work.
2014-10-13 00:56:11 +02:00
Bert Vermeulen 818df9f8ec build: Require glib 2.34. 2014-10-08 23:14:01 +02:00
Martin Ling da89e23a28 Use AM_PATH_PYTHON macro to find Python binary.
A specific interpreter can now be passed to configure e.g:

./configure PYTHON=python3
2014-09-14 02:32:49 +01:00
Uwe Hermann 0d14e30ba0 configure.ac: Add and use DRIVER2() to shorten file. 2014-09-08 23:53:42 +02:00
Uwe Hermann d3619a9b63 configure.ac: Shorten per-driver lines a bit. 2014-09-08 23:53:42 +02:00
Uwe Hermann 416de3ba05 configure.ac: Don't duplicate driver name.
The AC_DEFINEs don't need any driver names really, those only end up
as code comments in config.h and are otherwise useless. Thus, don't
duplicate them, we already have the driver names in DRIVER().
2014-09-08 23:53:42 +02:00
Uwe Hermann a0ca437de3 configure.ac: Show SCPI backends that'll be compiled. 2014-09-08 22:58:14 +02:00
Uwe Hermann 62ea3ef552 configure.ac: Whitespace, cosmetics, sorting, etc. 2014-09-08 22:42:26 +02:00
Bert Vermeulen ca1a7cb56f scpi-pps: Initial driver skeleton. 2014-09-08 12:45:21 +02:00
Bert Vermeulen d6e63a2c68 build: Use pkgconfig for libgpib. 2014-09-05 18:26:12 +02:00
Martin Ling bb2a4ed407 Add GPIB SCPI backend using linux-gpib and libgpib. 2014-09-05 10:34:04 +01:00
Marcus Comstedt d92de05ad1 C++: Provide fallbacks for missing stoi/stod functions
Notably, Android does not provide these functions.  The fallback
implementation is based on the one in the GNU ISO C++ Library.
2014-08-31 13:31:35 +02:00
Soeren Apel 107639373d yokogawa-dlm: Integrate driver skeleton 2014-08-31 00:42:10 +02:00
magnuskarlsson 4bd80e1228 added pipistrello-ols
Conflicts:
	configure.ac
	src/hwdriver.c
2014-08-25 01:00:55 +02:00
Bert Vermeulen 81a69107de build: Require libserialport version 0.2.0. 2014-08-20 23:39:27 +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
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 55e55a3f92 Fix include paths for out-of-tree builds 2014-08-17 12:58:38 +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
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 de44e114fc build: More dependency fixes. 2014-07-23 16:33:42 +02:00
Bert Vermeulen 1029d384d1 build: If language binding dependency checks fail, summarize the reason. 2014-07-23 14:36:11 +02:00
Bert Vermeulen 0afa91b765 build: Add more dependency checks for building bindings. 2014-07-23 13:05:10 +02:00
Bert Vermeulen 57d62c4c71 build: We only need python 2.x for generating the bindings. 2014-07-23 12:45:41 +02:00
Uwe Hermann 271cdfd267 configure: Show glibmm and gobject versions in the summary. 2014-07-22 23:18:38 +02:00
Uwe Hermann 022a7fe09f configure.ac: Add versioned dependency on pygobject.
Roughly around 3.0.0 usage changed from "import gobject" to the new
"from gi.repository import GObject" etc. (which we use).
2014-07-22 23:18:38 +02:00
Bert Vermeulen 43cd463728 build: Portability fixes.
This also defers reporting on enabled drivers until it's really decided.
2014-07-22 18:17:34 +02:00
Kumar Abhishek bb99379761 beaglelogic: Initial driver skeleton. 2014-07-22 01:47:02 +02:00
Bert Vermeulen 6223feeb8e configure: Add --enable-bindings switch. 2014-07-19 20:20:47 +02:00
Martin Ling abc7146d03 Fix building Python bindings with pygobject >= 3.7.91. 2014-07-19 16:12:34 +02:00
Bert Vermeulen 762aee1e91 configure: Fix java --enable check. 2014-07-18 21:40:27 +01:00
Bert Vermeulen bcacb8633e configure: Add C++ bindings dependency checks. 2014-07-18 21:40:20 +01:00
Bert Vermeulen f8158d5655 configure: Deal with missing macro a bit better.
The AX_CXX_COMPILE_STDCXX_11 macro is found in the autoconf-archive
package. If this is not installed, invoking the macro spits out an
error message that makes it look like a syntax error. This wraps it
in a check.
2014-07-18 21:40:14 +01:00
Martin Ling 9fcf4d0b5b Add Java bindings. 2014-07-18 21:34:57 +01:00
Martin Ling f774095496 Reimplement high-level Python bindings on top of SWIG/C++ bindings. 2014-07-18 20:47:10 +01:00
Martin Ling c23c8659b8 Add C++ bindings. 2014-07-18 20:47:10 +01:00
Martin Ling 63d0fb7528 Move public headers into include/libsigrok.
This is needed so that the C++ bindings, the header for which
references "libsigrok/libsigrok.h", can have a valid include
directory passed to build them before the headers are installed.
2014-07-17 18:30:49 +01:00
Bert Vermeulen d4b3874828 autoconf: Use DRIVER macro to declare drivers. 2014-07-10 20:44:32 +02:00
Bert Vermeulen 0acdd79357 testo: Initial driver skeleton. 2014-07-05 21:56:46 +02:00
Matthias Heidbrink adeae78f90 manson-hcs-3xxx: Fixed build without libserialport. 2014-06-28 01:26:21 +02:00
Uwe Hermann 8f4e922f43 manson-hcs-3xxx: Initial driver skeleton. 2014-06-23 00:59:17 +02:00
Uwe Hermann c78bcc6f5d Lower libftdi1 requirement to 1.0 (builds fine too). 2014-06-16 13:19:34 +02:00
Dan Horák 92506359d3 detect version 1.x of libftdi library
The FDTI library changed version, module name and also soname, so add an option to detect it
when the 0.x version is not found. The 1.x API is compatible enough for libsigrok to build.
2014-06-15 11:46:57 +02:00
Mike Frysinger 82bfb646ae do not add check to common cflags/libs
Only the unittests use these flags, so don't go linking them in for
the main library too.
2014-06-15 10:46:10 +02:00