Merge branch '0.10' into 0.10

debian/control

@@ -2,7 +2,7 @@ Source: ola
 Priority: extra
 Maintainer: Wouter Verhelst <[email protected]>
 Uploaders: RenZO <[email protected]>
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, python-numpy, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python, python-protobuf, python-numpy, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev
 Standards-Version: 3.9.5
 Section: libs
 Vcs-Git: https://github.com/OpenLightingProject/ola.git

examples/ola-streaming-client.cpp

@@ -35,7 +35,9 @@ using std::endl;
 using std::string;
 using ola::client::StreamingClient;
 
-DEFINE_s_string(dmx, d, "", "DMX512 data, e.g. '1,240,0,255'");
+DEFINE_s_string(dmx, d, "", "Comma separated DMX values to send, e.g. "
+                            "0,255,128 sets first channel to 0, second "
+                            "channel to 255 and third channel to 128.");
 DEFINE_s_uint32(universe, u, 1, "The universe to send data for");
 DEFINE_uint8(priority, ola::dmx::SOURCE_PRIORITY_DEFAULT,
              "The universe to send data for");

man/ola_streaming_client.1

@@ -11,7 +11,7 @@ will read from STDIN.
 .IP "-h, --help"
 Display the help message.
 .IP "-d, --dmx <dmx data>"
-The DMX512 data to send, e.g. '1,240,0,255'
+Comma separated DMX values to send, e.g. 0,255,128 sets first channel to 0, second channel to 255 and third channel to 128.
 .IP "-l, --log-level <int8_t>"
 Set the logging level 0 .. 4.
 .IP "-u, --universe <universe-id>"