diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 61d36c6d..d37e548a 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:34:54.344250692 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:37:34.337049641 +0000 @@ -17,6 +17,7 @@ vis tInstruction,0 vis tTmp,0 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis arm2,0 vis arm3,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:34:54.348250817 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:37:34.341049662 +0000 @@ -1125,33 +1125,6 @@ { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 @@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:34:54.348250817 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:37:33.337044390 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:37:34.341049662 +0000 @@ -12,28 +12,307 @@ Events @@ -408,8 +408,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:34:54.344250692 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:37:34.337049641 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 02d6ab84..e00b017c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -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-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:34:53.840234939 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:37:33.841047037 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:34:53.844235064 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:37:33.845047058 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -525,41 +525,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local -@@ -1125,33 +1581,6 @@ - { - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,",",1 -- // navigation icons -- spstr strCommand.txt,tId.txt,",",2 -- spstr tId.txt,tTmp.txt,"|",0 -- if(tTmp.txt=="0") -- { -- vis bPrev,0 -- } -- if(tTmp.txt=="1") -- { -- vis bPrev,1 -- bPrev.txt="" -- } -- if(tTmp.txt=="2") -- { -- vis bPrev,1 -- bPrev.txt="" -- } -- spstr tId.txt,tTmp.txt,"|",1 -- if(tTmp.txt=="0") -- { -- vis bNext,0 -- } -- if(tTmp.txt=="1") -- { -- vis bPrev,1 -- bNext.txt="" -- } - // get Type - spstr strCommand.txt,type1.txt,",",3 - // get internal name -@@ -1648,6 +2077,254 @@ +@@ -1648,6 +2104,254 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -815,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 21:34:53.844235064 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:37:33.337044390 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 21:37:33.845047058 +0000 @@ -242,12 +242,7 @@ Events @@ -866,8 +832,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt spstr strCommand.txt,type1.txt,",",3 // get internal name diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:34:53.844235064 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:37:33.845047058 +0000 @@ -435,12 +435,7 @@ Events @@ -965,8 +931,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt { vis t5,0 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:34:53.844235064 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 21:37:33.337044390 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:37:33.845047058 +0000 @@ -329,12 +329,7 @@ Events @@ -1309,8 +1275,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt udelete payloadLength-1 bufferPos=0 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:34:53.840234939 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:37:33.845047058 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1330,8 +1296,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 21:34:53.332219061 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:34:53.844235064 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 21:37:33.333044369 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:37:33.845047058 +0000 @@ -30,6 +30,26 @@ vis tSend,0 //page open event diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 04345837..0edf2924 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2912,6 +2912,33 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 spstr strCommand.txt,tHeading.txt,",",1 + // navigation icons + spstr strCommand.txt,tId.txt,",",2 + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + { + vis bPrev,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,",",3 // get internal name diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index e55888bf..dd7fb83c 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -52,11 +52,11 @@ cardThermo 232 Unique line(s) of event code cardEntities 86 Component(s) - 1334 Line(s) of event code - 540 Unique line(s) of event code + 1360 Line(s) of event code + 552 Unique line(s) of event code Total 13 Page(s) 375 Component(s) - 3882 Line(s) of event code + 3908 Line(s) of event code 1061 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index ba1e40f5..dddc4f1e 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1581,6 +1581,33 @@ Timer tmSerial { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 spstr strCommand.txt,tHeading.txt,",",1 + // navigation icons + spstr strCommand.txt,tId.txt,",",2 + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="0") + { + vis bPrev,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bPrev.txt="" + } + if(tTmp.txt=="2") + { + vis bPrev,1 + bPrev.txt="" + } + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="0") + { + vis bNext,0 + } + if(tTmp.txt=="1") + { + vis bPrev,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,",",3 // get internal name