h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-17 02:17:01 +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-07-06 17:55:44 +00:00
committed by github-actions[bot]
parent 4f9e540202
commit 1a51997114
6 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-06 17:55:40.111001656 +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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-06 17:55:40.111001656 +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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,22 +12,6 @@ @@ -12,22 +12,6 @@
Events Events
@@ -154,8 +154,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -199,8 +199,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0 TouchCap tc0
Attributes Attributes
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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardMedia.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,17 +12,6 @@ @@ -12,17 +12,6 @@
Events Events
@@ -239,8 +239,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardQR.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -283,8 +283,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardThermo.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -317,8 +317,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-06 17:55:40.111001656 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -348,8 +348,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/pageTest.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-06 17:55:40.111001656 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -399,8 +399,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Attributes Attributes
Only in HMI/n2t-out: popupFan.txt Only in HMI/n2t-out: popupFan.txt
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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/popupLight.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,25 +12,6 @@ @@ -12,25 +12,6 @@
Events Events
@@ -447,8 +447,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-06 17:55:40.111001656 +0000
@@ -18,17 +18,6 @@ @@ -18,17 +18,6 @@
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
@@ -487,8 +487,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-06 17:55:40.111001656 +0000
@@ -12,40 +12,6 @@ @@ -12,40 +12,6 @@
Events Events
@@ -656,8 +656,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/screensaver.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-05 16:30:31.757242183 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-06 17:55:40.111001656 +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

40
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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/Program.s.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-06 17:55:39.590965477 +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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.590965477 +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,8 +23,8 @@ 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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardEntities.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-06 17:55:39.590965477 +0000
@@ -81,6 +81,18 @@ @@ -81,6 +81,18 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
@@ -346,8 +346,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardGrid.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-06 17:55:39.590965477 +0000
@@ -928,10 +928,6 @@ @@ -928,10 +928,6 @@
{ {
page popupLight page popupLight
@@ -360,8 +360,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0 TouchCap tc0
Attributes Attributes
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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardQR.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-06 17:55:39.590965477 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -385,8 +385,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/cardThermo.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-06 17:55:39.590965477 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -400,8 +400,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/pageStartup.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-06 17:55:39.590965477 +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
@@ -421,8 +421,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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/pageTest.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-06 17:55:39.590965477 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -472,8 +472,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Attributes Attributes
Only in HMI/n2t-out: popupFan.txt Only in HMI/n2t-out: popupFan.txt
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-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/popupNotify.txt 2022-07-06 17:55:39.090930690 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-06 17:55:39.590965477 +0000
@@ -18,17 +18,6 @@ @@ -18,17 +18,6 @@
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-05 16:30:30.909241737 +0000 --- HMI/n2t-out/popupShutter.txt 2022-07-06 17:55:39.094930968 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-05 16:30:31.301241943 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-06 17:55:39.590965477 +0000
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none

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

@@ -1,13 +1,13 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-05 16:30:31.313241949 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-07-06 17:55:39.606966590 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-06 17:55:39.090930690 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-06 17:55:39.590965477 +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-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.094930968 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-06 17:55:39.590965477 +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,8 +17,8 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ Text tIcon + Text tIcon
+--- HMI/n2t-out/cardEntities.txt 2022-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-06 17:55:39.094930968 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -81,6 +81,18 @@ +@@ -81,6 +81,18 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -75,8 +75,8 @@
+ } + }
+ +
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-06 17:55:39.094930968 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -928,10 +928,6 @@ +@@ -928,10 +928,6 @@
+ { + {
+ page popupLight + page popupLight
@@ -87,8 +87,8 @@
+- } +- }
+ +
+ TouchCap tc0 + TouchCap tc0
+--- HMI/n2t-out/cardQR.txt 2022-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-06 17:55:39.094930968 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -12,21 +12,6 @@ +@@ -12,21 +12,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -111,8 +111,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-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-06 17:55:39.094930968 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -125,11 +125,11 @@
+ dim=dimValueNormal + dim=dimValueNormal
+ vis p0,0 + vis p0,0
+ vis tSend,0 + vis tSend,0
+--- HMI/n2t-out/pageStartup.txt 2022-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-06 17:55:39.090930690 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-06 17:55:39.590965477 +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-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/pageTest.txt 2022-07-06 17:55:39.090930690 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -13,46 +13,6 @@ +@@ -13,46 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -179,8 +179,8 @@
+ Attributes + Attributes
+Only in HMI/n2t-out: popupFan.txt +Only in HMI/n2t-out: popupFan.txt
+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-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-06 17:55:39.090930690 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -18,17 +18,6 @@ +@@ -18,17 +18,6 @@
+ vis tTmp,0 + vis tTmp,0
+ vis tInstruction,0 + vis tInstruction,0
@@ -200,8 +200,8 @@
+ Variable (string) strCommand + Variable (string) strCommand
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-07-05 16:30:30.909241737 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-06 17:55:39.094930968 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-05 16:30:31.301241943 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-06 17:55:39.590965477 +0000
+@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none

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

@@ -489,7 +489,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 301 y coordinate : 300
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -538,8 +538,8 @@ Text t3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 263 x coordinate : 259
y coordinate : 299 y coordinate : 300
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -775,7 +775,7 @@ Slider hVolume
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 67 x coordinate : 65
y coordinate : 304 y coordinate : 304
Width : 190 Width : 190
Height : 43 Height : 43
@@ -923,8 +923,8 @@ Hotspot mSwipeNext
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 311 x coordinate : 311
y coordinate : 5 y coordinate : 0
Width : 9 Width : 8
Height : 470 Height : 470
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -963,8 +963,8 @@ Hotspot mSwipePrev
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 5 y coordinate : 0
Width : 9 Width : 8
Height : 470 Height : 470
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0

6
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -1476,9 +1476,9 @@ Hotspot mSwipeNext
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 311 x coordinate : 310
y coordinate : 5 y coordinate : 5
Width : 9 Width : 8
Height : 470 Height : 470
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1518,7 +1518,7 @@ Hotspot mSwipePrev
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 5 y coordinate : 5
Width : 9 Width : 8
Height : 470 Height : 470
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0

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

@@ -38,10 +38,6 @@ pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 167 Line(s) of event code
122 Unique line(s) of event code 122 Unique line(s) of event code
cardThermo
53 Component(s)
565 Line(s) of event code
296 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
332 Line(s) of event code 332 Line(s) of event code
@@ -50,6 +46,10 @@ cardGrid
42 Component(s) 42 Component(s)
454 Line(s) of event code 454 Line(s) of event code
267 Unique line(s) of event code 267 Unique line(s) of event code
cardThermo
53 Component(s)
565 Line(s) of event code
296 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1245 Line(s) of event code 1245 Line(s) of event code