h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 22:18:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

v4.0.5.10 Fixed error wrong icon index in GeneratePowerPage by fre4242

Browse Source 
Fixed error wrong icon index in GeneratePowerPage
This commit is contained in:
Armilar
2023-04-23 22:28:58 +02:00
committed by GitHub
parent 3b20acc703 16afdd969d
commit c4e4400437
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ioBroker/NsPanelTs.ts
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript v4.0.5.9 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom TypeScript v4.0.5.10 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom
- abgestimmt auf TFT 50 / v4.0.5 / BerryDriver 8 / Tasmota 12.5.0 - abgestimmt auf TFT 50 / v4.0.5 / BerryDriver 8 / Tasmota 12.5.0
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker @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 NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -132,8 +132,9 @@ ReleaseNotes:
- 11.04.2023 - v4.0.5.6 Fix function InitDimmode - 11.04.2023 - v4.0.5.6 Fix function InitDimmode
- 18.04.2023 - v4.0.5.7 Fix Function check_updates - 18.04.2023 - v4.0.5.7 Fix Function check_updates
- 20.04.2023 - v4.0.5.8 Fix Layout Update message for TFT, Berry-Driver and Tasmota - 20.04.2023 - v4.0.5.8 Fix Layout Update message for TFT, Berry-Driver and Tasmota
- 21.04.2023 - v4.0.5.9 Add Parameter pageitem id0 to ActivePages (0_userdata) - 21.04.2023 - v4.0.5.9 Add Parameter pageitem id0 to ActivePages (0_userdata)
- 23.04.2023 - v4.0.5.10 v4.0.5.10 Fixed error wrong icon index in GeneratePowerPage by fre4242
*********************************************************************************************************** ***********************************************************************************************************
* Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! * * Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! *
*********************************************************************************************************** ***********************************************************************************************************
@@ -5071,17 +5072,17 @@ function GeneratePowerPage(page: PagePower): Payload[] {
let arrayColorScale = [colorScale0, colorScale1, colorScale2, colorScale3, colorScale4, colorScale5, colorScale6, colorScale7, colorScale8, colorScale9, colorScale10]; let arrayColorScale = [colorScale0, colorScale1, colorScale2, colorScale3, colorScale4, colorScale5, colorScale6, colorScale7, colorScale8, colorScale9, colorScale10];
let homeIconColor = 0;
if (!demoMode) { if (!demoMode) {
for (let obji = 1; obji < 7; obji++) { for (let obji = 1; obji < 7; obji++) {
array_icon_color[obji] = arrayColorScale[obj[obji].iconColor !== '' ? obj[obji].iconColor : 0]; const color = obj[obji].iconColor !== '' ? obj[obji].iconColor : 0;
array_icon_color[obji] = arrayColorScale[color];
array_icon[obji] = obj[obji].icon; array_icon[obji] = obj[obji].icon;
array_powerspeed[obji] = obj[obji].speed; array_powerspeed[obji] = obj[obji].speed;
array_powerstate[obji] = obj[obji].value + ' ' + obj[obji].unit ; array_powerstate[obji] = obj[obji].value + ' ' + obj[obji].unit ;
} }
array_icon[0] = obj[0].icon; array_icon[0] = obj[0].icon;
array_powerstate[0] = obj[0].value + ' ' + obj[0].unit; array_powerstate[0] = obj[0].value + ' ' + obj[0].unit;
homeIconColor = obj[0].iconColor; array_icon_color[0] = arrayColorScale[obj[0].iconColor];
} }
let power_string : any = ''; let power_string : any = '';
@@ -5108,7 +5109,7 @@ function GeneratePowerPage(page: PagePower): Payload[] {
'' + '~' + // type (ignored) '' + '~' + // type (ignored)
'' + '~' + // intNameEntity (ignored) '' + '~' + // intNameEntity (ignored)
Icons.GetIcon(array_icon[0]) + '~' + // icon Icons.GetIcon(array_icon[0]) + '~' + // icon
rgb_dec565(array_icon_color[homeIconColor]) + '~' + // icon_color rgb_dec565(array_icon_color[0]) + '~' + // icon_color
'' + '~' + // display (ignored in TS) '' + '~' + // display (ignored in TS)
array_powerstate[0] + '~' + // optionalValue array_powerstate[0] + '~' + // optionalValue
'' + '~' + // speed '' + '~' + // speed

11
ioBroker/NsPanelTs_without_Examples.ts
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
TypeScript v4.0.5.9 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom TypeScript v4.0.5.10 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom
- abgestimmt auf TFT 50 / v4.0.5 / BerryDriver 8 / Tasmota 12.5.0 - abgestimmt auf TFT 50 / v4.0.5 / BerryDriver 8 / Tasmota 12.5.0
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker @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 NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -133,6 +133,7 @@ ReleaseNotes:
- 18.04.2023 - v4.0.5.7 Fix Function check_updates - 18.04.2023 - v4.0.5.7 Fix Function check_updates
- 20.04.2023 - v4.0.5.8 Fix Layout Update message for TFT, Berry-Driver and Tasmota - 20.04.2023 - v4.0.5.8 Fix Layout Update message for TFT, Berry-Driver and Tasmota
- 21.04.2023 - v4.0.5.9 Add Parameter pageitem id0 to ActivePages (0_userdata) - 21.04.2023 - v4.0.5.9 Add Parameter pageitem id0 to ActivePages (0_userdata)
- 21.04.2023 - v4.0.5.10 Fixed error wrong icon index in GeneratePowerPage by fre4242
*********************************************************************************************************** ***********************************************************************************************************
* Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! * * Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! *
@@ -4572,17 +4573,17 @@ function GeneratePowerPage(page: PagePower): Payload[] {
let arrayColorScale = [colorScale0, colorScale1, colorScale2, colorScale3, colorScale4, colorScale5, colorScale6, colorScale7, colorScale8, colorScale9, colorScale10]; let arrayColorScale = [colorScale0, colorScale1, colorScale2, colorScale3, colorScale4, colorScale5, colorScale6, colorScale7, colorScale8, colorScale9, colorScale10];
let homeIconColor = 0;
if (!demoMode) { if (!demoMode) {
for (let obji = 1; obji < 7; obji++) { for (let obji = 1; obji < 7; obji++) {
array_icon_color[obji] = arrayColorScale[obj[obji].iconColor !== '' ? obj[obji].iconColor : 0]; const color = obj[obji].iconColor !== '' ? obj[obji].iconColor : 0;
array_icon_color[obji] = arrayColorScale[color];
array_icon[obji] = obj[obji].icon; array_icon[obji] = obj[obji].icon;
array_powerspeed[obji] = obj[obji].speed; array_powerspeed[obji] = obj[obji].speed;
array_powerstate[obji] = obj[obji].value + ' ' + obj[obji].unit ; array_powerstate[obji] = obj[obji].value + ' ' + obj[obji].unit ;
} }
array_icon[0] = obj[0].icon; array_icon[0] = obj[0].icon;
array_powerstate[0] = obj[0].value + ' ' + obj[0].unit; array_powerstate[0] = obj[0].value + ' ' + obj[0].unit;
homeIconColor = obj[0].iconColor; array_icon_color[0] = arrayColorScale[obj[0].iconColor];
} }
let power_string : any = ''; let power_string : any = '';
@@ -4609,7 +4610,7 @@ function GeneratePowerPage(page: PagePower): Payload[] {
'' + '~' + // type (ignored) '' + '~' + // type (ignored)
'' + '~' + // intNameEntity (ignored) '' + '~' + // intNameEntity (ignored)
Icons.GetIcon(array_icon[0]) + '~' + // icon Icons.GetIcon(array_icon[0]) + '~' + // icon
rgb_dec565(array_icon_color[homeIconColor]) + '~' + // icon_color rgb_dec565(array_icon_color[0]) + '~' + // icon_color
'' + '~' + // display (ignored in TS) '' + '~' + // display (ignored in TS)
array_powerstate[0] + '~' + // optionalValue array_powerstate[0] + '~' + // optionalValue
'' + '~' + // speed '' + '~' + // speed