diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 470c9278..37e314cf 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/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 03:33:55.454391181 +0000 @@ -10,7 +10,6 @@ int sleepValue=0 // dim value @@ -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-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 03:33:55.454391181 +0000 @@ -583,12 +583,12 @@ if(tInstruction.txt=="time") { @@ -53,8 +53,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-31 03:13:54.222892689 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 03:33:54.742386332 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 03:33:55.454391181 +0000 @@ -1675,12 +1675,12 @@ if(tInstruction.txt=="time") { @@ -94,8 +94,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt } diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-03-31 03:13:54.222892689 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 03:33:55.454391181 +0000 @@ -765,12 +765,12 @@ if(tInstruction.txt=="time") { @@ -135,8 +135,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt } diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-31 03:13:54.222892689 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 03:33:55.454391181 +0000 @@ -551,12 +551,12 @@ if(tInstruction.txt=="time") { @@ -176,8 +176,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt } diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-03-31 03:13:54.222892689 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-03-31 03:33:54.742386332 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 03:33:55.454391181 +0000 @@ -835,12 +835,12 @@ if(tInstruction.txt=="time") { @@ -217,8 +217,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt } diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 03:33:55.454391181 +0000 @@ -10,18 +10,6 @@ Swide left page ID : disabled Swide right page ID : disabled @@ -248,8 +248,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 03:33:55.454391181 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -275,8 +275,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/popupLight.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 03:33:55.454391181 +0000 @@ -382,6 +382,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -301,8 +301,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 03:33:55.454391181 +0000 @@ -195,6 +195,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -327,8 +327,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="dimmode") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 03:33:55.454391181 +0000 @@ -268,6 +268,7 @@ sleepValue+=1 if(sleepTimeout<=sleepValue) @@ -353,8 +353,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-03-31 03:13:54.222892689 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 03:13:55.246885710 +0000 +--- HMI/n2t-out/screensaver.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 03:33:55.454391181 +0000 @@ -14,18 +14,19 @@ Preinitialize Event recmod=1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3f01b130..34f3016d 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 03:13:54.218892716 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 03:13:54.754889063 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 03:33:55.098388657 +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 03:13:54.222892689 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 03:13:54.754889063 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-31 03:33:54.742386332 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 03:33:55.102388683 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -247,7 +247,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + + Events + Touch Press Event -+ tSend.txt="event,buttonPress2,"+entn4.txt+",down" ++ tSend.txt="event,buttonPress2,"+entn5.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -347,7 +347,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + + Events + Touch Press Event -+ tSend.txt="event,buttonPress2,"+entn4.txt+",down" ++ tSend.txt="event,buttonPress2,"+entn6.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -781,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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-31 03:13:54.218892716 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 03:13:54.754889063 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-31 03:33:54.738386306 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 03:33:55.098388657 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index f7862c57..497450d7 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2074,7 +2074,7 @@ Button bDown5 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn4.txt+",down" + tSend.txt="event,buttonPress2,"+entn5.txt+",down" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -2262,7 +2262,7 @@ Button bDown6 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn4.txt+",down" + tSend.txt="event,buttonPress2,"+entn6.txt+",down" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC 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 914d3c29..cf1d20ed 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 @@ -53,10 +53,10 @@ cardThermo cardEntities 86 Component(s) 1329 Line(s) of event code - 535 Unique line(s) of event code + 537 Unique line(s) of event code Total 13 Page(s) 374 Component(s) 3783 Line(s) of event code - 1030 Unique line(s) of event code + 1032 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 ef9467b0..620d62a6 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1047,7 +1047,7 @@ Button bDown5 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn4.txt+",down" + tSend.txt="event,buttonPress2,"+entn5.txt+",down" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1147,7 +1147,7 @@ Button bDown6 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn4.txt+",down" + tSend.txt="event,buttonPress2,"+entn6.txt+",down" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC