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

synced us-p (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-13 19:28:24 +00:00
committed by github-actions[bot]
parent 12701ce2f7
commit dbd042bc28
8 changed files with 106 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 19:23:43.769693891 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 19:28:23.344592433 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 19:23:43.769693891 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 19:28:23.344592433 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-12 19:23:43.769693891 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 19:28:23.344592433 +0000
@@ -570,43 +570,25 @@
//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

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:23:43.361690306 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 19:28:22.940587610 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:23:43.361690306 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 19:28:22.940587610 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -65,42 +65,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
Scope : local
@@ -171,7 +202,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity1
- Max. Text Size : 30
+ Max. Text Size : 50
Text tEntity2
Attributes
@@ -181,7 +212,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity2
- Max. Text Size : 30
+ Max. Text Size : 50
Text tEntity3
Attributes
@@ -191,7 +222,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity3
- Max. Text Size : 30
+ Max. Text Size : 50
Text tEntity4
Attributes
@@ -201,7 +232,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity4
- Max. Text Size : 30
+ Max. Text Size : 50
Text tIcon1
Attributes
@@ -283,6 +314,26 @@
Text :
Max. Text Size : 50
@@ -113,7 +77,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : tEntity5
+ Max. Text Size : 50
+ Max. Text Size : 30
+
+Text tIcon5
+ Attributes
@@ -463,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:23:43.361690306 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 19:28:22.940587610 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -484,8 +448,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:23:43.361690306 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 19:28:22.940587610 +0000
@@ -570,43 +570,25 @@
//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
@@ -537,36 +501,28 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:23:43.361690306 +0000
@@ -48,6 +48,26 @@
--- HMI/n2t-out/screensaver.txt 2022-04-13 19:28:22.560583074 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 19:28:22.940587610 +0000
@@ -48,6 +48,18 @@
Scope: local
Value: 0
+Text tInstruction
+Variable (string) tInstruction
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+ Max. Text Size: 50
+
+Text tTmp
+Variable (string) tTmp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+ Max. Text Size: 50
+
Text tTime
Attributes
Scope : local
@@ -278,26 +298,6 @@
@@ -278,26 +290,6 @@
Text :
Max. Text Size : 10

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

@@ -1,49 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 19:23:43.373690411 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:23:43.361690306 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:23:43.361690306 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 19:28:22.952587754 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-13 19:28:22.560583074 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 19:28:22.940587610 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-13 19:28:22.560583074 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 19:28:22.940587610 +0000
+@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@
+@@ -171,7 +202,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : tEntity1
+- Max. Text Size : 30
++ Max. Text Size : 50
+
+ Text tEntity2
+ Attributes
+@@ -181,7 +212,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : tEntity2
+- Max. Text Size : 30
++ Max. Text Size : 50
+
+ Text tEntity3
+ Attributes
+@@ -191,7 +222,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : tEntity3
+- Max. Text Size : 30
++ Max. Text Size : 50
+
+ Text tEntity4
+ Attributes
+@@ -201,7 +232,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : tEntity4
+- Max. Text Size : 30
++ Max. Text Size : 50
+
+ Text tIcon1
+ Attributes
+@@ -283,6 +314,26 @@
++ Max. Text Size : 50
+@@ -402,6 +453,34 @@
+@@ -859,6 +938,106 @@
+@@ -967,6 +1146,33 @@
@@ -52,11 +15,11 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:23:43.361690306 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-04-13 19:28:22.560583074 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 19:28:22.940587610 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:23:43.361690306 +0000
+--- HMI/n2t-out/popupLight.txt 2022-04-13 19:28:22.560583074 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 19:28:22.940587610 +0000
+@@ -570,43 +570,25 @@
+ //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
@@ -108,36 +71,28 @@
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:23:43.361690306 +0000
+@@ -48,6 +48,26 @@
+--- HMI/n2t-out/screensaver.txt 2022-04-13 19:28:22.560583074 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 19:28:22.940587610 +0000
+@@ -48,6 +48,18 @@
+ Scope: local
+ Value: 0
+
++Text tInstruction
++Variable (string) tInstruction
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++ Associated Keyboard : none
++ Text :
++ Max. Text Size : 50
++ Max. Text Size: 50
++
++Text tTmp
++Variable (string) tTmp
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++ Associated Keyboard : none
++ Text :
++ Max. Text Size : 50
++ Max. Text Size: 50
++
+ Text tTime
+ Attributes
+ Scope : local
+@@ -278,26 +298,6 @@
+@@ -278,26 +290,6 @@
+ Text :
+ Max. Text Size : 10
+

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

@@ -363,7 +363,7 @@ Text tEntity1
Vertical Alignment : center
Input Type : character
Text : tEntity1
Max. Text Size : 50
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -393,7 +393,7 @@ Text tEntity2
Vertical Alignment : center
Input Type : character
Text : tEntity2
Max. Text Size : 50
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -423,7 +423,7 @@ Text tEntity3
Vertical Alignment : center
Input Type : character
Text : tEntity3
Max. Text Size : 50
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -453,7 +453,7 @@ Text tEntity4
Vertical Alignment : center
Input Type : character
Text : tEntity4
Max. Text Size : 50
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -723,7 +723,7 @@ Text tEntity5
Vertical Alignment : center
Input Type : character
Text : tEntity5
Max. Text Size : 50
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

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

@@ -30,10 +30,6 @@ screensaver
33 Component(s)
195 Line(s) of event code
152 Unique line(s) of event code
cardEntities
74 Component(s)
1157 Line(s) of event code
479 Unique line(s) of event code
cardMedia
30 Component(s)
329 Line(s) of event code
@@ -50,6 +46,10 @@ cardThermo
41 Component(s)
442 Line(s) of event code
247 Unique line(s) of event code
cardEntities
74 Component(s)
1157 Line(s) of event code
479 Unique line(s) of event code
Total
12 Page(s)

110
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -48,80 +48,34 @@ Variable (string) strCommand
Variable (string) tId
Attributes
ID : 19
ID : 17
Scope : local
Text :
Max. Text Size: 25
Variable (int32) vaTap
Attributes
ID : 27
ID : 25
Scope: local
Value: 0
Text tInstruction
Variable (string) tInstruction
Attributes
ID : 5
ID : 31
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 260
y coordinate : 446
Width : 26
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Max. Text Size: 50
Text tTmp
Variable (string) tTmp
Attributes
ID : 6
ID : 32
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 293
y coordinate : 447
Width : 25
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Max. Text Size: 50
Text tTime
Attributes
ID : 7
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -151,7 +105,7 @@ Text tTime
Text tDate
Attributes
ID : 8
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -181,7 +135,7 @@ Text tDate
Text tSend
Attributes
ID : 9
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -211,7 +165,7 @@ Text tSend
Text tMainIcon
Attributes
ID : 10
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -241,7 +195,7 @@ Text tMainIcon
Text tMainText
Attributes
ID : 11
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -271,7 +225,7 @@ Text tMainText
Text tForecast1
Attributes
ID : 12
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -301,7 +255,7 @@ Text tForecast1
Text tForecast1Val
Attributes
ID : 13
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -331,7 +285,7 @@ Text tForecast1Val
Text tF1Icon
Attributes
ID : 14
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -361,7 +315,7 @@ Text tF1Icon
Text tForecast2
Attributes
ID : 15
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -391,7 +345,7 @@ Text tForecast2
Text tF2Icon
Attributes
ID : 16
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -421,7 +375,7 @@ Text tF2Icon
Text tForecast2Val
Attributes
ID : 17
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -451,7 +405,7 @@ Text tForecast2Val
Text t10
Attributes
ID : 18
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -481,7 +435,7 @@ Text t10
Text tAMPM
Attributes
ID : 20
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -511,7 +465,7 @@ Text tAMPM
Text tForecast3Val
Attributes
ID : 21
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -541,7 +495,7 @@ Text tForecast3Val
Text tF3Icon
Attributes
ID : 22
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -571,7 +525,7 @@ Text tF3Icon
Text tForecast3
Attributes
ID : 23
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -601,7 +555,7 @@ Text tForecast3
Text tForecast4
Attributes
ID : 24
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -631,7 +585,7 @@ Text tForecast4
Text tF4Icon
Attributes
ID : 25
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -661,7 +615,7 @@ Text tF4Icon
Text tForecast4Val
Attributes
ID : 26
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -691,7 +645,7 @@ Text tForecast4Val
Text tMainTextAlt
Attributes
ID : 29
ID : 27
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -721,7 +675,7 @@ Text tMainTextAlt
Text tMainIconAlt
Attributes
ID : 30
ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -751,7 +705,7 @@ Text tMainIconAlt
Text tMRIcon
Attributes
ID : 31
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -781,7 +735,7 @@ Text tMRIcon
Text tMR
Attributes
ID : 32
ID : 30
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1045,7 +999,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 28
ID : 26
Scope : local
Period (ms): 1000
Enabled : yes

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

@@ -202,7 +202,7 @@ Text tEntity1
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity1
Max. Text Size : 50
Max. Text Size : 30
Text tEntity2
Attributes
@@ -212,7 +212,7 @@ Text tEntity2
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity2
Max. Text Size : 50
Max. Text Size : 30
Text tEntity3
Attributes
@@ -222,7 +222,7 @@ Text tEntity3
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity3
Max. Text Size : 50
Max. Text Size : 30
Text tEntity4
Attributes
@@ -232,7 +232,7 @@ Text tEntity4
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity4
Max. Text Size : 50
Max. Text Size : 30
Text tIcon1
Attributes
@@ -322,7 +322,7 @@ Text tEntity5
Send Component ID : disabled
Associated Keyboard : none
Text : tEntity5
Max. Text Size : 50
Max. Text Size : 30
Text tIcon5
Attributes

16
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -48,25 +48,17 @@ Variable (int32) vaTap
Scope: local
Value: 0
Text tInstruction
Variable (string) tInstruction
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size: 50
Text tTmp
Variable (string) tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size: 50
Text tTime
Attributes