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

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

Browse Source
This commit is contained in:
Johannes
2022-10-15 14:16:11 +02:00
parent b43ed38d4c f0b02a3d4d
commit 3344e18efc
11 changed files with 46 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,7 +368,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -1826,26 +2059,174 @@ │ @@ -1826,14 +2059,163 @@
│ covx tTmp.txt,sys0,0,0 │ covx tTmp.txt,sys0,0,0
│ hSlider4.minval=sys0 │ hSlider4.minval=sys0
│ //third value is max value │ //third value is max value
@@ -532,73 +532,6 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName
│ //write name of speical page to tId │ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1 │ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
│ udelete payloadLength-1
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -1887,18 +2268,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── cardGrid.txt
│ @@ -789,15 +789,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
│ udelete payloadLength-1
│ bufferPos=0
│ if(tId.txt=="pageStartup")
│ {
│ page pageStartup
│ }
│ @@ -839,18 +838,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── pageIcons.txt ├── pageIcons.txt
│ @@ -15,15 +15,15 @@ │ @@ -15,15 +15,15 @@
│ Scope : global │ Scope : global
@@ -652,41 +585,6 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ @@ -302,15 +302,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
│ udelete payloadLength-1
│ bufferPos=0
│ if(tId.txt=="cardThermo")
│ {
│ page cardThermo
│ }
│ @@ -347,18 +346,14 @@
│ {
│ page cardAlarm
│ }
│ if(tId.txt=="cardQR")
│ {
│ page cardQR
│ }
│ - if(tId.txt=="cardPower")
│ - {
│ - page cardPower
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
├── popupFan.txt ├── popupFan.txt
│┄ ordering differences only │┄ ordering differences only
│ @@ -78,31 +78,31 @@ │ @@ -78,31 +78,31 @@

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

@@ -1,72 +1,4 @@
+++ /dev/fd/62 2022-10-08 22:48:53.818299279 +0000 +++ /dev/fd/62 2022-10-09 16:56:54.880530529 +0000
+,26 +2059,174 @@
+ //save second arg if there's one
+ spstr strCommand.txt,tTmp.txt,"~",2
+ //save third arg if there's one
+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
+ udelete payloadLength-1
+ bufferPos=0
+ if(tId.txt=="pageStartup")
+ {
+ page pageStartup
+ }
+,18 +2268,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+rdGrid.txt
+15 +789,14 @@
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+ //save second arg if there's one
+ spstr strCommand.txt,tTmp.txt,"~",2
+ //save third arg if there's one
+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
+ udelete payloadLength-1
+ bufferPos=0
+ if(tId.txt=="pageStartup")
+ {
+ page pageStartup
+ }
+18 +838,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+geIcons.txt +geIcons.txt
+5 +15,15 @@ +5 +15,15 @@
+ Scope : global + Scope : global
@@ -85,41 +17,6 @@
+ Scope : global + Scope : global
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+15 +302,14 @@
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+ //save second arg if there's one
+ spstr strCommand.txt,tTmp.txt,"~",2
+ //save third arg if there's one
+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
+ udelete payloadLength-1
+ bufferPos=0
+ if(tId.txt=="cardThermo")
+ {
+ page cardThermo
+ }
+18 +346,14 @@
+ {
+ page cardAlarm
+ }
+ if(tId.txt=="cardQR")
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+reensaver.txt +reensaver.txt
+5 +71,15 @@ +5 +71,15 @@
+ime +ime

5
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -3369,6 +3369,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -3418,6 +3419,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

5
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -1238,6 +1238,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -1287,6 +1288,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

14
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -20,8 +20,8 @@ popupNotify
146 Unique line(s) of event code 146 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 172 Line(s) of event code
122 Unique line(s) of event code 125 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
394 Line(s) of event code 394 Line(s) of event code
@@ -36,8 +36,8 @@ cardPower
292 Unique line(s) of event code 292 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
469 Line(s) of event code 474 Line(s) of event code
278 Unique line(s) of event code 281 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
409 Line(s) of event code 409 Line(s) of event code
@@ -60,11 +60,11 @@ cardThermo
306 Unique line(s) of event code 306 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1354 Line(s) of event code 1359 Line(s) of event code
605 Unique line(s) of event code 608 Unique line(s) of event code
Total Total
15 Page(s) 15 Page(s)
494 Component(s) 494 Component(s)
5952 Line(s) of event code 5967 Line(s) of event code
1620 Unique line(s) of event code 1620 Unique line(s) of event code

5
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -601,6 +601,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -645,6 +646,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

5
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -2223,6 +2223,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -2272,6 +2273,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

5
HMI/US/portrait/n2t-out/cardGrid.txt
View File

@@ -793,6 +793,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -842,6 +843,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

5
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -306,6 +306,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
@@ -350,6 +351,10 @@ Timer tmSerial
{ {
page cardQR page cardQR
} }
if(tId.txt=="cardPower")
{
page cardPower
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

8
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -400,7 +400,11 @@ class LuiPagesGen(object):
dest_temp2 = "" dest_temp2 = ""
if dest_temp is None: if dest_temp is None:
dest_temp = get_attr_safe(entity, "target_temp_high", 0) dest_temp = get_attr_safe(entity, "target_temp_high", 0)
dest_temp2 = int(get_attr_safe(entity, "target_temp_low", 0)*10) dest_temp2 = get_attr_safe(entity, "target_temp_low", None)
if dest_temp2 != None and dest_temp2 != "null":
dest_temp2 = int(dest_temp2*10)
else:
dest_temp2 = ""
dest_temp = int(dest_temp*10) dest_temp = int(dest_temp*10)
hvac_action = get_attr_safe(entity, "hvac_action", "") hvac_action = get_attr_safe(entity, "hvac_action", "")
@@ -586,7 +590,7 @@ class LuiPagesGen(object):
command = f"entityUpd~{heading}~{navigation}" command = f"entityUpd~{heading}~{navigation}"
for idx, item in enumerate(items): for idx, item in enumerate(items):
entity = apis.ha_api.get_entity(item.entityId) entity = apis.ha_api.get_entity(item.entityId)
icon_color = self.get_entity_color(entity) icon_color = self.get_entity_color(entity, overwrite=item.colorOverride)
device_class = entity.attributes.get("device_class", "") device_class = entity.attributes.get("device_class", "")
icon = get_icon(item.entityId.split(".")[0], state=entity.state, device_class=device_class, overwrite=item.iconOverride) icon = get_icon(item.entityId.split(".")[0], state=entity.state, device_class=device_class, overwrite=item.iconOverride)
speed = 0 speed = 0

1
ioBroker/NsPanelTs.ts
View File

@@ -3489,6 +3489,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
out_msgs.push({ out_msgs.push({
payload: 'entityUpdateDetail' + '~' //entityUpdateDetail payload: 'entityUpdateDetail' + '~' //entityUpdateDetail
+ id + '~'
+ icon + '~' //iconId + icon + '~' //iconId
+ iconColor + '~' //iconColor + iconColor + '~' //iconColor
+ switchVal + '~' //buttonState + switchVal + '~' //buttonState