diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1104d7eb..83d75f08 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-05-28 08:26:23.480334206 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 08:26:24.560334500 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:31:25.423829253 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,21 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 08:26:23.480334206 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 08:26:24.564334501 +0000 -@@ -34,7 +34,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 275 -+ Max. Text Size: 270 - - Variable (string) entn - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 08:26:23.480334206 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 08:26:24.564334501 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:31:25.423829253 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -32,100 +20,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc 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-05-28 08:26:23.480334206 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 08:26:24.564334501 +0000 -@@ -209,9 +209,6 @@ - sys0=sys0-pColorWheel.y - covx sys0,tTmp.txt,0,0 - tSend.txt+=tTmp.txt -- tSend.txt+="|" -- covx pColorWheel.h,tTmp.txt,0,0 -- tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-28 08:26:23.480334206 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 08:26:24.564334501 +0000 -@@ -62,12 +62,6 @@ - Text : - Max. Text Size: 50 - --Variable (string) tSend -- Attributes -- Scope : local -- Text : -- Max. Text Size: 50 -- - Text tTime - Attributes - Scope : local -@@ -88,6 +82,16 @@ - Text : Tuesday, 08. March 2022 - Max. Text Size : 35 - -+Text tSend -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 50 -+ - Text tMainIcon - Attributes - Scope : local -@@ -308,26 +312,6 @@ - Text : - Max. Text Size : 35 - --Text tIcon1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 5 -- --Text tIcon2 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- Associated Keyboard : none -- Text : -- Max. Text Size : 5 -- - Picture p0 - Attributes - Scope : local -@@ -490,14 +474,6 @@ - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 -- //statusIcon1 -- spstr strCommand.txt,tIcon1.txt,"~",17 -- spstr strCommand.txt,tTmp.txt,"~",18 -- covx tTmp.txt,tIcon1.pco,0,0 -- //statusIcon2 -- spstr strCommand.txt,tIcon2.txt,"~",19 -- spstr strCommand.txt,tTmp.txt,"~",20 -- covx tTmp.txt,tIcon2.pco,0,0 - } - if(tInstruction.txt=="color") - { -@@ -513,8 +489,6 @@ - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco -- tIcon1.bco=tTime.bco -- tIcon2.bco=tTime.bco - tForecast1.bco=tTime.bco - tForecast1Val.bco=tTime.bco - tF1Icon.bco=tTime.bco diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index b0eb93c1..534f9d9a 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -43,7 +43,7 @@ Variable (string) strCommand ID : 6 Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 77fcf2ea..484c75a6 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -608,9 +608,9 @@ Text tALbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 22 + x coordinate : 9 y coordinate : 260 - Width : 67 + Width : 80 Height : 30 Effect : load Effect Priority : 0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index a2b0e7a0..40de37a7 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -30,26 +30,26 @@ popupShutter 20 Component(s) 244 Line(s) of event code 138 Unique line(s) of event code -popupLight - 27 Component(s) - 345 Line(s) of event code - 187 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code -cardMedia - 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code cardQR 30 Component(s) 363 Line(s) of event code 207 Unique line(s) of event code +popupLight + 27 Component(s) + 348 Line(s) of event code + 188 Unique line(s) of event code +cardMedia + 33 Component(s) + 350 Line(s) of event code + 179 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code screensaver - 35 Component(s) - 297 Line(s) of event code - 238 Unique line(s) of event code + 37 Component(s) + 305 Line(s) of event code + 244 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 402 Component(s) - 4459 Line(s) of event code - 1168 Unique line(s) of event code + 404 Component(s) + 4470 Line(s) of event code + 1175 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 115a4ef2..386a4486 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -461,6 +461,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index d7bc5566..c2b90de5 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -50,27 +50,34 @@ Variable (string) strCommand Variable (string) tId Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 25 + ID : 24 Scope: local Value: 0 Variable (string) tInstruction Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 32 + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 34 Scope : local Text : Max. Text Size: 50 @@ -83,10 +90,10 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 52 y coordinate : 0 - Width : 451 - Height : 150 + Width : 376 + Height : 154 Effect : load Effect Priority : 0 Effect Time : 300 @@ -114,8 +121,8 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 150 - Width : 451 + y coordinate : 154 + Width : 450 Height : 38 Effect : load Effect Priority : 0 @@ -135,7 +142,7 @@ Text tDate Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tMainIcon Attributes ID : 7 Scope : local @@ -143,38 +150,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 420 - y coordinate : 2 - Width : 29 - 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 tMainIcon - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 x coordinate : 41 - y coordinate : 202 + y coordinate : 206 Width : 70 Height : 66 Effect : load @@ -197,14 +174,14 @@ Text tMainIcon Text tMainText Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 22 - y coordinate : 267 + y coordinate : 271 Width : 110 Height : 43 Effect : load @@ -227,14 +204,14 @@ Text tMainText Text tForecast1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 143 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 26 Effect : load @@ -257,14 +234,14 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 140 - y coordinate : 276 + y coordinate : 280 Width : 71 Height : 25 Effect : load @@ -287,14 +264,14 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 161 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -317,14 +294,14 @@ Text tF1Icon Text tForecast2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 227 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -347,14 +324,14 @@ Text tForecast2 Text tF2Icon Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 243 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -377,14 +354,14 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 227 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -407,14 +384,14 @@ Text tForecast2Val Text t10 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 61 - y coordinate : 195 + y coordinate : 199 Width : 360 Height : 2 Effect : load @@ -437,14 +414,14 @@ Text t10 Text tAMPM Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 358 - y coordinate : 48 + y coordinate : 49 Width : 104 Height : 57 Effect : load @@ -467,14 +444,14 @@ Text tAMPM Text tForecast3Val Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 307 - y coordinate : 277 + y coordinate : 281 Width : 71 Height : 25 Effect : load @@ -497,14 +474,14 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 324 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -527,14 +504,14 @@ Text tF3Icon Text tForecast3 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 308 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -557,14 +534,14 @@ Text tForecast3 Text tForecast4 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 389 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -587,14 +564,14 @@ Text tForecast4 Text tF4Icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 405 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -617,14 +594,14 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 389 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -647,14 +624,14 @@ Text tForecast4Val Text tMainTextAlt Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 119 - y coordinate : 210 + y coordinate : 214 Width : 106 Height : 42 Effect : load @@ -677,14 +654,14 @@ Text tMainTextAlt Text tMainIconAlt Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 221 + y coordinate : 225 Width : 100 Height : 66 Effect : load @@ -707,14 +684,14 @@ Text tMainIconAlt Text tMRIcon Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 116 - y coordinate : 266 + y coordinate : 270 Width : 40 Height : 35 Effect : load @@ -737,14 +714,14 @@ Text tMRIcon Text tMR Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 159 - y coordinate : 270 + y coordinate : 274 Width : 62 Height : 21 Effect : load @@ -767,14 +744,14 @@ Text tMR Text tNotifyHead Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 201 + y coordinate : 205 Width : 450 Height : 58 Effect : load @@ -797,14 +774,14 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 258 + y coordinate : 262 Width : 450 Height : 47 Effect : load @@ -825,6 +802,66 @@ Text tNotifyText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tIcon1 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 8 + y coordinate : 0 + Width : 38 + Height : 38 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 434 + y coordinate : 0 + Width : 38 + Height : 38 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -998,6 +1035,14 @@ Timer tmSerial } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -1013,6 +1058,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -1151,7 +1198,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 1000 Enabled : yes diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 50ada2f8..7f60a8ea 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -34,7 +34,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 3e3da25b..4c4b5703 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -209,6 +209,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 04c7b2c5..bd952279 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -62,6 +62,12 @@ Variable (string) tTmp Text : Max. Text Size: 50 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -82,16 +88,6 @@ Text tDate Text : Tuesday, 08. March 2022 Max. Text Size : 35 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Text tMainIcon Attributes Scope : local @@ -312,6 +308,26 @@ Text tNotifyText Text : Max. Text Size : 35 +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + Picture p0 Attributes Scope : local @@ -474,6 +490,14 @@ Timer tmSerial } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -489,6 +513,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index a48c0c13..a09b4d08 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-05-28 08:26:23.480334206 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 08:26:23.988334344 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +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-05-28 08:26:23.480334206 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 08:26:23.988334344 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 08:26:23.480334206 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 08:26:23.988334344 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 08:26:23.480334206 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 08:26:23.988334344 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +501,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-05-28 08:26:23.480334206 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 08:26:23.988334344 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000 @@ -209,9 +209,6 @@ sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 @@ -514,8 +514,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.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-05-28 08:26:23.480334206 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 08:26:23.988334344 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 19:31:24.471828653 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000 @@ -471,22 +471,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 55cd990a..4862425c 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,15 +1,15 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 08:26:24.036334357 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 08:26:23.480334206 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 08:26:23.988334344 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 08:26:23.480334206 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 08:26:23.988334344 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 08:26:23.480334206 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 08:26:23.988334344 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 08:26:23.480334206 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 08:26:23.988334344 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:31:24.959828961 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-28 19:31:24.471828653 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:31:24.471828653 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-28 19:31:24.471828653 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-28 08:26:23.480334206 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 08:26:23.988334344 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000 +@@ -209,9 +209,6 @@ + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 @@ -20,6 +20,6 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/screensaver.txt 2022-05-28 08:26:23.480334206 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 08:26:23.988334344 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-28 19:31:24.471828653 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000 +@@ -471,22 +471,6 @@ diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 94605eb6..819ed374 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -610,7 +610,7 @@ Text tALbl Opacity : 127 x coordinate : 7 y coordinate : 260 - Width : 67 + Width : 74 Height : 30 Effect : load Effect Priority : 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index a14cc636..197f58df 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ popupLight 27 Component(s) 348 Line(s) of event code 188 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code cardQR 30 Component(s) 363 Line(s) of event code @@ -50,6 +46,10 @@ cardAlarm 38 Component(s) 364 Line(s) of event code 224 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code