Initial FTDI RDM support

.gitignore

@@ -246,3 +246,7 @@ javascript/new-src/node_modules
 .cproject
 .settings
 .vscode/
+*.config
+*.creator*
+*.files
+*.includes

.travis.yml

@@ -296,6 +296,7 @@ before_install:
  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall libtool; fi
 #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 if [ ! -d /usr/local/sbin ]; then sudo mkdir -p /usr/local/sbin && sudo chown -R $(whoami) /usr/local/sbin; fi; 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

common/utils/StringUtils.cpp

@@ -152,13 +152,16 @@ bool StringToBoolTolerant(const string &value, bool *output) {
   return false;
 }
 
-bool StringToInt(const string &value, unsigned int *output, bool strict) {
+bool StringToInt(const string &value,
+                 unsigned int *output,
+                 bool strict,
+                 uint8_t base) {
   if (value.empty()) {
     return false;
   }
   char *end_ptr;
   errno = 0;
-  long long l = strtoll(value.data(), &end_ptr, 10);  // NOLINT(runtime/int)
+  long long l = strtoll(value.data(), &end_ptr, base);  // NOLINT(runtime/int)
   if (l < 0 || (l == 0 && errno != 0)) {
     return false;
   }
@@ -168,10 +171,12 @@ bool StringToInt(const string &value, unsigned int *output, bool strict) {
   if (strict && *end_ptr != 0) {
     return false;
   }
+
+  *output = static_cast<unsigned int>(l);
+
   if (l > static_cast<long long>(UINT32_MAX)) {  // NOLINT(runtime/int)
     return false;
   }
-  *output = static_cast<unsigned int>(l);
   return true;
 }
 
@@ -199,16 +204,19 @@ bool StringToInt(const string &value, uint8_t *output, bool strict) {
   return true;
 }
 
-bool StringToInt(const string &value, int *output, bool strict) {
+bool StringToInt(const string &value, int *output, bool strict, uint8_t base) {
   if (value.empty()) {
     return false;
   }
   char *end_ptr;
   errno = 0;
-  long long l = strtoll(value.data(), &end_ptr, 10);  // NOLINT(runtime/int)
+  long long l = strtoll(value.data(), &end_ptr, base);  // NOLINT(runtime/int)
   if (l == 0 && errno != 0) {
     return false;
   }
+
+  *output = static_cast<unsigned int>(l);
+
   if (value == end_ptr) {
     return false;
   }
@@ -218,7 +226,7 @@ bool StringToInt(const string &value, int *output, bool strict) {
   if (l < INT32_MIN || l > INT32_MAX) {
     return false;
   }
-  *output = static_cast<unsigned int>(l);
+
   return true;
 }
 

include/ola/StringUtils.h

@@ -262,12 +262,14 @@ bool StringToBoolTolerant(const std::string &value, bool *output);
  * @param[in] value the string to convert
  * @param[out] output a pointer where the value will be stored.
  * @param[in] strict this controls if trailing characters produce an error.
+ * @param[in] base sets the base of the input string, default decimal (10)
  * @returns true if the value was converted, false if the string was not an int
  * or the value was too large / small for the type.
  */
 bool StringToInt(const std::string &value,
                  unsigned int *output,
-                 bool strict = false);
+                 bool strict = false,
+                 uint8_t base = 10);
 
 /**
  * @brief Convert a string to a uint16_t.
@@ -300,11 +302,15 @@ bool StringToInt(const std::string &value,
  * @param[in] value the string to convert
  * @param[out] output a pointer where the value will be stored.
  * @param[in] strict this controls if trailing characters produce an error.
+ * @param[in] base sets the base of the input string, default decimal (10)
  * @returns true if the value was converted, false if the string was not an int
  * or the value was too large / small for the type.
  * @sa StringToInt.
  */
-bool StringToInt(const std::string &value, int *output, bool strict = false);
+bool StringToInt(const std::string &value,
+                 int *output,
+                 bool strict = false,
+                 uint8_t base = 10);
 
 /**
  * @brief Convert a string to a int16_t.

plugins/convert_README_to_header.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # A simple script to build a C++ header file containing the plugin description
 # from the plugin's README.md
@@ -30,8 +30,8 @@ outfilename=`basename $outfile`;
 # See http://stackoverflow.com/a/16576291
 # On Mac OS's sed, \n is not recognized as a newline character, but
 # \[actual newline] works
-desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's/\"/\\\"/g' -e 's/\n/\\\\n"\\
-"/g' "$path/README.md"`;
+desc=`sed -e ':a' -e 'N' -e '$!ba' -e 's#\\\#\\\\\\\#g' -e 's#\"#\\\"#g' -e 's#\n#\\\\n"\\
+"#g' "$path/README.md"`;
 
 identifier=`echo "PLUGINS_${plugin}_${outfilename%.h}_H_" | tr '[:lower:]' '[:upper:]'`
 

plugins/ftdidmx/FtdiDmxDevice.cpp

@@ -56,15 +56,19 @@ FtdiDmxDevice::~FtdiDmxDevice() {
 bool FtdiDmxDevice::StartHook() {
   unsigned int interface_count = m_widget->GetInterfaceCount();
   unsigned int successfully_added = 0;
+  unsigned int serial = 0;
 
   OLA_INFO << "Widget " << m_widget->Name() << " has " << interface_count
            << " interfaces.";
 
   for (unsigned int i = 1; i <= interface_count; i++) {
+    if (!StringToInt(m_widget->Serial(), &serial, false, 36)) {
+      OLA_WARN << "StringToInt returned false, serial used: " << serial;
+    }
     FtdiInterface *port = new FtdiInterface(m_widget,
                                             static_cast<ftdi_interface>(i));
     if (port->SetupOutput()) {
-      AddPort(new FtdiDmxOutputPort(this, port, i, m_frequency));
+      AddPort(new FtdiDmxOutputPort(this, port, i, m_frequency, serial));
       successfully_added += 1;
     } else {
       OLA_WARN << "Failed to add interface: " << i;

plugins/ftdidmx/FtdiDmxPort.h

@@ -29,8 +29,12 @@
 #include <string>
 
 #include "ola/DmxBuffer.h"
+#include "ola/rdm/DiscoveryAgent.h"
+#include "ola/rdm/RDMResponseCodes.h"
+
 #include "olad/Port.h"
 #include "olad/Preferences.h"
+
 #include "plugins/ftdidmx/FtdiDmxDevice.h"
 #include "plugins/ftdidmx/FtdiWidget.h"
 #include "plugins/ftdidmx/FtdiDmxThread.h"
@@ -44,10 +48,11 @@ class FtdiDmxOutputPort : public ola::BasicOutputPort {
     FtdiDmxOutputPort(FtdiDmxDevice *parent,
                       FtdiInterface *interface,
                       unsigned int id,
-                      unsigned int freq)
-        : BasicOutputPort(parent, id),
+                      unsigned int freq,
+                      unsigned int serial)
+      : BasicOutputPort(parent, id, true, true),
           m_interface(interface),
-          m_thread(interface, freq) {
+          m_thread(interface, freq, serial) {
       m_thread.Start();
     }
     ~FtdiDmxOutputPort() {
@@ -59,6 +64,18 @@ class FtdiDmxOutputPort : public ola::BasicOutputPort {
       return m_thread.WriteDMX(buffer);
     }
 
+    void SendRDMRequest(ola::rdm::RDMRequest *request,
+                        ola::rdm::RDMCallback *callback) {
+      m_thread.SendRDMRequest(request, callback);
+    }
+
+    void RunFullDiscovery(ola::rdm::RDMDiscoveryCallback *callback) {
+      m_thread.RunFullDiscovery(callback);
+    }
+    void RunIncrementalDiscovery(ola::rdm::RDMDiscoveryCallback *callback) {
+      m_thread.RunIncrementalDiscovery(callback);
+    }
+
     std::string Description() const { return m_interface->Description(); }
 
  private: