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 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-12-10 08:03:23 +00:00
committed by github-actions[bot]
parent 50b36fc490
commit 31d3e2e416
18 changed files with 80 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,25 +13,6 @@
│ - // fix touch offset │ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020 │ - lcd_dev fffb 0002 0000 0020
│ - page pageStartup │ - page pageStartup
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/landscape/n2t-out/cardChart.txt
│ @@ -176,15 +176,15 @@
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│
│ Events
│ Touch Press Event
│ tSend.txt="event,buttonPress2,cardChart,"
│ - if(bPrev.txt=="")
│ + if(bNext.txt=="")
│ {
│ tSend.txt+="bHome"
│ }else
│ {
│ tSend.txt+="bNext"
│ }
│ //send calc crc
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -173,15 +173,15 @@ │ @@ -173,15 +173,15 @@
@@ -51,132 +32,6 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/landscape/n2t-out/popupFan.txt
│ @@ -619,14 +619,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/landscape/n2t-out/popupInSel.txt
│ @@ -977,14 +977,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/landscape/n2t-out/popupLight.txt
│ @@ -682,14 +682,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -437,14 +437,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupShutter.txt
├── +++ HMI/US/landscape/n2t-out/popupShutter.txt
│ @@ -671,14 +671,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/landscape/n2t-out/popupThermo.txt
│ @@ -942,14 +942,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,29 +29,20 @@ │ @@ -29,29 +29,20 @@

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

@@ -17,7 +17,7 @@
│ page pageStartup │ page pageStartup
│ --- HMI/n2t-out/cardChart.txt │ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt ├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -175,16 +175,16 @@ │ @@ -175,15 +175,15 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ State : unpressed │ State : unpressed
│ Text :  │ Text : 
@@ -26,16 +26,14 @@
│ Events │ Events
│ Touch Press Event │ Touch Press Event
│ - tSend.txt="event,buttonPress2,cardChart," │ - tSend.txt="event,buttonPress2,cardChart,"
│ - if(bPrev.txt=="")
│ + tSend.txt="event,buttonPress2,cardPower," │ + tSend.txt="event,buttonPress2,cardPower,"
│ + if(bNext.txt=="") │ if(bNext.txt=="")
│ { │ {
│ tSend.txt+="bHome" │ tSend.txt+="bHome"
│ }else │ }else
│ { │ {
│ tSend.txt+="bNext" │ tSend.txt+="bNext"
│ } │ }
│ //send calc crc
│ @@ -207,15 +207,15 @@ │ @@ -207,15 +207,15 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ State : unpressed │ State : unpressed
@@ -732,27 +730,6 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/portrait/n2t-out/popupFan.txt
│ @@ -619,14 +619,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupInSel.txt │ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/portrait/n2t-out/popupInSel.txt ├── +++ HMI/US/portrait/n2t-out/popupInSel.txt
│ @@ -632,98 +632,14 @@ │ @@ -632,98 +632,14 @@
@@ -853,110 +830,6 @@
│ Scope : local │ Scope : local
│ Period (ms): 100 │ Period (ms): 100
│ Enabled : no │ Enabled : no
│
│ @@ -977,14 +893,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -682,14 +682,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -437,14 +437,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupShutter.txt
├── +++ HMI/US/portrait/n2t-out/popupShutter.txt
│ @@ -671,14 +671,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/portrait/n2t-out/popupThermo.txt
│ @@ -942,14 +942,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,29 +29,20 @@ │ @@ -29,29 +29,20 @@

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

@@ -1,9 +1,9 @@
+++ /dev/fd/62 2022-12-09 23:39:29.754086326 +0000 +++ /dev/fd/62 2022-12-10 08:03:16.022725697 +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
++ HMI/US/portrait/n2t-out/cardChart.txt ++ HMI/US/portrait/n2t-out/cardChart.txt
+16 +175,16 @@ +15 +175,15 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ State : unpressed + State : unpressed
+ Text :  + Text : 
@@ -12,7 +12,6 @@
+nts +nts
+ Touch Press Event + Touch Press Event
+ tSend.txt="event,buttonPress2,cardChart," + tSend.txt="event,buttonPress2,cardChart,"
+ if(bPrev.txt=="")
+ tSend.txt="event,buttonPress2,cardPower," + tSend.txt="event,buttonPress2,cardPower,"
+ if(bNext.txt=="") + if(bNext.txt=="")
+ { + {
@@ -21,7 +20,6 @@
+ { + {
+ tSend.txt+="bNext" + tSend.txt+="bNext"
+ } + }
+ //send calc crc
+15 +207,15 @@ +15 +207,15 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ State : unpressed + State : unpressed
@@ -88,27 +86,6 @@
+ Enabled : yes + Enabled : yes
+I/n2t-out/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+I/n2t-out/popupFan.txt
++ HMI/US/portrait/n2t-out/popupFan.txt
+14 +619,18 @@
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/popupInSel.txt +I/n2t-out/popupInSel.txt
++ HMI/US/portrait/n2t-out/popupInSel.txt ++ HMI/US/portrait/n2t-out/popupInSel.txt
+98 +632,14 @@ +98 +632,14 @@
@@ -209,110 +186,6 @@
+ Scope : local + Scope : local
+ Period (ms): 100 + Period (ms): 100
+ Enabled : no + Enabled : no
+
+14 +893,18 @@
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+14 +682,18 @@
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+14 +437,18 @@
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/popupShutter.txt
++ HMI/US/portrait/n2t-out/popupShutter.txt
+14 +671,18 @@
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/popupThermo.txt
++ HMI/US/portrait/n2t-out/popupThermo.txt
+14 +942,18 @@
+ {
+ page cardQR
+ }
+ if(tId.txt=="cardPower")
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+9 +29,20 @@ +9 +29,20 @@

2
HMI/n2t-out-visual/cardChart.txt
View File

@@ -281,7 +281,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="") if(bNext.txt=="")
{ {
tSend.txt+="bHome" tSend.txt+="bHome"
}else }else

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

@@ -6,18 +6,18 @@ pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
popupShutter popupThermo
25 Component(s) 44 Component(s)
394 Line(s) of event code 519 Line(s) of event code
216 Unique line(s) of event code 274 Unique line(s) of event code
popupLight
28 Component(s)
404 Line(s) of event code
223 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
253 Line(s) of event code 257 Line(s) of event code
164 Unique line(s) of event code 166 Unique line(s) of event code
cardChart
31 Component(s)
452 Line(s) of event code
296 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
181 Line(s) of event code 181 Line(s) of event code
@@ -26,14 +26,22 @@ pageTest
23 Component(s) 23 Component(s)
73 Line(s) of event code 73 Line(s) of event code
69 Unique line(s) of event code 69 Unique line(s) of event code
cardChart popupFan
31 Component(s) 27 Component(s)
452 Line(s) of event code 351 Line(s) of event code
296 Unique line(s) of event code 204 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
613 Line(s) of event code 617 Line(s) of event code
293 Unique line(s) of event code 295 Unique line(s) of event code
popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
popupShutter
25 Component(s)
398 Line(s) of event code
218 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
514 Line(s) of event code 514 Line(s) of event code
@@ -42,10 +50,6 @@ cardPower
43 Component(s) 43 Component(s)
439 Line(s) of event code 439 Line(s) of event code
299 Unique line(s) of event code 299 Unique line(s) of event code
popupFan
27 Component(s)
347 Line(s) of event code
202 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
425 Line(s) of event code 425 Line(s) of event code
@@ -58,10 +62,6 @@ screensaver
47 Component(s) 47 Component(s)
402 Line(s) of event code 402 Line(s) of event code
298 Unique line(s) of event code 298 Unique line(s) of event code
popupThermo
44 Component(s)
515 Line(s) of event code
272 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
612 Line(s) of event code 612 Line(s) of event code
@@ -78,5 +78,5 @@ cardEntities
Total Total
18 Page(s) 18 Page(s)
636 Component(s) 636 Component(s)
7909 Line(s) of event code 7933 Line(s) of event code
2009 Unique line(s) of event code 2008 Unique line(s) of event code

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

@@ -914,6 +914,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -1361,6 +1361,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -1035,6 +1035,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -670,6 +670,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -984,6 +984,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -1372,6 +1372,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

2
HMI/n2t-out/cardChart.txt
View File

@@ -180,7 +180,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="") if(bNext.txt=="")
{ {
tSend.txt+="bHome" tSend.txt+="bHome"
}else }else

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

@@ -623,6 +623,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -981,6 +981,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -686,6 +686,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -441,6 +441,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -675,6 +675,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

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

@@ -946,6 +946,10 @@ Timer tmSerial
{ {
page cardPower page cardPower
} }
if(tId.txt=="cardChart")
{
page cardChart
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1