From 476a252a924e1d7e6a38f8b44aa43f79ae5fe32d Mon Sep 17 00:00:00 2001 From: ticaki <59184294+ticaki@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:52:36 +0200 Subject: [PATCH 1/2] ready for 9.0.11 --- ioBroker/DEV/NSPanelTs.ts | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index 8782466c..891bb70c 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -968,8 +968,8 @@ export const config: Config = { // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________ // _________________________________ EN: No more configuration from here _____________________________________ -const scriptVersion: string = 'v4.9.3.1'; -const tft_version: string = 'v4.9.3'; +const scriptVersion: string = 'v4.9.2.3'; +const tft_version: string = 'v4.9.2'; const desired_display_firmware_version = 58; const berry_driver_version = 9; @@ -5789,7 +5789,7 @@ function CreateEntity (pageItem: PageItem, placeId: number, useColors: boolean = // Register Origin Datapoint RegisterEntityWatcher(obj.common.alias.id); // Check Data-Type (This must be boolean) - if (obj2.common.type == "boolean") { + if (obj2.type === 'state' && obj2.common.type == "boolean") { if (Debug) log(getState(obj.common.alias.id).val, 'info'); if (getState(obj.common.alias.id).val) { iconId = pageItem.icon != undefined ? Icons.GetIcon(pageItem.icon) : iconId; @@ -6297,7 +6297,7 @@ function GenerateThermoPage (page: NSPanel.PageThermo): NSPanel.Payload[] { // ioBroker if (id && existsObject(id)) { let o = getObject(id); - let name = page.heading !== undefined ? page.heading : o.common.name.de; + let name = page.heading !== undefined ? page.heading : o.common.name && typeof o.common.name === 'object' ? o.common.name.de : o.common.name; let currentTemp = 0; if (existsState(id + '.ACTUAL')) { currentTemp = Math.round(parseFloat(getState(id + '.ACTUAL').val) * 10) / 10; @@ -8292,7 +8292,7 @@ function GenerateQRPage (page: NSPanel.PageQR): NSPanel.Payload[] { let o = getObject(id); - let heading = page.heading !== undefined ? page.heading : o.common.name.de; + let heading = page.heading !== undefined ? page.heading : typeof o.common.name === 'object' ? o.common.name.de : o.common.name; let textQR = page.items[0].id + '.ACTUAL' !== undefined ? getState(page.items[0].id + '.ACTUAL').val : 'WIFI:T:undefined;S:undefined;P:undefined;H:undefined;'; let hiddenPWD = false; if (page.items[0].hidePassword !== undefined && page.items[0].hidePassword == true) { @@ -8472,7 +8472,7 @@ function GeneratePowerPage (page: NSPanel.PagePower): NSPanel.Payload[] { unsubscribePowerSubscriptions(); let o = getObject(id); - heading = page.heading !== undefined ? page.heading : o.common.name.de; + heading = page.heading !== undefined ? page.heading : typeof o.common.name === 'object' ? o.common.name.de : o.common.name; obj = JSON.parse(getState(page.items[0].id + '.ACTUAL').val); } @@ -11235,13 +11235,6 @@ function GenerateDetailPage (type: NSPanel.PopupType, optional: NSPanel.mediaOpt shutterTyp = pageItem.shutterType; } - let shutterZeroIsClosed:string = "0"; - if (pageItem.shutterZeroIsClosed != undefined) { - if(pageItem.shutterZeroIsClosed==true) { - shutterZeroIsClosed = "1"; - } - } - out_msgs.push({ payload: 'entityUpdateDetail' + @@ -11290,9 +11283,7 @@ function GenerateDetailPage (type: NSPanel.PopupType, optional: NSPanel.mediaOpt '~' + bEntity3Visibility + //20 '~' + - shutterTyp + //21 for Future - '~' + - shutterZeroIsClosed //21 for Future + shutterTyp //21 for Future }); } @@ -14246,7 +14237,6 @@ namespace NSPanel { alwaysOnDisplay?: boolean; popupVersion?: number; shutterType?: string; - shutterZeroIsClosed?: boolean; }; type shutterIcons = { From c2ca3b26d1c7374ba2a394d7397b1ee40cd40da6 Mon Sep 17 00:00:00 2001 From: ticaki <59184294+ticaki@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:59:16 +0200 Subject: [PATCH 2/2] fix --- ioBroker/DEV/NSPanelTs.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index 891bb70c..dd1eb3c5 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -968,8 +968,8 @@ export const config: Config = { // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________ // _________________________________ EN: No more configuration from here _____________________________________ -const scriptVersion: string = 'v4.9.2.3'; -const tft_version: string = 'v4.9.2'; +const scriptVersion: string = 'v4.9.3.1'; +const tft_version: string = 'v4.9.3'; const desired_display_firmware_version = 58; const berry_driver_version = 9; @@ -11235,6 +11235,13 @@ function GenerateDetailPage (type: NSPanel.PopupType, optional: NSPanel.mediaOpt shutterTyp = pageItem.shutterType; } + let shutterZeroIsClosed:string = "0"; + if (pageItem.shutterZeroIsClosed != undefined) { + if(pageItem.shutterZeroIsClosed==true) { + shutterZeroIsClosed = "1"; + } + } + out_msgs.push({ payload: 'entityUpdateDetail' + @@ -11283,7 +11290,9 @@ function GenerateDetailPage (type: NSPanel.PopupType, optional: NSPanel.mediaOpt '~' + bEntity3Visibility + //20 '~' + - shutterTyp //21 for Future + shutterTyp +//21 for Future + '~' + + shutterZeroIsClosed //21 for Future }); } @@ -14237,6 +14246,7 @@ namespace NSPanel { alwaysOnDisplay?: boolean; popupVersion?: number; shutterType?: string; + shutterZeroIsClosed?: boolean; }; type shutterIcons = {