Merge ac60b02 into 84cd83a

OpenLightingProject · Jun 29, 2021 · f45c7f4 · f45c7f4
2 parents 84cd83a + ac60b02
commit f45c7f4
Show file tree

Hide file tree

Showing 11 changed files with 144 additions and 85 deletions.
diff --git a/.github/workflows/annotation.yml b/.github/workflows/annotation.yml
@@ -6,15 +6,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 2.7
       - name: Flake8 with annotations - Python 2
         # Using the flake8 options in the .flake8 file
-        uses: peternewman/actions-flake8@python2
+        uses: TrueBrain/actions-flake8@main
   flake8-annotation-python3:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
       - name: Flake8 with annotations - Python 3
         # Using the flake8 options in the .flake8 file
-        uses: TrueBrain/actions-flake8@master
+        uses: TrueBrain/actions-flake8@main
         with:
           only_warn: 1
diff --git a/.travis.yml b/.travis.yml
@@ -77,6 +77,7 @@ jobs:
   include:
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='doxygen'
       addons:
         apt:
@@ -89,6 +90,7 @@ jobs:
            - ubuntu-toolchain-r-test
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='lint'
       addons:
         apt:
@@ -97,6 +99,7 @@ jobs:
            - *bionic_build_extras_python2
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='check-licences'
       addons:
         apt:
@@ -105,6 +108,7 @@ jobs:
            - *bionic_build_extras_python2
     - os: linux
       dist: bionic
+      arch: arm64
       env:
         - TASK='codespell'
         - PYTHON='python3'
@@ -116,20 +120,25 @@ jobs:
            - moreutils
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='weblint'
       addons:
         apt:
           packages:
     - os: linux
       dist: bionic
-      env: TASK='flake8'
+      arch: arm64
+      env:
+        - TASK='flake8'
+        - PYTHON='python3'
       addons:
         apt:
           packages:
            - *base_build
-           - *bionic_build_extras_python2
+           - *bionic_build_extras_python3
     - os: linux
       dist: xenial
+      arch: arm64
       env: TASK='pychecker'
       python: '2.7'
       addons:
@@ -139,53 +148,61 @@ jobs:
            - python-tk
     - os: linux
       dist: xenial
+      arch: arm64
       env: TASK='pychecker-wip'
       python: '2.7'
       addons:
         apt:
           packages:
            - *base_build
            - python-tk
-    - os: linux
-      dist: bionic
-      arch: amd64
-      compiler: clang
-      env:
-        - TASK='compile'
-        - PYTHON='python3'
       addons:
         apt:
           packages:
-           - *core_build_clang_latest
+           - *base_build
            - *bionic_build_extras_python3
-          sources:
-           - sourceline: "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
-             key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
-           - sourceline: "ppa:ubuntu-toolchain-r/test"
-    - os: linux
-      dist: bionic
-      arch: amd64
-      compiler: gcc
-      env: TASK='compile'
-      python: '2.7'
-      addons:
-        apt:
-          packages:
-           - *core_build_gpp_latest
-           - *bionic_build_extras_python2
-          sources:
-           - ubuntu-toolchain-r-test
+# Only run Travis builds against the zero credit partner queue solution
+#    - os: linux
+#      dist: bionic
+#      arch: amd64
+#      compiler: clang
+#      env:
+#        - TASK='compile'
+#        - PYTHON='python3'
+#      addons:
+#        apt:
+#          packages:
+#           - *core_build_clang_latest
+#           - *bionic_build_extras_python3
+#          sources:
+#           - sourceline: "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main"
+#             key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+#           - sourceline: "ppa:ubuntu-toolchain-r/test"
+#    - os: linux
+#      dist: bionic
+#      arch: amd64
+#      compiler: gcc
+#      env: TASK='compile'
+#      python: '2.7'
+#      addons:
+#        apt:
+#          packages:
+#           - *core_build_gpp_latest
+#           - *bionic_build_extras_python2
+#          sources:
+#           - ubuntu-toolchain-r-test
     - os: linux
       dist: bionic
       arch: arm64
       compiler: clang
