sync (add nextion2text)

This commit is contained in:
joBr99
2022-06-25 19:33:04 +00:00
committed by github-actions[bot]
parent 148178f13c
commit 69a5bd426e
6 changed files with 127 additions and 77 deletions

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-23 21:11:30.566513919 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-25 19:33:03.053725892 +0000
@@ -11,9 +11,4 @@ @@ -11,9 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.454513479 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -65,8 +65,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06-23 21:11:30.570513917 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-25 19:33:02.217732181 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 21:11:31.454513479 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,22 +12,6 @@ @@ -12,22 +12,6 @@
Events Events
@@ -110,8 +110,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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -144,8 +144,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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,17 +12,6 @@ @@ -12,17 +12,6 @@
Events Events
@@ -184,8 +184,8 @@ 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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -228,8 +228,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-06-23 21:11:30.570513917 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 21:11:31.454513479 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -262,8 +262,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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-25 19:33:03.053725892 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -293,8 +293,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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/pageTest.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-25 19:33:03.053725892 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -343,8 +343,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Picture p0 Picture p0
Attributes Attributes
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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,25 +12,6 @@ @@ -12,25 +12,6 @@
Events Events
@@ -391,8 +391,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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -425,8 +425,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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 21:11:31.450513481 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-25 19:33:03.053725892 +0000
@@ -12,40 +12,6 @@ @@ -12,40 +12,6 @@
Events Events
@@ -576,8 +576,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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 21:11:31.454513479 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-25 19:33:03.053725892 +0000
@@ -406,22 +406,10 @@ @@ -406,22 +406,10 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1

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-23 21:11:30.566513919 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -23,9 +23,28 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Text tIcon Text tIcon
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-23 21:11:30.570513917 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-25 19:33:02.217732181 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000
@@ -136,6 +136,18 @@ @@ -81,6 +81,18 @@
vis nNum4,0
vis bPrev,0
vis bNext,0
+ //ui e5
+ vis btOnOff5,0
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis tIcon5,0
+ vis tEntity5,0
+ vis bText5,0
+ vis hSlider5,0
+ vis nNum5,0
+ vis bPrev,0
+ vis bNext,0
Variable (string) strCommand
Attributes
@@ -136,6 +148,18 @@
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
@@ -44,7 +63,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1 Number nNum1
Attributes Attributes
Scope : local Scope : local
@@ -172,6 +184,15 @@ @@ -172,6 +196,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -60,7 +79,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
@@ -302,6 +323,26 @@ @@ -302,6 +335,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -87,7 +106,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -421,6 +462,34 @@ @@ -421,6 +474,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -122,7 +141,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -878,6 +947,106 @@ @@ -878,6 +959,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -229,7 +248,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -986,6 +1155,33 @@ @@ -986,6 +1167,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -263,7 +282,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1091,6 +1287,28 @@ @@ -1091,6 +1299,28 @@
page popupLight page popupLight
} }
@@ -293,8 +312,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Attributes Attributes
Scope : local Scope : local
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-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -318,8 +337,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-23 21:11:30.570513917 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -333,8 +352,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
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-23 21:11:30.566513919 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +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
@@ -354,8 +373,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/pageTest.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -404,8 +423,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Picture p0 Picture p0
Attributes Attributes
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-23 21:11:30.566513919 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 21:11:31.002513703 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events

View File

@@ -1,13 +1,13 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 21:11:31.014513697 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-25 19:33:02.641728991 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-23 21:11:30.566513919 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@
+ //color vars + //color vars
+ int defaultFontColor=65535 + int defaultFontColor=65535
+ int defaultBcoColor=6371 + int defaultBcoColor=6371
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -138,7 +138,7 @@ +@@ -138,7 +138,7 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
@@ -17,19 +17,26 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ Text tIcon + Text tIcon
+--- HMI/n2t-out/cardEntities.txt 2022-06-23 21:11:30.570513917 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-25 19:33:02.217732181 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000
+@@ -136,6 +136,18 @@ +@@ -81,6 +81,18 @@
+@@ -172,6 +184,15 @@ + vis bPrev,0
+@@ -302,6 +323,26 @@ + vis bNext,0
+@@ -421,6 +462,34 @@ ++ vis bPrev,0
+@@ -878,6 +947,106 @@ ++ vis bNext,0
+ Variable (string) strCommand
+ Attributes
+@@ -136,6 +148,18 @@
+@@ -172,6 +196,15 @@
+@@ -302,6 +335,26 @@
+@@ -421,6 +474,34 @@
+@@ -878,6 +959,106 @@
++ Text : ++ Text :
++ Max. Text Size : 20 ++ Max. Text Size : 20
+@@ -986,6 +1155,33 @@ +@@ -986,6 +1167,33 @@
+@@ -1091,6 +1287,28 @@ +@@ -1091,6 +1299,28 @@
+--- HMI/n2t-out/cardQR.txt 2022-06-23 21:11:30.566513919 +0000 +--- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -12,21 +12,6 @@ +@@ -12,21 +12,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -52,8 +59,8 @@
+ vis p0,0 + vis p0,0
+ vis tSend,0 + vis tSend,0
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-06-23 21:11:30.570513917 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -66,11 +73,11 @@
+ dim=dimValueNormal + dim=dimValueNormal
+ vis p0,0 + vis p0,0
+ vis tSend,0 + vis tSend,0
+--- HMI/n2t-out/pageStartup.txt 2022-06-23 21:11:30.566513919 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -13,46 +13,6 @@ +@@ -13,46 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -119,8 +126,8 @@
+ Picture p0 + Picture p0
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-06-23 21:11:30.566513919 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 21:11:31.002513703 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events

View File

@@ -89,6 +89,18 @@ Page cardEntities
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
//ui e5
vis btOnOff5,0
vis bUp5,0
vis bStop5,0
vis bDown5,0
vis tIcon5,0
vis tEntity5,0
vis bText5,0
vis hSlider5,0
vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -52,11 +52,11 @@ cardGrid
267 Unique line(s) of event code 267 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1234 Line(s) of event code 1245 Line(s) of event code
524 Unique line(s) of event code 533 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
424 Component(s) 424 Component(s)
4947 Line(s) of event code 4958 Line(s) of event code
1312 Unique line(s) of event code 1320 Unique line(s) of event code

View File

@@ -81,6 +81,18 @@ Page cardEntities
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
//ui e5
vis btOnOff5,0
vis bUp5,0
vis bStop5,0
vis bDown5,0
vis tIcon5,0
vis tEntity5,0
vis bText5,0
vis hSlider5,0
vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes