Merge branch 'master' into Nanoleaf

.github/workflows/apt.yml

@@ -36,7 +36,7 @@ jobs:
     name: Setup APT build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set APT matrix
         id: apt-ppa
         run: |
@@ -54,7 +54,7 @@ jobs:
       matrix: ${{ fromJson(needs.setup.outputs.apt-matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.head_sha || github.event.client_payload.head_sha }}
           submodules: true
@@ -107,12 +107,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.head_sha || github.event.client_payload.head_sha }}
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5.3.0
+        uses: crazy-max/ghaction-import-gpg@v6.0.0
         with:
           gpg_private_key: ${{ secrets.APT_GPG }}
 

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/nightly.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository_owner == 'hyperion-project'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
@@ -48,7 +48,7 @@ jobs:
     if: github.repository_owner == 'hyperion-project'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check if commit has changed
         id: build-necessary
         run: |
@@ -66,7 +66,7 @@ jobs:
     if: ${{ needs.check.outputs.build-nightly == 'true' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set nightly matrix
         id: nightly-ppa
         run: |
@@ -84,7 +84,7 @@ jobs:
       matrix: ${{ fromJson(needs.setup.outputs.nightly-matrix) }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -135,10 +135,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v5.3.0
+        uses: crazy-max/ghaction-import-gpg@v6.0.0
         with:
           gpg_private_key: ${{ secrets.APT_GPG }}
 

.github/workflows/pull-request.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -76,7 +76,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -125,7 +125,7 @@ jobs:
       QT_VERSION: 5.15.2
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/push-master.yml

@@ -33,7 +33,7 @@ jobs:
             platform: amlogic
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -62,7 +62,7 @@ jobs:
     name: macOS
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -97,7 +97,7 @@ jobs:
       QT_VERSION: 5.15.2
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -162,7 +162,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Generate environment variables
       - name: Generate environment variables from .version and tag

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       # Dispatch event to build new HyperBian image
       - name: Dispatch HyperBian build
-        uses: peter-evans/repository-dispatch@v2.1.1
+        uses: peter-evans/repository-dispatch@v2.1.2
         if: ${{ github.repository_owner == 'hyperion-project'}}
         with:
           repository: hyperion-project/HyperBian

libsrc/hyperion/SettingsManager.cpp

@@ -791,7 +791,8 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 					if (newDeviceConfig.contains("type"))
 					{
 						QString type = newDeviceConfig["type"].toString();
-						if (type == "philipshue")
+
+            if (type == "philipshue")
 						{
 							if (newDeviceConfig.contains("groupId"))
 							{
@@ -821,7 +822,7 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
 							}
 						}
 
-						if (type == "nanoleaf")
+            if (type == "nanoleaf")
 						{
 							if (newDeviceConfig.contains("panelStartPos"))
 							{

libsrc/leddevice/dev_net/LedDevicePhilipsHue.cpp

@@ -1852,7 +1852,6 @@ bool LedDevicePhilipsHue::setLights()
 			_useEntertainmentAPI = false;
 			Error(_log, "Group-ID [%s] is not usable - Entertainment API usage was disabled!", QSTRING_CSTR(_groupId)  );
 		}
-
 		lights = _devConfig[ CONFIG_lightIdS ].toVariant().toStringList();
 	}