h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-25 17:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #944 from fre4242/main

Browse Source 
Improved screensaver advanced icon handling: option to load from iobroker object
This commit is contained in:
Armilar
2023-07-30 22:02:56 +02:00
committed by GitHub
parent 8850e1d8cb 2aa1e222aa
commit 832c9cd241
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ioBroker/NsPanelTs.ts
View File

@@ -1,5 +1,5 @@
/*-----------------------------------------------------------------------
TypeScript v4.0.5.14 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom
TypeScript v4.0.5.15 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
@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
@@ -138,6 +138,7 @@ ReleaseNotes:
- 02.05.2023 - v4.0.5.12 Add new Function Debug mode from script activatable via panel
- 02.05.2023 - v4.0.5.13 Fix Problems with weather-instances-number !="0" #876
- 02.05.2023 - v4.0.5.14 Fix: Remove empty log statements #883
- 30.07.2023 - v4.0.5.15 Improved screensaverAdvanced icon handling: option to load from iobroker object #944
***********************************************************************************************************
* Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! *
@@ -6987,7 +6988,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
let icon;
if (existsObject(config.leftScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.leftScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') {
val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -7164,7 +7171,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
let icon;
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -7215,7 +7228,7 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = null;
let icon;
if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);

23
ioBroker/NsPanelTs_without_Examples.ts
View File

@@ -1,5 +1,5 @@
/*-----------------------------------------------------------------------
TypeScript v4.0.5.14 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @Sternmiere / @Britzelpuf / @ravenS0ne / @TT-Tom
TypeScript v4.0.5.15 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
@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
@@ -138,7 +138,8 @@ ReleaseNotes:
- 02.05.2023 - v4.0.5.12 Add new Function Debug mode from script activatable via panel
- 02.05.2023 - v4.0.5.13 Fix Problems with weather-instances-number !="0" #876
- 02.05.2023 - v4.0.5.14 Fix: Remove empty log statements (PR #883)
- 30.07.2023 - v4.0.5.15 Improved screensaverAdvanced icon handling: option to load from iobroker object #944
***********************************************************************************************************
* Für die Erstellung der Aliase durch das Skript, muss in der JavaScript Instanz "setObect" gesetzt sein! *
***********************************************************************************************************
@@ -6488,7 +6489,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
let icon;
if (existsObject(config.leftScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.leftScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') {
val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -6665,7 +6672,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
let icon;
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -6716,7 +6729,7 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White);
let icon = null;
let icon;
if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);