Merge 127671047f into 0b01c0d236

Able to merge. These branches can be automatically merged.

HMI/US/portrait/diff-filtered.txt

@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2024-01-20 19:56:08.135834636 +0000
++++ /dev/fd/62	2024-01-20 23:31:31.560618969 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@

docs/config-screensaver.md

@@ -44,6 +44,8 @@ Using a 6th entity will automatically activate the alternative layout.
           type: 0
         - entity: weather.demo_weather_north
           type: 1
+        - entity: weather.demo_weather_north
+          type: 2
         - entity: sensor.energy_usage
         - entity: delete
         - entity: sensor.indoor_temp

ioBroker/DEV/NSPanelTs.ts

@@ -5304,8 +5304,8 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
                     name = 'Spotify-Premium';
                 }
                 author = getState(id + '.ARTIST').val + ' | ' + getState(id + '.ALBUM').val;
-                if (author.length > 30) {
-                    author = getState(id + '.ARTIST').val;
+                if (author.length > 37) {
+                    author = author.slice(0,37) + '...';
                 }
                 if ((getState(id + '.ARTIST').val).length == 0) {
                     author = findLocale('media','no_music_to_control');
@@ -5391,9 +5391,9 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
 
             //Volumio
             if (v2Adapter == 'volumio') {
-                if (name != undefined) { author = author + " [" + name + "]"; }
-                name = getState(vInstance + 'info.name').val;  /* page.heading; 
-                                                                  getState(id + '.TRACK').val; */
+                media_icon = Icons.GetIcon('clock-time-twelve-outline');
+                if (name != undefined) { author = author + " | " + name; }
+                name = page.heading;
             }
 
             let volume = getState(id + '.VOLUME').val;
@@ -5404,7 +5404,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
             if (shuffle == 'off' || shuffle == false || shuffle == 0 || shuffle == 'false') {
                 shuffle_icon = Icons.GetIcon('shuffle-disabled'); //shuffle
             }
-            if (v2Adapter == 'volumio') { shuffle_icon = Icons.GetIcon('refresh'); } //Volumio: refresh playlist
+            //if (v2Adapter == 'volumio') { shuffle_icon = Icons.GetIcon('shuffle-disabled'); } //Volumio: refresh playlist
 
 
             //For all players
@@ -5447,6 +5447,8 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
                 currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'Players.', page.items[0].mediaDevice, '.Playername'].join(''))).val;
             } else if (v2Adapter == 'bosesoundtouch') {
                 currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'deviceInfo.name'].join(''))).val;
+            } else if (v2Adapter == 'volumio') {
+                currentSpeaker = getState(([page.items[0].adapterPlayerInstance, 'info.name'].join(''))).val;
             }
             //-------------------------------------------------------------------------------------------------------------
             // All Alexa devices (the online / player and commands directory is available) are listed and linked below
@@ -5672,7 +5674,7 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
             } else if (v2Adapter == 'volumio') { /* Volumio: only Repeat true/false with API */
                 if (getState(id + '.REPEAT').val == true) {
                     repeatIcon = Icons.GetIcon('repeat-variant');
-                    repeatIconCol = rgb_dec565(colMediaIcon);
+                    repeatIconCol = rgb_dec565(HMIOn);
                 }
             }
 
@@ -5758,7 +5760,6 @@ function GenerateMediaPage(page: NSPanel.PageMedia): NSPanel.Payload[] {
     }
 }
 
-
 async function createAutoAlarmAlias (id: string, nsPath: string){
     try {
         if (Debug){

nspanel-lovelace-ui/config.yaml

@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: NSPanel Lovelace UI Addon
-version: "4.7.77"
+version: "4.7.78"
 slug: nspanel-lovelace-ui
 description: NSPanel Lovelace UI Addon
 services: