Merge pull request #1438 from peternewman/master-resync

peternewman · web-flow · commit d1010976c47d · 2018-06-27T15:42:05.000+01:00
Master resync
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 *.lo
 *.log
 *.o
+*.o.*
 *.o-????????
 *.pb.cc
 *.pb.cpp
diff --git a/.travis.yml b/.travis.yml
@@ -73,15 +73,15 @@ matrix:
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
-      - PROTOBUF='3.5'
+      - PROTOBUF='3.6'
       - LIBFTDI='1'
     - os: osx
       osx_image: xcode9.3
       compiler: gcc
       env:
       - TASK='compile'
       - CPPUNIT='1.14'
-      - PROTOBUF='3.5'
+      - PROTOBUF='3.6'
       - LIBFTDI='1'
     - os: linux
       dist: trusty
@@ -278,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
@@ -298,9 +298,9 @@ before_install:
  - 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.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
+ - 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
diff --git a/NEWS b/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:
diff --git a/data/rdm/manufacturer_pids.proto b/data/rdm/manufacturer_pids.proto
@@ -50,7 +50,7 @@ manufacturer {
 }
 manufacturer {
   manufacturer_id: 776
-  manufacturer_name: "ImageCue LLC "
+  manufacturer_name: "ImageCue LLC"
   pid {
     name: "SERIAL_NUMBER"
     value: 32976
@@ -6793,6 +6793,116 @@ manufacturer {
     }
     set_sub_device_range: ROOT_OR_ALL_SUBDEVICE
   }
+  pid {
+    name: "TOUCHSCREEN_LOCK"
+    value: 40975
+    get_request {
+    }
+    get_response {
+      field {
+        type: UINT8
+        name: "Touchscreen Lock Delay"
+        label {
+          value: 0
+          label: "Off"
+        }
+        label {
+          value: 1
+          label: "1 Minute"
+        }
+        label {
+          value: 2
+          label: "2 Minutes"
+        }
+        label {
+          value: 3
+          label: "3 Minutes"
+        }
+        label {
+          value: 4
+          label: "4 Minutes"
+        }
+        label {
+          value: 5
+          label: "5 Minutes"
+        }
+        label {
+          value: 6
+          label: "6 Minutes"
+        }
+        label {
+          value: 7
+          label: "7 Minutes"
+        }
+        label {
+          value: 8
+          label: "8 Minutes"
+        }
+        label {
+          value: 9
+          label: "9 Minutes"
+        }
+        label {
+          value: 10
+          label: "10 Minutes"
+        }
+      }
+    }
+    get_sub_device_range: ROOT_OR_SUBDEVICE
+    set_request {
+      field {
+        type: UINT8
+        name: "Touchscreen Lock Delay"
+        label {
+          value: 0
+          label: "Off"
+        }
+        label {
+          value: 1
+          label: "1 Minute"
+        }
+        label {
+          value: 2
+          label: "2 Minutes"
+        }
+        label {
+          value: 3
+          label: "3 Minutes"
+        }
+        label {
+          value: 4
+          label: "4 Minutes"
+        }
+        label {
+          value: 5
+          label: "5 Minutes"
+        }
+        label {
+          value: 6
+          label: "6 Minutes"
+        }
+        label {
+          value: 7
+          label: "7 Minutes"
+        }
+        label {
+          value: 8
+          label: "8 Minutes"
+        }
+        label {
+          value: 9
+          label: "9 Minutes"
+        }
+        label {
+          value: 10
+          label: "10 Minutes"
+        }
+      }
+    }
+    set_response {
+    }
+    set_sub_device_range: ROOT_OR_ALL_SUBDEVICE
+  }
 }
 manufacturer {
   manufacturer_id: 21324
@@ -9054,4 +9164,4 @@ manufacturer {
     set_sub_device_range: ROOT_DEVICE
   }
 }
-version: 1521301591
+version: 1528709287
diff --git a/plugins/ftdidmx/FtdiDmxDevice.h b/plugins/ftdidmx/FtdiDmxDevice.h
@@ -48,6 +48,10 @@ class FtdiDmxDevice : public Device {
   std::string Description() const { return m_widget_info.Description(); }
   FtdiWidget* GetDevice() { return m_widget; }
 
+  // We can send the same universe to multiple ports, or patch port 2 before
+  // port 1
+  bool AllowMultiPortPatching() const { return true; }
+
  protected:
   bool StartHook();
 
