h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-20 22:47: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-06-23 20:36:05 +00:00
committed by github-actions[bot]
parent 1450414e17
commit 617213d441
10 changed files with 177 additions and 263 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-06-23 20:32:23.467040958 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.517214717 +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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.467040958 +0000 --- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-23 20:36:04.517214717 +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 20:32:23.467040958 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.467040958 +0000 --- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.467040958 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.467040958 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.471040993 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-23 20:36:04.513214585 +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 20:32:23.467040958 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:32:24.367053524 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-23 20:36:04.517214717 +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

139
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-23 20:32:23.467040958 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:36:04.001164408 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -11,31 +11,9 @@ 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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.001164408 +0000
@@ -12,21 +12,6 @@ @@ -138,7 +138,7 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(defaultBcoColor==0)
- {
- tCode.bco=6371
- tCode.pco=40179
- }
- if(defaultBcoColor==6371)
- {
- tCode.bco=10565
- tCode.pco=40179
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -138,7 +123,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -45,49 +23,9 @@ 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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:32:23.911044863 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:36:04.005164823 +0000
@@ -12,22 +12,6 @@ @@ -136,6 +136,18 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- if(b[sys0].type==1&&defaultBcoColor==0)
- {
- b[sys0].pic=14
- b[sys0].pic1=13
- b[sys0].pic2=15
- }
- }
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -79,6 +63,16 @@
vis bText4,0
vis hSlider4,0
vis nNum4,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
@@ -136,6 +130,18 @@
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
@@ -106,7 +44,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 +178,15 @@ @@ -172,6 +184,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -122,7 +60,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 +317,26 @@ @@ -302,6 +323,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -149,7 +87,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 +456,34 @@ @@ -421,6 +462,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -184,7 +122,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 +941,106 @@ @@ -878,6 +947,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -291,7 +229,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 +1149,33 @@ @@ -986,6 +1155,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -325,7 +263,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 +1281,28 @@ @@ -1091,6 +1287,28 @@
page popupLight page popupLight
} }
@@ -354,30 +292,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:32:23.471040993 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:32:23.907044828 +0000
@@ -12,17 +12,6 @@
Events
Preinitialize Event
- for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(defaultBcoColor==0)
- {
- hVolume.pic=14
- hVolume.pic1=13
- hVolume.pic2=15
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
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 20:32:23.467040958 +0000 --- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:36:04.001164408 +0000
@@ -12,21 +12,6 @@ @@ -12,21 +12,6 @@
Events Events
@@ -401,8 +318,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 20:32:23.471040993 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:36:04.005164823 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -416,8 +333,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 20:32:23.467040958 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:36:04.001164408 +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
@@ -437,8 +354,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 20:32:23.467040958 +0000 --- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:36:04.001164408 +0000
@@ -13,46 +13,6 @@ @@ -13,46 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -487,8 +404,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-23 20:32:23.467040958 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:36:04.001164408 +0000
@@ -12,25 +12,6 @@ @@ -12,25 +12,6 @@
Events Events
@@ -516,8 +433,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.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-06-23 20:32:23.467040958 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:36:04.001164408 +0000
@@ -12,11 +12,6 @@ @@ -12,11 +12,6 @@
Events Events
@@ -531,8 +448,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
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-06-23 20:32:23.471040993 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:32:23.907044828 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:36:04.001164408 +0000
@@ -215,7 +215,7 @@ @@ -215,7 +215,7 @@
Touch Release Event Touch Release Event
// event,buttonPress2,internalNameEntity,positionSlider,50 // event,buttonPress2,internalNameEntity,positionSlider,50

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

@@ -1,36 +1,14 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:32:23.923044969 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-23 20:36:04.017166066 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-23 20:32:23.467040958 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 20:36:04.001164408 +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 20:32:23.471040993 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 20:36:04.001164408 +0000
+@@ -12,21 +12,6 @@ +@@ -138,7 +138,7 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<40;sys0++)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- if(defaultBcoColor==0)
+- {
+- tCode.bco=6371
+- tCode.pco=40179
+- }
+- if(defaultBcoColor==6371)
+- {
+- tCode.bco=10565
+- tCode.pco=40179
+- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -138,7 +123,7 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
@@ -39,64 +17,19 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+ +
+ Text tIcon + Text tIcon
+--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:32:23.471040993 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:32:23.911044863 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 20:36:04.005164823 +0000
+@@ -12,22 +12,6 @@ +@@ -136,6 +136,18 @@
+ +@@ -172,6 +184,15 @@
+ Events +@@ -302,6 +323,26 @@
+ Preinitialize Event +@@ -421,6 +462,34 @@
+- for(sys0=0;sys0<40;sys0++) +@@ -878,6 +947,106 @@
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- if(b[sys0].type==53&&defaultBcoColor==0)
+- {
+- b[sys0].pic=10
+- b[sys0].pic2=11
+- }
+- if(b[sys0].type==1&&defaultBcoColor==0)
+- {
+- b[sys0].pic=14
+- b[sys0].pic1=13
+- b[sys0].pic2=15
+- }
+- }
+ dim=dimValueNormal
+ //wup=cardEntities
+ //remove background & activate reparse mode
+@@ -79,6 +63,16 @@
+@@ -136,6 +130,18 @@
+@@ -172,6 +178,15 @@
+@@ -302,6 +317,26 @@
+@@ -421,6 +456,34 @@
+@@ -878,6 +941,106 @@
++ Text : ++ Text :
++ Max. Text Size : 20 ++ Max. Text Size : 20
+@@ -986,6 +1149,33 @@ +@@ -986,6 +1155,33 @@
+@@ -1091,6 +1281,28 @@ +@@ -1091,6 +1287,28 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardQR.txt 2022-06-23 20:36:03.525115067 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-06-23 20:32:23.471040993 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:36:04.001164408 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-23 20:32:23.907044828 +0000
+@@ -12,17 +12,6 @@
+
+ Events
+ Preinitialize Event
+- for(sys0=0;sys0<40;sys0++)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- if(defaultBcoColor==0)
+- {
+- hVolume.pic=14
+- hVolume.pic1=13
+- hVolume.pic2=15
+- }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+--- HMI/n2t-out/cardQR.txt 2022-06-23 20:32:23.467040958 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 20:32:23.907044828 +0000
+@@ -12,21 +12,6 @@ +@@ -12,21 +12,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -119,8 +52,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 20:32:23.471040993 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 20:36:04.005164823 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -133,11 +66,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 20:32:23.467040958 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 20:36:04.001164408 +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 20:32:23.467040958 +0000 +--- HMI/n2t-out/pageTest.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 20:36:04.001164408 +0000
+@@ -13,46 +13,6 @@ +@@ -13,46 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -186,8 +119,8 @@
+ Picture p0 + Picture p0
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-06-23 20:32:23.467040958 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-23 20:36:04.001164408 +0000
+@@ -12,25 +12,6 @@ +@@ -12,25 +12,6 @@
+ +
+ Events + Events
@@ -215,8 +148,8 @@
+ //get entitiy name + //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt + tEntity.txt=pageIcons.tTmp1.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-06-23 20:32:23.467040958 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 20:36:04.001164408 +0000
+@@ -12,11 +12,6 @@ +@@ -12,11 +12,6 @@
+ +
+ Events + Events
@@ -230,8 +163,8 @@
+ vis p0,0 + vis p0,0
+ vis tSend,0 + vis tSend,0
+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-06-23 20:32:23.471040993 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-23 20:36:03.525115067 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:32:23.907044828 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-23 20:36:04.001164408 +0000
+@@ -215,7 +215,7 @@ +@@ -215,7 +215,7 @@
+ Touch Release Event + Touch Release Event
+ // event,buttonPress2,internalNameEntity,positionSlider,50 + // event,buttonPress2,internalNameEntity,positionSlider,50

