diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index a637407e..b251d7fc 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-06-15 18:19:09.032808526 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-15 18:19:09.900863875 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-16 16:54:48.686499319 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,56 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-15 18:19:09.900863875 +0000 -@@ -769,8 +769,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event -@@ -794,8 +794,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event -@@ -819,8 +819,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event -@@ -844,8 +844,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-15 18:19:09.900863875 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-16 16:54:48.690499574 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 95bcb778..3bd1705f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -83,63 +83,63 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 45 + ID : 41 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 46 + ID : 42 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 47 + ID : 43 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 48 + ID : 44 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 49 + ID : 45 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 50 + ID : 46 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 51 + ID : 47 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 52 + ID : 48 Scope : local Text : Max. Text Size: 80 Number nNum1 Attributes - ID : 58 + ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -169,7 +169,7 @@ Number nNum1 Number nNum2 Attributes - ID : 59 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -199,7 +199,7 @@ Number nNum2 Number nNum3 Attributes - ID : 60 + ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -229,7 +229,7 @@ Number nNum3 Number nNum4 Attributes - ID : 61 + ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -275,7 +275,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -666,7 +666,7 @@ Picture p0 Slider hSlider1 Attributes - ID : 54 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -709,7 +709,7 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 55 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -752,7 +752,7 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 56 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -795,7 +795,7 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 57 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1503,15 +1503,15 @@ Button bNext Button bText1 Attributes - ID : 37 + ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 292 + x coordinate : 276 y coordinate : 84 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1527,8 +1527,8 @@ Button bText1 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1550,15 +1550,15 @@ Button bText1 Button bText2 Attributes - ID : 38 + ID : 62 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 291 + x coordinate : 276 y coordinate : 140 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1574,8 +1574,8 @@ Button bText2 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1597,15 +1597,15 @@ Button bText2 Button bText3 Attributes - ID : 39 + ID : 63 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 292 + x coordinate : 277 y coordinate : 197 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1621,8 +1621,8 @@ Button bText3 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1644,15 +1644,15 @@ Button bText3 Button bText4 Attributes - ID : 40 + ID : 64 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 292 + x coordinate : 277 y coordinate : 254 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1668,8 +1668,8 @@ Button bText4 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1897,7 +1897,7 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 41 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1905,7 +1905,7 @@ Hotspot m2 Opacity : 127 x coordinate : 40 y coordinate : 184 - Width : 250 + Width : 235 Height : 60 Effect : load Effect Priority : 0 @@ -1928,7 +1928,7 @@ Hotspot m2 Hotspot m1 Attributes - ID : 42 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1936,7 +1936,7 @@ Hotspot m1 Opacity : 127 x coordinate : 39 y coordinate : 127 - Width : 247 + Width : 236 Height : 60 Effect : load Effect Priority : 0 @@ -1959,7 +1959,7 @@ Hotspot m1 Hotspot m0 Attributes - ID : 43 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1967,7 +1967,7 @@ Hotspot m0 Opacity : 127 x coordinate : 37 y coordinate : 70 - Width : 244 + Width : 237 Height : 56 Effect : load Effect Priority : 0 @@ -1990,7 +1990,7 @@ Hotspot m0 Hotspot m3 Attributes - ID : 44 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1998,7 +1998,7 @@ Hotspot m3 Opacity : 127 x coordinate : 38 y coordinate : 237 - Width : 244 + Width : 236 Height : 60 Effect : load Effect Priority : 0 @@ -2021,7 +2021,7 @@ Hotspot m3 Hotspot mSwipeNext Attributes - ID : 62 + ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2041,7 +2041,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 63 + ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2049,7 +2049,7 @@ Hotspot mSwipeUp Opacity : 127 x coordinate : 12 y coordinate : 0 - Width : 454 + Width : 453 Height : 9 Effect : load Effect Priority : 0 @@ -2061,7 +2061,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 64 + ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2953,7 +2953,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 53 + ID : 49 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index c8023456..1b045322 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -769,8 +769,8 @@ Button bText1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -794,8 +794,8 @@ Button bText2 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -819,8 +819,8 @@ Button bText3 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -844,8 +844,8 @@ Button bText4 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2c39ef58..2cde0cd8 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-06-15 18:19:09.032808526 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-15 18:19:09.456835563 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +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-06-15 18:19:09.032808526 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-15 18:19:09.456835563 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -127,50 +127,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Button bDown1 Attributes Scope : local -@@ -769,8 +848,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event -@@ -794,8 +873,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event -@@ -819,8 +898,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event -@@ -844,8 +923,8 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : -- Max. Text Size : 15 -+ Text : newtxt -+ Max. Text Size : 10 - - Events - Touch Press Event @@ -862,6 +941,106 @@ prints tSend.txt,0 prints crcval,2 @@ -257,8 +213,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed -+ Text : newtxt -+ Max. Text Size : 10 ++ Text : ++ Max. Text Size : 20 + + Events + Touch Press Event @@ -512,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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-15 18:19:09.456835563 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 6ef1276b..814c4c3b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,60 +1,18 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-15 18:19:09.468836328 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-15 18:19:09.032808526 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-15 18:19:09.456835563 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-15 18:19:09.032808526 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-15 18:19:09.456835563 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-16 16:54:48.258472024 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-16 16:54:47.818443964 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-16 16:54:48.242471004 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-16 16:54:47.818443964 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-16 16:54:48.242471004 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ +@@ -286,6 +317,26 @@ +@@ -405,6 +456,34 @@ -+@@ -769,8 +848,8 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : -+- Max. Text Size : 15 -++ Text : newtxt -++ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+@@ -794,8 +873,8 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : -+- Max. Text Size : 15 -++ Text : newtxt -++ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+@@ -819,8 +898,8 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : -+- Max. Text Size : 15 -++ Text : newtxt -++ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+@@ -844,8 +923,8 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : -+- Max. Text Size : 15 -++ Text : newtxt -++ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event +@@ -862,6 +941,106 @@ +++ Text : +++ Max. Text Size : 20 +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-06-15 18:19:09.032808526 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-15 18:19:09.456835563 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-16 16:54:47.818443964 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-16 16:54:48.242471004 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index a719fbda..8785252a 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -1684,8 +1684,8 @@ Button bText1 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1731,8 +1731,8 @@ Button bText2 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1778,8 +1778,8 @@ Button bText3 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1825,8 +1825,8 @@ Button bText4 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -2013,8 +2013,8 @@ Button bText5 Horizontal Alignment : right Vertical Alignment : center State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 5a48f58d..980a1a2c 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -848,8 +848,8 @@ Button bText1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -873,8 +873,8 @@ Button bText2 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -898,8 +898,8 @@ Button bText3 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -923,8 +923,8 @@ Button bText4 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event @@ -1023,8 +1023,8 @@ Button bText5 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt - Max. Text Size : 10 + Text : + Max. Text Size : 20 Events Touch Press Event diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 9174183d..a4a466f6 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -83,63 +83,63 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 45 + ID : 41 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 46 + ID : 42 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 47 + ID : 43 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 48 + ID : 44 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 49 + ID : 45 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 50 + ID : 46 Scope : local Text : Max. Text Size: 80 Variable (string) entn3 Attributes - ID : 51 + ID : 47 Scope : local Text : Max. Text Size: 80 Variable (string) entn4 Attributes - ID : 52 + ID : 48 Scope : local Text : Max. Text Size: 80 Number nNum1 Attributes - ID : 58 + ID : 54 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -169,7 +169,7 @@ Number nNum1 Number nNum2 Attributes - ID : 59 + ID : 55 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -199,7 +199,7 @@ Number nNum2 Number nNum3 Attributes - ID : 60 + ID : 56 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -229,7 +229,7 @@ Number nNum3 Number nNum4 Attributes - ID : 61 + ID : 57 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -666,7 +666,7 @@ Picture p0 Slider hSlider1 Attributes - ID : 54 + ID : 50 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -709,7 +709,7 @@ Slider hSlider1 Slider hSlider2 Attributes - ID : 55 + ID : 51 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -752,7 +752,7 @@ Slider hSlider2 Slider hSlider3 Attributes - ID : 56 + ID : 52 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -795,7 +795,7 @@ Slider hSlider3 Slider hSlider4 Attributes - ID : 57 + ID : 53 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1503,15 +1503,15 @@ Button bNext Button bText1 Attributes - ID : 37 + ID : 61 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 261 y coordinate : 84 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1528,7 +1528,7 @@ Button bText1 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1550,15 +1550,15 @@ Button bText1 Button bText2 Attributes - ID : 38 + ID : 62 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 276 + x coordinate : 261 y coordinate : 140 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1575,7 +1575,7 @@ Button bText2 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1597,15 +1597,15 @@ Button bText2 Button bText3 Attributes - ID : 39 + ID : 63 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 262 y coordinate : 197 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1622,7 +1622,7 @@ Button bText3 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1644,15 +1644,15 @@ Button bText3 Button bText4 Attributes - ID : 40 + ID : 64 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 262 y coordinate : 254 - Width : 145 + Width : 166 Height : 30 Effect : load Effect Priority : 0 @@ -1669,7 +1669,7 @@ Button bText4 Vertical Alignment : center State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -1897,7 +1897,7 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 41 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1905,7 +1905,7 @@ Hotspot m2 Opacity : 127 x coordinate : 25 y coordinate : 184 - Width : 250 + Width : 235 Height : 60 Effect : load Effect Priority : 0 @@ -1928,7 +1928,7 @@ Hotspot m2 Hotspot m1 Attributes - ID : 42 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1936,7 +1936,7 @@ Hotspot m1 Opacity : 127 x coordinate : 24 y coordinate : 127 - Width : 247 + Width : 236 Height : 60 Effect : load Effect Priority : 0 @@ -1959,7 +1959,7 @@ Hotspot m1 Hotspot m0 Attributes - ID : 43 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1967,7 +1967,7 @@ Hotspot m0 Opacity : 127 x coordinate : 22 y coordinate : 70 - Width : 244 + Width : 237 Height : 56 Effect : load Effect Priority : 0 @@ -1990,7 +1990,7 @@ Hotspot m0 Hotspot m3 Attributes - ID : 44 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1998,7 +1998,7 @@ Hotspot m3 Opacity : 127 x coordinate : 23 y coordinate : 237 - Width : 244 + Width : 236 Height : 60 Effect : load Effect Priority : 0 @@ -2021,7 +2021,7 @@ Hotspot m3 Hotspot mSwipeNext Attributes - ID : 62 + ID : 58 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2041,7 +2041,7 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 63 + ID : 59 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2061,7 +2061,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 64 + ID : 60 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2953,7 +2953,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 53 + ID : 49 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 6f23d407..1b045322 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -770,7 +770,7 @@ Button bText1 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Events Touch Press Event @@ -795,7 +795,7 @@ Button bText2 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Events Touch Press Event @@ -820,7 +820,7 @@ Button bText3 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Events Touch Press Event @@ -845,7 +845,7 @@ Button bText4 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 15 + Max. Text Size : 20 Events Touch Press Event