Resync 0.10 into master

.travis.yml

@@ -37,7 +37,14 @@ addons:
 matrix:
   fast_finish: true
   include:
-    - compiler: clang
+    - os: osx
+      compiler: clang
+      env: TASK='compile'
+    - os: osx
+      compiler: gcc
+      env: TASK='compile'
+    - os: linux
+      compiler: clang
       env: TASK='compile'
       addons:
         apt:
@@ -46,23 +53,26 @@ matrix:
           sources:
            - ubuntu-toolchain-r-test
            - llvm-toolchain-precise
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       env: TASK='compile'
       addons:
         apt:
           packages:
            - *core_build_gpp_latest
           sources:
            - ubuntu-toolchain-r-test
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       env: TASK='coverage'
       addons:
         apt:
           packages:
            - *core_build_gpp_latest
           sources:
            - ubuntu-toolchain-r-test
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       env: TASK='coverity'
       addons:
         apt:
@@ -72,7 +82,8 @@ matrix:
            - g++-4.9
           sources:
            - ubuntu-toolchain-r-test
-    - env: TASK='doxygen'
+    - os: linux
+      env: TASK='doxygen'
       addons:
         apt:
           packages:
@@ -81,21 +92,25 @@ matrix:
            - graphviz
           sources:
            - ubuntu-toolchain-r-test
-    - env: TASK='lint'
+    - os: linux
+      env: TASK='lint'
       addons:
         apt:
           packages:
            - *core_build
-    - env: TASK='check-licences'
+    - os: linux
+      env: TASK='check-licences'
       addons:
         apt:
           packages:
            - *core_build
-    - env: TASK='jshint'
+    - os: linux
+      env: TASK='jshint'
       addons:
         apt:
           packages:
-    - env: TASK='flake8'
+    - os: linux
+      env: TASK='flake8'
       addons:
         apt:
           packages:
@@ -108,9 +123,11 @@ matrix:
            - python-numpy
            - python-rrdtool
   allow_failures:
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       env: TASK='coverage'
-    - compiler: gcc
+    - os: linux
+      compiler: gcc
       env: TASK='coverity'
     - env: TASK='pychecker'
 
@@ -151,19 +168,25 @@ install:
   - if [ "$TASK" = "pychecker" ]; then pip install --user http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
 
 before_install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache cppunit bison flex ossp-uuid protobuf-c libftdi libftdi0 libusb liblo libmicrohttpd; fi
+ - 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
 #Coverity doesn't work with g++ 5, so only upgrade to g++ 4.9 for that
- - if [ \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-5" CC="ccache gcc-5"; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-5" CC="ccache gcc-5"; fi
  - if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="ccache g++-4.9" CC="ccache gcc-4.9"; fi
 #Use the latest clang if we're compiling with clang
- - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.8" CC="clang-3.8"; fi
+ - if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-3.8" CC="clang-3.8"; fi
 #Report the compiler version
  - $CXX --version
 
+after_failure:
+  - cat ${TRAVIS_BUILD_DIR}/ola-*/_build/test-suite.log
+
 after_success:
   - if [ "$TASK" = "coverage" ]; then coveralls --gcov /usr/bin/gcov-5 -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 cat /home/travis/build/${TRAVIS_REPO_SLUG}/cov-int/scm_log.txt; fi
+  - if [ "$TASK" = "coverity" ]; then cat ${TRAVIS_BUILD_DIR}/cov-int/scm_log.txt; fi
 
 notifications:
   irc:

NEWS

@@ -1,4 +1,4 @@
-x/y/2016 ola-0.10.1
+x/y/2016 ola-0.10.2
  Features:
  * 
 
@@ -9,11 +9,26 @@ x/y/2016 ola-0.10.1
  * 
 
  Bugs:
- * Check if a device exists before trying to acquire a UUCP lock file for it #1006
+ *
 
  Internal:
  *
 
+29/2/2016 ola-0.10.1
+ Features:
+ * Add support for Osram Lightify products via a Philips Hue bridge
+ * Add Stellascapes Lightwidgets Number1 PIDs
+ * Add a warning to the Web UIs if Javascript is disabled.
+
+ Bugs:
+ * Check if a device exists before trying to acquire a UUCP lock file for it #1006
+ * Fix the build on FreeBSD
+ * Fix the build when using the musl C library
+ * Python RpcChannel incorrectly decodes message header on big-endian machines
+ * Fix a configure warning on OpenBSD
+ * Allow you to set DMX address of a one slot device to 512 #1042. The JSON API now returns min and max inclusive
+ * Switch to pkg-config for cppunit detection #1043
+
 3/1/2016 ola-0.10.0
  Features:
  * Add better logging for open()

config/ola_version.m4

@@ -19,7 +19,7 @@
 # -----------------------------------------------------------------------------
 m4_define([ola_major_version], [0])
 m4_define([ola_minor_version], [10])
-m4_define([ola_revision_version], [0])
+m4_define([ola_revision_version], [1])
 
 m4_define([ola_version],
       [ola_major_version.ola_minor_version.ola_revision_version])

data/rdm/manufacturer_pids.proto

@@ -279,6 +279,129 @@ manufacturer {
     set_sub_device_range: ROOT_OR_ALL_SUBDEVICE
   }
 }
+manufacturer {
+  manufacturer_id: 11720
+  manufacturer_name: "Stellascapes"
+  pid {
+    name: "MODEL_ID"
+    value: 32770
+    get_request {
+    }
+    get_response {
+      field {
+        type: UINT16
+        name: "model_id"
+      }
+    }
+    get_sub_device_range: ROOT_DEVICE
+    set_request {
+      field {
+        type: UINT16
+        name: "model_id"
+      }
+    }
+    set_response {
+    }
+    set_sub_device_range: ROOT_DEVICE
+  }
+  pid {
+    name: "MODEL_ID_LIST"
+    value: 32771
+    get_request {
+    }
+    get_response {
+      field {
+        type: GROUP
+        name: "models"
+        field {
+          type: UINT16
+          name: "model_id"
+        }
+      }
+    }
+    get_sub_device_range: ROOT_DEVICE
+  }
+  pid {
+    name: "PIXEL_TYPE"
+    value: 32773
+    get_request {
+    }
+    get_response {
+      field {
+        type: UINT16
+        name: "pixel_type"
+        label {
+          value: 1
+          label: "LPD8806"
+        }
+        label {
+          value: 2
+          label: "WS2801"
+        }
+        label {
+          value: 3
+          label: "P9813"
+        }
+        label {
+          value: 4
+          label: "APA102"
+        }
+      }
+    }
+    get_sub_device_range: ROOT_DEVICE
+    set_request {
+      field {
+        type: UINT16
+        name: "pixel_type"
+        label {
+          value: 1
+          label: "LPD8806"
+        }
+        label {
+          value: 2
+          label: "WS2801"
+        }
+        label {
+          value: 3
+          label: "P9813"
+        }
+        label {
+          value: 4
+          label: "APA102"
+        }
+      }
+    }
+    set_response {
+    }
+    set_sub_device_range: ROOT_DEVICE
+  }
+  pid {
+    name: "PIXEL_COUNT"
+    value: 32774
+    get_request {
+    }
+    get_response {
+      field {
+        type: UINT16
+        name: "pixel_count"
+      }
+    }
+    get_sub_device_range: ROOT_DEVICE
+    set_request {
+      field {
+        type: UINT16
+        name: "pixel_count"
+        range {
+          min: 1
+          max: 65535
+        }
+      }
+    }
+    set_response {
+    }
+    set_sub_device_range: ROOT_DEVICE
+  }
+}
 manufacturer {
   manufacturer_id: 16761
   manufacturer_name: "AYRTON"
@@ -8263,4 +8386,4 @@ manufacturer {
     set_sub_device_range: ROOT_DEVICE
   }
 }
-version: 1438559429
+version: 1455773308

debian/changelog

@@ -1,3 +1,9 @@
+ola (0.10.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Simon Newton <[email protected]>  Sun, 29 Feb 2016 07:51:00 -0700
+
 ola (0.10.0-1) unstable; urgency=low
 
   * New upstream release

include/ola/Constants.h

@@ -36,6 +36,16 @@ enum {
   DMX_UNIVERSE_SIZE = 512  /**< The number of slots in a DMX512 universe. */
 };
 
+/**
+ * @brief The minimum number for a DMX512 slot.
+ */
+static const uint16_t DMX_MIN_SLOT_NUMBER = 1;
+
+/**
+ * @brief The maximum number for a DMX512 slot.
+ */
+static const uint16_t DMX_MAX_SLOT_NUMBER = DMX_UNIVERSE_SIZE;
+
 /**
  * @brief The minimum value a DMX512 slot can take.
  */

olad/RDMHTTPModule.cpp

@@ -2104,8 +2104,8 @@ void RDMHTTPModule::GetStartAddressHandler(
   } else {
     UIntItem *uint_item = new UIntItem("DMX Start Address", address,
                                        ADDRESS_FIELD);
-    uint_item->SetMin(0);
-    uint_item->SetMax(DMX_UNIVERSE_SIZE - 1);
+    uint_item->SetMin(DMX_MIN_SLOT_NUMBER);
+    uint_item->SetMax(DMX_MAX_SLOT_NUMBER);
     item = uint_item;
   }
   section.AddItem(item);

olad/www/mobile.html

@@ -448,6 +448,15 @@
       <div id="plugin_info_frame"></div>
     </div>
 
+    <noscript>
+      <br>
+      <p align="center">
+        <strong>This interface requires JavaScript to function. If you
+          would like to use it, please enable JavaScript and reload
+          the page.</strong>
+      </p>
+      <br>
+    </noscript>
 
     <div id='footer'>
       OLA &copy; 2005-2015 Open Lighting Project<br/>

olad/www/new/index.html

@@ -89,6 +89,15 @@
  </div>
  <!-- /.container-fluid -->
 </nav>
+<noscript>
+  <br>
+  <p align="center">
+    <strong>This interface requires JavaScript to function. If you
+      would like to use it, please enable JavaScript and reload the
+      page.</strong>
+  </p>
+  <br>
+</noscript>
 <div id="errorAlerts"></div>
 <div id="ngView" class="container-fluid" ng-view></div>
 <div class="modal fade" id="errorModal" tabindex="-1" role="dialog"

olad/www/ola.html

@@ -1015,6 +1015,15 @@ <h2 id="plugin_name"></h2>
         </div>
       </div>
     </div>
+    <noscript>
+      <br>
+      <p align="center">
+        <strong>This interface requires JavaScript to function. If you
+          would like to use it, please enable JavaScript and reload
+          the page.</strong>
+      </p>
+      <br>
+    </noscript>
 
     <div id='footer'>
       OLA &copy; 2005-2015 Open Lighting Project<br>