mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-24 00:14:26 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
5d88f9d8b8
commit
0cda4e4e7a
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-06 18:04:28.306901867 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -11,9 +11,4 @@
|
||||
// dim value
|
||||
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
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,21 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -65,8 +65,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,22 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -154,8 +154,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-06 18:04:28.306901867 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,11 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -199,8 +199,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-06 18:04:28.306901867 +0000
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,17 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -239,8 +239,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||
--- HMI/n2t-out/cardQR.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,21 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -283,8 +283,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,11 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -317,8 +317,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-06 18:04:28.306901867 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -348,8 +348,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-06 18:04:28.306901867 +0000
|
||||
--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -13,46 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
@@ -399,8 +399,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||
Attributes
|
||||
Only in HMI/n2t-out: popupFan.txt
|
||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||
--- HMI/n2t-out/popupLight.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/popupLight.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,25 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -447,8 +447,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -18,17 +18,6 @@
|
||||
vis tTmp,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")
|
||||
{
|
||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -12,40 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -656,8 +656,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-06 18:04:28.310901935 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-07 19:52:19.367317435 +0000
|
||||
@@ -406,22 +406,10 @@
|
||||
// get value
|
||||
spstr strCommand.txt,tTmp.txt,"~",1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -14,6 +14,6 @@
|
||||
//color vars
|
||||
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
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -138,7 +138,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
|
||||
Text tIcon
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-06 18:04:27.718891929 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -81,6 +81,18 @@
|
||||
vis nNum4,0
|
||||
vis bPrev,0
|
||||
@@ -346,8 +346,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
|
||||
Hotspot mSwipeNext
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-06 18:04:27.718891929 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -928,10 +928,6 @@
|
||||
{
|
||||
page popupLight
|
||||
@@ -360,8 +360,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||
--- HMI/n2t-out/cardQR.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -12,21 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -385,8 +385,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||
vis p0,0
|
||||
vis tSend,0
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-06 18:04:27.718891929 +0000
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -12,11 +12,6 @@
|
||||
|
||||
Events
|
||||
@@ -400,8 +400,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
vis p0,0
|
||||
vis tSend,0
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
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
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -13,46 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
@@ -472,8 +472,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
Attributes
|
||||
Only in HMI/n2t-out: popupFan.txt
|
||||
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -18,17 +18,6 @@
|
||||
vis tTmp,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
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
@@ -143,7 +143,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-06 18:04:27.734892199 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-07 19:52:18.891308278 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -14,6 +14,6 @@
|
||||
+ //color vars
|
||||
+ int defaultFontColor=65535
|
||||
+ int defaultBcoColor=6371
|
||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -138,7 +138,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
@@ -17,8 +17,8 @@
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Text tIcon
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-06 18:04:27.718891929 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -81,6 +81,18 @@
|
||||
+ vis bPrev,0
|
||||
+ vis bNext,0
|
||||
@@ -75,8 +75,8 @@
|
||||
+ }
|
||||
+
|
||||
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
+--- HMI/n2t-out/cardGrid.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-06 18:04:27.718891929 +0000
|
||||
+--- HMI/n2t-out/cardGrid.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -928,10 +928,6 @@
|
||||
+ {
|
||||
+ page popupLight
|
||||
@@ -87,8 +87,8 @@
|
||||
+- }
|
||||
+
|
||||
+ TouchCap tc0
|
||||
+--- HMI/n2t-out/cardQR.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+--- HMI/n2t-out/cardQR.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -12,21 +12,6 @@
|
||||
+ Events
|
||||
+ Preinitialize Event
|
||||
@@ -111,8 +111,8 @@
|
||||
+ vis p0,0
|
||||
+ vis tSend,0
|
||||
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-06 18:04:27.718891929 +0000
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -12,11 +12,6 @@
|
||||
+
|
||||
+ Events
|
||||
@@ -125,11 +125,11 @@
|
||||
+ dim=dimValueNormal
|
||||
+ vis p0,0
|
||||
+ vis tSend,0
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
+--- HMI/n2t-out/pageTest.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+--- HMI/n2t-out/pageTest.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -13,46 +13,6 @@
|
||||
+ Events
|
||||
+ Preinitialize Event
|
||||
@@ -179,8 +179,8 @@
|
||||
+ Attributes
|
||||
+Only in HMI/n2t-out: popupFan.txt
|
||||
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
|
||||
+--- HMI/n2t-out/popupNotify.txt 2022-07-06 18:04:27.190883004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+--- HMI/n2t-out/popupNotify.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -18,17 +18,6 @@
|
||||
+ vis tTmp,0
|
||||
+ vis tInstruction,0
|
||||
@@ -200,8 +200,8 @@
|
||||
+ Variable (string) strCommand
|
||||
+ Attributes
|
||||
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-07-06 18:04:27.194883072 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-06 18:04:27.714891861 +0000
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-07-07 19:52:18.435299522 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-07 19:52:18.875307970 +0000
|
||||
+@@ -143,7 +143,7 @@
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
|
||||
@@ -775,10 +775,10 @@ Slider hVolume
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 24
|
||||
x coordinate : 36
|
||||
y coordinate : 238
|
||||
Width : 270
|
||||
Height : 43
|
||||
Width : 250
|
||||
Height : 44
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
|
||||
@@ -14,18 +14,10 @@ popupNotify
|
||||
17 Component(s)
|
||||
214 Line(s) of event code
|
||||
132 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
382 Line(s) of event code
|
||||
209 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
388 Line(s) of event code
|
||||
211 Unique line(s) of event code
|
||||
cardMedia
|
||||
34 Component(s)
|
||||
384 Line(s) of event code
|
||||
207 Unique line(s) of event code
|
||||
cardQR
|
||||
32 Component(s)
|
||||
384 Line(s) of event code
|
||||
@@ -38,6 +30,14 @@ pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
382 Line(s) of event code
|
||||
209 Unique line(s) of event code
|
||||
cardMedia
|
||||
34 Component(s)
|
||||
384 Line(s) of event code
|
||||
207 Unique line(s) of event code
|
||||
screensaver
|
||||
38 Component(s)
|
||||
332 Line(s) of event code
|
||||
|
||||
@@ -507,7 +507,7 @@ Slider hBrightness
|
||||
x coordinate : 61
|
||||
y coordinate : 376
|
||||
Width : 250
|
||||
Height : 43
|
||||
Height : 44
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
|
||||
@@ -325,8 +325,8 @@ Slider hPosition
|
||||
Opacity : 127
|
||||
x coordinate : 12
|
||||
y coordinate : 213
|
||||
Width : 300
|
||||
Height : 43
|
||||
Width : 250
|
||||
Height : 44
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
@@ -369,8 +369,8 @@ Slider hTilt
|
||||
Opacity : 127
|
||||
x coordinate : 12
|
||||
y coordinate : 365
|
||||
Width : 300
|
||||
Height : 43
|
||||
Width : 250
|
||||
Height : 44
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
|
||||
Reference in New Issue
Block a user