[libsigrok] 04/12: Merge tag 'upstream/0.4.0'

Zoltan Gyarmati zgyarmati-guest at moszumanska.debian.org
Wed Mar 29 21:34:56 UTC 2017


This is an automated email from the git hooks/post-receive script.

zgyarmati-guest pushed a commit to branch master
in repository libsigrok.

commit 2d5ae59d4b7556083b2a00985b337b077689d37e
Merge: b3dc3a2 278340a
Author: Zoltan Gyarmati <Zoltan Gyarmati mr.zoltan.gyarmati at gmail.com>
Date:   Sun Feb 26 20:06:38 2017 +0100

    Merge tag 'upstream/0.4.0'
    
    Upstream version 0.4.0

 ChangeLog                                          | 10837 ++++++++++++++++-
 Doxyfile                                           |    48 +-
 HACKING                                            |    32 +-
 Makefile.am                                        |   802 +-
 Makefile.in                                        |  4039 ++++---
 NEWS                                               |   330 +-
 README                                             |    72 +-
 README.devices                                     |    11 +-
 aclocal.m4                                         |  1093 +-
 autostuff/ar-lib                                   |     2 +-
 autostuff/compile                                  |     2 +-
 autostuff/config.guess                             |   233 +-
 autostuff/config.sub                               |    60 +-
 autostuff/depcomp                                  |     2 +-
 autostuff/install-sh                               |   373 +-
 autostuff/ltmain.sh                                |     4 +-
 autostuff/missing                                  |     2 +-
 autostuff/test-driver                              |    15 +-
 bindings/cxx/ConfigKey_methods.cpp                 |   118 +
 bindings/cxx/ConfigKey_methods.hpp                 |    10 +
 bindings/cxx/ConfigKey_methods.i                   |     1 +
 Doxyfile => bindings/cxx/Doxyfile                  |    80 +-
 bindings/cxx/QuantityFlag_methods.cpp              |    21 +
 bindings/cxx/QuantityFlag_methods.hpp              |     7 +
 bindings/cxx/classes.cpp                           |  1477 +++
 bindings/cxx/enums.py                              |   175 +
 bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp |   998 ++
 bindings/cxx/libsigrokcxx.pc.in                    |    13 +
 Doxyfile => bindings/java/Doxyfile                 |    87 +-
 bindings/java/org/sigrok/core/classes/classes.i    |   378 +
 .../sigrok/core/interfaces/DatafeedCallback.java   |     9 +
 .../org/sigrok/core/interfaces/LogCallback.java    |     8 +
 Doxyfile => bindings/python/Doxyfile               |    89 +-
 bindings/python/setup.py                           |   100 +
 bindings/python/sigrok/__init__.py                 |    20 +
 bindings/python/sigrok/core/__init__.py            |    21 +
 bindings/python/sigrok/core/classes.i              |   551 +
 bindings/swig/classes.i                            |   220 +
 bindings/swig/doc.py                               |   114 +
 bindings/swig/templates.i                          |    96 +
 config.h.in                                        |   224 +-
 configure                                          | 11603 +++++++++++++++----
 configure.ac                                       |  1123 +-
 contrib/z60_libsigrok.rules                        |    33 +-
 device.c                                           |   530 -
 hardware/common/usb.c                              |   269 -
 hardware/serial-dmm/api.c                          |   632 -
 hardware/serial-dmm/protocol.h                     |   146 -
 hardware/sysclk-lwla/api.c                         |   612 -
 hardware/sysclk-lwla/lwla.h                        |   122 -
 hardware/sysclk-lwla/protocol.c                    |   985 --
 hardware/sysclk-lwla/protocol.h                    |   263 -
 hardware/uni-t-dmm/api.c                           |   425 -
 hwdriver.c                                         |   796 --
 libsigrok.h => include/libsigrok/libsigrok.h       |   731 +-
 include/libsigrok/proto.h                          |   246 +
 version.h => include/libsigrok/version.h.in        |    16 +-
 input/binary.c                                     |   151 -
 input/chronovu_la8.c                               |   206 -
 input/csv.c                                        |   868 --
 input/input.c                                      |    76 -
 input/vcd.c                                        |   546 -
 input/wav.c                                        |   204 -
 libsigrok-internal.h                               |   616 -
 libsigrok.pc.in                                    |     5 +-
 m4/ax_cxx_compile_stdcxx_11.m4                     |   142 +
 {autostuff => m4}/libtool.m4                       |     0
 {autostuff => m4}/ltoptions.m4                     |     0
 {autostuff => m4}/ltsugar.m4                       |     0
 {autostuff => m4}/ltversion.m4                     |     0
 {autostuff => m4}/lt~obsolete.m4                   |     0
 m4/sigrok.m4                                       |   449 +
 output/csv.c                                       |   220 -
 output/output.c                                    |   120 -
 proto.h                                            |   163 -
 session.c                                          |   835 --
 session_file.c                                     |   504 -
 src/analog.c                                       |   356 +
 backend.c => src/backend.c                         |   230 +-
 src/device.c                                       |   722 ++
 src/dmm/bm25x.c                                    |   215 +
 hardware/common/dmm/fs9721.c => src/dmm/dtm0660.c  |   242 +-
 {hardware/common => src}/dmm/es519xx.c             |    21 +-
 {hardware/common => src}/dmm/fs9721.c              |    21 +-
 {hardware/common => src}/dmm/fs9922.c              |    15 +-
 {hardware/common => src}/dmm/m2110.c               |     5 +-
 {hardware/common => src}/dmm/metex14.c             |    58 +-
 {hardware/common => src}/dmm/rs9lcd.c              |     7 +-
 src/dmm/ut372.c                                    |   136 +
 src/dmm/ut71x.c                                    |   352 +
 src/dmm/vc870.c                                    |   439 +
 src/drivers.c                                      |   351 +
 error.c => src/error.c                             |    11 +-
 {hardware/common => src}/ezusb.c                   |    60 +-
 .../protocol.h => src/fallback.c                   |    30 +-
 .../hardware}/agilent-dmm/agilent-dmm.h            |    19 +-
 {hardware => src/hardware}/agilent-dmm/api.c       |   123 +-
 {hardware => src/hardware}/agilent-dmm/sched.c     |   197 +-
 {hardware => src/hardware}/appa-55ii/api.c         |    84 +-
 {hardware => src/hardware}/appa-55ii/protocol.c    |    15 +-
 {hardware => src/hardware}/appa-55ii/protocol.h    |     2 +-
 src/hardware/asix-sigma/api.c                      |   445 +
 .../hardware/asix-sigma/protocol.c                 |   700 +-
 .../hardware/asix-sigma/protocol.h                 |    34 +-
 {hardware => src/hardware}/atten-pps3xxx/api.c     |   140 +-
 .../hardware}/atten-pps3xxx/protocol.c             |    17 +-
 .../hardware}/atten-pps3xxx/protocol.h             |     8 +-
 src/hardware/baylibre-acme/api.c                   |   447 +
 src/hardware/baylibre-acme/gpio.c                  |   166 +
 src/hardware/baylibre-acme/gpio.h                  |    41 +
 src/hardware/baylibre-acme/protocol.c              |   804 ++
 src/hardware/baylibre-acme/protocol.h              |    97 +
 src/hardware/beaglelogic/api.c                     |   426 +
 src/hardware/beaglelogic/beaglelogic.h             |   210 +
 src/hardware/beaglelogic/protocol.c                |   112 +
 src/hardware/beaglelogic/protocol.h                |    71 +
 {hardware => src/hardware}/brymen-bm86x/api.c      |    87 +-
 {hardware => src/hardware}/brymen-bm86x/protocol.c |    22 +-
 {hardware => src/hardware}/brymen-bm86x/protocol.h |     3 +-
 {hardware => src/hardware}/brymen-dmm/api.c        |    68 +-
 {hardware => src/hardware}/brymen-dmm/parser.c     |     6 +-
 {hardware => src/hardware}/brymen-dmm/protocol.c   |    23 +-
 {hardware => src/hardware}/brymen-dmm/protocol.h   |     4 +-
 {hardware => src/hardware}/cem-dt-885x/api.c       |   160 +-
 {hardware => src/hardware}/cem-dt-885x/protocol.c  |    40 +-
 {hardware => src/hardware}/cem-dt-885x/protocol.h  |     6 +-
 {hardware => src/hardware}/center-3xx/api.c        |    89 +-
 {hardware => src/hardware}/center-3xx/protocol.c   |    24 +-
 {hardware => src/hardware}/center-3xx/protocol.h   |    13 +-
 {hardware => src/hardware}/chronovu-la/api.c       |   276 +-
 {hardware => src/hardware}/chronovu-la/protocol.c  |    84 +-
 {hardware => src/hardware}/chronovu-la/protocol.h  |     7 +-
 {hardware => src/hardware}/colead-slm/api.c        |    80 +-
 {hardware => src/hardware}/colead-slm/protocol.c   |   173 +-
 {hardware => src/hardware}/colead-slm/protocol.h   |     2 +-
 .../hardware}/conrad-digi-35-cpu/api.c             |    65 +-
 .../hardware}/conrad-digi-35-cpu/protocol.c        |     8 +-
 .../hardware}/conrad-digi-35-cpu/protocol.h        |     3 +-
 {hardware => src/hardware}/demo/demo.c             |   585 +-
 src/hardware/deree-de5000/api.c                    |    86 +
 {hardware => src/hardware}/fluke-dmm/api.c         |    96 +-
 {hardware => src/hardware}/fluke-dmm/fluke-dmm.h   |     3 +
 {hardware => src/hardware}/fluke-dmm/fluke.c       |    52 +-
 {hardware => src/hardware}/fx2lafw/api.c           |   429 +-
 src/hardware/fx2lafw/dslogic.c                     |   238 +
 src/hardware/fx2lafw/dslogic.h                     |   132 +
 {hardware => src/hardware}/fx2lafw/protocol.c      |   332 +-
 {hardware => src/hardware}/fx2lafw/protocol.h      |    42 +-
 {hardware => src/hardware}/gmc-mh-1x-2x/api.c      |   192 +-
 {hardware => src/hardware}/gmc-mh-1x-2x/protocol.c |   165 +-
 {hardware => src/hardware}/gmc-mh-1x-2x/protocol.h |    22 +-
 src/hardware/gwinstek-gds-800/api.c                |   282 +
 src/hardware/gwinstek-gds-800/protocol.c           |   283 +
 src/hardware/gwinstek-gds-800/protocol.h           |    63 +
 {hardware => src/hardware}/hameg-hmo/api.c         |   169 +-
 {hardware => src/hardware}/hameg-hmo/protocol.c    |   385 +-
 {hardware => src/hardware}/hameg-hmo/protocol.h    |    16 +-
 {hardware => src/hardware}/hantek-dso/api.c        |   589 +-
 {hardware => src/hardware}/hantek-dso/dso.c        |   102 +-
 {hardware => src/hardware}/hantek-dso/dso.h        |    18 +-
 src/hardware/hung-chang-dso-2100/api.c             |   764 ++
 src/hardware/hung-chang-dso-2100/protocol.c        |   464 +
 src/hardware/hung-chang-dso-2100/protocol.h        |    69 +
 .../hardware}/ikalogic-scanalogic2/api.c           |   130 +-
 .../hardware}/ikalogic-scanalogic2/protocol.c      |    94 +-
 .../hardware}/ikalogic-scanalogic2/protocol.h      |    12 +-
 .../hardware}/ikalogic-scanaplus/api.c             |    83 +-
 .../hardware}/ikalogic-scanaplus/protocol.c        |     1 +
 .../hardware}/ikalogic-scanaplus/protocol.h        |     4 +-
 {hardware => src/hardware}/kecheng-kc-330b/api.c   |    90 +-
 .../hardware}/kecheng-kc-330b/protocol.c           |    16 +-
 .../hardware}/kecheng-kc-330b/protocol.h           |     6 +-
 src/hardware/kern-scale/api.c                      |   267 +
 src/hardware/kern-scale/protocol.c                 |   141 +
 .../hardware/kern-scale}/protocol.h                |    70 +-
 src/hardware/korad-kaxxxxp/api.c                   |   436 +
 src/hardware/korad-kaxxxxp/protocol.c              |   406 +
 src/hardware/korad-kaxxxxp/protocol.h              |   120 +
 {hardware => src/hardware}/lascar-el-usb/api.c     |    93 +-
 .../hardware}/lascar-el-usb/protocol.c             |    98 +-
 .../hardware}/lascar-el-usb/protocol.h             |    15 +-
 src/hardware/lecroy-logicstudio/api.c              |   559 +
 src/hardware/lecroy-logicstudio/protocol.c         |  1189 ++
 src/hardware/lecroy-logicstudio/protocol.h         |   107 +
 src/hardware/manson-hcs-3xxx/api.c                 |   440 +
 src/hardware/manson-hcs-3xxx/protocol.c            |   261 +
 src/hardware/manson-hcs-3xxx/protocol.h            |    99 +
 src/hardware/maynuo-m97/api.c                      |   521 +
 src/hardware/maynuo-m97/protocol.c                 |   212 +
 src/hardware/maynuo-m97/protocol.h                 |   164 +
 {hardware => src/hardware}/mic-985xx/api.c         |   114 +-
 {hardware => src/hardware}/mic-985xx/protocol.c    |    24 +-
 {hardware => src/hardware}/mic-985xx/protocol.h    |    13 +-
 src/hardware/motech-lps-30x/api.c                  |   855 ++
 src/hardware/motech-lps-30x/protocol.c             |   242 +
 src/hardware/motech-lps-30x/protocol.h             |   119 +
 {hardware => src/hardware}/norma-dmm/api.c         |   153 +-
 {hardware => src/hardware}/norma-dmm/protocol.c    |    51 +-
 {hardware => src/hardware}/norma-dmm/protocol.h    |    11 +-
 .../hardware}/openbench-logic-sniffer/api.c        |   214 +-
 .../hardware}/openbench-logic-sniffer/protocol.c   |   157 +-
 .../hardware}/openbench-logic-sniffer/protocol.h   |    27 +-
 .../hardware/pipistrello-ols}/api.c                |   508 +-
 src/hardware/pipistrello-ols/protocol.c            |   682 ++
 .../hardware/pipistrello-ols}/protocol.h           |    69 +-
 {hardware => src/hardware}/rigol-ds/api.c          |   340 +-
 {hardware => src/hardware}/rigol-ds/protocol.c     |   462 +-
 {hardware => src/hardware}/rigol-ds/protocol.h     |    15 +-
 {hardware => src/hardware}/saleae-logic16/api.c    |   203 +-
 .../hardware}/saleae-logic16/protocol.c            |   536 +-
 .../hardware}/saleae-logic16/protocol.h            |    27 +-
 src/hardware/scpi-pps/api.c                        |   663 ++
 src/hardware/scpi-pps/profiles.c                   |   549 +
 src/hardware/scpi-pps/protocol.c                   |   122 +
 src/hardware/scpi-pps/protocol.h                   |   161 +
 src/hardware/serial-dmm/api.c                      |   615 +
 {hardware => src/hardware}/serial-dmm/protocol.c   |   150 +-
 src/hardware/serial-dmm/protocol.h                 |    88 +
 src/hardware/sysclk-lwla/api.c                     |   824 ++
 {hardware => src/hardware}/sysclk-lwla/lwla.c      |   139 +-
 src/hardware/sysclk-lwla/lwla.h                    |   168 +
 src/hardware/sysclk-lwla/lwla1016.c                |   477 +
 src/hardware/sysclk-lwla/lwla1034.c                |   602 +
 src/hardware/sysclk-lwla/protocol.c                |   590 +
 src/hardware/sysclk-lwla/protocol.h                |   170 +
 {hardware => src/hardware}/teleinfo/api.c          |   121 +-
 {hardware => src/hardware}/teleinfo/protocol.c     |    16 +-
 {hardware => src/hardware}/teleinfo/protocol.h     |     4 +-
 src/hardware/testo/api.c                           |   540 +
 src/hardware/testo/protocol.c                      |   291 +
 src/hardware/testo/protocol.h                      |    84 +
 {hardware => src/hardware}/tondaj-sl-814/api.c     |    70 +-
 .../hardware}/tondaj-sl-814/protocol.c             |    23 +-
 .../hardware}/tondaj-sl-814/protocol.h             |     2 +-
 src/hardware/uni-t-dmm/api.c                       |   425 +
 {hardware => src/hardware}/uni-t-dmm/protocol.c    |    77 +-
 {hardware => src/hardware}/uni-t-dmm/protocol.h    |    44 +-
 {hardware => src/hardware}/uni-t-ut32x/api.c       |   100 +-
 {hardware => src/hardware}/uni-t-ut32x/protocol.c  |    22 +-
 {hardware => src/hardware}/uni-t-ut32x/protocol.h  |     6 +-
 {hardware => src/hardware}/victor-dmm/api.c        |   143 +-
 {hardware => src/hardware}/victor-dmm/protocol.c   |    77 +-
 {hardware => src/hardware}/victor-dmm/protocol.h   |     2 +-
 src/hardware/yokogawa-dlm/api.c                    |   719 ++
 src/hardware/yokogawa-dlm/protocol.c               |  1188 ++
 src/hardware/yokogawa-dlm/protocol.h               |   127 +
 src/hardware/yokogawa-dlm/protocol_wrappers.c      |   359 +
 src/hardware/yokogawa-dlm/protocol_wrappers.h      |    91 +
 .../hardware}/zeroplus-logic-cube/analyzer.c       |    64 +-
 .../hardware}/zeroplus-logic-cube/analyzer.h       |    12 +-
 .../hardware}/zeroplus-logic-cube/api.c            |   269 +-
 .../hardware}/zeroplus-logic-cube/gl_usb.c         |    15 +-
 .../hardware}/zeroplus-logic-cube/gl_usb.h         |     2 +-
 .../hardware}/zeroplus-logic-cube/protocol.c       |     7 +-
 .../hardware}/zeroplus-logic-cube/protocol.h       |     3 +-
 src/hwdriver.c                                     |   902 ++
 src/input/binary.c                                 |   173 +
 src/input/chronovu_la8.c                           |   187 +
 src/input/csv.c                                    |   815 ++
 src/input/input.c                                  |   586 +
 src/input/raw_analog.c                             |   283 +
 src/input/trace32_ad.c                             |   803 ++
 src/input/vcd.c                                    |   647 ++
 src/input/wav.c                                    |   372 +
 src/lcr/es51919.c                                  |   946 ++
 src/libsigrok-internal.h                           |  1257 ++
 log.c => src/log.c                                 |   155 +-
 src/modbus/modbus.c                                |   578 +
 src/modbus/modbus_serial_rtu.c                     |   209 +
 {output => src/output}/analog.c                    |   180 +-
 {output => src/output}/ascii.c                     |    71 +-
 {output => src/output}/binary.c                    |    13 +-
 {output => src/output}/bits.c                      |    69 +-
 {output => src/output}/chronovu_la8.c              |    29 +-
 src/output/csv.c                                   |   358 +
 {output => src/output}/gnuplot.c                   |    37 +-
 {output => src/output}/hex.c                       |    70 +-
 {output => src/output}/ols.c                       |    29 +-
 src/output/output.c                                |   361 +
 src/output/srzip.c                                 |   334 +
 {output => src/output}/vcd.c                       |    39 +-
 src/output/wav.c                                   |   386 +
 src/resource.c                                     |   380 +
 src/scale/kern.c                                   |   218 +
 src/scpi.h                                         |   143 +
 src/scpi/helpers.c                                 |   136 +
 {hardware/common => src/scpi}/scpi.c               |   197 +-
 src/scpi/scpi_libgpib.c                            |   167 +
 {hardware/common => src/scpi}/scpi_serial.c        |    41 +-
 {hardware/common => src/scpi}/scpi_tcp.c           |    39 +-
 {hardware/common => src/scpi}/scpi_usbtmc_libusb.c |   217 +-
 {hardware/common => src/scpi}/scpi_visa.c          |    25 +-
 {hardware/common => src/scpi}/scpi_vxi.c           |    53 +-
 {hardware/common => src/scpi}/vxi.h                |     2 +
 {hardware/common => src/scpi}/vxi_clnt.c           |     3 +-
 {hardware/common => src/scpi}/vxi_xdr.c            |     1 +
 {hardware/common => src}/serial.c                  |   535 +-
 src/session.c                                      |  1628 +++
 session_driver.c => src/session_driver.c           |   267 +-
 src/session_file.c                                 |   322 +
 src/soft-trigger.c                                 |   222 +
 std.c => src/std.c                                 |    28 +-
 strutil.c => src/strutil.c                         |   157 +-
 src/transform/invert.c                             |    99 +
 tests/check_output_all.c => src/transform/nop.c    |    48 +-
 src/transform/scale.c                              |   134 +
 src/transform/transform.c                          |   287 +
 src/trigger.c                                      |   181 +
 src/usb.c                                          |   512 +
 version.c => src/version.c                         |     3 +-
 tests/analog.c                                     |   216 +
 tests/{check_core.c => core.c}                     |     3 +-
 tests/device.c                                     |    81 +
 tests/{check_driver_all.c => driver_all.c}         |    27 +-
 tests/{check_input_all.c => input_all.c}           |     7 +-
 tests/{check_input_binary.c => input_binary.c}     |   141 +-
 tests/lib.c                                        |   118 +-
 tests/lib.h                                        |    20 +-
 tests/{check_main.c => main.c}                     |     8 +-
 tests/output_all.c                                 |   117 +
 tests/session.c                                    |   214 +
 tests/{check_strutil.c => strutil.c}               |    23 +-
 tests/transform_all.c                              |   117 +
 tests/trigger.c                                    |   281 +
 tests/{check_version.c => version.c}               |     3 +-
 version.h.in                                       |    69 -
 326 files changed, 76957 insertions(+), 21760 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libsigrok.git



More information about the debian-science-commits mailing list