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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-31 16:49:40 +00:00
committed by github-actions[bot]
parent 52421caef8
commit b63f428306
6 changed files with 401 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
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-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-31 16:49:35.915562207 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-31 16:49:35.919562233 +0000
@@ -1925,10 +1925,6 @@ @@ -1925,10 +1925,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-31 16:49:35.915562207 +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
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-31 16:49:35.915562207 +0000
@@ -636,10 +636,7 @@ @@ -636,10 +636,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,9 +52,94 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-31 16:49:35.915562207 +0000
@@ -582,10 +582,7 @@ @@ -30,8 +30,6 @@
vis tIcon2,0
vis tEntity2,0
vis bText2,0
- tsw m0,0
- tsw m1,0
Variable (string) strCommand
Attributes
@@ -93,12 +91,6 @@
Text :
Max. Text Size: 10
-Variable (string) vaQR
- Attributes
- Scope : local
- Text :
- Max. Text Size: 100
-
Text tEntity1
Attributes
Scope : local
@@ -156,6 +148,15 @@
Disable release event after dragging: 0
Send Component ID : disabled
+QR Code qr0
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Text :
+ Max. Text Size : 100
+
Button bNext
Attributes
Scope : local
@@ -350,20 +351,6 @@
Touch Press Event
click bPrev,1
-Hotspot m0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-
-Hotspot m1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-
Timer tmSerial
Attributes
Scope : local
@@ -456,7 +443,7 @@
bNext.txt=""
}
//text qrcode
- spstr strCommand.txt,vaQR.txt,"~",3
+ spstr strCommand.txt,qr0.txt,"~",3
// get Type
spstr strCommand.txt,type1.txt,"~",4
// get internal name
@@ -579,16 +566,6 @@
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15
}
- if(type2.txt=="delete"||type2.txt=="")
- {
- if(type1.txt=="delete"||type1.txt=="")
- {
- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
- }
- }else
- {
- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
- }
}
if(tInstruction.txt=="time")
{
@@ -605,10 +582,7 @@
// 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
@@ -67,8 +152,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-31 16:49:35.919562233 +0000
@@ -1170,10 +1170,6 @@ @@ -1170,10 +1170,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -81,8 +166,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
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-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-31 16:49:35.915562207 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -104,8 +189,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-31 16:49:35.915562207 +0000
@@ -561,10 +561,6 @@ @@ -561,10 +561,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -118,8 +203,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/popupNotify.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-31 16:49:35.915562207 +0000
@@ -311,10 +311,6 @@ @@ -311,10 +311,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -132,8 +217,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-31 16:49:35.915562207 +0000
@@ -406,10 +406,6 @@ @@ -406,10 +406,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -146,8 +231,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-31 15:07:45.430982442 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-31 16:49:35.919562233 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0

105
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-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 16:49:35.459559179 +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-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 16:49:35.459559179 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,9 +468,16 @@ 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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 16:49:35.459559179 +0000
@@ -35,7 +35,7 @@ @@ -30,14 +30,12 @@
vis tIcon2,0
vis tEntity2,0
vis bText2,0
- tsw m0,0
- tsw m1,0
Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
@@ -479,9 +486,85 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -93,12 +91,6 @@
Text :
Max. Text Size: 10
-Variable (string) vaQR
- Attributes
- Scope : local
- Text :
- Max. Text Size: 100
-
Text tEntity1
Attributes
Scope : local
@@ -156,6 +148,15 @@
Disable release event after dragging: 0
Send Component ID : disabled
+QR Code qr0
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Text :
+ Max. Text Size : 100
+
Button bNext
Attributes
Scope : local
@@ -350,20 +351,6 @@
Touch Press Event
click bPrev,1
-Hotspot m0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-
-Hotspot m1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-
Timer tmSerial
Attributes
Scope : local
@@ -456,7 +443,7 @@
bNext.txt=""
}
//text qrcode
- spstr strCommand.txt,vaQR.txt,"~",3
+ spstr strCommand.txt,qr0.txt,"~",3
// get Type
spstr strCommand.txt,type1.txt,"~",4
// get internal name
@@ -579,16 +566,6 @@
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15
}
- if(type2.txt=="delete"||type2.txt=="")
- {
- if(type1.txt=="delete"||type1.txt=="")
- {
- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
- }
- }else
- {
- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
- }
}
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-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 16:49:35.463559206 +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
@@ -501,8 +584,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-31 16:49:35.031556338 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 16:49:35.463559206 +0000
@@ -474,22 +474,6 @@ @@ -474,22 +474,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-31 15:07:44.926974773 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-31 16:49:35.475559286 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-31 16:49:35.031556338 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 16:49:35.459559179 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-31 16:49:35.031556338 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 16:49:35.459559179 +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,11 +12,94 @@
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-31 16:49:35.031556338 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 16:49:35.459559179 +0000
+@@ -35,7 +35,7 @@ +@@ -30,14 +30,12 @@
+--- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000 + vis tIcon2,0
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000 + vis tEntity2,0
+--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000 + vis bText2,0
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000 +- tsw m0,0
+- tsw m1,0
+
+ Variable (string) strCommand
+@@ -93,12 +91,6 @@
+ Text :
+ Max. Text Size: 10
+
+-Variable (string) vaQR
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 100
+-
+ Text tEntity1
+ Attributes
+ Scope : local
+@@ -156,6 +148,15 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+
++QR Code qr0
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++ Text :
++ Max. Text Size : 100
++
+ Button bNext
+ Attributes
+ Scope : local
+@@ -350,20 +351,6 @@
+ Touch Press Event
+ click bPrev,1
+
+-Hotspot m0
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+-
+-Hotspot m1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+-
+ Timer tmSerial
+ Attributes
+ Scope : local
+@@ -456,7 +443,7 @@
+ bNext.txt=""
+ }
+ //text qrcode
+- spstr strCommand.txt,vaQR.txt,"~",3
++ spstr strCommand.txt,qr0.txt,"~",3
+ // get Type
+ spstr strCommand.txt,type1.txt,"~",4
+ // get internal name
+@@ -579,16 +566,6 @@
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",15
+ }
+- if(type2.txt=="delete"||type2.txt=="")
+- {
+- if(type1.txt=="delete"||type1.txt=="")
+- {
+- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
+- }
+- }else
+- {
+- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
+- }
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-31 16:49:35.031556338 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 16:49:35.463559206 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-31 16:49:35.031556338 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 16:49:35.463559206 +0000
+@@ -474,22 +474,6 @@ +@@ -474,22 +474,6 @@

