h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 15:04:24 +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:
Johannes Braun
2022-12-09 14:52:23 +01:00
parent ffb2f374a8 8c35275924
commit 251eaa2378
6 changed files with 128 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -484,260 +431,14 @@ │ @@ -484,280 +431,14 @@
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ printh 55 bb │ printh 55 bb
@@ -506,6 +506,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type2.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -547,6 +551,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type3.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -588,6 +596,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type4.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -629,6 +641,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type5.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -666,7 +682,11 @@
│ - { │ - {
│ - page popupShutter │ - page popupShutter
│ - } │ - }
│ - if(type6.txt=="input_sel") │ - if(entn.txt=="input_sel")
│ - {
│ - page popupInSel
│ - }
│ - if(type6.txt=="media_pl")
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
@@ -693,7 +713,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ State : unpressed │ State : unpressed
│ @@ -837,31 +538,14 @@ │ @@ -857,31 +538,14 @@
│ Period (ms): 100 │ Period (ms): 100
│ Enabled : no │ Enabled : no
│ │
@@ -725,7 +745,7 @@
│ Enabled : yes │ Enabled : yes
│ │
│ Events │ Events
│ @@ -907,15 +591,15 @@ │ @@ -927,15 +591,15 @@
│ // here is the location where acual code should be │ // here is the location where acual code should be
│ // write command to variable strCommand │ // write command to variable strCommand
│ ucopy strCommand.txt,4,payloadLength-5,0 │ ucopy strCommand.txt,4,payloadLength-5,0
@@ -742,7 +762,7 @@
│ if(tTmp.txt=="0") │ if(tTmp.txt=="0")
│ { │ {
│ vis bPrev,0 │ vis bPrev,0
│ @@ -951,183 +635,111 @@ │ @@ -971,183 +635,111 @@
│ if(tTmp.txt=="2") │ if(tTmp.txt=="2")
│ { │ {
│ vis bNext,1 │ vis bNext,1
@@ -993,7 +1013,7 @@
│ //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 │ //save second arg if there's one
│ @@ -1184,63 +796,38 @@ │ @@ -1204,63 +796,38 @@
│ { │ {
│ page cardQR │ page cardQR
│ } │ }
@@ -1024,14 +1044,14 @@
│ - // get background color │ - // get background color
│ - spstr strCommand.txt,tTmp.txt,"~",3 │ - spstr strCommand.txt,tTmp.txt,"~",3
│ - if(tTmp.txt!="") │ - if(tTmp.txt!="")
│ - { │ + if(tId.txt=="cardChart")
│ {
│ - covx tTmp.txt,defaultBcoColor,0,0 │ - covx tTmp.txt,defaultBcoColor,0,0
│ - } │ - }
│ - // get font color │ - // get font color
│ - spstr strCommand.txt,tTmp.txt,"~",4 │ - spstr strCommand.txt,tTmp.txt,"~",4
│ - if(tTmp.txt!="") │ - if(tTmp.txt!="")
│ + if(tId.txt=="cardChart") │ - {
│ {
│ - covx tTmp.txt,defaultFontColor,0,0 │ - covx tTmp.txt,defaultFontColor,0,0
│ + page cardChart │ + page cardChart
│ } │ }

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

@@ -1057,7 +1057,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ │
│ @@ -484,260 +431,14 @@ │ @@ -484,280 +431,14 @@
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ printh 55 bb │ printh 55 bb
@@ -1131,6 +1131,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type2.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -1172,6 +1176,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type3.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -1213,6 +1221,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type4.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -1254,6 +1266,10 @@
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
│ - if(type5.txt=="media_pl")
│ - {
│ - page popupInSel
│ - }
│ - │ -
│ - Touch Release Event │ - Touch Release Event
│ - tmLP.en=0 │ - tmLP.en=0
@@ -1291,7 +1307,11 @@
│ - { │ - {
│ - page popupShutter │ - page popupShutter
│ - } │ - }
│ - if(type6.txt=="input_sel") │ - if(entn.txt=="input_sel")
│ - {
│ - page popupInSel
│ - }
│ - if(type6.txt=="media_pl")
│ - { │ - {
│ - page popupInSel │ - page popupInSel
│ - } │ - }
@@ -1318,7 +1338,7 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ State : unpressed │ State : unpressed
│ @@ -837,31 +538,14 @@ │ @@ -857,31 +538,14 @@
│ Period (ms): 100 │ Period (ms): 100
│ Enabled : no │ Enabled : no
│ │
@@ -1350,7 +1370,7 @@
│ Enabled : yes │ Enabled : yes
│ │
│ Events │ Events
│ @@ -907,15 +591,15 @@ │ @@ -927,15 +591,15 @@
│ // here is the location where acual code should be │ // here is the location where acual code should be
│ // write command to variable strCommand │ // write command to variable strCommand
│ ucopy strCommand.txt,4,payloadLength-5,0 │ ucopy strCommand.txt,4,payloadLength-5,0
@@ -1367,7 +1387,7 @@
│ if(tTmp.txt=="0") │ if(tTmp.txt=="0")
│ { │ {
│ vis bPrev,0 │ vis bPrev,0
│ @@ -951,183 +635,111 @@ │ @@ -971,183 +635,111 @@
│ if(tTmp.txt=="2") │ if(tTmp.txt=="2")
│ { │ {
│ vis bNext,1 │ vis bNext,1
@@ -1618,7 +1638,7 @@
│ //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 │ //save second arg if there's one
│ @@ -1184,63 +796,38 @@ │ @@ -1204,63 +796,38 @@
│ { │ {
│ page cardQR │ page cardQR
│ } │ }
@@ -1649,14 +1669,14 @@
│ - // get background color │ - // get background color
│ - spstr strCommand.txt,tTmp.txt,"~",3 │ - spstr strCommand.txt,tTmp.txt,"~",3
│ - if(tTmp.txt!="") │ - if(tTmp.txt!="")
│ - { │ + if(tId.txt=="cardChart")
│ {
│ - covx tTmp.txt,defaultBcoColor,0,0 │ - covx tTmp.txt,defaultBcoColor,0,0
│ - } │ - }
│ - // get font color │ - // get font color
│ - spstr strCommand.txt,tTmp.txt,"~",4 │ - spstr strCommand.txt,tTmp.txt,"~",4
│ - if(tTmp.txt!="") │ - if(tTmp.txt!="")
│ + if(tId.txt=="cardChart") │ - {
│ {
│ - covx tTmp.txt,defaultFontColor,0,0 │ - covx tTmp.txt,defaultFontColor,0,0
│ + page cardChart │ + page cardChart
│ } │ }

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-12-06 21:19:22.503654117 +0000 +++ /dev/fd/62 2022-12-08 22:30:18.613127649 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardChart.txt +I/n2t-out/cardChart.txt
@@ -447,7 +447,7 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ +
+260 +431,14 @@ +280 +431,14 @@
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
@@ -521,6 +521,10 @@
+ { + {
+ page popupInSel + page popupInSel
+ } + }
+ if(type2.txt=="media_pl")
+ {
+ page popupInSel
+ }
+ +
+ Touch Release Event + Touch Release Event
+ tmLP.en=0 + tmLP.en=0
@@ -562,6 +566,10 @@
+ { + {
+ page popupInSel + page popupInSel
+ } + }
+ if(type3.txt=="media_pl")
+ {
+ page popupInSel
+ }
+ +
+ Touch Release Event + Touch Release Event
+ tmLP.en=0 + tmLP.en=0
@@ -603,6 +611,10 @@
+ { + {
+ page popupInSel + page popupInSel
+ } + }
+ if(type4.txt=="media_pl")
+ {
+ page popupInSel
+ }
+ +
+ Touch Release Event + Touch Release Event
+ tmLP.en=0 + tmLP.en=0
@@ -644,6 +656,10 @@
+ { + {
+ page popupInSel + page popupInSel
+ } + }
+ if(type5.txt=="media_pl")
+ {
+ page popupInSel
+ }
+ +
+ Touch Release Event + Touch Release Event
+ tmLP.en=0 + tmLP.en=0
@@ -681,7 +697,11 @@
+ { + {
+ page popupShutter + page popupShutter
+ } + }
+ if(type6.txt=="input_sel") + if(entn.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type6.txt=="media_pl")
+ { + {
+ page popupInSel + page popupInSel
+ } + }
@@ -1039,13 +1059,13 @@
+ // get background color + // get background color
+ spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",3
+ if(tTmp.txt!="") + if(tTmp.txt!="")
+ if(tId.txt=="cardChart")
+ { + {
+ covx tTmp.txt,defaultBcoColor,0,0 + covx tTmp.txt,defaultBcoColor,0,0
+ } + }
+ // get font color + // get font color
+ spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="") + if(tTmp.txt!="")
+ if(tId.txt=="cardChart")
+ { + {
+ covx tTmp.txt,defaultFontColor,0,0 + covx tTmp.txt,defaultFontColor,0,0
+ page cardChart + page cardChart

22
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -878,6 +878,10 @@ Button bEntity2
{ {
page popupInSel page popupInSel
} }
if(type2.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -941,6 +945,10 @@ Button bEntity3
{ {
page popupInSel page popupInSel
} }
if(type3.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -1004,6 +1012,10 @@ Button bEntity4
{ {
page popupInSel page popupInSel
} }
if(type4.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -1067,6 +1079,10 @@ Button bEntity5
{ {
page popupInSel page popupInSel
} }
if(type5.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -1126,7 +1142,11 @@ Button bEntity6
{ {
page popupShutter page popupShutter
} }
if(type6.txt=="input_sel") if(entn.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="media_pl")
{ {
page popupInSel page popupInSel
} }

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

@@ -68,8 +68,8 @@ cardThermo
318 Unique line(s) of event code 318 Unique line(s) of event code
cardMedia cardMedia
57 Component(s) 57 Component(s)
640 Line(s) of event code 660 Line(s) of event code
320 Unique line(s) of event code 325 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1169 Line(s) of event code 1169 Line(s) of event code
@@ -78,5 +78,5 @@ cardEntities
Total Total
18 Page(s) 18 Page(s)
636 Component(s) 636 Component(s)
7805 Line(s) of event code 7825 Line(s) of event code
1967 Unique line(s) of event code 1973 Unique line(s) of event code

22
HMI/n2t-out/cardMedia.txt
View File

@@ -554,6 +554,10 @@ Button bEntity2
{ {
page popupInSel page popupInSel
} }
if(type2.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -595,6 +599,10 @@ Button bEntity3
{ {
page popupInSel page popupInSel
} }
if(type3.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -636,6 +644,10 @@ Button bEntity4
{ {
page popupInSel page popupInSel
} }
if(type4.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -677,6 +689,10 @@ Button bEntity5
{ {
page popupInSel page popupInSel
} }
if(type5.txt=="media_pl")
{
page popupInSel
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -714,7 +730,11 @@ Button bEntity6
{ {
page popupShutter page popupShutter
} }
if(type6.txt=="input_sel") if(entn.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="media_pl")
{ {
page popupInSel page popupInSel
} }