From 14d337891a2ecbe50b19cf0a19700cb27a65ae5f Mon Sep 17 00:00:00 2001 From: tt-tom17 Date: Thu, 23 Jan 2025 10:24:28 +0100 Subject: [PATCH 1/6] DEV v4.5.0 - Update NSPanelTs.ts - fix leftScreensaverentity --- ioBroker/DEV/NSPanelTs.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index c1647353..7012b830 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -10911,7 +10911,7 @@ function HandleScreensaverUpdate(): void { if (screensaverAdvanced) { let checkpoint = true; let i = 0; - if (config.leftScreensaverEntity && Array.isArray(config.leftScreensaverEntity)) { + if (config.leftScreensaverEntity && Array.isArray(config.leftScreensaverEntity) && config.leftScreensaverEntity.length > 0) { for (i = 0; i < 3 && i < config.leftScreensaverEntity.length; i++) { const leftScreensaverEntity = config.leftScreensaverEntity[i]; if (leftScreensaverEntity === null || leftScreensaverEntity === undefined) { From f6b605443da64d1168bc88c37ae62efd6400bba3 Mon Sep 17 00:00:00 2001 From: tt-tom17 Date: Thu, 23 Jan 2025 10:25:59 +0100 Subject: [PATCH 2/6] DEV v4.5.0 - Update NSPanelTs.ts - fix leftScreensaverentity --- ioBroker/DEV/NSPanelTs.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index 7012b830..b17c5804 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -10965,6 +10965,8 @@ function HandleScreensaverUpdate(): void { payloadString += '~' + '~' + icon + '~' + iconColor + '~' + leftScreensaverEntity.ScreensaverEntityText + '~' + val + '~'; } + } else { + checkpoint = false; } if (checkpoint == false) { for (let j = i; j < 3; j++) { From bae90b2b554098a909820328116bcdeb19b548ed Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:21:29 +0100 Subject: [PATCH 3/6] DEV v4.5.0.1 - Update NSPanelTs.ts Change TFT URLs --- ioBroker/DEV/NSPanelTs.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index c1647353..052d3018 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -TypeScript v4.5.0.0 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne +TypeScript v4.5.0.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne - abgestimmt auf TFT 54 / v4.5.0 / BerryDriver 9 / Tasmota 14.4.1 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts @@ -140,6 +140,7 @@ ReleaseNotes: - 20.01.2025 - v4.4.0.14 Added Easy-View Screensaver states handling - 20.01.2025 - v4.4.0.14 icon3 added for use in blind for the state between 0-100 - 21.01.2025 - v4.5.0 TFT 54 / 4.5.0 + - 23.01.2025 - v4.5.0.1 Change TFT URLs Todo: - XX.12.2024 - v5.0.0 ioBroker Adapter @@ -235,7 +236,10 @@ Erforderliche Adapter: Upgrades in Konsole: Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1 - TFT EU STABLE Version : FlashNextion http://nspanel.de/nspanel-4.5.0.tft + TFT EU STABLE Version : FlashNextion http://nspanel.de/nspanel-v4.5.0.tft + + TFT US-L STABLE Version : FlashNextion http://nspanel.de/nspanel-us-l-v4.5.0.tft + TFT US-P STABLE Version : FlashNextion http://nspanel.de/nspanel-us-p-v4.5.0.tft --------------------------------------------------------------------------------------- */ @@ -4325,11 +4329,11 @@ function update_tft_firmware() { let desired_display_firmware_url = ''; if (getState(NSPanel_Path + 'NSPanel_Version').val == 'us-l') { - desired_display_firmware_url = `http://nspanel.pky.eu/lovelace-ui/github/nspanel-us-l-${tft_version}.tft`; + desired_display_firmware_url = `http://nspanel.de/nspanel-us-l-${tft_version}.tft`; } else if (getState(NSPanel_Path + 'NSPanel_Version').val == 'us-p') { - desired_display_firmware_url = `http://nspanel.pky.eu/lovelace-ui/github/nspanel-us-p-${tft_version}.tft`; + desired_display_firmware_url = `http://nspanel.de/nspanel-us-p-${tft_version}.tft`; } else { - desired_display_firmware_url = `http://nspanel.pky.eu/lovelace-ui/github/nspanel-${tft_version}.tft`; + desired_display_firmware_url = `http://nspanel.de/nspanel-${tft_version}.tft`; } log('Start TFT-Upgrade for: ' + getState(NSPanel_Path + 'NSPanel_Version').val + ' Version', 'info'); From 84e21053618fa5acf4956dc1a63afff3d61c9843 Mon Sep 17 00:00:00 2001 From: Armilar <102996011+Armilar@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:09:39 +0100 Subject: [PATCH 4/6] v4.5.0.1 - Update NsPanelTs.ts Change URL's --- ioBroker/NsPanelTs.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts index c1647353..17160bc9 100644 --- a/ioBroker/NsPanelTs.ts +++ b/ioBroker/NsPanelTs.ts @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -TypeScript v4.5.0.0 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne +TypeScript v4.5.0.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne - abgestimmt auf TFT 54 / v4.5.0 / BerryDriver 9 / Tasmota 14.4.1 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts @@ -140,6 +140,7 @@ ReleaseNotes: - 20.01.2025 - v4.4.0.14 Added Easy-View Screensaver states handling - 20.01.2025 - v4.4.0.14 icon3 added for use in blind for the state between 0-100 - 21.01.2025 - v4.5.0 TFT 54 / 4.5.0 + - 23.01.2025 - v4.5.0.1 Change TFT URLs Todo: - XX.12.2024 - v5.0.0 ioBroker Adapter @@ -235,7 +236,10 @@ Erforderliche Adapter: Upgrades in Konsole: Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1 - TFT EU STABLE Version : FlashNextion http://nspanel.de/nspanel-4.5.0.tft + TFT EU STABLE Version : FlashNextion http://nspanel.de/nspanel-v4.5.0.tft + + TFT US-L STABLE Version : FlashNextion http://nspanel.de/nspanel-us-l-v4.5.0.tft + TFT US-P STABLE Version : FlashNextion http://nspanel.de/nspanel-us-p-v4.5.0.tft --------------------------------------------------------------------------------------- */ @@ -1013,7 +1017,7 @@ export const config: Config = { // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________ // _________________________________ EN: No more configuration from here _____________________________________ -const scriptVersion: string = 'v4.5.0.0'; +const scriptVersion: string = 'v4.5.0.1'; const tft_version: string = 'v4.5.0'; const desired_display_firmware_version = 54; const berry_driver_version = 9; @@ -4325,11 +4329,11 @@ function update_tft_firmware() { let desired_display_firmware_url = ''; if (getState(NSPanel_Path + 'NSPanel_Version').val == 'us-l') { - desired_display_firmware_url = `http://nspanel.pky.eu/lovelace-ui/github/nspanel-us-l-${tft_version}.tft`; + desired_display_firmware_url = `http://nspanel.de/nspanel-us-l-${tft_version}.tft`; } else if (getState(NSPanel_Path + 'NSPanel_Version').val == 'us-p') { - desired_display_firmware_url = `http://nspanel.pky.eu/lovelace-ui/github/nspanel-us-p-${tft_version}.tft`; + desired_display_firmware_url = `http://nspanel.de/nspanel-us-p-${tft_version}.tft`; } else { - desired_display_firmware_url = `http://nspanel.pky.eu/lovelace-ui/github/nspanel-${tft_version}.tft`; + desired_display_firmware_url = `http://nspanel.de/nspanel-${tft_version}.tft`; } log('Start TFT-Upgrade for: ' + getState(NSPanel_Path + 'NSPanel_Version').val + ' Version', 'info'); From b1b042a25fb374324727725366c22b06a4d90289 Mon Sep 17 00:00:00 2001 From: tt-tom17 Date: Thu, 23 Jan 2025 16:19:53 +0100 Subject: [PATCH 5/6] DEV v4.5.0 - Update NSPanelTs.ts fix handleScreensaverUpdate => leftScreensaverentity fix type leftScreensaverEntity --- ioBroker/DEV/NSPanelTs.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index 7a756396..14345baf 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -10969,9 +10969,12 @@ function HandleScreensaverUpdate(): void { payloadString += '~' + '~' + icon + '~' + iconColor + '~' + leftScreensaverEntity.ScreensaverEntityText + '~' + val + '~'; } - } else { + } + + if (i < 3) { checkpoint = false; } + if (checkpoint == false) { for (let j = i; j < 3; j++) { payloadString += '~~~~~~'; @@ -12779,7 +12782,7 @@ namespace NSPanel { button1: ConfigButtonFunction; button2: ConfigButtonFunction; }; - export type leftScreensaverEntityType = [ScreenSaverElementWithUndefined, ScreenSaverElementWithUndefined, ScreenSaverElementWithUndefined] | []; + export type leftScreensaverEntityType = [ScreenSaverElementWithUndefined?, ScreenSaverElementWithUndefined?, ScreenSaverElementWithUndefined?] | []; export type indicatorScreensaverEntityType = | [ScreenSaverElementWithUndefined?, ScreenSaverElementWithUndefined?, ScreenSaverElementWithUndefined?, ScreenSaverElementWithUndefined?, ScreenSaverElementWithUndefined?] | []; From 9ca7a4e829c800fd6c4c54503ee15557f6f976da Mon Sep 17 00:00:00 2001 From: Thomas <101348966+tt-tom17@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:28:40 +0100 Subject: [PATCH 6/6] DEV v4.5.0.2 - Update NSPanelTs.ts fix version --- ioBroker/DEV/NSPanelTs.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ioBroker/DEV/NSPanelTs.ts b/ioBroker/DEV/NSPanelTs.ts index 14345baf..a9764151 100644 --- a/ioBroker/DEV/NSPanelTs.ts +++ b/ioBroker/DEV/NSPanelTs.ts @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------- -TypeScript v4.5.0.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne +TypeScript v4.5.0.2 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @ticaki / @Britzelpuf / @Sternmiere / @ravenS0ne - abgestimmt auf TFT 54 / v4.5.0 / BerryDriver 9 / Tasmota 14.4.1 @joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts @@ -141,6 +141,7 @@ ReleaseNotes: - 20.01.2025 - v4.4.0.14 icon3 added for use in blind for the state between 0-100 - 21.01.2025 - v4.5.0 TFT 54 / 4.5.0 - 23.01.2025 - v4.5.0.1 Change TFT URLs + - 23.01.2025 - v4.5.0.2 fix handleScreensaverUpdate => leftscreensaverEntity; fix Type leftscreensaverentitiy Todo: - XX.12.2024 - v5.0.0 ioBroker Adapter @@ -1017,7 +1018,7 @@ export const config: Config = { // _________________________________ DE: Ab hier keine Konfiguration mehr _____________________________________ // _________________________________ EN: No more configuration from here _____________________________________ -const scriptVersion: string = 'v4.5.0.0'; +const scriptVersion: string = 'v4.5.0.2'; const tft_version: string = 'v4.5.0'; const desired_display_firmware_version = 54; const berry_driver_version = 9;