-      env: TASK='compile'
-      python: '2.7'
+      env:
+        - TASK='compile'
+        - PYTHON='python3'
       addons:
         apt:
           packages:
            - *core_build
-           - *bionic_build_extras_python2
+           - *bionic_build_extras_python3
     - os: linux
       dist: bionic
       arch: arm64
@@ -263,40 +280,41 @@ jobs:
 #           - protobuf
 #           - libftdi0
 #          update: false
-    - os: osx
-      osx_image: xcode9.4
-      compiler: clang
-      env:
-      - TASK='compile'
-      - CPPUNIT='1.14'
-      - PROTOBUF='latest'
-      - LIBFTDI='1'
-      addons:
-        homebrew:
-          packages:
-           - *mac_core_build
-           - cppunit
-           - protobuf
-           - libftdi # install the latest cppunit, which needs C++11
-          update: false
-    - os: osx
-      osx_image: xcode9.4
-      compiler: gcc
-      env:
-      - TASK='compile'
-      - CPPUNIT='1.14'
-      - PROTOBUF='latest'
-      - LIBFTDI='1'
-      addons:
-        homebrew:
-          packages:
-           - *mac_core_build
-           - cppunit
-           - protobuf
-           - libftdi # install the latest cppunit, which needs C++11
-          update: false
+#    - os: osx
+#      osx_image: xcode9.4
+#      compiler: clang
+#      env:
+#      - TASK='compile'
+#      - CPPUNIT='1.14'
+#      - PROTOBUF='latest'
+#      - LIBFTDI='1'
+#      addons:
+#        homebrew:
+#          packages:
+#           - *mac_core_build
+#           - cppunit
+#           - protobuf
+#           - libftdi # install the latest cppunit, which needs C++11
+#          update: false
+#    - os: osx
+#      osx_image: xcode9.4
+#      compiler: gcc
+#      env:
+#      - TASK='compile'
+#      - CPPUNIT='1.14'
+#      - PROTOBUF='latest'
+#      - LIBFTDI='1'
+#      addons:
+#        homebrew:
+#          packages:
+#           - *mac_core_build
+#           - cppunit
+#           - protobuf
+#           - libftdi # install the latest cppunit, which needs C++11
+#          update: false
     - os: linux
       dist: bionic
+      arch: arm64
       compiler: gcc
       env: TASK='coverage'
       addons:
@@ -307,6 +325,7 @@ jobs:
            - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: xenial
+      arch: arm64
       compiler: gcc
       env: TASK='coverity'
       addons:
@@ -319,25 +338,30 @@ jobs:
            - sourceline: "ppa:ubuntu-toolchain-r/test"
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='spellintian'
       addons:
         apt:
           packages:
            - *core_build
+           - *bionic_build_extras_python2
            - lintian
            - moreutils
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='spellintian-duplicates'
       addons:
         apt:
           packages:
            - *core_build
+           - *bionic_build_extras_python2
            - lintian
            - moreutils
   allow_failures:
     - os: linux
       dist: xenial
+      arch: arm64
       env: TASK='pychecker-wip'
 #    - os: osx
 #      osx_image: xcode9.4
@@ -399,17 +423,27 @@ jobs:
       - LIBFTDI='1'
     - os: linux
       dist: bionic
+      arch: arm64
+      env:
+      - TASK='flake8'
+      - PYTHON='python3'
+    - os: linux
+      dist: bionic
+      arch: arm64
       compiler: gcc
       env: TASK='coverage'
     - os: linux
       dist: xenial
+      arch: arm64
       compiler: gcc
       env: TASK='coverity'
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='spellintian'
     - os: linux
       dist: bionic
+      arch: arm64
       env: TASK='spellintian-duplicates'
 
 env:
@@ -449,7 +483,8 @@ before_cache:
   - ccache -s # see how many hits ccache got
 
 before_install:
- - if [ "$PYTHON" == "python3" ]; then pyenv global 3.8.1 ; fi
+# Try doing nothing (on arm64 at least)
+# - if [ "$PYTHON" == "python3" ]; then pyenv global 3.8.1 ; fi
 #Fix permissions for unbound (and possibly others)
  - 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
 #Add a missing gnupg folder

diff --git a/README b/README
@@ -2,7 +2,7 @@
 
 [www.openlighting.org/ola](https://www.openlighting.org/ola)
 
-[![Build Status](https://travis-ci.org/OpenLightingProject/ola.svg?branch=master)](https://travis-ci.org/OpenLightingProject/ola) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/r/OpenLightingProject/ola?branch=master)
+[![Build Status](https://travis-ci.com/github/OpenLightingProject/ola.svg?branch=master)](https://travis-ci.com/github/OpenLightingProject/ola) [![Coverity Scan Status](https://scan.coverity.com/projects/3514/badge.svg)](https://scan.coverity.com/projects/3514) [![Coverage Status](https://coveralls.io/repos/OpenLightingProject/ola/badge.svg?branch=master)](https://coveralls.io/r/OpenLightingProject/ola?branch=master)
 
 The Open Lighting Architecture (OLA) is a framework for controlling
 entertainment lighting equipment. Within the entertainment lighting industry,

diff --git a/include/ola/MultiCallback.h b/include/ola/MultiCallback.h
@@ -14,7 +14,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * MultiCallback.h
- * A callback which can be exectuted multiple times. When a pre-defined limit
+ * A callback which can be executed multiple times. When a pre-defined limit
  * is reached, then the underlying callback is executed.
  * Copyright (C) 2011 Simon Newton
  */
@@ -66,7 +66,7 @@ namespace ola {
  *
  * @note MultiCallback is <b>NOT</b> thread safe.
  *
- * @note If limit is 0, the callback is exectuted immediately.
+ * @note If limit is 0, the callback is executed immediately.
  */
 class MultiCallback: public BaseCallback0<void> {
  public:

diff --git a/include/ola/rdm/RDMCommandSerializer.h b/include/ola/rdm/RDMCommandSerializer.h
@@ -78,7 +78,7 @@ class RDMCommandSerializer {
   /**
    * @brief Serialize a RDMCommand to an array of bytes.
    * @param command the RDMCommand to serialize.
-   * @param buffer The memory location to serailize to.
+   * @param buffer The memory location to serialize to.
    * @param[in,out] size The size of the memory location.
    * @returns True if the command was serialized correctly, false otherwise.
    *

diff --git a/olad/BonjourDiscoveryAgent.cpp b/olad/BonjourDiscoveryAgent.cpp
@@ -160,7 +160,7 @@ string BonjourDiscoveryAgent::BuildTxtRecord(
     unsigned int pair_size = iter->first.size() + iter->second.size() + 1;
     if (pair_size > UINT8_MAX) {
       OLA_WARN << "Discovery data of " << iter->first << ": " << iter->second
-               << " exceeed " << static_cast<int>(UINT8_MAX)
+               << " exceed " << static_cast<int>(UINT8_MAX)
                << " bytes. Data skipped";
       continue;
     }

diff --git a/plugins/ftdidmx/README.md b/plugins/ftdidmx/README.md
@@ -1,9 +1,9 @@
 FTDI USB Chipset DMX Plugin
 ===========================
 
-This plugin is compatible with Enttec OpenDmx and other FTDI chipset based
-USB to DMX converters where the host needs to create the DMX stream itself
-and not the interface (the interface has no microprocessor to do so).
+This plugin is compatible with Enttec Open DMX USB and other FTDI chipset
+based USB to DMX converters where the host needs to create the DMX stream
+itself and not the interface (the interface has no microprocessor to do so).
 
 
 ## Config file: ola-ftdidmx.conf

diff --git a/plugins/opendmx/README.md b/plugins/opendmx/README.md
@@ -2,7 +2,8 @@ Enttec Open DMX Plugin
 ======================
 
 The plugin creates a single device with one output port using the Enttec
-Open DMX USB widget.
+Open DMX USB widget. It requires the Open DMX kernel module, if you don't
+have this installed, use the FTDI DMX USB plugin instead.
 
 
 ## Config file: `ola-opendmx.conf`