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

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-06 20:41:17 +00:00
committed by github-actions[bot]
parent a208c1dbfc
commit ca4a7b200d
8 changed files with 103 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
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-06 20:37:23.366287644 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:37:24.258297598 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:41:14.285762803 +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/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:37:23.366287644 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-06 20:41:13.397750333 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:37:24.258297598 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:41:14.285762803 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -18,89 +18,13 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
- // get value normal - // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2 - spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0 - covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:37:24.258297598 +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")
{
@@ -662,10 +636,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:37:24.258297598 +0000
@@ -1152,10 +1152,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal - dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06 20:37:23.366287644 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:37:24.258297598 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:41:14.285762803 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

32
HMI/US/landscape/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 : 22 ID : 22
@@ -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")
{ {
@@ -1085,7 +1112,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out-visual/cardThermo.txt
View File

@@ -1870,6 +1870,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -10,14 +10,14 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 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
33 Component(s)
347 Line(s) of event code
182 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
374 Line(s) of event code 374 Line(s) of event code
@@ -34,10 +34,6 @@ popupShutter
25 Component(s) 25 Component(s)
330 Line(s) of event code 330 Line(s) of event code
162 Unique line(s) of event code 162 Unique line(s) of event code
cardThermo
53 Component(s)
552 Line(s) of event code
290 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
@@ -50,6 +46,10 @@ 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
cardThermo
53 Component(s)
555 Line(s) of event code
292 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
@@ -57,6 +57,6 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
411 Component(s) 412 Component(s)
4620 Line(s) of event code 4639 Line(s) of event code
1220 Unique line(s) of event code 1232 Unique line(s) of event code

31
HMI/US/landscape/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")
{ {
@@ -636,7 +662,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out/cardThermo.txt
View File

@@ -1152,6 +1152,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

16
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-06 20:37:23.366287644 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +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-06 20:37:23.366287644 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,8 @@ 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 diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") 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-06 20:37:23.366287644 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +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

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:37:23.814292644 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:41:13.841756568 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:37:23.366287644 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +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 @@
@@ -13,8 +13,8 @@
+@@ -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 +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,5 +59,5 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000