From 1654d20ead172b898788edc37a0a589c07fdbf74 Mon Sep 17 00:00:00 2001 From: Bartosz Kostrzewa Date: Thu, 12 May 2011 20:56:38 +0200 Subject: [PATCH] added entec driver and OLA test programs --- entec-driver/dmx_usb_module | 1 + ola-test/blackout | Bin 0 -> 8467 bytes ola-test/blackout.cpp | 47 +++++++++++++++++++++++++++++ ola-test/compile-blackout.sh | 1 + ola-test/compile.sh | 1 + ola-test/flash | Bin 0 -> 12669 bytes ola-test/flash.cpp | 57 +++++++++++++++++++++++++++++++++++ 7 files changed, 107 insertions(+) create mode 160000 entec-driver/dmx_usb_module create mode 100755 ola-test/blackout create mode 100644 ola-test/blackout.cpp create mode 100644 ola-test/compile-blackout.sh create mode 100644 ola-test/compile.sh create mode 100755 ola-test/flash create mode 100644 ola-test/flash.cpp diff --git a/entec-driver/dmx_usb_module b/entec-driver/dmx_usb_module new file mode 160000 index 0000000..3253e7b --- /dev/null +++ b/entec-driver/dmx_usb_module @@ -0,0 +1 @@ +Subproject commit 3253e7b6ef906ce78e423245925f658cba35530a diff --git a/ola-test/blackout b/ola-test/blackout new file mode 100755 index 0000000000000000000000000000000000000000..592b67e8e35ff538a361c6739bbb94bb48bf2b22 GIT binary patch literal 8467 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 literal 0 HcmV?d00001 diff --git a/ola-test/blackout.cpp b/ola-test/blackout.cpp new file mode 100644 index 0000000..bf77be2 --- /dev/null +++ b/ola-test/blackout.cpp @@ -0,0 +1,47 @@ +#include +#include +#include +#include +#include +#include + +#include + +using std::cout; +using std::endl; + +int main(int argc, char *argv[]) { +unsigned int universe = 0; // universe to use for sending data +unsigned int i; + +// turn on OLA logging +ola::InitLogging(ola::OLA_LOG_WARN, ola::OLA_LOG_STDERR); + +// Create a new DmxBuffer to hold the data +ola::DmxBuffer buffer; +// set all channels to 0 +buffer.Blackout(); + +// create a new client and set the Error Closure +ola::StreamingClient ola_client; + +// Setup the client, this connects to the server +if (!ola_client.Setup()) { +cout << "Setup failed" << endl; +exit(1); +} + + + +// send the data to the ola server + +if (!ola_client.SendDmx(0, buffer)) { + cout << "Send DMX failed" << endl; + exit(1); + } + +// close the connection +ola_client.Stop(); +return 0; +} + diff --git a/ola-test/compile-blackout.sh b/ola-test/compile-blackout.sh new file mode 100644 index 0000000..5a68569 --- /dev/null +++ b/ola-test/compile-blackout.sh @@ -0,0 +1 @@ +g++ -I/usr/local/include/libola -L/usr/local/lib -lola -lolacommon -lprotobuf blackout.cpp -o blackout diff --git a/ola-test/compile.sh b/ola-test/compile.sh new file mode 100644 index 0000000..9cb5f3c --- /dev/null +++ b/ola-test/compile.sh @@ -0,0 +1 @@ +g++ -I/usr/local/include/libola -L/usr/local/lib -lola -lolacommon -lprotobuf flash.cpp -o flash diff --git a/ola-test/flash b/ola-test/flash new file mode 100755 index 0000000000000000000000000000000000000000..f884c65fb273917a264ae8227062cf13f03805f5 GIT binary patch literal 12669 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 PpWYVi>KAI+%SZNa)6Ago literal 0 HcmV?d00001 diff --git a/ola-test/flash.cpp b/ola-test/flash.cpp new file mode 100644 index 0000000..fe1e1bc --- /dev/null +++ b/ola-test/flash.cpp @@ -0,0 +1,57 @@ +#include +#include +#include +#include +#include +#include + +#include + +using std::cout; +using std::endl; + +int main(int argc, char *argv[]) { +unsigned int universe = 0; // universe to use for sending data +unsigned int i; + +// turn on OLA logging +ola::InitLogging(ola::OLA_LOG_WARN, ola::OLA_LOG_STDERR); + +// Create a new DmxBuffer to hold the data +ola::DmxBuffer buffer; +// set all channels to 0 +buffer.Blackout(); + +// create a new client and set the Error Closure +ola::StreamingClient ola_client; + +// Setup the client, this connects to the server +if (!ola_client.Setup()) { +cout << "Setup failed" << endl; +exit(1); +} + + + +// send the data to the ola server + +double t = 0.0; +while(1) { + t += 0.1; + buffer.SetChannel(4, (int)(127+128*sin(t))); + buffer.SetChannel(5, (int)(127+128*cos(t/4))); +//for(int j = 0; j < 255; j++) { +if (!ola_client.SendDmx(0, buffer)) { + cout << "Send DMX failed" << endl; + exit(1); + } +usleep(20000); // sleep for 20ms between updates +//cout << "universe " << j << endl; +//} +} + +// close the connection +ola_client.Stop(); +return 0; +} +