From f73ead611e130e032b0e0ece9ba45ed658c29ba3 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Mon, 19 Dec 2022 21:57:58 +0000 Subject: [PATCH] move time (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 52 - HMI/US/portrait/diff-eu-version.txt | 51 - HMI/US/portrait/diff-filtered.txt | 53 +- HMI/n2t-out-visual/cardGrid.txt | 4 - HMI/n2t-out-visual/nspanel_Stats.txt | 32 +- HMI/n2t-out-visual/pageStartup.txt | 4 - HMI/n2t-out-visual/pageTest.txt | 36 + HMI/n2t-out-visual/screensaver.txt | 12 +- HMI/n2t-out-visual/screensaver2.txt | 1396 -------------------------- HMI/n2t-out/cardGrid.txt | 4 - HMI/n2t-out/pageStartup.txt | 4 - HMI/n2t-out/pageTest.txt | 14 + HMI/n2t-out/screensaver2.txt | 881 ---------------- 13 files changed, 71 insertions(+), 2472 deletions(-) delete mode 100644 HMI/n2t-out-visual/screensaver2.txt delete mode 100644 HMI/n2t-out/screensaver2.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5446ae31..92f0e50c 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,17 +1,5 @@ --- HMI/n2t-out +++ HMI/US/landscape/n2t-out -├── file list -│ @@ -12,9 +12,8 @@ -│ pageTest.txt -│ popupFan.txt -│ popupInSel.txt -│ popupLight.txt -│ popupNotify.txt -│ popupShutter.txt -│ popupThermo.txt -│ -screensaver.txt -│ -screensaver2.txt -│ +screensaver.txt │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/landscape/n2t-out/Program.s.txt │ @@ -10,10 +10,7 @@ @@ -25,27 +13,6 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/landscape/n2t-out/cardGrid.txt -│ @@ -854,18 +854,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -173,15 +173,15 @@ @@ -65,25 +32,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -314,18 +314,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -29,29 +29,20 @@ diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 144c9fdf..fc63378d 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,17 +1,5 @@ --- HMI/n2t-out +++ HMI/US/portrait/n2t-out -├── file list -│ @@ -12,9 +12,8 @@ -│ pageTest.txt -│ popupFan.txt -│ popupInSel.txt -│ popupLight.txt -│ popupNotify.txt -│ popupShutter.txt -│ popupThermo.txt -│ -screensaver.txt -│ -screensaver2.txt -│ +screensaver.txt │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt │ @@ -10,10 +10,10 @@ @@ -706,26 +694,6 @@ │ Scope : local │ Period (ms): 50 │ Enabled : yes -│ -│ @@ -854,18 +858,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -118,15 +118,15 @@ @@ -762,25 +730,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -314,18 +314,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,29 +29,20 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c6efaaaa..28be1a59 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,16 +1,4 @@ -+++ /dev/fd/62 2022-12-19 15:52:45.018563481 +0000 -+le list -+ +12,8 @@ -+t.txt -+n.txt -+Sel.txt -+ght.txt -+tify.txt -+utter.txt -+ermo.txt -+aver.txt -+aver2.txt -+aver.txt ++++ /dev/fd/62 2022-12-19 21:57:51.229884209 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -96,47 +84,8 @@ + Scope : local + Period (ms): 50 + Enabled : yes -+ -+18 +858,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt -+18 +314,14 @@ -+ { -+ page pageStartup -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { -+ page cardGrid +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +9 +29,20 @@ diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 09626e1d..f3f0252e 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1304,10 +1304,6 @@ Timer tmSerial { page screensaver } - if(tId.txt=="screensaver2") - { - page screensaver2 - } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index eb054d28..b51da2a3 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,10 +18,6 @@ cardChart 31 Component(s) 452 Line(s) of event code 296 Unique line(s) of event code -pageTest - 20 Component(s) - 65 Line(s) of event code - 63 Unique line(s) of event code screensaver 47 Component(s) 411 Line(s) of event code @@ -44,16 +40,20 @@ popupShutter 218 Unique line(s) of event code pageStartup 19 Component(s) - 185 Line(s) of event code - 131 Unique line(s) of event code + 181 Line(s) of event code + 129 Unique line(s) of event code +cardGrid + 42 Component(s) + 514 Line(s) of event code + 293 Unique line(s) of event code +pageTest + 21 Component(s) + 66 Line(s) of event code + 64 Unique line(s) of event code cardPower 43 Component(s) 439 Line(s) of event code 299 Unique line(s) of event code -screensaver2 - 43 Component(s) - 360 Line(s) of event code - 253 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -66,10 +66,6 @@ cardThermo 55 Component(s) 555 Line(s) of event code 322 Unique line(s) of event code -cardGrid - 42 Component(s) - 518 Line(s) of event code - 295 Unique line(s) of event code cardMedia 57 Component(s) 660 Line(s) of event code @@ -80,7 +76,7 @@ cardEntities 532 Unique line(s) of event code Total - 19 Page(s) - 678 Component(s) - 8245 Line(s) of event code - 2013 Unique line(s) of event code + 18 Page(s) + 636 Component(s) + 7878 Line(s) of event code + 2008 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index a6b8acf0..f9361edb 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -613,10 +613,6 @@ Timer tmSerial { page screensaver } - if(tId.txt=="screensaver2") - { - page screensaver2 - } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index c1c6eecf..ff46f405 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -272,6 +272,42 @@ Button b12 Touch Press Event page cardPower +Button b13 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 152 + y coordinate : 245 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : newtxt + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + showqq + Button b2 Attributes ID : 13 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 354266b4..e148844b 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -197,7 +197,7 @@ Text tAMPM Send Component ID : disabled Opacity : 127 x coordinate : 343 - y coordinate : 52 + y coordinate : 56 Width : 104 Height : 57 Effect : load @@ -616,10 +616,10 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 1 + x coordinate : 0 y coordinate : 0 Width : 85 - Height : 48 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -649,7 +649,7 @@ Text tIcon2 x coordinate : 365 y coordinate : 0 Width : 85 - Height : 48 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -917,7 +917,7 @@ Text tTime Send Component ID : disabled Opacity : 127 x coordinate : 37 - y coordinate : 21 + y coordinate : 25 Width : 376 Height : 112 Effect : load @@ -947,7 +947,7 @@ Text tTimeAdd Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 133 + y coordinate : 134 Width : 450 Height : 32 Effect : load diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt deleted file mode 100644 index b8ee29b2..00000000 --- a/HMI/n2t-out-visual/screensaver2.txt +++ /dev/null @@ -1,1396 +0,0 @@ -Page screensaver2 - Attributes - ID : 0 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - Width : 480 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - Fill : solid color - Back. Color : 0 - - Events - Preinitialize Event - recmod=1 - baud=115200 - vis tInstruction,0 - vis tTmp,0 - vis p0,0 - vis tNotifyHead,0 - vis tNotifyText,0 - //load gloabl time string from pageIcons - //tTime.txt=vaTime.txt - spstr pageIcons.vaTime.txt,tTime.txt,"?",0 - spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 - if(tAMPM.txt=="") - { - vis tAMPM,0 - } - tDate.txt=pageIcons.vaDate.txt - dim=dimValue - vis tSend,0 - //page open event - // clear weather elements, to keep example content in HMI - - Postinitialize Event - click m0,1 - -Variable (string) strCommand - Attributes - ID : 4 - Scope : local - Text : - Max. Text Size: 200 - -Variable (string) strTmp - Attributes - ID : 41 - Scope : local - Text : - Max. Text Size: 2 - -Variable (string) tId - Attributes - ID : 16 - Scope : local - Text : - Max. Text Size: 25 - -Variable (string) tInstruction - Attributes - ID : 26 - Scope : local - Text : - Max. Text Size: 50 - -Variable (string) tSend - Attributes - ID : 30 - Scope : local - Text : - Max. Text Size: 50 - -Variable (string) tTmp - Attributes - ID : 27 - Scope : local - Text : - Max. Text Size: 50 - -Variable (int32) vaTap - Attributes - ID : 24 - Scope: local - Value: 0 - -Variable (int32) xc1 - Attributes - ID : 35 - Scope: local - Value: 0 - -Variable (int32) xc2 - Attributes - ID : 37 - Scope: local - Value: 0 - -Variable (int32) xcR - Attributes - ID : 40 - Scope: local - Value: 0 - -Variable (int32) yc1 - Attributes - ID : 36 - Scope: local - Value: 0 - -Variable (int32) yc2 - Attributes - ID : 38 - Scope: local - Value: 0 - -Variable (int32) ycR - Attributes - ID : 39 - Scope: local - Value: 0 - -Text m0 - Attributes - ID : 42 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 462 - y coordinate : 0 - Width : 18 - Height : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 63488 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - if(tDate.x==0) - { - vis m0,1 - }else - { - vis m0,1 - } - -Text t10 - Attributes - ID : 15 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 143 - y coordinate : 32 - Width : 2 - Height : 256 - 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 : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tAMPM - Attributes - ID : 17 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 129 - Width : 137 - Height : 40 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : PM - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tDate - Attributes - ID : 6 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 263 - Width : 137 - Height : 32 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 2 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : bottom - Input Type : character - Text : Sat, 17. Dec - Max. Text Size : 40 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tF1Icon - Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 382 - y coordinate : 124 - Width : 40 - Height : 35 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tF2Icon - Attributes - ID : 13 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 381 - y coordinate : 211 - Width : 40 - Height : 35 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tF3Icon - Attributes - ID : 19 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 171 - y coordinate : 34 - Width : 40 - Height : 35 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tF4Icon - Attributes - ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 252 - y coordinate : 34 - Width : 40 - Height : 35 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 5 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast1 - Attributes - ID : 9 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 364 - y coordinate : 98 - Width : 72 - Height : 26 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast1Val - Attributes - ID : 10 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 364 - y coordinate : 159 - Width : 72 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast2 - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 365 - y coordinate : 186 - Width : 72 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast2Val - Attributes - ID : 14 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 365 - y coordinate : 246 - Width : 72 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast3 - Attributes - ID : 20 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 155 - y coordinate : 5 - Width : 72 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast3Val - Attributes - ID : 18 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 154 - y coordinate : 72 - Width : 71 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast4 - Attributes - ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 236 - y coordinate : 5 - Width : 72 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tForecast4Val - Attributes - ID : 23 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 236 - y coordinate : 72 - Width : 72 - Height : 25 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tIcon1 - Attributes - ID : 31 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 146 - y coordinate : 272 - Width : 81 - Height : 48 - 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 : bottom - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tIcon2 - Attributes - ID : 32 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 227 - y coordinate : 272 - Width : 81 - Height : 48 - 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 : bottom - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainIcon - Attributes - ID : 7 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 360 - y coordinate : 0 - Width : 70 - Height : 57 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 4 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainText - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 341 - y coordinate : 57 - Width : 110 - Height : 40 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tNotifyHead - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 165 - y coordinate : 183 - Width : 73 - Height : 58 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 3 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : top - Input Type : character - Text : - Max. Text Size : 35 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tNotifyText - Attributes - ID : 29 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 180 - y coordinate : 134 - Width : 105 - Height : 47 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : top - Input Type : character - Text : - Max. Text Size : 80 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tTime - Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 25 - Width : 137 - Height : 238 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 5 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : 21\r\n23 - Max. Text Size : 15 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tTimeAdd - Attributes - ID : 33 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 263 - y coordinate : 192 - Width : 77 - Height : 32 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 2 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : bottom - Input Type : character - Text : - Max. Text Size : 40 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Picture p0 - Attributes - ID : 1 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 1 - Width : 479 - Height : 319 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 - -Timer tm0 - Attributes - ID : 34 - Scope : local - Period (ms): 50 - Enabled : yes - - Events - Timer Event - if(tc0.val!=0) - { - xc2.val=tch0 - yc2.val=tch1 - } - -Timer tmSerial - Attributes - ID : 3 - Scope : local - Period (ms): 50 - Enabled : yes - - Events - Timer Event - // data available - if(usize>1) - { - bufferPos=0 - while(bufferPos-125&&xcR.val<125) - { - //tStatusNew.txt="x low, -> y" - // check if below minimum value (change is negative) - if(ycR.val<-80) - { - //tDirNew.txt="down" - tSend.txt="event,buttonPress2,screensaver,swipeDown" - }else if(ycR.val>80) - { - //tDirNew.txt="up" - tSend.txt="event,buttonPress2,screensaver,swipeUp" - }else - { - //tDirNew.txt="invalid" - } - // y difference between -125 and 125 (swipe on x-axis) - }else if(ycR.val>-125&&ycR.val<125) - { - //tStatusNew.txt="y low, -> x" - if(xcR.val<-80) - { - //tDirNew.txt="right" - tSend.txt="event,buttonPress2,screensaver,swipeRight" - }else if(xcR.val>80) - { - //tDirNew.txt="left" - tSend.txt="event,buttonPress2,screensaver,swipeLeft" - }else - { - //tDirNew.txt="invalid" - } - //diagonal swipe invalid - }else - { - //tStatusNew.txt="invalid" - //tDirNew.txt="diagonal" - } - } - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index f7cfd549..2244d8ee 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -858,10 +858,6 @@ Timer tmSerial { page screensaver } - if(tId.txt=="screensaver2") - { - page screensaver2 - } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index a2cd84df..aa7dc4d5 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -318,10 +318,6 @@ Timer tmSerial { page screensaver } - if(tId.txt=="screensaver2") - { - page screensaver2 - } if(tId.txt=="cardEntities") { page cardEntities diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index 358a2a28..24c80390 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -121,6 +121,20 @@ Button b12 Touch Press Event page cardPower +Button b13 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + Max. Text Size : 10 + + Events + Touch Press Event + showqq + Button b2 Attributes Scope : local diff --git a/HMI/n2t-out/screensaver2.txt b/HMI/n2t-out/screensaver2.txt deleted file mode 100644 index 71606bf3..00000000 --- a/HMI/n2t-out/screensaver2.txt +++ /dev/null @@ -1,881 +0,0 @@ -Page screensaver2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - - Events - Preinitialize Event - recmod=1 - baud=115200 - vis tInstruction,0 - vis tTmp,0 - vis p0,0 - vis tNotifyHead,0 - vis tNotifyText,0 - //load gloabl time string from pageIcons - //tTime.txt=vaTime.txt - spstr pageIcons.vaTime.txt,tTime.txt,"?",0 - spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 - if(tAMPM.txt=="") - { - vis tAMPM,0 - } - tDate.txt=pageIcons.vaDate.txt - dim=dimValue - vis tSend,0 - //page open event - // clear weather elements, to keep example content in HMI - - Postinitialize Event - click m0,1 - -Variable (string) strCommand - Attributes - Scope : local - Text : - Max. Text Size: 200 - -Variable (string) strTmp - Attributes - Scope : local - Text : - Max. Text Size: 2 - -Variable (string) tId - Attributes - Scope : local - Text : - Max. Text Size: 25 - -Variable (string) tInstruction - Attributes - Scope : local - Text : - Max. Text Size: 50 - -Variable (string) tSend - Attributes - Scope : local - Text : - Max. Text Size: 50 - -Variable (string) tTmp - Attributes - Scope : local - Text : - Max. Text Size: 50 - -Variable (int32) vaTap - Attributes - Scope: local - Value: 0 - -Variable (int32) xc1 - Attributes - Scope: local - Value: 0 - -Variable (int32) xc2 - Attributes - Scope: local - Value: 0 - -Variable (int32) xcR - Attributes - Scope: local - Value: 0 - -Variable (int32) yc1 - Attributes - Scope: local - Value: 0 - -Variable (int32) yc2 - Attributes - Scope: local - Value: 0 - -Variable (int32) ycR - Attributes - Scope: local - Value: 0 - -Text m0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - - Events - Touch Press Event - if(tDate.x==0) - { - vis m0,1 - }else - { - vis m0,1 - } - -Text t10 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : | - Max. Text Size : 10 - -Text tAMPM - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : PM - Max. Text Size : 10 - -Text tDate - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Sat, 17. Dec - Max. Text Size : 40 - -Text tF1Icon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tF2Icon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tF3Icon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tF4Icon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 5 - -Text tForecast1 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast1Val - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast2Val - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast3 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast3Val - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast4 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast4Val - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tIcon1 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tIcon2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMainIcon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMainText - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tNotifyHead - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 35 - -Text tNotifyText - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 80 - -Text tTime - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : 21\r\n23 - Max. Text Size : 15 - -Text tTimeAdd - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 40 - -Picture p0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - -Timer tm0 - Attributes - Scope : local - Period (ms): 50 - Enabled : yes - - Events - Timer Event - if(tc0.val!=0) - { - xc2.val=tch0 - yc2.val=tch1 - } - -Timer tmSerial - Attributes - Scope : local - Period (ms): 50 - Enabled : yes - - Events - Timer Event - // data available - if(usize>1) - { - bufferPos=0 - while(bufferPos-125&&xcR.val<125) - { - //tStatusNew.txt="x low, -> y" - // check if below minimum value (change is negative) - if(ycR.val<-80) - { - //tDirNew.txt="down" - tSend.txt="event,buttonPress2,screensaver,swipeDown" - }else if(ycR.val>80) - { - //tDirNew.txt="up" - tSend.txt="event,buttonPress2,screensaver,swipeUp" - }else - { - //tDirNew.txt="invalid" - } - // y difference between -125 and 125 (swipe on x-axis) - }else if(ycR.val>-125&&ycR.val<125) - { - //tStatusNew.txt="y low, -> x" - if(xcR.val<-80) - { - //tDirNew.txt="right" - tSend.txt="event,buttonPress2,screensaver,swipeRight" - }else if(xcR.val>80) - { - //tDirNew.txt="left" - tSend.txt="event,buttonPress2,screensaver,swipeLeft" - }else - { - //tDirNew.txt="invalid" - } - //diagonal swipe invalid - }else - { - //tStatusNew.txt="invalid" - //tDirNew.txt="diagonal" - } - } - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 -