diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1de3fd52..dbb9c29f 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-04-13 19:28:22.560583074 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 19:28:23.344592433 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:14:00.109218807 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-13 19:28:22.560583074 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 19:28:23.344592433 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:14:00.109218807 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-13 19:28:22.560583074 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 19:28:23.344592433 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:14:00.109218807 +0000 @@ -570,43 +570,25 @@ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 @@ -75,3 +75,130 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt } if(tId.txt=="cardAlarm") { +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:14:00.109218807 +0000 +@@ -48,18 +48,6 @@ + Scope: local + Value: 0 + +-Variable (string) tInstruction +- Attributes +- Scope : local +- Text : +- Max. Text Size: 50 +- +-Variable (string) tTmp +- Attributes +- Scope : local +- Text : +- Max. Text Size: 50 +- + Text tTime + Attributes + Scope : local +@@ -290,6 +278,26 @@ + Text : + Max. Text Size : 10 + ++Text tTmp ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 50 ++ ++Text tInstruction ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 50 ++ + Picture p0 + Attributes + Scope : local +@@ -450,77 +458,6 @@ + //tMR + spstr strCommand.txt,tMR.txt,"~",16 + } +- if(tInstruction.txt=="color") +- { +- spstr strCommand.txt,tTmp.txt,"~",1 +- covx tTmp.txt,tTime.bco,0,0 +- screensaver.bco=tTime.bco +- tAMPM.bco=tTime.bco +- tDate.bco=tTime.bco +- tMainIcon.bco=tTime.bco +- tMainText.bco=tTime.bco +- tMainIconAlt.bco=tTime.bco +- tMainTextAlt.bco=tTime.bco +- tMRIcon.bco=tTime.bco +- tMR.bco=tTime.bco +- tMRIcon.bco=tTime.bco +- tForecast1.bco=tTime.bco +- tForecast1Val.bco=tTime.bco +- tF1Icon.bco=tTime.bco +- tForecast2.bco=tTime.bco +- tForecast2Val.bco=tTime.bco +- tF2Icon.bco=tTime.bco +- tForecast3.bco=tTime.bco +- tForecast3Val.bco=tTime.bco +- tF3Icon.bco=tTime.bco +- tForecast4.bco=tTime.bco +- tForecast4Val.bco=tTime.bco +- tF4Icon.bco=tTime.bco +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,tTime.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",3 +- covx tTmp.txt,tAMPM.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",4 +- covx tTmp.txt,tDate.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",5 +- covx tTmp.txt,tMainIcon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",6 +- covx tTmp.txt,tMainText.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",7 +- covx tTmp.txt,tForecast1.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",8 +- covx tTmp.txt,tForecast2.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",9 +- covx tTmp.txt,tForecast3.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",10 +- covx tTmp.txt,tForecast4.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",11 +- covx tTmp.txt,tF1Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",12 +- covx tTmp.txt,tF2Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",13 +- covx tTmp.txt,tF3Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",14 +- covx tTmp.txt,tF4Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",15 +- covx tTmp.txt,tForecast1Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",16 +- covx tTmp.txt,tForecast2Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",17 +- covx tTmp.txt,tForecast3Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",18 +- covx tTmp.txt,tForecast4Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",19 +- covx tTmp.txt,t10.bco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",20 +- covx tTmp.txt,tMainIconAlt.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",21 +- covx tTmp.txt,tMainTextAlt.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",22 +- covx tTmp.txt,tMRIcon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",23 +- covx tTmp.txt,tMR.pco,0,0 +- } + if(tInstruction.txt=="pageType") + { + dim=100 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 973ed575..88a14a00 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-04-13 19:28:22.560583074 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 19:28:22.940587610 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +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-04-13 19:28:22.560583074 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 19:28:22.940587610 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,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-04-13 19:28:22.560583074 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 19:28:22.940587610 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -448,8 +448,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-04-13 19:28:22.560583074 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 19:28:22.940587610 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +0000 @@ -570,43 +570,25 @@ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 @@ -501,51 +501,83 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt if(tId.txt=="cardAlarm") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-04-13 19:28:22.560583074 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 19:28:22.940587610 +0000 -@@ -48,6 +48,18 @@ - Scope: local - Value: 0 - -+Variable (string) tInstruction -+ Attributes -+ Scope : local -+ Text : -+ Max. Text Size: 50 -+ -+Variable (string) tTmp -+ Attributes -+ Scope : local -+ Text : -+ Max. Text Size: 50 -+ - Text tTime - Attributes - Scope : local -@@ -278,26 +290,6 @@ - Text : - Max. Text Size : 10 - --Text tTmp -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 50 -- --Text tInstruction -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 50 -- - Picture p0 - Attributes - Scope : local +--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000 +@@ -450,77 +450,6 @@ + //tMR + spstr strCommand.txt,tMR.txt,"~",16 + } +- if(tInstruction.txt=="color") +- { +- spstr strCommand.txt,tTmp.txt,"~",1 +- covx tTmp.txt,tTime.bco,0,0 +- screensaver.bco=tTime.bco +- tAMPM.bco=tTime.bco +- tDate.bco=tTime.bco +- tMainIcon.bco=tTime.bco +- tMainText.bco=tTime.bco +- tMainIconAlt.bco=tTime.bco +- tMainTextAlt.bco=tTime.bco +- tMRIcon.bco=tTime.bco +- tMR.bco=tTime.bco +- tMRIcon.bco=tTime.bco +- tForecast1.bco=tTime.bco +- tForecast1Val.bco=tTime.bco +- tF1Icon.bco=tTime.bco +- tForecast2.bco=tTime.bco +- tForecast2Val.bco=tTime.bco +- tF2Icon.bco=tTime.bco +- tForecast3.bco=tTime.bco +- tForecast3Val.bco=tTime.bco +- tF3Icon.bco=tTime.bco +- tForecast4.bco=tTime.bco +- tForecast4Val.bco=tTime.bco +- tF4Icon.bco=tTime.bco +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,tTime.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",3 +- covx tTmp.txt,tAMPM.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",4 +- covx tTmp.txt,tDate.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",5 +- covx tTmp.txt,tMainIcon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",6 +- covx tTmp.txt,tMainText.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",7 +- covx tTmp.txt,tForecast1.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",8 +- covx tTmp.txt,tForecast2.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",9 +- covx tTmp.txt,tForecast3.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",10 +- covx tTmp.txt,tForecast4.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",11 +- covx tTmp.txt,tF1Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",12 +- covx tTmp.txt,tF2Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",13 +- covx tTmp.txt,tF3Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",14 +- covx tTmp.txt,tF4Icon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",15 +- covx tTmp.txt,tForecast1Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",16 +- covx tTmp.txt,tForecast2Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",17 +- covx tTmp.txt,tForecast3Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",18 +- covx tTmp.txt,tForecast4Val.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",19 +- covx tTmp.txt,t10.bco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",20 +- covx tTmp.txt,tMainIconAlt.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",21 +- covx tTmp.txt,tMainTextAlt.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",22 +- covx tTmp.txt,tMRIcon.pco,0,0 +- spstr strCommand.txt,tTmp.txt,"~",23 +- covx tTmp.txt,tMR.pco,0,0 +- } + if(tInstruction.txt=="pageType") + { + dim=100 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7efa5cd8..31c522f6 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 19:28:22.952587754 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-13 19:28:22.560583074 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 19:28:22.940587610 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-13 19:28:22.560583074 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 19:28:22.940587610 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:13:59.713214007 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-13 20:13:59.313209160 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:13:59.313209160 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -15,11 +15,11 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-04-13 19:28:22.560583074 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 19:28:22.940587610 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:13:59.313209160 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-04-13 19:28:22.560583074 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 19:28:22.940587610 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +0000 +@@ -570,43 +570,25 @@ + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 @@ -71,51 +71,83 @@ + if(tId.txt=="cardAlarm") + { +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-13 19:28:22.560583074 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 19:28:22.940587610 +0000 -+@@ -48,6 +48,18 @@ -+ Scope: local -+ Value: 0 -+ -++Variable (string) tInstruction -++ Attributes -++ Scope : local -++ Text : -++ Max. Text Size: 50 -++ -++Variable (string) tTmp -++ Attributes -++ Scope : local -++ Text : -++ Max. Text Size: 50 -++ -+ Text tTime -+ Attributes -+ Scope : local -+@@ -278,26 +290,6 @@ -+ Text : -+ Max. Text Size : 10 -+ -+-Text tTmp -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text : -+- Max. Text Size : 50 -+- -+-Text tInstruction -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- Associated Keyboard : none -+- Text : -+- Max. Text Size : 50 -+- -+ Picture p0 -+ Attributes -+ Scope : local ++--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000 ++@@ -450,77 +450,6 @@ ++ //tMR ++ spstr strCommand.txt,tMR.txt,"~",16 ++ } ++- if(tInstruction.txt=="color") ++- { ++- spstr strCommand.txt,tTmp.txt,"~",1 ++- covx tTmp.txt,tTime.bco,0,0 ++- screensaver.bco=tTime.bco ++- tAMPM.bco=tTime.bco ++- tDate.bco=tTime.bco ++- tMainIcon.bco=tTime.bco ++- tMainText.bco=tTime.bco ++- tMainIconAlt.bco=tTime.bco ++- tMainTextAlt.bco=tTime.bco ++- tMRIcon.bco=tTime.bco ++- tMR.bco=tTime.bco ++- tMRIcon.bco=tTime.bco ++- tForecast1.bco=tTime.bco ++- tForecast1Val.bco=tTime.bco ++- tF1Icon.bco=tTime.bco ++- tForecast2.bco=tTime.bco ++- tForecast2Val.bco=tTime.bco ++- tF2Icon.bco=tTime.bco ++- tForecast3.bco=tTime.bco ++- tForecast3Val.bco=tTime.bco ++- tF3Icon.bco=tTime.bco ++- tForecast4.bco=tTime.bco ++- tForecast4Val.bco=tTime.bco ++- tF4Icon.bco=tTime.bco ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,tTime.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",3 ++- covx tTmp.txt,tAMPM.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",4 ++- covx tTmp.txt,tDate.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",5 ++- covx tTmp.txt,tMainIcon.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",6 ++- covx tTmp.txt,tMainText.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",7 ++- covx tTmp.txt,tForecast1.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",8 ++- covx tTmp.txt,tForecast2.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",9 ++- covx tTmp.txt,tForecast3.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",10 ++- covx tTmp.txt,tForecast4.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",11 ++- covx tTmp.txt,tF1Icon.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",12 ++- covx tTmp.txt,tF2Icon.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",13 ++- covx tTmp.txt,tF3Icon.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",14 ++- covx tTmp.txt,tF4Icon.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",15 ++- covx tTmp.txt,tForecast1Val.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",16 ++- covx tTmp.txt,tForecast2Val.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",17 ++- covx tTmp.txt,tForecast3Val.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",18 ++- covx tTmp.txt,tForecast4Val.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",19 ++- covx tTmp.txt,t10.bco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",20 ++- covx tTmp.txt,tMainIconAlt.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",21 ++- covx tTmp.txt,tMainTextAlt.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",22 ++- covx tTmp.txt,tMRIcon.pco,0,0 ++- spstr strCommand.txt,tTmp.txt,"~",23 ++- covx tTmp.txt,tMR.pco,0,0 ++- } ++ if(tInstruction.txt=="pageType") ++ { ++ dim=100 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 058b96c8..1be6aa3f 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -40,8 +40,8 @@ cardGrid 244 Unique line(s) of event code screensaver 33 Component(s) - 195 Line(s) of event code - 152 Unique line(s) of event code + 266 Line(s) of event code + 218 Unique line(s) of event code cardAlarm 35 Component(s) 343 Line(s) of event code @@ -54,5 +54,5 @@ cardEntities Total 12 Page(s) 341 Component(s) - 3590 Line(s) of event code - 948 Unique line(s) of event code + 3661 Line(s) of event code + 1002 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index c63c7fdb..1ba7e29f 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -59,6 +59,20 @@ Variable (int32) vaTap Scope: local Value: 0 +Variable (string) tInstruction + Attributes + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tTmp + Attributes + ID : 32 + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes ID : 5 @@ -749,66 +763,6 @@ Text tMR Horizontal Spacing : 0 Vertical Spacing : 0 -Text tTmp - Attributes - ID : 31 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 368 - y coordinate : 0 - Width : 25 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tInstruction - Attributes - ID : 32 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 335 - y coordinate : 0 - Width : 27 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Picture p0 Attributes ID : 1 @@ -980,6 +934,77 @@ Timer tmSerial //tMR spstr strCommand.txt,tMR.txt,"~",16 } + if(tInstruction.txt=="color") + { + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,tTime.bco,0,0 + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,tTime.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",3 + covx tTmp.txt,tAMPM.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tDate.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,tMainIcon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",6 + covx tTmp.txt,tMainText.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",7 + covx tTmp.txt,tForecast1.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",8 + covx tTmp.txt,tForecast2.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",9 + covx tTmp.txt,tForecast3.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",10 + covx tTmp.txt,tForecast4.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,tF1Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",12 + covx tTmp.txt,tF2Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,tF3Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",14 + covx tTmp.txt,tF4Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,tForecast1Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,tForecast2Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",17 + covx tTmp.txt,tForecast3Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tForecast4Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",19 + covx tTmp.txt,t10.bco,0,0 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tMainIconAlt.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,tMainTextAlt.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tMRIcon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",23 + covx tTmp.txt,tMR.pco,0,0 + } if(tInstruction.txt=="pageType") { dim=100 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index bb92fffc..f7600ee3 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -48,6 +48,18 @@ Variable (int32) vaTap Scope: local Value: 0 +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -278,26 +290,6 @@ Text tMR Text : Max. Text Size : 10 -Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - -Text tInstruction - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Picture p0 Attributes Scope : local @@ -458,6 +450,77 @@ Timer tmSerial //tMR spstr strCommand.txt,tMR.txt,"~",16 } + if(tInstruction.txt=="color") + { + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,tTime.bco,0,0 + screensaver.bco=tTime.bco + tAMPM.bco=tTime.bco + tDate.bco=tTime.bco + tMainIcon.bco=tTime.bco + tMainText.bco=tTime.bco + tMainIconAlt.bco=tTime.bco + tMainTextAlt.bco=tTime.bco + tMRIcon.bco=tTime.bco + tMR.bco=tTime.bco + tMRIcon.bco=tTime.bco + tForecast1.bco=tTime.bco + tForecast1Val.bco=tTime.bco + tF1Icon.bco=tTime.bco + tForecast2.bco=tTime.bco + tForecast2Val.bco=tTime.bco + tF2Icon.bco=tTime.bco + tForecast3.bco=tTime.bco + tForecast3Val.bco=tTime.bco + tF3Icon.bco=tTime.bco + tForecast4.bco=tTime.bco + tForecast4Val.bco=tTime.bco + tF4Icon.bco=tTime.bco + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,tTime.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",3 + covx tTmp.txt,tAMPM.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tDate.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,tMainIcon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",6 + covx tTmp.txt,tMainText.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",7 + covx tTmp.txt,tForecast1.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",8 + covx tTmp.txt,tForecast2.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",9 + covx tTmp.txt,tForecast3.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",10 + covx tTmp.txt,tForecast4.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,tF1Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",12 + covx tTmp.txt,tF2Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,tF3Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",14 + covx tTmp.txt,tF4Icon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,tForecast1Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,tForecast2Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",17 + covx tTmp.txt,tForecast3Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tForecast4Val.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",19 + covx tTmp.txt,t10.bco,0,0 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tMainIconAlt.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",21 + covx tTmp.txt,tMainTextAlt.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tMRIcon.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",23 + covx tTmp.txt,tMR.pco,0,0 + } if(tInstruction.txt=="pageType") { dim=100