Merge branch 'e1.20-2025' of https://github.com/peternewman/ola into e1.20-2025

Author: peternewman

.codespellignorelines

@@ -62,7 +62,7 @@ const uint8_t BaseRobeWidget::SOM;
         /^(?:([0-9]{1,3})(?:\s(THRU)\s(?:([0-9]{1,3}))?)?(?:\s(@)\s(?:([0-9]{1,3}|FULL))?)?)/;
             $scope.input(' THRU ');
   manufacturer_name: "ALS Stanislaw Binkiewicz"
-  manufacturer_name: "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""
+  manufacturer_name: "EK INC (formerly Guangzhou Litewise Lighting Equipments Co., Ltd.)"
   manufacturer_name: "Guangzhou VAS Lighting Co., Ltd."
   manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
   manufacturer_name: "MEDIAM Ltd. (Modus brand)"

.github/workflows/build.yaml

@@ -1,5 +1,9 @@
 name: build
 on: [push, pull_request]
+
+permissions:
+  contents: read
+
 jobs:
   build:
     name: "${{ matrix.id }}"
@@ -57,6 +61,8 @@ jobs:
       - name: Install Git
         run: apt-get -y install git
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Install build tools
         shell: bash
         run: |
@@ -114,7 +120,8 @@ jobs:
         # actually exclude it, so it must first be touched
         run: |
           touch ola-${{ matrix.id }}-source-tree.tar.gz
-          tar --exclude=ola-${{ matrix.id }}-source-tree.tar.gz -cvzf ola-${{ matrix.id }}-source-tree.tar.gz .
+          touch .git
+          tar --exclude=ola-${{ matrix.id }}-source-tree.tar.gz --exclude=.git -cvzf ola-${{ matrix.id }}-source-tree.tar.gz .
       - name: SHA256 artifact archives
         if: always()
         run: sha256sum ola-*.tar.gz

.github/workflows/debian.yml

@@ -3,6 +3,10 @@
 
 name: debian
 on: [push, pull_request]
+
+permissions:
+  contents: read
+
 jobs:
   debian-build:
     name: 'Debian Build ${{ matrix.image_tag }} ${{ matrix.architecture }}'
@@ -28,6 +32,8 @@ jobs:
       - name: Install Git
         run: apt-get -y install git
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Install build tools
         run: apt-get -y install devscripts adduser fakeroot sudo
       - name: Install build dependencies
@@ -70,7 +76,9 @@ jobs:
         architecture: [amd64]
     container: debian:${{ matrix.image_tag }}
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:

.github/workflows/isort.yml

@@ -1,12 +1,15 @@
 name: isort
 
-on:
-  - push
-  - pull_request
+on: [push, pull_request]
+
+permissions:
+  contents: read
 
 jobs:
   isort:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - uses: isort/isort-action@v1

.github/workflows/lint.yaml

@@ -1,5 +1,9 @@
 name: lint
 on: [push, pull_request]
+
+permissions:
+  contents: read
+
 jobs:
   build:
     name: Build for Lint Tasks
@@ -17,6 +21,8 @@ jobs:
       - name: Install Git
         run: apt-get -y install git
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Install build tools
         shell: bash
         run: |
@@ -53,7 +59,8 @@ jobs:
         # actually exclude it, so it must first be touched
         run: |
           touch ola-debian-stable-built-source-tree.tar.gz
-          tar --exclude=ola-debian-stable-built-source-tree.tar.gz -cvzf ola-debian-stable-built-source-tree.tar.gz .
+          touch .git
+          tar --exclude=ola-debian-stable-built-source-tree.tar.gz --exclude=.git -cvzf ola-debian-stable-built-source-tree.tar.gz .
       - name: SHA256 artifact archive
         run: sha256sum ola-debian-stable-built-source-tree.tar.gz
       - uses: actions/upload-artifact@v4
@@ -261,6 +268,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
       - name: Setup Node.js v18
         uses: actions/setup-node@v4
         with:

Makefile.am

@@ -247,7 +247,7 @@ else
 endif
 
 # cpplint linter
-CPP_LINT_FILTER = "-legal/copyright,-readability/streams,-runtime/arrays"
+CPP_LINT_FILTER = "-legal/copyright,-readability/streams,-runtime/arrays,-whitespace/indent_namespace"
 CPP_LINT_FILES = $(shell find . \( -name "*.h" -or -name "*.cpp" \) -and ! \( \
         -wholename "./common/protocol/Ola.pb.*" -or \
         -wholename "./common/rpc/Rpc.pb.*" -or \

common/io/SelectServerTest.cpp

@@ -122,7 +122,9 @@ class SelectServerTest: public CppUnit::TestFixture {
 
   void Terminate() {
     OLA_DEBUG << "Terminate called";
-    if (m_ss) { m_ss->Terminate(); }
+    if (m_ss) {
+      m_ss->Terminate();
+    }
   }
 
   void SingleIncrementTimeout() {
@@ -147,8 +149,9 @@ class SelectServerTest: public CppUnit::TestFixture {
   void NullHandler() {}
 
   bool IncrementTimeout() {
-    if (m_ss && m_ss->IsRunning())
+    if (m_ss && m_ss->IsRunning()) {
       m_timeout_counter++;
+    }
     return true;
   }
 

common/rdm/RDMHelper.cpp

@@ -1223,7 +1223,7 @@ string UnitToString(uint8_t unit) {
     case UNITS_RPM:
       return "RPM";
     case UNITS_BYTE_PER_SECOND:
-      return "bps";
+      return "Bps";
     default:
       ostringstream str;
       str << "Unknown, was " << static_cast<int>(unit);

common/testing/GenericTester.cpp

@@ -25,6 +25,7 @@
 #include <cppunit/CompilerOutputter.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+#include <iostream>
 #include <string>
 
 #include "ola/base/Env.h"

doxygen/examples/callback_client_transmit.cpp

@@ -22,6 +22,8 @@
 #include <ola/client/ClientWrapper.h>
 #include <ola/Callback.h>
 
+#include <iostream>
+
 using std::cout;
 using std::endl;