Skip to content
Permalink
Browse files

Merge branch 'master' into eurolite-pro-mk2

  • Loading branch information...
peternewman committed Jul 14, 2018
2 parents 302691a + d101097 commit ddf8a02e76f65b3b1275c3ca7ace172894f54fcd
Showing with 732 additions and 314 deletions.
  1. +3 −0 .codespellignore
  2. +1 −0 .gitignore
  3. +2 −0 .travis-ci.sh
  4. +32 −22 .travis.yml
  5. +2 −1 AUTHORS
  6. +30 −24 NEWS
  7. +1 −1 TODO
  8. +1 −1 common/base/Init.cpp
  9. +2 −2 common/protocol/Makefile.mk
  10. +1 −1 common/rdm/Makefile.mk
  11. +2 −1 common/rdm/RDMHelper.cpp
  12. +3 −3 common/rpc/Makefile.mk
  13. +1 −1 common/utils/Clock.cpp
  14. +29 −6 configure.ac
  15. +182 −72 data/rdm/manufacturer_pids.proto
  16. +181 −1 data/rdm/pids.proto
  17. +6 −5 debian/control
  18. +9 −9 debian/ola.udev
  19. +1 −1 doxygen/namespaces.dox
  20. +1 −1 doxygen/overview.dox
  21. +8 −8 examples/ola-artnet.cpp
  22. +2 −2 include/ola/network/NetworkUtils.h
  23. +1 −1 include/ola/rdm/DimmerSubDevice.h
  24. +1 −1 include/ola/rdm/PidStore.h
  25. +1 −1 include/ola/web/JsonSchema.h
  26. +1 −1 javascript/ola/common/server_stats.js
  27. +1 −1 javascript/ola/mobile/plugin_tab.js
  28. +1 −1 javascript/ola/mobile/universe_tab.js
  29. +2 −2 libs/acn/E131InflatorTest.cpp
  30. +1 −1 libs/acn/TransportHeader.h
  31. +6 −0 libs/usb/HotplugAgent.cpp
  32. +8 −8 man/ola_artnet.1
  33. +0 −4 olad/Makefile.mk
  34. +2 −2 plugins/artnet/ArtNetDevice.cpp
  35. +3 −3 plugins/artnet/ArtNetDevice.h
  36. +15 −13 plugins/artnet/ArtNetNode.cpp
  37. +14 −13 plugins/artnet/ArtNetNode.h
  38. +1 −1 plugins/artnet/ArtNetNodeTest.cpp
  39. +2 −2 plugins/artnet/ArtNetPackets.h
  40. +1 −1 plugins/artnet/ArtNetPlugin.cpp
  41. +1 −1 plugins/artnet/ArtNetPlugin.h
  42. +6 −6 plugins/artnet/ArtNetPort.cpp
  43. +1 −1 plugins/artnet/ArtNetPort.h
  44. +1 −1 plugins/artnet/Makefile.mk
  45. +30 −30 plugins/artnet/README.md
  46. +2 −2 plugins/artnet/artnet_loadtest.cpp
  47. +2 −2 plugins/artnet/messages/ArtNetConfigMessages.proto
  48. +2 −2 plugins/artnet/messages/Makefile.mk
  49. +1 −1 plugins/artnet/messages/libolaartnetconf.pc.in
  50. +1 −1 plugins/e131/messages/E131ConfigMessages.proto
  51. +1 −1 plugins/e131/messages/Makefile.mk
  52. +1 −1 plugins/espnet/EspNetPackets.h
  53. +4 −0 plugins/ftdidmx/FtdiDmxDevice.h
  54. +14 −1 plugins/ftdidmx/FtdiWidget.cpp
  55. +9 −0 plugins/ftdidmx/FtdiWidget.h
  56. +6 −1 plugins/ftdidmx/Makefile.mk
  57. +4 −0 plugins/kinet/KiNetDevice.h
  58. +7 −7 plugins/osc/README.md
  59. +1 −1 plugins/spidmx/SPIDMXParser.cpp
  60. +4 −0 plugins/usbdmx/SyncPluginImpl.cpp
  61. +1 −1 plugins/usbpro/messages/Makefile.mk
  62. +1 −1 python/examples/ola_artnet_params.py
  63. +2 −2 python/ola/ClientWrapper.py
  64. +6 −6 python/ola/Makefile.mk
  65. +1 −1 python/ola/PidStore.py
  66. +31 −0 python/ola/__init__.py
  67. +5 −5 python/ola/rpc/Makefile.mk
  68. +13 −13 python/ola/rpc/StreamRpcChannel.py
  69. +4 −4 tools/ola_trigger/Makefile.mk
  70. +3 −1 tools/rdm/TestLogger.py
  71. +1 −1 tools/rdm/setup_patch.py
  72. +5 −2 tools/rdm/static/rdmtests.html
@@ -61,3 +61,6 @@ const uint8_t BaseRobeWidget::SOM;
$scope.input(' THRU ');
manufacturer_name: "ALS Stanislaw Binkiewicz"
manufacturer_name: "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""
manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
manufacturer_name: "SRM Technik GmbH"
manufacturer_name: "medien technik cords"
@@ -8,6 +8,7 @@
*.lo
*.log
*.o
*.o.*
*.o-????????
*.pb.cc
*.pb.cpp
@@ -12,6 +12,7 @@ COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coveri
PYCHECKER_BLACKLIST="threading,unittest,cmd,optparse,google,google.protobuf,ssl,fftpack,lapack_lite,mtrand"

SPELLINGBLACKLIST=$(cat <<-BLACKLIST
-wholename "./.codespellignore" -or \
-wholename "./.git/*" -or \
-wholename "./aclocal.m4" -or \
-wholename "./config/config.guess" -or \
@@ -24,6 +25,7 @@ SPELLINGBLACKLIST=$(cat <<-BLACKLIST
-wholename "./config/ltsugar.m4" -or \
-wholename "./config/missing" -or \
-wholename "./libtool" -or \
-wholename "./config.log" -or \
-wholename "./config.status" -or \
-wholename "./Makefile" -or \
-wholename "./Makefile.in" -or \
@@ -31,52 +31,58 @@ addons:
- libmicrohttpd-dev
packages: &core_build_gpp_latest
- *core_build
- g++-6
- g++-8
packages: &core_build_clang_latest
- *core_build
- clang-5.0
- clang-6.0

matrix:
fast_finish: true
include:
- os: osx
osx_image: xcode9.3beta
osx_image: xcode9.3
compiler: clang
env:
- TASK='compile'
- CPPUNIT='1.13'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3beta
osx_image: xcode9.3
compiler: clang
env:
- TASK='compile'
- CPPUNIT='1.14'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3beta
osx_image: xcode9.3
compiler: gcc
env:
- TASK='compile'
- CPPUNIT='1.13'
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3beta
osx_image: xcode9.3
compiler: gcc
env:
- TASK='compile'
- CPPUNIT='1.14'
    - os: osx
osx_image: xcode9.2
- LIBFTDI='0'
- os: osx
osx_image: xcode9.3
compiler: clang
env:
- TASK='compile'
- CPPUNIT='1.14'
- PROTOBUF='3.5'
- PROTOBUF='3.6'
- LIBFTDI='1'
- os: osx
osx_image: xcode9.2
osx_image: xcode9.3
compiler: gcc
env:
- TASK='compile'
- CPPUNIT='1.14'
- PROTOBUF='3.5'
- PROTOBUF='3.6'
- LIBFTDI='1'
- os: linux
dist: trusty
compiler: clang
@@ -88,7 +94,7 @@ matrix:
- *core_build_clang_latest
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise
- llvm-toolchain-trusty-6.0
- os: linux
dist: trusty
compiler: gcc
@@ -272,13 +278,13 @@ before_cache:

install:
# Match the version of protobuf being installed via apt
  - if [[ "$PROTOBUF" == "3.5" ]]; then pip install --user protobuf==3.5.1; fi
- if [[ "$PROTOBUF" != "3.5" ]]; then pip install --user protobuf==3.1.0; fi
  - if [[ "$PROTOBUF" == "3.6" ]]; then pip install --user protobuf==3.6.0; fi
- if [[ "$PROTOBUF" != "3.6" ]]; then pip install --user protobuf==3.1.0; fi
# We need to use pip rather than apt on Trusty
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then pip install --user numpy; fi
- if [ "$TASK" = "coverage" ]; then pip install --user cpp-coveralls; fi
- if [ "$TASK" = "flake8" ]; then pip install --user flake8; fi
- if [ "$TASK" = "codespell" ]; then pip install --user git+https://github.com/lucasdemarchi/codespell.git; fi
- if [ "$TASK" = "codespell" ]; then pip install --user git+https://github.com/codespell-project/codespell.git; fi
- if [ "$TASK" = "jshint" ]; then npm install -g grunt-cli; fi
# If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net
- if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install --user http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
@@ -287,19 +293,23 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
#Fix a broken homebrew libtool install
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex libftdi libftdi0 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" == "3.5" ]; then brew install protobuf@3.5; fi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "3.5" ]; then brew install protobuf@3.1; fi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "3.5" ]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # When protobuf is not on the latest release
#Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy and libusb already present
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" != "1" ]; then brew install libftdi0; fi # install libftdi0
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" == "1" ]; then brew install libftdi; fi # install the latest libftdi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" == "3.6" ]; then brew install protobuf@3.6; fi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "3.6" ]; then brew install protobuf@3.1; fi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$PROTOBUF" != "3.6" ]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # When protobuf is not on the latest release
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages; echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth; fi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$CPPUNIT" != "1.14" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3%5E/Formula/cppunit.rb; fi # install a slightly older cppunit, as latest needs C++11 support
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$CPPUNIT" == "1.14" ]; then brew install cppunit; fi # install the latest cppunit, which needs C++11
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too
#Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-6" CC="ccache gcc-6"; fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-8" CC="ccache gcc-8"; fi
- if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
#Use the latest clang if we're compiling with clang
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-6.0" CC="clang-6.0"; fi
#Report the compiler version
- $CXX --version
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then sudo add-apt-repository ppa:waja/trusty-backports -y; sudo apt-get update -qq; sudo apt-get install lintian -y; fi # Install a late enough lintian
@@ -309,7 +319,7 @@ after_failure:
- if [ -f ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/test-suite.log ]; then cat ${TRAVIS_BUILD_DIR}/ola-*/_build/sub/test-suite.log; fi

