From: Uwe Hermann Date: Mon, 23 Dec 2019 12:53:55 +0000 (+0100) Subject: Backport recent changes from mainline. X-Git-Tag: libsigrok-0.5.2~4 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e4204b1757459a03c0a70849a659f27387edc295;p=libsigrok.git Backport recent changes from mainline. This includes all changes from 4c660b46c11f8a84941194f60e4f48e57b0a86b7 Makefile.am: Add missing src/serial_hid.h. up to 39ea7b7d390c4f1d4a697a40769ce364de9c97d0 dmm/eev121gw: add missing scale items for sub display in power modes This is possible since none of the changes above change or remove public API calls of the library. --- diff --git a/Doxyfile b/Doxyfile index c5028285..4665f424 100644 --- a/Doxyfile +++ b/Doxyfile @@ -743,7 +743,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = src include $(BUILDDIR)include/libsigrok +INPUT = $(SRCDIR)src $(SRCDIR)include $(BUILDDIR)include/libsigrok # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -763,7 +763,11 @@ INPUT_ENCODING = UTF-8 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, # *.qsf, *.as and *.js. -FILE_PATTERNS = +# BEWARE! DON'T set the variable to an empty value. Don't set the variable +# at all instead. See https://github.com/doxygen/doxygen/issues/7190 and +# https://sigrok.org/bugzilla/show_bug.cgi?id=1422 (can get reverted when +# the Doxygen version which causes the issue no longer is used in the wild). +## FILE_PATTERNS = # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. diff --git a/HACKING b/HACKING index 5978863b..a5aa8d66 100644 --- a/HACKING +++ b/HACKING @@ -61,8 +61,9 @@ This is a rough overview of what you need to do in order to add a new driver (using the Tondaj SL-814 device as example). It's basically what the 'new-driver' script (see above) does for you: - - Makefile.am: Add HW_TONDAJ_SL_814 and add to libsigrok_la_SOURCES. - - configure.ac: Add a DRIVER() and DRIVER2() call. + - Makefile.am: Add to src_libdrivers_la_SOURCES under the HW_TONDAJ_SL_814 + condition. + - configure.ac: Add an SR_DRIVER() call. - src/drivers.c: Add a tondaj_sl_814_driver_info entry in two places. - src/hardware/tondaj-sl-814/ directory: Add api.c, protocol.c, protocol.h. diff --git a/Makefile.am b/Makefile.am index 148de0ff..2e111e93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,6 +95,7 @@ libsigrok_la_SOURCES += \ src/output/ols.c \ src/output/srzip.c \ src/output/vcd.c \ + src/output/wavedrom.c \ src/output/null.c # Transform modules @@ -116,9 +117,21 @@ libsigrok_la_SOURCES += \ src/scpi/vxi_xdr.c \ src/scpi/vxi.h endif +# if HAVE_BLUETOOTH +libsigrok_la_SOURCES += \ + src/bt/bt_bluez.c +# endif if NEED_SERIAL libsigrok_la_SOURCES += \ src/serial.c \ + src/serial_bt.c \ + src/serial_hid.c \ + src/serial_hid.h \ + src/serial_hid_bu86x.c \ + src/serial_hid_ch9325.c \ + src/serial_hid_cp2110.c \ + src/serial_hid_victor.c \ + src/serial_libsp.c \ src/scpi/scpi_serial.c endif if NEED_USB @@ -148,6 +161,7 @@ endif libsigrok_la_SOURCES += \ src/dmm/asycii.c \ src/dmm/bm25x.c \ + src/dmm/bm86x.c \ src/dmm/dtm0660.c \ src/dmm/eev121gw.c \ src/dmm/es519xx.c \ @@ -155,6 +169,7 @@ libsigrok_la_SOURCES += \ src/dmm/fs9922.c \ src/dmm/m2110.c \ src/dmm/metex14.c \ + src/dmm/ms2115b.c \ src/dmm/ms8250d.c \ src/dmm/rs9lcd.c \ src/dmm/ut372.c \ @@ -165,7 +180,8 @@ libsigrok_la_SOURCES += \ # Hardware (LCR chip parsers) if NEED_SERIAL libsigrok_la_SOURCES += \ - src/lcr/es51919.c + src/lcr/es51919.c \ + src/lcr/vc4080.c endif # Hardware (Scale protocol parsers) @@ -238,12 +254,6 @@ src_libdrivers_la_SOURCES += \ src/hardware/beaglelogic/beaglelogic_native.c \ src/hardware/beaglelogic/beaglelogic_tcp.c endif -if HW_BRYMEN_BM86X -src_libdrivers_la_SOURCES += \ - src/hardware/brymen-bm86x/protocol.h \ - src/hardware/brymen-bm86x/protocol.c \ - src/hardware/brymen-bm86x/api.c -endif if HW_BRYMEN_DMM src_libdrivers_la_SOURCES += \ src/hardware/brymen-dmm/parser.c \ @@ -437,18 +447,36 @@ src_libdrivers_la_SOURCES += \ src/hardware/manson-hcs-3xxx/protocol.c \ src/hardware/manson-hcs-3xxx/api.c endif +if HW_MASTECH_MS6514 +src_libdrivers_la_SOURCES += \ + src/hardware/mastech-ms6514/protocol.h \ + src/hardware/mastech-ms6514/protocol.c \ + src/hardware/mastech-ms6514/api.c +endif if HW_MAYNUO_M97 src_libdrivers_la_SOURCES += \ src/hardware/maynuo-m97/protocol.h \ src/hardware/maynuo-m97/protocol.c \ src/hardware/maynuo-m97/api.c endif +if HW_MICROCHIP_PICKIT2 +src_libdrivers_la_SOURCES += \ + src/hardware/microchip-pickit2/protocol.h \ + src/hardware/microchip-pickit2/protocol.c \ + src/hardware/microchip-pickit2/api.c +endif if HW_MIC_985XX src_libdrivers_la_SOURCES += \ src/hardware/mic-985xx/protocol.h \ src/hardware/mic-985xx/protocol.c \ src/hardware/mic-985xx/api.c endif +if HW_MOOSHIMETER_DMM +src_libdrivers_la_SOURCES += \ + src/hardware/mooshimeter-dmm/protocol.h \ + src/hardware/mooshimeter-dmm/protocol.c \ + src/hardware/mooshimeter-dmm/api.c +endif if HW_MOTECH_LPS_30X src_libdrivers_la_SOURCES += \ src/hardware/motech-lps-30x/protocol.h \ @@ -509,6 +537,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/saleae-logic-pro/protocol.c \ src/hardware/saleae-logic-pro/api.c endif +if HW_SCPI_DMM +src_libdrivers_la_SOURCES += \ + src/hardware/scpi-dmm/protocol.h \ + src/hardware/scpi-dmm/protocol.c \ + src/hardware/scpi-dmm/api.c +endif if HW_SCPI_PPS src_libdrivers_la_SOURCES += \ src/hardware/scpi-pps/protocol.h \ @@ -524,6 +558,8 @@ src_libdrivers_la_SOURCES += \ endif if HW_SERIAL_LCR src_libdrivers_la_SOURCES += \ + src/hardware/serial-lcr/protocol.h \ + src/hardware/serial-lcr/protocol.c \ src/hardware/serial-lcr/api.c endif if HW_SIGLENT_SDS @@ -542,6 +578,12 @@ src_libdrivers_la_SOURCES += \ src/hardware/sysclk-lwla/protocol.c \ src/hardware/sysclk-lwla/api.c endif +if HW_SYSCLK_SLA5032 +src_libdrivers_la_SOURCES += \ + src/hardware/sysclk-sla5032/protocol.h \ + src/hardware/sysclk-sla5032/protocol.c \ + src/hardware/sysclk-sla5032/api.c +endif if HW_TELEINFO src_libdrivers_la_SOURCES += \ src/hardware/teleinfo/protocol.h \ @@ -572,12 +614,6 @@ src_libdrivers_la_SOURCES += \ src/hardware/uni-t-ut32x/protocol.c \ src/hardware/uni-t-ut32x/api.c endif -if HW_VICTOR_DMM -src_libdrivers_la_SOURCES += \ - src/hardware/victor-dmm/protocol.h \ - src/hardware/victor-dmm/protocol.c \ - src/hardware/victor-dmm/api.c -endif if HW_YOKOGAWA_DLM src_libdrivers_la_SOURCES += \ src/hardware/yokogawa-dlm/protocol.h \ @@ -711,7 +747,7 @@ nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \ pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc doxy/xml/index.xml: include/libsigrok/libsigrok.h - $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null + $(AM_V_GEN)cd $(srcdir) && SRCDIR=$(abs_srcdir)/ BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null bindings/swig/enums.i: bindings/cxx/enums.timestamp bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp @@ -746,7 +782,7 @@ CPPXMLDOC = bindings/cxx/doxy/xml/index.xml $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \ bindings/cxx/enums.timestamp - $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null + $(AM_V_GEN)cd $(srcdir)/bindings/cxx && SRCDIR=$(abs_srcdir)/bindings/cxx/ BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null # Macro definitions to be used by the SWIG parser. swig_defs = -Dnoexcept= -Dprivate=protected -DG_GNUC_BEGIN_IGNORE_DEPRECATIONS= -DG_GNUC_END_IGNORE_DEPRECATIONS= @@ -794,7 +830,7 @@ python-clean: -$(AM_V_at)$(setup_py) clean --all 2>/dev/null python-doc: - $(AM_V_at)cd $(srcdir)/$(PDIR) && BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null + $(AM_V_at)cd $(srcdir)/$(PDIR) && SRCDIR="$(abs_srcdir)/$(PDIR)/" BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null BUILD_EXTRA += python-build INSTALL_EXTRA += python-install @@ -911,7 +947,7 @@ java-clean: -$(AM_V_at)rm -fr $(JDIR)/doxy java-doc: - $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile + $(AM_V_at)cd $(srcdir)/$(JDIR) && SRCDIR="$(abs_srcdir)/$(JDIR)/" BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile BUILD_EXTRA += java-build INSTALL_EXTRA += java-install diff --git a/NEWS b/NEWS index dd44cf53..81ea0a90 100644 --- a/NEWS +++ b/NEWS @@ -473,7 +473,7 @@ Note: This release DOES change the libsigrok API. That means it is NOT - LeCroy LogicStudio - mcupro Logic16 clone - Pipistrello OLS - - SysClk LWLA1016 + - Sysclk LWLA1016 - Oscilloscopes: - Rigol/Agilent DS1000Z series - Yokogawa DLM2000 series diff --git a/README b/README index 154c4928..7a76f3fd 100644 --- a/README +++ b/README @@ -41,9 +41,12 @@ Requirements for the C library: - libserialport >= 0.1.1 (optional, used by some drivers) - librevisa >= 0.0.20130412 (optional, used by some drivers) - libusb-1.0 >= 1.0.16 (optional, used by some drivers) + - hidapi >= 0.8.0 (optional, used for some HID based "serial cables") + - bluez/libbluetooth >= 4.0 (optional, used for Bluetooth/BLE communication) - libftdi1 >= 1.0 (optional, used by some drivers) - libgpib (optional, used by some drivers) - libieee1284 (optional, used by some drivers) + - libgio >= 2.32.0 (optional, used by some drivers) - check >= 0.9.4 (optional, only needed to run unit tests) - doxygen (optional, only needed for the C API docs) - graphviz (optional, only needed for the C API docs) diff --git a/README.devices b/README.devices index a64c587f..32e2ffc0 100644 --- a/README.devices +++ b/README.devices @@ -37,6 +37,11 @@ The following drivers/devices require a firmware upload upon connection: 'sigrok-firmware' repository/project under a license which allows us to redistribute them. + - dreamsourcelab-dslogic: The DreamSourceLab DSLogic/DSCope device series + requires various firmware files and FPGA bitstream files. + These can be extracted/downloaded from the vendor's GitHub repo using a + tool from our 'sigrok-util' repository/project. + - fx2lafw: Logic analyzers based on the Cypress FX2(LP) chip need the firmware files from the 'sigrok-firmware-fx2lafw' repository/project. The firmware is written from scratch and licensed under the GNU GPLv2+. @@ -64,6 +69,11 @@ The following drivers/devices require a firmware upload upon connection: These can be extracted from the vendor's Linux application using a tool from our 'sigrok-util' repository/project. + - saleae-logic-pro: The Saleae Logic Pro 16 needs a firmware file for the + Cypress FX3 chip in the device, as well as an FPGA bitstream file. + These can be extracted from the vendor's Linux application using a tool + from our 'sigrok-util' repository/project. + - sysclk-lwla: - The Sysclk LWLA1034 requires various bitstream files. @@ -74,6 +84,12 @@ The following drivers/devices require a firmware upload upon connection: These can be extracted from the vendor's Windows drivers using a tool from our 'sigrok-util' repository/project. + - sysclk-sla5032: The Sysclk SLA5032 needs an FPGA bitstream file. + This file can be copied (and renamed) from the Windows vendor software + installation directory. Details: + + https://sigrok.org/wiki/Sysclk_SLA5032#Firmware + The following drivers/devices do not need any firmware upload: - agilent-dmm @@ -82,7 +98,6 @@ The following drivers/devices do not need any firmware upload: - atten-pps3xxx - baylibre-acme - beaglelogic - - brymen-bm86x - brymen-dmm - cem-dt-885x - center-3xx (including all subdrivers) @@ -90,28 +105,40 @@ The following drivers/devices do not need any firmware upload: - colead-slm - conrad-digi-35-cpu - demo + - fluke-45 - fluke-dmm - ftdi-la - gmc-mh-1x-2x (including all subdrivers) - gwinstek-gds-800 + - gwinstek-gpd - hameg-hmo + - hantek-4032l - hp-3457a + - hp-3478a - hung-chang-dso-2100 - ikalogic-scanalogic2 - ikalogic-scanaplus + - ipdbg-la - kecheng-kc-330b - kern-scale + - korad-kaxxxxp - lascar-el-usb + - lecroy-xstream - link-mso19 - manson-hcs-3xxx - maynuo-m97 - mic-985xx (including all subdrivers) + - microchip-pickit2 + - mooshimeter-dmm - motech-lps-30x - norma-dmm - openbench-logic-sniffer - pce-322a - pipistrello-ols + - rdtech-dps - rigol-ds + - rohde-schwarz-sme-0x + - scpi-dmm - scpi-pps - serial-dmm (including all subdrivers) - serial-lcr (including all subdrivers) @@ -121,16 +148,23 @@ The following drivers/devices do not need any firmware upload: - tondaj-sl-814 - uni-t-dmm (including all subdrivers) - uni-t-ut32x - - victor-dmm - yokogawa-dlm - zeroplus-logic-cube + - zketech-ebd-usb Specifying serial ports ----------------------- Many devices supported by libsigrok use serial port based cables (real RS232 -or USB-to-serial ones) to connect to a PC. +or USB-to-serial ones, CDC class) to connect to a PC. These serial cables are +supported by the libserialport library. Some vendors prefer to use HID chips +instead of CDC chips in their serial cables. These cables can get supported +by means of the hidapi library. Note that each chip type requires specific +support in the libsigrok library. Bluetooth connected devices may be supported +as well when they communicate by means of RFCOMM channels, or one of the +implemented BLE notification/indication approaches, and one of the Bluetooth +supporting platforms is used. For all these devices, you need to specify the serial port they are connected to (e.g. using the 'conn' option in sigrok-cli). It is not possible to scan @@ -139,67 +173,42 @@ for such devices without specifying a serial port. Example: $ sigrok-cli --driver :conn=/dev/ttyUSB0 ... - -The following drivers/devices require a serial port specification. Some of -the drivers implement a default for the connection. - - - agilent-dmm - - appa-55ii - - atten-pps3xxx - - brymen-dmm - - cem-dt-885x - - center-3xx (including all subdrivers) - - colead-slm - - conrad-digi-35-cpu - - fluke-dmm - - gmc-mh-1x-2x (including all subdrivers) - - hameg-hmo - - link-mso19 - - mic-985xx (including all subdrivers) - - norma-dmm - - openbench-logic-sniffer - - rigol-ds (for RS232; not required for USBTMC or TCP) - - serial-dmm (including all subdrivers) - - serial-lcr (including all subdrivers) - - teleinfo - - tondaj-sl-814 - -The following drivers/devices do not require a serial port specification: - - - asix-sigma - - brymen-bm86x - - chronovu-la - - demo - - fx2lafw - - hantek-dso - - ikalogic-scanalogic2 - - ikalogic-scanaplus - - kecheng-kc-330b - - lascar-el-usb - - pipistrello-ols - - rigol-ds (USBTMC or TCP) - - saleae-logic16 - - sysclk-lwla - - uni-t-dmm (including all subdrivers) - - uni-t-ut32x - - victor-dmm - - yokogawa-dlm (USBTMC or TCP) - - zeroplus-logic-cube - -Beyond strict serial communication over COM ports (e.g. /dev/ttyUSB0), the + $ sigrok-cli --driver :conn=hid/cp2110 ... + $ sigrok-cli --driver :conn=bt/rfcomm/01-23-45-67-89-ab ... + +Formal syntax for serial communication: + + - COM ports (RS232, USB CDC): + conn= + - USB HID cables: + conn=hid[/] + conn=hid[/]/usb=.[.] + conn=hid[/]/raw= + conn=hid[/]/sn= + chip can be: bu86x, ch9325, cp2110, victor + path may contain slashes + path and serno are "greedy" (span to the end of the spec) + - Bluetooth Classic and Bluetooth Low Energy (BLE): + conn=bt// + conn can be: rfcomm, ble122, nrf51, cc254x + addr can be "dense" or separated, bt/cc254x/0123456789ab or + bt/rfcomm/11-22-33-44-55-66 or bt/ble122/88:6b:12:34:56:78 + (note that colons may not be available when the conn= spec is taken + from a string that separates fields by colon, e.g. in the "--driver + :conn=" example, that is why the dense form and the use + of dashes for separation are supported) + +Some of the drivers implement a default for the connection. Some of the +drivers can auto-detect USB connected devices. + +Beyond strict serial communication over COM ports (discussed above), the conn= property can also address specific USB devices, as well as specify TCP or VXI communication parameters. See these examples: $ sigrok-cli --driver :conn=. ... $ sigrok-cli --driver :conn=tcp-raw// ... $ sigrok-cli --driver :conn=vxi/ ... - -The following drivers/devices accept network communication parameters: - - - hameg-hmo - - rigol-ds - - siglent-sds - - yokogawa-dlm + $ sigrok-cli --driver :conn=usbtmc/. ... Specifying serial port parameters @@ -284,9 +293,11 @@ UNI-T DMM (and rebranded models) cables UNI-T multimeters (and rebranded devices, e.g. some Voltcraft models) can ship with different PC connectivity cables: + - UT-D02 (RS232 cable) - UT-D04 (USB/HID cable with Hoitek HE2325U chip, USB VID/PID 04fa:2490) - UT-D04 (USB/HID cable with WCH CH9325 chip, USB VID/PID 1a86:e008) - - UT-D02 (RS232 cable) + - UT-D07 (Bluetooth adapter, ISSC BL79 BLETR chip) + - UT-D09 (USB/HID cable with SiL CP2110 chip, USB VID/PID 10c4:ea80) The above cables are all physically compatible (same IR connector shape) with all/most currently known UNI-T multimeters. For example, you can @@ -361,7 +372,12 @@ a short list for convenience: - BBC Goertz Metrawatt M2110: Briefly press the "Start/Reset" button on the interface panel on top. + - Brymen BM257s: Press HOLD during power-on. - Digitek DT4000ZC: Briefly press the "RS232" button. + - EEVBlog 121GW: Hold "1ms PEAK" until the "BT" indicator is shown. + - ES51919 based LCR meters (DER EE DE-5000, PeakTech 2170, UNI-T UT612): + Press the button with the "RS232" or "USB" or "PC link" label (usually + the "up" cursor button). - Gossen Metrawatt Metrahit 1x/2x devices, driver gmc-mh-1x-2x-rs232: - Power on the device with the "DATA" button pressed. - Metrahit 2x devices must be configured for the respective interface type. @@ -373,6 +389,7 @@ a short list for convenience: 'SI232 online' (28-29S) or 'SI232 store' (22-26x). The interface must be configured to the same baud rate as the host (default 9600). Multimeter and interface must be configured to the same address. + - MASTECH MS6514: Press the "Setup/PC-Link" button for roughly 3 seconds. - Metrix MX56C: Press the PRINT button to have the meter send acquisition data via IR. Hold the PRINT button to adjust the meter's transmission interval. @@ -434,3 +451,74 @@ Example: $ sigrok-cli --driver ols:conn=/dev/ttyACM0 ... + +Mooshimeter +----------- + +The Mooshim Engineering Mooshimeter is controlled via Bluetooth Low Energy +(sometimes called Bluetooth 4.0), as such it requires a supported Bluetooth +interface available. The 'conn' option is required and must contain the +Bluetooth MAC address of the meter. + +Example: + + $ sigrok-cli --driver mooshimeter-dmm:conn=12-34-56-78-9A-BC ... + +Since the Mooshimeter has no physical interface on the meter itself, the +channel configuration is set with the 'channel_config' option. The format +of this option is 'CH1,CH2' where each channel configuration has the form +'MODE:RANGE:ANALYSIS', with later parts being optional. In addition for +CLI compatibility, the ',' in the channels can also be a '/' and the ':' in +the individual configuration can be a ';'. + +Available channel 1 modes: + + - Current, A: Current in amps + - Temperature, T, K: Internal meter temperature in Kelvin + - Resistance, Ohm, W: Resistance in ohms + - Diode, D: Diode voltage + - Aux, LV: Auxiliary (W input) low voltage sensor (1.2V max) + +Available channel 2 modes: + + - Voltage, V: Voltage + - Temperature, T, K: Internal meter temperature in Kelvin + - Resistance, Ohm, W: Resistance in ohms + - Diode, D: Diode voltage + - Aux, LV: Auxiliary (W input) low voltage sensor (1.2V max) + +Only one channel can use the shared inputs at a time (e.g. if CH1 is measuring +resistance, CH2 cannot measure low voltage). Temperature is excepted from +this, so the meter can measure internal temperature and low voltage at the +same time. + +Additionally, the meter can calculate the real power of both channels. This +generally only makes sense when CH1 is set to current and CH2 is set to a +voltage and so it is disabled by default. It must be enabled by enabling the +'P' channel (the third channel). + +The range of the channel specification sets the maximum input for that channel +and is rounded up to the next value the meter itself supports. For example, +specifying 50 for the voltage will result in the actual maximum of 60. +Specifying 61 would result in 600. If omitted, sigrok will perform +auto-ranging of the channel by selecting the next greater value than the +latest maximum. + +The analysis option sets how the meter reports its internal sampling buffer +to sigrok: + + - Mean, DC: The default is a simple arithmetic mean of the sample buffer + - RMS, AC: The root mean square of the sample buffer + - Buf, Buffer, Samples: Report the entire sample buffer to sigrok. This + results in packets that contain all the samples in the buffer instead + of a single output value. + +The size of the sample buffer is set with the 'avg_samples' option, while +the sampling rate is set with the 'samplerate' option. So the update rate +is avg_samples/samplerate. Both are rounded up to the next supported value +by the meter. + +Example: + + $ sigrok-cli -c channel_config="Aux;0.1/T" --driver mooshimeter-dmm... + $ sigrok-cli -c channel_config="A;;AC/V;;AC" --driver mooshimeter-dmm... diff --git a/bindings/cxx/ConfigKey_methods.cpp b/bindings/cxx/ConfigKey_methods.cpp index 9c3668ff..7f8c201e 100644 --- a/bindings/cxx/ConfigKey_methods.cpp +++ b/bindings/cxx/ConfigKey_methods.cpp @@ -8,7 +8,7 @@ const DataType *ConfigKey::data_type() const return DataType::get(info->datatype); } -string ConfigKey::identifier() const +std::string ConfigKey::identifier() const { const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id()); if (!info) @@ -16,7 +16,7 @@ string ConfigKey::identifier() const return valid_string(info->id); } -string ConfigKey::description() const +std::string ConfigKey::description() const { const struct sr_key_info *info = sr_key_info_get(SR_KEY_CONFIG, id()); if (!info) @@ -24,7 +24,7 @@ string ConfigKey::description() const return valid_string(info->name); } -const ConfigKey *ConfigKey::get_by_identifier(string identifier) +const ConfigKey *ConfigKey::get_by_identifier(std::string identifier) { const struct sr_key_info *info = sr_key_info_name_get(SR_KEY_CONFIG, identifier.c_str()); if (!info) @@ -70,7 +70,7 @@ static inline double stod( const std::string& str ) } #endif -Glib::VariantBase ConfigKey::parse_string(string value, enum sr_datatype dt) +Glib::VariantBase ConfigKey::parse_string(std::string value, enum sr_datatype dt) { GVariant *variant; uint64_t p, q; @@ -116,7 +116,7 @@ Glib::VariantBase ConfigKey::parse_string(string value, enum sr_datatype dt) return Glib::VariantBase(variant, false); } -Glib::VariantBase ConfigKey::parse_string(string value) const +Glib::VariantBase ConfigKey::parse_string(std::string value) const { enum sr_datatype dt = (enum sr_datatype)(data_type()->id()); return parse_string(value, dt); diff --git a/bindings/cxx/ConfigKey_methods.hpp b/bindings/cxx/ConfigKey_methods.hpp index bbc7ce81..f233bf2b 100644 --- a/bindings/cxx/ConfigKey_methods.hpp +++ b/bindings/cxx/ConfigKey_methods.hpp @@ -1,11 +1,11 @@ /** Data type used for this configuration key. */ const DataType *data_type() const; /** String identifier for this configuration key, suitable for CLI use. */ - string identifier() const; + std::string identifier() const; /** Description of this configuration key. */ - string description() const; + std::string description() const; /** Get configuration key by string identifier. */ - static const ConfigKey *get_by_identifier(string identifier); + static const ConfigKey *get_by_identifier(std::string identifier); /** Parse a string argument into the appropriate type for this key. */ - static Glib::VariantBase parse_string(string value, enum sr_datatype dt); - Glib::VariantBase parse_string(string value) const; + static Glib::VariantBase parse_string(std::string value, enum sr_datatype dt); + Glib::VariantBase parse_string(std::string value) const; diff --git a/bindings/cxx/Doxyfile b/bindings/cxx/Doxyfile index 7d35ae9b..de1db0cf 100644 --- a/bindings/cxx/Doxyfile +++ b/bindings/cxx/Doxyfile @@ -743,7 +743,7 @@ WARN_LOGFILE = # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = include/libsigrokcxx/libsigrokcxx.hpp \ +INPUT = $(SRCDIR)include/libsigrokcxx/libsigrokcxx.hpp \ $(BUILDDIR)include/libsigrokcxx/enums.hpp # This tag can be used to specify the character encoding of the source files diff --git a/bindings/cxx/QuantityFlag_methods.cpp b/bindings/cxx/QuantityFlag_methods.cpp index e822b804..09f6ee99 100644 --- a/bindings/cxx/QuantityFlag_methods.cpp +++ b/bindings/cxx/QuantityFlag_methods.cpp @@ -1,7 +1,7 @@ -vector +std::vector QuantityFlag::flags_from_mask(unsigned int mask) { - auto result = vector(); + auto result = std::vector(); while (mask) { unsigned int new_mask = mask & (mask - 1); @@ -12,7 +12,7 @@ vector return result; } -unsigned int QuantityFlag::mask_from_flags(vector flags) +unsigned int QuantityFlag::mask_from_flags(std::vector flags) { unsigned int result = 0; for (auto flag : flags) diff --git a/bindings/cxx/QuantityFlag_methods.hpp b/bindings/cxx/QuantityFlag_methods.hpp index d07c37a1..47e622fe 100644 --- a/bindings/cxx/QuantityFlag_methods.hpp +++ b/bindings/cxx/QuantityFlag_methods.hpp @@ -1,7 +1,7 @@ /** Get flags corresponding to a bitmask. */ - static vector + static std::vector flags_from_mask(unsigned int mask); /** Get bitmask corresponding to a set of flags. */ static unsigned int mask_from_flags( - vector flags); + std::vector flags); diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index cdf7fd35..c917c3fa 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -32,6 +32,8 @@ namespace sigrok { +using namespace std; + /** Helper function to translate C errors to C++ exceptions. */ static void check(int result) { @@ -377,6 +379,14 @@ shared_ptr Context::create_analog_packet( return shared_ptr{new Packet{nullptr, packet}, default_delete{}}; } +shared_ptr Context::create_end_packet() +{ + auto packet = g_new(struct sr_datafeed_packet, 1); + packet->type = SR_DF_END; + return shared_ptr{new Packet{nullptr, packet}, + default_delete{}}; +} + shared_ptr Context::load_session(string filename) { return shared_ptr{ @@ -936,6 +946,7 @@ Session::Session(shared_ptr context, string filename) : _owned_devices.emplace(sdi, move(device)); } _context->_session = this; + g_slist_free(dev_list); } Session::~Session() @@ -970,6 +981,7 @@ vector> Session::devices() auto *const sdi = static_cast(dev->data); result.push_back(get_device(sdi)); } + g_slist_free(dev_list); return result; } @@ -1651,6 +1663,11 @@ Output::~Output() check(sr_output_free(_structure)); } +shared_ptr Output::format() +{ + return _format; +} + string Output::receive(shared_ptr packet) { GString *out; diff --git a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp index ba346315..e087f85c 100644 --- a/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp +++ b/bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp @@ -87,8 +87,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS namespace sigrok { -using namespace std; - /* Forward declarations */ class SR_API Error; class SR_API Context; @@ -124,7 +122,7 @@ class SR_API Option; class SR_API UserDevice; /** Exception thrown when an error code is returned by any libsigrok call. */ -class SR_API Error: public exception +class SR_API Error: public std::exception { public: explicit Error(int result); @@ -139,7 +137,7 @@ class SR_API ParentOwned { private: /* Weak pointer for shared_from_this() implementation. */ - weak_ptr _weak_this; + std::weak_ptr _weak_this; static void reset_parent(Class *object) { @@ -162,14 +160,14 @@ protected: This strategy ensures that the destructors for both the child and the parent are called at the correct time, i.e. only when all references to both the parent and all its children are gone. */ - shared_ptr _parent; + std::shared_ptr _parent; ParentOwned() {} /* Note, this implementation will create a new smart_ptr if none exists. */ - shared_ptr shared_from_this() + std::shared_ptr shared_from_this() { - shared_ptr shared = _weak_this.lock(); + std::shared_ptr shared = _weak_this.lock(); if (!shared) { @@ -180,7 +178,7 @@ protected: return shared; } - shared_ptr share_owned_by(shared_ptr parent) + std::shared_ptr share_owned_by(std::shared_ptr parent) { if (!parent) throw Error(SR_ERR_BUG); @@ -190,7 +188,7 @@ protected: public: /* Get parent object that owns this object. */ - shared_ptr parent() + std::shared_ptr parent() { return _parent; } @@ -198,14 +196,14 @@ public: /* Base template for classes whose resources are owned by the user. */ template -class SR_API UserOwned : public enable_shared_from_this +class SR_API UserOwned : public std::enable_shared_from_this { protected: UserOwned() {} - shared_ptr shared_from_this() + std::shared_ptr shared_from_this() { - auto shared = enable_shared_from_this::shared_from_this(); + auto shared = std::enable_shared_from_this::shared_from_this(); if (!shared) throw Error(SR_ERR_BUG); return shared; @@ -213,7 +211,7 @@ protected: }; /** Type of log callback */ -typedef function LogCallbackFunction; +typedef std::function LogCallbackFunction; /** Resource reader delegate. */ class SR_API ResourceReader @@ -223,7 +221,7 @@ public: virtual ~ResourceReader(); private: /** Resource open hook. */ - virtual void open(struct sr_resource *res, string name) = 0; + virtual void open(struct sr_resource *res, std::string name) = 0; /** Resource close hook. */ virtual void close(struct sr_resource *res) = 0; /** Resource read hook. */ @@ -243,19 +241,19 @@ class SR_API Context : public UserOwned { public: /** Create new context */ - static shared_ptr create(); + static std::shared_ptr create(); /** libsigrok package version. */ - static string package_version(); + static std::string package_version(); /** libsigrok library version. */ - static string lib_version(); + static std::string lib_version(); /** Available hardware drivers, indexed by name. */ - map > drivers(); + std::map > drivers(); /** Available input formats, indexed by name. */ - map > input_formats(); + std::map > input_formats(); /** Lookup the responsible input module for an input file. */ - shared_ptr input_format_match(string filename); + std::shared_ptr input_format_match(std::string filename); /** Available output formats, indexed by name. */ - map > output_formats(); + std::map > output_formats(); /** Current log level. */ const LogLevel *log_level() const; /** Set the log level. @@ -270,41 +268,43 @@ public: * @param reader The resource reader delegate, or nullptr to unset. */ void set_resource_reader(ResourceReader *reader); /** Create a new session. */ - shared_ptr create_session(); + std::shared_ptr create_session(); /** Create a new user device. */ - shared_ptr create_user_device( - string vendor, string model, string version); + std::shared_ptr create_user_device( + std::string vendor, std::string model, std::string version); /** Create a header packet. */ - shared_ptr create_header_packet(Glib::TimeVal start_time); + std::shared_ptr create_header_packet(Glib::TimeVal start_time); /** Create a meta packet. */ - shared_ptr create_meta_packet( - map config); + std::shared_ptr create_meta_packet( + std::map config); /** Create a logic packet. */ - shared_ptr create_logic_packet( + std::shared_ptr create_logic_packet( void *data_pointer, size_t data_length, unsigned int unit_size); /** Create an analog packet. */ - shared_ptr create_analog_packet( - vector > channels, + std::shared_ptr create_analog_packet( + std::vector > channels, float *data_pointer, unsigned int num_samples, const Quantity *mq, - const Unit *unit, vector mqflags); + const Unit *unit, std::vector mqflags); + /** Create an end packet. */ + std::shared_ptr create_end_packet(); /** Load a saved session. * @param filename File name string. */ - shared_ptr load_session(string filename); + std::shared_ptr load_session(std::string filename); /** Create a new trigger. * @param name Name string for new trigger. */ - shared_ptr create_trigger(string name); + std::shared_ptr create_trigger(std::string name); /** Open an input file. * @param filename File name string. */ - shared_ptr open_file(string filename); + std::shared_ptr open_file(std::string filename); /** Open an input stream based on header data. * @param header Initial data from stream. */ - shared_ptr open_stream(string header); - map serials(shared_ptr driver) const; + std::shared_ptr open_stream(std::string header); + std::map serials(std::shared_ptr driver) const; private: struct sr_context *_structure; - map > _drivers; - map > _input_formats; - map > _output_formats; + std::map > _drivers; + std::map > _input_formats; + std::map > _output_formats; Session *_session; LogCallbackFunction _log_callback; Context(); @@ -319,7 +319,7 @@ class SR_API Configurable { public: /** Supported configuration keys. */ - set config_keys() const; + std::set config_keys() const; /** Read configuration for the given key. * @param key ConfigKey to read. */ Glib::VariantBase config_get(const ConfigKey *key) const; @@ -332,7 +332,7 @@ public: Glib::VariantContainerBase config_list(const ConfigKey *key) const; /** Enumerate configuration capabilities for the given configuration key. * @param key ConfigKey to enumerate capabilities for. */ - set config_capabilities(const ConfigKey *key) const; + std::set config_capabilities(const ConfigKey *key) const; /** Check whether a configuration capability is supported for a given key. * @param key ConfigKey to check. * @param capability Capability to check for. */ @@ -353,19 +353,19 @@ class SR_API Driver : public ParentOwned, public Configurable { public: /** Name of this driver. */ - string name() const; + std::string name() const; /** Long name for this driver. */ - string long_name() const; + std::string long_name() const; /** Scan options supported by this driver. */ - set scan_options() const; + std::set scan_options() const; /** Scan for devices and return a list of devices found. * @param options Mapping of (ConfigKey, value) pairs. */ - vector > scan(map - options = map()); + std::vector > scan(std::map + options = std::map()); private: struct sr_dev_driver *_structure; bool _initialized; - vector _devices; + std::vector _devices; explicit Driver(struct sr_dev_driver *structure); ~Driver(); friend class Context; @@ -379,19 +379,19 @@ class SR_API Device : public Configurable { public: /** Vendor name for this device. */ - string vendor() const; + std::string vendor() const; /** Model name for this device. */ - string model() const; + std::string model() const; /** Version string for this device. */ - string version() const; + std::string version() const; /** Serial number for this device. */ - string serial_number() const; + std::string serial_number() const; /** Connection ID for this device. */ - string connection_id() const; + std::string connection_id() const; /** List of the channels available on this device. */ - vector > channels(); + std::vector > channels(); /** Channel groups available on this device, indexed by name. */ - map > channel_groups(); + std::map > channel_groups(); /** Open device. */ void open(); /** Close device. */ @@ -399,13 +399,13 @@ public: protected: explicit Device(struct sr_dev_inst *structure); ~Device(); - virtual shared_ptr get_shared_from_this() = 0; - shared_ptr get_channel(struct sr_channel *ptr); + virtual std::shared_ptr get_shared_from_this() = 0; + std::shared_ptr get_channel(struct sr_channel *ptr); struct sr_dev_inst *_structure; - map > _channels; + std::map > _channels; private: - map > _channel_groups; + std::map > _channel_groups; friend class Session; friend class Channel; @@ -422,12 +422,12 @@ class SR_API HardwareDevice : { public: /** Driver providing this device. */ - shared_ptr driver(); + std::shared_ptr driver(); private: - HardwareDevice(shared_ptr driver, struct sr_dev_inst *structure); + HardwareDevice(std::shared_ptr driver, struct sr_dev_inst *structure); ~HardwareDevice(); - shared_ptr get_shared_from_this(); - shared_ptr _driver; + std::shared_ptr get_shared_from_this(); + std::shared_ptr _driver; friend class Driver; friend class ChannelGroup; @@ -441,11 +441,11 @@ class SR_API UserDevice : { public: /** Add a new channel to this device. */ - shared_ptr add_channel(unsigned int index, const ChannelType *type, string name); + std::shared_ptr add_channel(unsigned int index, const ChannelType *type, std::string name); private: - UserDevice(string vendor, string model, string version); + UserDevice(std::string vendor, std::string model, std::string version); ~UserDevice(); - shared_ptr get_shared_from_this(); + std::shared_ptr get_shared_from_this(); friend class Context; friend struct std::default_delete; @@ -457,10 +457,10 @@ class SR_API Channel : { public: /** Current name of this channel. */ - string name() const; + std::string name() const; /** Set the name of this channel. * * @param name Name string to set. */ - void set_name(string name); + void set_name(std::string name); /** Type of this channel. */ const ChannelType *type() const; /** Enabled status of this channel. */ @@ -491,13 +491,13 @@ class SR_API ChannelGroup : { public: /** Name of this channel group. */ - string name() const; + std::string name() const; /** List of the channels in this group. */ - vector > channels(); + std::vector > channels(); private: ChannelGroup(const Device *device, struct sr_channel_group *structure); ~ChannelGroup(); - vector _channels; + std::vector _channels; friend class Device; friend struct std::default_delete; }; @@ -507,17 +507,17 @@ class SR_API Trigger : public UserOwned { public: /** Name of this trigger configuration. */ - string name() const; + std::string name() const; /** List of the stages in this trigger. */ - vector > stages(); + std::vector > stages(); /** Add a new stage to this trigger. */ - shared_ptr add_stage(); + std::shared_ptr add_stage(); private: - Trigger(shared_ptr context, string name); + Trigger(std::shared_ptr context, std::string name); ~Trigger(); struct sr_trigger *_structure; - shared_ptr _context; - vector > _stages; + std::shared_ptr _context; + std::vector > _stages; friend class Context; friend class Session; friend struct std::default_delete; @@ -531,19 +531,19 @@ public: /** Index number of this stage. */ int number() const; /** List of match conditions on this stage. */ - vector > matches(); + std::vector > matches(); /** Add a new match condition to this stage. * @param channel Channel to match on. * @param type TriggerMatchType to apply. */ - void add_match(shared_ptr channel, const TriggerMatchType *type); + void add_match(std::shared_ptr channel, const TriggerMatchType *type); /** Add a new match condition to this stage. * @param channel Channel to match on. * @param type TriggerMatchType to apply. * @param value Threshold value. */ - void add_match(shared_ptr channel, const TriggerMatchType *type, float value); + void add_match(std::shared_ptr channel, const TriggerMatchType *type, float value); private: struct sr_trigger_stage *_structure; - vector > _matches; + std::vector > _matches; explicit TriggerStage(struct sr_trigger_stage *structure); ~TriggerStage(); friend class Trigger; @@ -556,25 +556,25 @@ class SR_API TriggerMatch : { public: /** Channel this condition matches on. */ - shared_ptr channel(); + std::shared_ptr channel(); /** Type of match. */ const TriggerMatchType *type() const; /** Threshold value. */ float value() const; private: - TriggerMatch(struct sr_trigger_match *structure, shared_ptr channel); + TriggerMatch(struct sr_trigger_match *structure, std::shared_ptr channel); ~TriggerMatch(); struct sr_trigger_match *_structure; - shared_ptr _channel; + std::shared_ptr _channel; friend class TriggerStage; friend struct std::default_delete; }; /** Type of session stopped callback */ -typedef function SessionStoppedCallback; +typedef std::function SessionStoppedCallback; /** Type of datafeed callback */ -typedef function, shared_ptr)> +typedef std::function, std::shared_ptr)> DatafeedCallbackFunction; /* Data required for C callback function to call a C++ datafeed callback */ @@ -599,7 +599,7 @@ class SR_API SessionDevice : private: explicit SessionDevice(struct sr_dev_inst *sdi); ~SessionDevice(); - shared_ptr get_shared_from_this(); + std::shared_ptr get_shared_from_this(); friend class Session; friend struct std::default_delete; @@ -611,9 +611,9 @@ class SR_API Session : public UserOwned public: /** Add a device to this session. * @param device Device to add. */ - void add_device(shared_ptr device); + void add_device(std::shared_ptr device); /** List devices attached to this session. */ - vector > devices(); + std::vector > devices(); /** Remove all devices from this session. */ void remove_devices(); /** Add a datafeed callback to this session. @@ -632,27 +632,27 @@ public: /** Set callback to be invoked on session stop. */ void set_stopped_callback(SessionStoppedCallback callback); /** Get current trigger setting. */ - shared_ptr trigger(); + std::shared_ptr trigger(); /** Get the context. */ - shared_ptr context(); + std::shared_ptr context(); /** Set trigger setting. * @param trigger Trigger object to use. */ - void set_trigger(shared_ptr trigger); + void set_trigger(std::shared_ptr trigger); /** Get filename this session was loaded from. */ - string filename() const; + std::string filename() const; private: - explicit Session(shared_ptr context); - Session(shared_ptr context, string filename); + explicit Session(std::shared_ptr context); + Session(std::shared_ptr context, std::string filename); ~Session(); - shared_ptr get_device(const struct sr_dev_inst *sdi); + std::shared_ptr get_device(const struct sr_dev_inst *sdi); struct sr_session *_structure; - const shared_ptr _context; - map > _owned_devices; - map > _other_devices; - vector > _datafeed_callbacks; + const std::shared_ptr _context; + std::map > _owned_devices; + std::map > _other_devices; + std::vector > _datafeed_callbacks; SessionStoppedCallback _stopped_callback; - string _filename; - shared_ptr _trigger; + std::string _filename; + std::shared_ptr _trigger; friend class Context; friend class DatafeedCallbackData; @@ -667,14 +667,14 @@ public: /** Type of this packet. */ const PacketType *type() const; /** Payload of this packet. */ - shared_ptr payload(); + std::shared_ptr payload(); private: - Packet(shared_ptr device, + Packet(std::shared_ptr device, const struct sr_datafeed_packet *structure); ~Packet(); const struct sr_datafeed_packet *_structure; - shared_ptr _device; - unique_ptr _payload; + std::shared_ptr _device; + std::unique_ptr _payload; friend class Session; friend class Output; @@ -694,7 +694,7 @@ protected: PacketPayload(); virtual ~PacketPayload() = 0; private: - virtual shared_ptr share_owned_by(shared_ptr parent) = 0; + virtual std::shared_ptr share_owned_by(std::shared_ptr parent) = 0; friend class Packet; friend class Output; @@ -714,7 +714,7 @@ public: private: explicit Header(const struct sr_datafeed_header *structure); ~Header(); - shared_ptr share_owned_by(shared_ptr parent); + std::shared_ptr share_owned_by(std::shared_ptr parent); const struct sr_datafeed_header *_structure; @@ -728,14 +728,14 @@ class SR_API Meta : { public: /* Mapping of (ConfigKey, value) pairs. */ - map config() const; + std::map config() const; private: explicit Meta(const struct sr_datafeed_meta *structure); ~Meta(); - shared_ptr share_owned_by(shared_ptr parent); + std::shared_ptr share_owned_by(std::shared_ptr parent); const struct sr_datafeed_meta *_structure; - map _config; + std::map _config; friend class Packet; }; @@ -755,7 +755,7 @@ public: private: explicit Logic(const struct sr_datafeed_logic *structure); ~Logic(); - shared_ptr share_owned_by(shared_ptr parent); + std::shared_ptr share_owned_by(std::shared_ptr parent); const struct sr_datafeed_logic *_structure; @@ -780,7 +780,7 @@ public: /** Number of samples in this packet. */ unsigned int num_samples() const; /** Channels for which this packet contains data. */ - vector > channels(); + std::vector > channels(); /** Size of a single sample in bytes. */ unsigned int unitsize() const; /** Samples use a signed data type. */ @@ -798,15 +798,15 @@ public: /** TBD */ bool is_digits_decimal() const; /** TBD */ - shared_ptr scale(); + std::shared_ptr scale(); /** TBD */ - shared_ptr offset(); + std::shared_ptr offset(); /** Measured quantity of the samples in this packet. */ const Quantity *mq() const; /** Unit of the samples in this packet. */ const Unit *unit() const; /** Measurement flags associated with the samples in this packet. */ - vector mq_flags() const; + std::vector mq_flags() const; /** * Provides a Logic packet that contains a conversion of the analog * data using a simple threshold. @@ -817,7 +817,7 @@ public: * logic->data_pointer() will be allocated and must * be freed by the caller. */ - shared_ptr get_logic_via_threshold(float threshold, + std::shared_ptr get_logic_via_threshold(float threshold, uint8_t *data_ptr=nullptr) const; /** * Provides a Logic packet that contains a conversion of the analog @@ -833,12 +833,12 @@ public: * logic->data_pointer() will be allocated and must be * freed by the caller. */ - shared_ptr get_logic_via_schmitt_trigger(float lo_thr, + std::shared_ptr get_logic_via_schmitt_trigger(float lo_thr, float hi_thr, uint8_t *state, uint8_t *data_ptr=nullptr) const; private: explicit Analog(const struct sr_datafeed_analog *structure); ~Analog(); - shared_ptr share_owned_by(shared_ptr parent); + std::shared_ptr share_owned_by(std::shared_ptr parent); const struct sr_datafeed_analog *_structure; @@ -859,7 +859,7 @@ public: private: explicit Rational(const struct sr_rational *structure); ~Rational(); - shared_ptr share_owned_by(shared_ptr parent); + std::shared_ptr share_owned_by(std::shared_ptr parent); const struct sr_rational *_structure; @@ -873,18 +873,18 @@ class SR_API InputFormat : { public: /** Name of this input format. */ - string name() const; + std::string name() const; /** Description of this input format. */ - string description() const; + std::string description() const; /** A list of preferred file name extensions for this file format. * @note This list is a recommendation only. */ - vector extensions() const; + std::vector extensions() const; /** Options supported by this input format. */ - map > options(); + std::map > options(); /** Create an input using this input format. * @param options Mapping of (option name, value) pairs. */ - shared_ptr create_input(map - options = map()); + std::shared_ptr create_input(std::map + options = std::map()); private: explicit InputFormat(const struct sr_input_module *structure); ~InputFormat(); @@ -901,7 +901,7 @@ class SR_API Input : public UserOwned { public: /** Virtual device associated with this input. */ - shared_ptr device(); + std::shared_ptr device(); /** Send next stream data. * @param data Next stream data. * @param length Length of data. */ @@ -910,11 +910,11 @@ public: void end(); void reset(); private: - Input(shared_ptr context, const struct sr_input *structure); + Input(std::shared_ptr context, const struct sr_input *structure); ~Input(); const struct sr_input *_structure; - shared_ptr _context; - unique_ptr _device; + std::shared_ptr _context; + std::unique_ptr _device; friend class Context; friend class InputFormat; @@ -927,10 +927,10 @@ class SR_API InputDevice : public Device { private: - InputDevice(shared_ptr input, struct sr_dev_inst *sdi); + InputDevice(std::shared_ptr input, struct sr_dev_inst *sdi); ~InputDevice(); - shared_ptr get_shared_from_this(); - shared_ptr _input; + std::shared_ptr get_shared_from_this(); + std::shared_ptr _input; friend class Input; friend struct std::default_delete; }; @@ -940,23 +940,23 @@ class SR_API Option : public UserOwned