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

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2023-07-31 18:20:22 +02:00
parent 3f416ade44 832c9cd241
commit 3ddef89431
10 changed files with 117 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
HMI/US/landscape/diff-eu-version.txt
View File

@@ -268,3 +268,22 @@
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ @@ -824,18 +800,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }

19
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1842,3 +1842,22 @@
│ if(tAMPM.txt=="")
│ {
│ vis tAMPM,0
│ @@ -824,18 +800,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }

35
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-06-01 14:52:47.691403479 +0000
+++ /dev/fd/62 2023-06-23 18:14:46.258673287 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@
@@ -586,13 +586,6 @@
+ covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0
+ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+I/n2t-out/cardGrid2.txt
++ HMI/US/portrait/n2t-out/cardGrid2.txt
+6 +25,28 @@
@@ -850,6 +843,13 @@
+ spstr strCommand.txt,tEntity9.txt,"~",66
+ vis tEntity9,1
+ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ sleepValue=0
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt
+6 +45,16 @@
@@ -1380,3 +1380,22 @@
+ if(tAMPM.txt=="")
+ {
+ vis tAMPM,0
+18 +800,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ if(tInstruction.txt=="timeout")
+ {
+ //set timeout to global var
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sleepTimeout,0,0
+ }

10
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -50,6 +50,10 @@ cardChart
33 Component(s)
437 Line(s) of event code
296 Unique line(s) of event code
screensaver2
59 Component(s)
362 Line(s) of event code
255 Unique line(s) of event code
cardAlarm
43 Component(s)
500 Line(s) of event code
@@ -62,10 +66,6 @@ cardThermo
57 Component(s)
540 Line(s) of event code
319 Unique line(s) of event code
screensaver2
59 Component(s)
358 Line(s) of event code
253 Unique line(s) of event code
cardMedia
59 Component(s)
649 Line(s) of event code
@@ -94,5 +94,5 @@ cardEntities
Total
22 Page(s)
850 Component(s)
9944 Line(s) of event code
9948 Line(s) of event code
2385 Unique line(s) of event code

4
HMI/n2t-out-visual/screensaver2.txt
View File

@@ -1661,6 +1661,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

4
HMI/n2t-out/screensaver2.txt
View File

@@ -828,6 +828,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{

2
apps/nspanel-lovelace-ui/luibackend/controller.py
View File

@@ -275,7 +275,7 @@ class LuiController(object):
apis.ha_api.get_entity(entity_id).call_service("close_cover_tilt")
if button_type == "tiltSlider":
pos = int(value)
apis.ha_api.get_entity(entity_id).call_service("set_cover_tilt_position", position=pos)
apis.ha_api.get_entity(entity_id).call_service("set_cover_tilt_position", tilt_position=pos)
if button_type == "button":

3
apps/nspanel-lovelace-ui/luibackend/translations/frontend/sk.json
View File

@@ -516,6 +516,9 @@
"last_triggered": "Naposledy spustené",
"trigger": "Spustiť akcie"
},
"button": {
"press": "stlač"
},
"camera": {
"not_available": "Obrázok nie je k dispozícii"
},

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);