15
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -20,6 +20,21 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
tCode.bco=6371
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0

26
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -20,6 +20,22 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -71,16 +87,6 @@ Page cardEntities
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,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 bPrev,0
vis bNext,0 vis bNext,0

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

@@ -20,6 +20,17 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0

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

@@ -20,12 +20,8 @@ popupShutter
207 Unique line(s) of event code 207 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
373 Line(s) of event code 384 Line(s) of event code
200 Unique line(s) of event code 207 Unique line(s) of event code
cardAlarm
40 Component(s)
402 Line(s) of event code
244 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
384 Line(s) of event code 384 Line(s) of event code
@@ -34,6 +30,10 @@ popupLight
27 Component(s) 27 Component(s)
363 Line(s) of event code 363 Line(s) of event code
196 Unique line(s) of event code 196 Unique line(s) of event code
cardAlarm
40 Component(s)
417 Line(s) of event code
252 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
167 Line(s) of event code 167 Line(s) of event code
@@ -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)
1227 Line(s) of event code 1234 Line(s) of event code
523 Unique line(s) of event code 524 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
424 Component(s) 424 Component(s)
4895 Line(s) of event code 4928 Line(s) of event code
1296 Unique line(s) of event code 1302 Unique line(s) of event code

15
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -12,6 +12,21 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
tCode.bco=6371
tCode.pco=40179
}
if(defaultBcoColor==6371)
{
tCode.bco=10565
tCode.pco=40179
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0

26
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -12,6 +12,22 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
if(b[sys0].type==1&&defaultBcoColor==0)
{
b[sys0].pic=14
b[sys0].pic1=13
b[sys0].pic2=15
}
}
dim=dimValueNormal dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
@@ -63,16 +79,6 @@ Page cardEntities
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,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 bPrev,0
vis bNext,0 vis bNext,0

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

@@ -12,6 +12,17 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
dim=dimValueNormal dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0