after_success:
- if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-6 -b . -E '.*Test\.cpp$' -E '.*\.pb\.cc$' -E '.*\.pb\.cpp$' -E '.*\.pb\.h$' -E '.*\.yy\.cpp$' -E '.*\.tab\.cpp$' -E '.*\.tab\.h$' -E '.*/doxygen/examples.*$' --gcov-options '\-lp' > /dev/null; fi
- if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-8 -b . -E '.*Test\.cpp$' -E '.*\.pb\.cc$' -E '.*\.pb\.cpp$' -E '.*\.pb\.h$' -E '.*\.yy\.cpp$' -E '.*\.tab\.cpp$' -E '.*\.tab\.h$' -E '.*/doxygen/examples.*$' --gcov-options '\-lp' > /dev/null; fi

after_script:
- if [ "$TASK" = "coverity" ]; then tail -n 10000 ${TRAVIS_BUILD_DIR}/cov-int/build-log.txt; cat ${TRAVIS_BUILD_DIR}/cov-int/scm_log.txt; fi
@@ -8,14 +8,15 @@ Contributors:
Bastien Andrès, contributed to the dmx4linux plugin
Carsten Presser, Karate USB plugin
Dave Olsthoorn, working on a new web-ui
E.S. Rosenberg, further work on ftdidmx plugin.
Florian Edelmann, added DMXCreator 512 Basic USB and native SPI DMX support
Hakan Lindestaf, Renard plugin
Harry F, for the Eurolite USB Pro code
Heikki Junnila, bug fixes for the debian packaging files
Laurent (Renzo), Debian packages, FreeBSD & RDM testing.
Lukas Erlinghagen, win32 port.
Johan Nilsson, Philips Hue, Osram Lightify & crelay trigger config
Joshua Moyerman, ArtNet fixes.
Joshua Moyerman, Art-Net fixes.
Masaki Muranaka, various patches
Nicolas, for the win32 port of libartnet
Nicolas Bertrand, added ShowJockey DMX-U1 support
54 NEWS
@@ -1,21 +1,27 @@
x/y/2018 ola-0.10.7
Features:
*
* Allow multiple KiNet ports to be patched to the same universe #1414
* Support libftdi1 too in FTDI DMX #1012 Debian #810374

API:
*

RDM Tests:
*
* Fix a bug in the RDM tests when a responder supports sensor PIDs #1388

Bugs:
* Fix the build on Windows
* Entire codebase now passes codespell testing
* Fix a Python 3 bug in the API
*
* Fix a few longstanding bugs in the Python ola_rdm_discover
* Correct the OSC config option name for output format in the documentation
* Use top_builddir in more places in the build
* Use libusb_set_option where available
* Fix the udev rules
* Downstream Debian fixes

Internal:
*
* Various minor log formatting tidying up

07/01/2018 ola-0.10.6
Bugs:
@@ -43,7 +49,7 @@ x/y/2018 ola-0.10.7

21/05/2017 ola-0.10.4
Features:
* Add more help regarding the ArtNet use_limited_broadcast option
* Add more help regarding the Art-Net use_limited_broadcast option

Bugs:
* Ensure Pathport node actually uses configured IP #1166
@@ -178,7 +184,7 @@ x/y/2018 ola-0.10.7
Bugs:
* Fix some Xcode build errors
* Fix the build on Windows
* Fix a bug in Artnet universe mapping #856
* Fix a bug in Art-Net universe mapping #856
* NACK requests for IPv4 default route PID with data
* NACK with format error requests for DNS PIDs with data
* Fix a bug regarding stack traces error messages with Python RDM gets #884
@@ -318,7 +324,7 @@ x/y/2018 ola-0.10.7
Working:
* Building simple client applications
* olad, with the web UI
* Plugins: Dummy, ArtNet, ShowNet, ESP Net, SandNet, Pathport, OSC, KiNet
* Plugins: Dummy, Art-Net, ShowNet, ESP Net, SandNet, Pathport, OSC, KiNet
* Python bindings
Not working yet:
* all other plugins, especially device-based ones (USB, serial, SPI)
@@ -462,7 +468,7 @@ Documentation:
* Save the SPI pixel count during shutdown
* Fix E1.31 merge timeouts - #256
* Fixed 2 bugs in the RDM responder tests.
* Fix a bug where OLA wouldn't receive on ArtNet universe 0 - #260
* Fix a bug where OLA wouldn't receive on Art-Net universe 0 - #260
* Expose the source priority in the C++ API

29/9/2013 ola-0.8.32
@@ -471,8 +477,8 @@ Documentation:
timestamp in the RDM test logs
* Added pretty printing of slot info messages
* Added support for new OSC formats
* Added support for more than 4 ArtNet output ports
* Added a simple ArtNet loadtest
* Added support for more than 4 Art-Net output ports
* Added a simple Art-Net loadtest
* Fixed a couple of bugs in the Dummy RDM responders
* Added support for templates in the OSC target addresses.
* Re-wrote the SPI backend with loads of new options.
@@ -550,7 +556,7 @@ Documentation:
* Add a script to enforce code licences
* Add the slp_sa_test program
* Improved support for the RDM-TRI
* Added support for using the loopback interface with the ArtNet plugin
* Added support for using the loopback interface with the Art-Net plugin
* Fixed some bugs in the RDM tests
* Add configure time options to disable each plugin
* Fixed a bug in the sniffer tool
@@ -642,7 +648,7 @@ Documentation:
* Added support for multiple Open DMX USB devices (still Linux Only) - #166
* Fixed a build error in the StageProfi widget - #169
* Added an option to choose the NIC olad uses - #173
* Add support for listing remote ArtNet nodes - #167
* Add support for listing remote Art-Net nodes - #167

23/01/2012 ola-0.8.17
* fix a bug in the RDM sniffer
@@ -653,19 +659,19 @@ Documentation:
* Added a configure test for the python google.protobuf module
* Added the ola_trigger program
* Changed the ForceDiscovery rpc to only return once discovery completes
* Fixed ArtNet RDM discovery so DMXWorkshop works correctly - #160
* Fixed a memory leak in the ArtNet RDM implementation
* Add an option for using the limited broadcast address for ArtNet dmx data
* Fixed Art-Net RDM discovery so DMXWorkshop works correctly - #160
* Fixed a memory leak in the Art-Net RDM implementation
* Add an option for using the limited broadcast address for Art-Net DMX data
* Add an option to ignore specific USB serial devices
* Added a program to sniff traffic using the RDM USB Pro
* Added many more unit tests for the ArtNet plugin
* Added many more unit tests for the Art-Net plugin
* Fixed build warnings found by newer versions of clang
* Fix a bug in the RDM discovery code for the Robe Widget

12/12/2011 ola-0.8.15
* Add DMX IN support for the Robe widget - #156
* Add an option to send DMX during RDM tests - #153
* Add basic support for sending ArtNet timecode - #150
* Add basic support for sending Art-Net timecode - #150
* Added a DMX keypad to the mobile UI, thanks to Chris Stranex
* Fix a race condition in the WidgetDectectorThreadTest
* Fix compile errors with new versions of clang
@@ -683,7 +689,7 @@ Documentation:

22/10/2011 ola-0.8.13
* Attempt to reconnect to usb devices periodically - #143
* Add support for ArtNet 3 - #144
* Add support for Art-Net 3 - #144
* Add support for the Eurolite USB Pro - thanks Harry F
* Large cleanup of the build rules
* Added a script to collect device model information using RDM
@@ -700,7 +706,7 @@ Documentation:
* Fixed link errors with the new version of gcc - #142, #145
* Fixed sorting of Sensors in the RDM web UI - #137
* Improvements to the threading model to support more async operations.
* Enabled SO_REUSEPORT so that local ArtNet applications work - #141
* Enabled SO_REUSEPORT so that local Art-Net applications work - #141
* Reduced the cost of logging by using lazy evaluation
* Added more PIDs to the dummy responder
* Refactored the core I/O classes, removed the "socket operation on
@@ -763,7 +769,7 @@ Documentation:

19/10/2010 ola-0.8.4
Add the RDM web UI
Work around an ArtNet RDM bug
Work around an Art-Net RDM bug
Handle ACK overflow in the DMX-TRI

23/9/2010 ola-0.8.3
@@ -776,7 +782,7 @@ Documentation:
19/9/2010 ola-0.8.2
Moved the DMX Console to the new UI
Removed the old web UI, no more requirements for ctemplate
Added ACK_OVERFLOW support for RDM over ArtNet
Added ACK_OVERFLOW support for RDM over Art-Net
Added Support for the last remaining E1.20 PIDS
Re-factored the Ola Client code to fix the problem of de-multiplexing
responses.
@@ -789,8 +795,8 @@ Documentation:
Fixed some compiler warnings with gcc 4.4

7/8/2010 ola-0.8.0
Initial RDM support for the ArtNet, Dummy & DMX-TRI devices
New ArtNet stack to support RDM - no more dependency on libartnet
Initial RDM support for the Art-Net, Dummy & DMX-TRI devices
New Art-Net stack to support RDM - no more dependency on libartnet
Support for packetheads DMX dongle
Make the FPS limit for USB Pro devices configurable

@@ -826,7 +832,7 @@ Documentation:
Improved USB Pro handling
Added port priorities & multi source merging
TX support for the DMX-TRI
Support for the Ardiuno RGB Mixer
Support for the Arduino RGB Mixer
DSCP for E1.31
Support for using the OSSP uuid library
Removal of run-time loadable plugins.
2 TODO
@@ -2,7 +2,7 @@
See https://github.com/OpenLightingProject/ola/issues?direction=desc&state=open

--URGENT--
resend DMX on idle (artnet every 4s)
resend DMX on idle (Art-Net every 4s)

--REQUIRED--

@@ -137,7 +137,7 @@ bool SetThreadScheduling() {
OLA_WARN << "Maximum value for --scheduler-priority is " << max;
return false;
}
#endif // _POSIX_PRORITY_SCHEDULING
#endif // _POSIX_PRIORITY_SCHEDULING

// Set the scheduling parameters.
struct sched_param param;
@@ -22,7 +22,7 @@ common_protocol_libolaproto_la_CXXFLAGS = $(COMMON_CXXFLAGS_ONLY_WARNINGS)
common_libolacommon_la_LIBADD += common/protocol/libolaproto.la

common/protocol/Ola.pb.cc common/protocol/Ola.pb.h: common/protocol/Makefile.mk common/protocol/Ola.proto
$(PROTOC) --cpp_out common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto
$(PROTOC) --cpp_out $(top_builddir)/common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto

common/protocol/OlaService.pb.cpp common/protocol/OlaService.pb.h: common/protocol/Makefile.mk common/protocol/Ola.proto protoc/ola_protoc_plugin$(EXEEXT)
$(OLA_PROTOC) --cppservice_out common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto
$(OLA_PROTOC) --cppservice_out $(top_builddir)/common/protocol --proto_path $(srcdir)/common/protocol $(srcdir)/common/protocol/Ola.proto
@@ -56,7 +56,7 @@ common_libolacommon_la_LIBADD += $(libprotobuf_LIBS)
EXTRA_DIST += common/rdm/Pids.proto

common/rdm/Pids.pb.cc common/rdm/Pids.pb.h: common/rdm/Makefile.mk common/rdm/Pids.proto
$(PROTOC) --cpp_out common/rdm --proto_path $(srcdir)/common/rdm $(srcdir)/common/rdm/Pids.proto
$(PROTOC) --cpp_out $(top_builddir)/common/rdm --proto_path $(srcdir)/common/rdm $(srcdir)/common/rdm/Pids.proto

# TESTS_DATA
##################################################

0 comments on commit ddf8a02

Please sign in to comment.
You can’t perform that action at this time.