96
HMI/n2t-out-visual/cardQR.txt
View File

@@ -38,6 +38,8 @@ Page cardQR
vis tIcon2,0 vis tIcon2,0
vis tEntity2,0 vis tEntity2,0
vis bText2,0 vis bText2,0
tsw m0,0
tsw m1,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -83,35 +85,42 @@ Variable (string) tInstruction
Variable (string) entn1 Variable (string) entn1
Attributes Attributes
ID : 26 ID : 25
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 27 ID : 26
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) type1 Variable (string) type1
Attributes Attributes
ID : 28 ID : 27
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type2 Variable (string) type2
Attributes Attributes
ID : 29 ID : 28
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) vaQR
Attributes
ID : 31
Scope : local
Text :
Max. Text Size: 100
Text tEntity1 Text tEntity1
Attributes Attributes
ID : 18 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -141,7 +150,7 @@ Text tEntity1
Text tIcon1 Text tIcon1
Attributes Attributes
ID : 19 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -171,7 +180,7 @@ Text tIcon1
Text tEntity2 Text tEntity2
Attributes Attributes
ID : 22 ID : 21
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -201,7 +210,7 @@ Text tEntity2
Text tIcon2 Text tIcon2
Attributes Attributes
ID : 23 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -231,7 +240,7 @@ Text tIcon2
Text tHeading Text tHeading
Attributes Attributes
ID : 25 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -276,25 +285,6 @@ Picture p0
Effect Time : 300 Effect Time : 300
Picture ID : 0 Picture ID : 0
QR Code qr0
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 13
y coordinate : 91
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
Logo overlay : no
Text :
Max. Text Size : 100
Button bNext Button bNext
Attributes Attributes
ID : 3 ID : 3
@@ -398,7 +388,7 @@ Button bPrev
Button bText1 Button bText1
Attributes Attributes
ID : 20 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -445,7 +435,7 @@ Button bText1
Button bText2 Button bText2
Attributes Attributes
ID : 24 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -537,7 +527,7 @@ Dual-state Button btOnOff1
Dual-state Button btOnOff2 Dual-state Button btOnOff2
Attributes Attributes
ID : 21 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -640,6 +630,38 @@ Hotspot mSwipePrev
Touch Press Event Touch Press Event
click bPrev,1 click bPrev,1
Hotspot m0
Attributes
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 13
y coordinate : 91
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
Hotspot m1
Attributes
ID : 30
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 128
y coordinate : 91
Width : 200
Height : 200
Effect : load
Effect Priority : 0
Effect Time : 300
Timer tmSerial Timer tmSerial
Attributes Attributes
ID : 5 ID : 5
@@ -733,7 +755,7 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//text qrcode //text qrcode
spstr strCommand.txt,qr0.txt,"~",3 spstr strCommand.txt,vaQR.txt,"~",3
// get Type // get Type
spstr strCommand.txt,type1.txt,"~",4 spstr strCommand.txt,type1.txt,"~",4
// get internal name // get internal name
@@ -856,6 +878,16 @@ Timer tmSerial
// get Text (optional Value) // get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15 spstr strCommand.txt,bText2.txt,"~",15
} }
if(type2.txt=="delete"||type2.txt=="")
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -10,10 +10,6 @@ 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
cardQR
30 Component(s)
362 Line(s) of event code
211 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
@@ -26,6 +22,10 @@ popupShutter
20 Component(s) 20 Component(s)
248 Line(s) of event code 248 Line(s) of event code
141 Unique line(s) of event code 141 Unique line(s) of event code
cardQR
32 Component(s)
374 Line(s) of event code
218 Unique line(s) of event code
cardMedia cardMedia
33 Component(s) 33 Component(s)
349 Line(s) of event code 349 Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
406 Component(s) 408 Component(s)
4509 Line(s) of event code 4521 Line(s) of event code
1188 Unique line(s) of event code 1193 Unique line(s) of event code

43
HMI/n2t-out/cardQR.txt
View File

@@ -30,6 +30,8 @@ Page cardQR
vis tIcon2,0 vis tIcon2,0
vis tEntity2,0 vis tEntity2,0
vis bText2,0 vis bText2,0
tsw m0,0
tsw m1,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -91,6 +93,12 @@ Variable (string) type2
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) vaQR
Attributes
Scope : local
Text :
Max. Text Size: 100
Text tEntity1 Text tEntity1
Attributes Attributes
Scope : local Scope : local
@@ -148,15 +156,6 @@ Picture p0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
QR Code qr0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Text :
Max. Text Size : 100
Button bNext Button bNext
Attributes Attributes
Scope : local Scope : local
@@ -351,6 +350,20 @@ Hotspot mSwipePrev
Touch Press Event Touch Press Event
click bPrev,1 click bPrev,1
Hotspot m0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Hotspot m1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -443,7 +456,7 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//text qrcode //text qrcode
spstr strCommand.txt,qr0.txt,"~",3 spstr strCommand.txt,vaQR.txt,"~",3
// get Type // get Type
spstr strCommand.txt,type1.txt,"~",4 spstr strCommand.txt,type1.txt,"~",4
// get internal name // get internal name
@@ -566,6 +579,16 @@ Timer tmSerial
// get Text (optional Value) // get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",15 spstr strCommand.txt,bText2.txt,"~",15
} }
if(type2.txt=="delete"||type2.txt=="")
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {