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

bump version and sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-12 12:21:20 +00:00
committed by github-actions[bot]
parent 95da1a325b
commit cce1b39c0e
14 changed files with 95 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-11 16:39:29.571843283 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:21:19.348768343 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-11 16:39:29.571843283 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:21:19.348768343 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -14,10 +14,6 @@ cardMedia
34 Component(s) 34 Component(s)
363 Line(s) of event code 363 Line(s) of event code
195 Unique line(s) of event code 195 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code
@@ -26,6 +22,10 @@ cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code

2
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 36 Text : 37
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

2
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 36 Text : 37
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

62
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -467,59 +467,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
-Variable (string) vaMenu
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tSend
Attributes
Scope : local
@@ -218,24 +212,6 @@
Text :
Max. Text Size : 10
- Events
- Touch Release Event
- if(vaMenu.txt!="")
- {
- tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,2
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
- }
-
Text t1
Attributes
Scope : local
@@ -644,8 +620,6 @@
vis t5,1
covx tTmp.txt,t5.pco,0,0
}
- //tIconBtnEntityName
- spstr strCommand.txt,vaMenu.txt,"~",12
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-11 16:39:29.019814315 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-12 12:21:18.904762528 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -12,52 +12,5 @@
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000
+@@ -45,12 +45,6 @@
+ Scope: local
+ Value: 0
+
+-Variable (string) vaMenu
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 50
+-
+ Text tSend
+ Scope : local
+@@ -218,24 +212,6 @@
+ Text :
+ Max. Text Size : 10
+- Events
+- Touch Release Event
+- if(vaMenu.txt!="")
+- {
+- tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
+- //send calc crc
+- btlen tSend.txt,sys0
+- crcrest 1,0xffff // reset CRC
+- crcputh 55 bb
+- crcputs sys0,2
+- crcputs tSend.txt,0
+- //send cmd
+- printh 55 bb
+- prints sys0,2
+- prints tSend.txt,0
+- prints crcval,2
+- }
+-
+ Text t1
+ Scope : local
+@@ -644,8 +620,6 @@
+ vis t5,1
+ covx tTmp.txt,t5.pco,0,0
+ }
+- //tIconBtnEntityName
+- spstr strCommand.txt,vaMenu.txt,"~",12
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +0000

27
HMI/US/portrait/n2t-out-visual/cardMedia.txt
View File

@@ -57,6 +57,13 @@ Variable (int32) vaSpeakerPos
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) vaMenu
Attributes
ID : 33
Scope : local
Text :
Max. Text Size: 50
Text tSend Text tSend
Attributes Attributes
ID : 2 ID : 2
@@ -444,6 +451,24 @@ Text tIcon
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Events
Touch Release Event
if(vaMenu.txt!="")
{
tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
Text t1 Text t1
Attributes Attributes
ID : 21 ID : 21
@@ -1069,6 +1094,8 @@ Timer tmSerial
vis t5,1 vis t5,1
covx tTmp.txt,t5.pco,0,0 covx tTmp.txt,t5.pco,0,0
} }
//tIconBtnEntityName
spstr strCommand.txt,vaMenu.txt,"~",12
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -22,6 +22,10 @@ cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
204 Line(s) of event code 204 Line(s) of event code
@@ -30,6 +34,10 @@ cardThermo
53 Component(s) 53 Component(s)
555 Line(s) of event code 555 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
cardMedia
34 Component(s)
363 Line(s) of event code
195 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
319 Line(s) of event code 319 Line(s) of event code
@@ -42,21 +50,13 @@ cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code
259 Unique line(s) of event code 259 Unique line(s) of event code
cardMedia
33 Component(s)
349 Line(s) of event code
183 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
392 Line(s) of event code 392 Line(s) of event code
239 Unique line(s) of event code 239 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
423 Component(s) 424 Component(s)
4858 Line(s) of event code 4872 Line(s) of event code
1292 Unique line(s) of event code 1304 Unique line(s) of event code

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

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 36 Text : 37
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

26
HMI/US/portrait/n2t-out/cardMedia.txt
View File

@@ -45,6 +45,12 @@ Variable (int32) vaSpeakerPos
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) vaMenu
Attributes
Scope : local
Text :
Max. Text Size: 50
Text tSend Text tSend
Attributes Attributes
Scope : local Scope : local
@@ -212,6 +218,24 @@ Text tIcon
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
Events
Touch Release Event
if(vaMenu.txt!="")
{
tSend.txt="event,buttonPress2,"+vaMenu.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
Text t1 Text t1
Attributes Attributes
Scope : local Scope : local
@@ -620,6 +644,8 @@ Timer tmSerial
vis t5,1 vis t5,1
covx tTmp.txt,t5.pco,0,0 covx tTmp.txt,t5.pco,0,0
} }
//tIconBtnEntityName
spstr strCommand.txt,vaMenu.txt,"~",12
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 36 Text : 37
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

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

@@ -22,14 +22,14 @@ popupLight
27 Component(s) 27 Component(s)
352 Line(s) of event code 352 Line(s) of event code
191 Unique line(s) of event code 191 Unique line(s) of event code
cardMedia
34 Component(s)
363 Line(s) of event code
195 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
157 Line(s) of event code 157 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
cardMedia
34 Component(s)
363 Line(s) of event code
195 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
330 Line(s) of event code 330 Line(s) of event code

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

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 36 Text : 37
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 36 Text : 37
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0