diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 838ccc32..3cc561f4 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-29 22:12:23.291612091 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 22:12:23.795618184 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-29 22:31:04.197072937 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 22:31:04.597077152 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -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-29 22:12:23.291612091 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 22:12:23.799618232 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-29 22:31:04.197072937 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 22:31:04.601077192 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -780,9 +780,36 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-03-29 22:31:04.197072937 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 22:31:04.597077152 +0000 +@@ -17,6 +17,7 @@ + vis tInstruction,0 + vis tTmp,0 + vis tId,0 ++ vis nPageDisp,0 + vis xTempMin,0 + vis xTempMax,0 + vis xTempStep,0 +@@ -98,6 +99,15 @@ + Text : + Max. Text Size: 10 + ++Number nPageDisp ++ Attributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 ++ + XFloat xTempCurr + Attributes + Scope : local diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-29 22:12:23.291612091 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 22:12:23.795618184 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-29 22:31:04.197072937 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 22:31:04.597077152 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index 45818e84..70b507fb 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -25,7 +25,6 @@ Page cardThermo vis tInstruction,0 vis tTmp,0 vis tId,0 - vis nPageDisp,0 vis xTempMin,0 vis xTempMax,0 vis xTempStep,0 @@ -43,114 +42,84 @@ Page cardThermo Variable (string) strCommand Attributes - ID : 7 + ID : 6 Scope : local Text : Max. Text Size: 250 Variable (string) entn Attributes - ID : 22 + ID : 21 Scope : local Text : Max. Text Size: 50 Variable (string) va0 Attributes - ID : 33 + ID : 32 Scope : local Text : Max. Text Size: 10 Variable (string) va1 Attributes - ID : 34 + ID : 33 Scope : local Text : Max. Text Size: 10 Variable (string) va2 Attributes - ID : 35 + ID : 34 Scope : local Text : Max. Text Size: 10 Variable (string) va3 Attributes - ID : 36 + ID : 35 Scope : local Text : Max. Text Size: 10 Variable (string) va4 Attributes - ID : 37 + ID : 36 Scope : local Text : Max. Text Size: 10 Variable (string) va5 Attributes - ID : 38 + ID : 37 Scope : local Text : Max. Text Size: 10 Variable (string) va6 Attributes - ID : 39 + ID : 38 Scope : local Text : Max. Text Size: 10 Variable (string) va7 Attributes - ID : 40 + ID : 39 Scope : local Text : Max. Text Size: 10 Variable (string) va8 Attributes - ID : 41 + ID : 40 Scope : local Text : Max. Text Size: 10 -Number nPageDisp - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 426 - y coordinate : 0 - Width : 42 - Height : 24 - 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 - Value : 0 - Significant digits shown : all - Format : decimal - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - XFloat xTempCurr Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -180,7 +149,7 @@ XFloat xTempCurr XFloat xTempDest Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -210,7 +179,7 @@ XFloat xTempDest XFloat xTempMin Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -240,7 +209,7 @@ XFloat xTempMin XFloat xTempMax Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -270,7 +239,7 @@ XFloat xTempMax XFloat xTempStep Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -360,7 +329,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -390,7 +359,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -420,7 +389,7 @@ Text tId Text tHeading Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -450,7 +419,7 @@ Text tHeading Text tStatus Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -480,7 +449,7 @@ Text tStatus Text t2 Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -574,7 +543,7 @@ Button bNext Button bDown Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -628,7 +597,7 @@ Button bDown Button bUp Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -682,7 +651,7 @@ Button bUp Button bPrev Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -729,7 +698,7 @@ Button bPrev Dual-state Button bt0 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -778,7 +747,7 @@ Dual-state Button bt0 Dual-state Button bt1 Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -827,7 +796,7 @@ Dual-state Button bt1 Dual-state Button bt2 Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -876,7 +845,7 @@ Dual-state Button bt2 Dual-state Button bt3 Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -925,7 +894,7 @@ Dual-state Button bt3 Dual-state Button bt4 Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -974,7 +943,7 @@ Dual-state Button bt4 Dual-state Button bt5 Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1023,7 +992,7 @@ Dual-state Button bt5 Dual-state Button bt6 Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1072,7 +1041,7 @@ Dual-state Button bt6 Dual-state Button bt7 Attributes - ID : 31 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1121,7 +1090,7 @@ Dual-state Button bt7 Dual-state Button bt8 Attributes - ID : 32 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1170,7 +1139,7 @@ Dual-state Button bt8 Timer tmSerial Attributes - ID : 6 + ID : 5 Scope : local Period (ms): 50 Enabled : yes @@ -1494,7 +1463,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 20 + ID : 19 Scope : local Period (ms): 1000 Enabled : yes @@ -1514,7 +1483,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 21 + ID : 20 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 34dc4997..6ee141ae 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -34,10 +34,6 @@ cardMedia 30 Component(s) 278 Line(s) of event code 139 Unique line(s) of event code -cardThermo - 42 Component(s) - 406 Line(s) of event code - 218 Unique line(s) of event code cardAlarm 35 Component(s) 276 Line(s) of event code @@ -50,6 +46,10 @@ screensaver 31 Component(s) 183 Line(s) of event code 133 Unique line(s) of event code +cardThermo + 41 Component(s) + 405 Line(s) of event code + 217 Unique line(s) of event code cardEntities 62 Component(s) 930 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 352 Component(s) - 3363 Line(s) of event code - 910 Unique line(s) of event code + 351 Component(s) + 3362 Line(s) of event code + 909 Unique line(s) of event code diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index f805b2a3..5a6b45bf 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -17,7 +17,6 @@ Page cardThermo vis tInstruction,0 vis tTmp,0 vis tId,0 - vis nPageDisp,0 vis xTempMin,0 vis xTempMax,0 vis xTempStep,0 @@ -99,15 +98,6 @@ Variable (string) va8 Text : Max. Text Size: 10 -Number nPageDisp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Value : 0 - XFloat xTempCurr Attributes Scope : local