diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index c845e023..3b11ea3b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1094,60 +1094,7 @@ │ } │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt -│ @@ -8,47 +8,56 @@ -│ Swide up page ID : disabled -│ Swide down page ID : disabled -│ Swide left page ID : disabled -│ Swide right page ID : disabled -│ -│ Events -│ Preinitialize Event -│ + dim=dimValueNormal -│ vis p0,0 -│ - recmod=1 -│ - bauds=115200 -│ vis tSend,0 -│ vis tInstruction,0 -│ vis tTmp,0 -│ vis tId,0 -│ - vis bSendStartup,0 -│ - vis frame_ptr,0 -│ - vis spinner_w,0 -│ - vis frapic_w,0 -│ - vis usual_cnt,0 -│ - vis tMsg2,0 -│ - vis tMsg3,0 -│ - vis tVersion,0 -│ - dim=100 -│ + vis t5,0 -│ + vis tShuffle,0 -│ + vis bPrev,0 -│ + vis bNext,0 -│ + vis bEntity1,0 -│ + vis bEntity2,0 -│ + vis bEntity3,0 -│ + vis bEntity4,0 -│ + vis bEntity5,0 -│ + vis bEntity6,0 -│ + cardMedia.bco=defaultBcoColor -│ + for(sys0=0;sys0<52;sys0++) -│ + { -│ + if(b[sys0].type==98||b[sys0].type==116) -│ + { -│ + b[sys0].bco=defaultBcoColor -│ + b[sys0].pco=defaultFontColor -│ + } -│ + } -│ + if(defaultBcoColor==0) -│ + { -│ + hVolume.pic=14 -│ + hVolume.pic1=13 -│ + hVolume.pic2=15 -│ + } -│ -│ Postinitialize Event -│ //send messages by clicking button -│ click bSendStartup,1 +│ @@ -35,20 +35,14 @@ │ │ Variable (string) strCommand │ Attributes @@ -1168,7 +1115,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -124,15 +133,15 @@ +│ @@ -124,15 +118,15 @@ │ Text tMsg3 │ Attributes │ Scope : local @@ -1185,7 +1132,7 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -179,15 +188,15 @@ +│ @@ -179,15 +173,15 @@ │ Max. Text Size : 10 │ │ Events @@ -1264,3 +1211,20 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -494,15 +470,15 @@ +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,defaultFontColor,0,0 +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ - click m0,1 +│ + //click m0,1 +│ //get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 +│ if(tAMPM.txt=="") +│ { +│ vis tAMPM,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index b45ee337..a233c1e1 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-23 17:28:44.671366324 +0000 ++++ /dev/fd/62 2023-01-23 19:17:01.556599214 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -54,13 +54,13 @@ +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 +14 +186,26 @@ +e (string) type6 @@ -513,60 +513,7 @@ + } +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt -+ +8,56 @@ -+ Swide up page ID : disabled -+ Swide down page ID : disabled -+ Swide left page ID : disabled -+ Swide right page ID : disabled -+ -+nts -+ Preinitialize Event -+ dim=dimValueNormal -+ vis p0,0 -+ recmod=1 -+ bauds=115200 -+ vis tSend,0 -+ vis tInstruction,0 -+ vis tTmp,0 -+ vis tId,0 -+ vis bSendStartup,0 -+ vis frame_ptr,0 -+ vis spinner_w,0 -+ vis frapic_w,0 -+ vis usual_cnt,0 -+ vis tMsg2,0 -+ vis tMsg3,0 -+ vis tVersion,0 -+ dim=100 -+ vis t5,0 -+ vis tShuffle,0 -+ vis bPrev,0 -+ vis bNext,0 -+ vis bEntity1,0 -+ vis bEntity2,0 -+ vis bEntity3,0 -+ vis bEntity4,0 -+ vis bEntity5,0 -+ vis bEntity6,0 -+ cardMedia.bco=defaultBcoColor -+ for(sys0=0;sys0<52;sys0++) -+ { -+ if(b[sys0].type==98||b[sys0].type==116) -+ { -+ b[sys0].bco=defaultBcoColor -+ b[sys0].pco=defaultFontColor -+ } -+ } -+ if(defaultBcoColor==0) -+ { -+ hVolume.pic=14 -+ hVolume.pic1=13 -+ hVolume.pic2=15 -+ } -+ -+ Postinitialize Event -+ //send messages by clicking button -+ click bSendStartup,1 ++0 +35,14 @@ + +e (string) strCommand +ributes @@ -587,8 +534,6 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +133,15 @@ -+15 +188,15 @@ +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +2 +29,19 @@ @@ -651,3 +596,20 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++15 +470,15 @@ ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,defaultFontColor,0,0 ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ click m0,1 ++ //click m0,1 ++ //get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 ++ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 ++ if(tAMPM.txt=="") ++ { ++ vis tAMPM,0 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 01c43a50..8e5fd142 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -28,12 +28,8 @@ cardQR 234 Unique line(s) of event code screensaver 46 Component(s) - 419 Line(s) of event code - 300 Unique line(s) of event code -pageStartup - 19 Component(s) - 200 Line(s) of event code - 142 Unique line(s) of event code + 418 Line(s) of event code + 299 Unique line(s) of event code cardGrid 44 Component(s) 515 Line(s) of event code @@ -54,6 +50,10 @@ cardMedia 59 Component(s) 641 Line(s) of event code 318 Unique line(s) of event code +pageStartup + 19 Component(s) + 185 Line(s) of event code + 131 Unique line(s) of event code cardChart 33 Component(s) 429 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 747 Component(s) - 9231 Line(s) of event code - 2383 Unique line(s) of event code + 9215 Line(s) of event code + 2390 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index dc4a6e38..40c52ede 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -20,37 +20,22 @@ Page pageStartup Events Preinitialize Event - dim=dimValueNormal vis p0,0 + recmod=1 + bauds=115200 vis tSend,0 vis tInstruction,0 vis tTmp,0 vis tId,0 - vis t5,0 - vis tShuffle,0 - vis bPrev,0 - vis bNext,0 - vis bEntity1,0 - vis bEntity2,0 - vis bEntity3,0 - vis bEntity4,0 - vis bEntity5,0 - vis bEntity6,0 - cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<52;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - } - } - if(defaultBcoColor==0) - { - hVolume.pic=14 - hVolume.pic1=13 - hVolume.pic2=15 - } + vis bSendStartup,0 + vis frame_ptr,0 + vis spinner_w,0 + vis frapic_w,0 + vis usual_cnt,0 + vis tMsg2,0 + vis tMsg3,0 + vis tVersion,0 + dim=100 Postinitialize Event //send messages by clicking button diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 96ed6ff7..0db4bd34 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -155,9 +155,9 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 + x coordinate : 60 y coordinate : 374 - Width : 240 + Width : 251 Height : 30 Effect : load Effect Priority : 0 @@ -186,7 +186,7 @@ Text t2 Send Component ID : disabled Opacity : 127 x coordinate : 10 - y coordinate : 415 + y coordinate : 374 Width : 45 Height : 30 Effect : load @@ -216,7 +216,7 @@ Text t3 Send Component ID : disabled Opacity : 127 x coordinate : 10 - y coordinate : 307 + y coordinate : 267 Width : 45 Height : 30 Effect : load @@ -245,9 +245,9 @@ Text t4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 9 - y coordinate : 267 - Width : 242 + x coordinate : 60 + y coordinate : 266 + Width : 250 Height : 30 Effect : load Effect Priority : 0 @@ -336,7 +336,7 @@ Text tId Send Component ID : disabled Opacity : 127 x coordinate : 100 - y coordinate : 417 + y coordinate : 450 Width : 100 Height : 30 Effect : load @@ -366,7 +366,7 @@ Text tInstruction Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 417 + y coordinate : 450 Width : 100 Height : 30 Effect : load @@ -396,7 +396,7 @@ Text tTmp Send Component ID : disabled Opacity : 127 x coordinate : 282 - y coordinate : 413 + y coordinate : 446 Width : 34 Height : 30 Effect : load @@ -487,9 +487,9 @@ Slider hBrightness Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 61 + x coordinate : 12 y coordinate : 409 - Width : 250 + Width : 300 Height : 44 Effect : load Effect Priority : 0 @@ -532,9 +532,9 @@ Slider hTempSlider Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 61 + x coordinate : 12 y coordinate : 304 - Width : 250 + Width : 300 Height : 44 Effect : load Effect Priority : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index 305eb326..658fc86a 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -301,9 +301,9 @@ Slider hPosition Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 12 + x coordinate : 11 y coordinate : 213 - Width : 250 + Width : 300 Height : 44 Effect : load Effect Priority : 0 @@ -345,9 +345,9 @@ Slider hTilt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 12 + x coordinate : 11 y coordinate : 365 - Width : 250 + Width : 300 Height : 44 Effect : load Effect Priority : 0 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 1730d9d3..f51de876 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1047,7 +1047,7 @@ Timer tmSerial } if(tInstruction.txt=="time") { - click m0,1 + //click m0,1 //get set time to global variable spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 9c1c4ecd..4e9f4000 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -12,37 +12,22 @@ Page pageStartup Events Preinitialize Event - dim=dimValueNormal vis p0,0 + recmod=1 + bauds=115200 vis tSend,0 vis tInstruction,0 vis tTmp,0 vis tId,0 - vis t5,0 - vis tShuffle,0 - vis bPrev,0 - vis bNext,0 - vis bEntity1,0 - vis bEntity2,0 - vis bEntity3,0 - vis bEntity4,0 - vis bEntity5,0 - vis bEntity6,0 - cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<52;sys0++) - { - if(b[sys0].type==98||b[sys0].type==116) - { - b[sys0].bco=defaultBcoColor - b[sys0].pco=defaultFontColor - } - } - if(defaultBcoColor==0) - { - hVolume.pic=14 - hVolume.pic1=13 - hVolume.pic2=15 - } + vis bSendStartup,0 + vis frame_ptr,0 + vis spinner_w,0 + vis frapic_w,0 + vis usual_cnt,0 + vis tMsg2,0 + vis tMsg3,0 + vis tVersion,0 + dim=100 Postinitialize Event //send messages by clicking button diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index ea549132..1a45ee61 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -474,7 +474,7 @@ Timer tmSerial } if(tInstruction.txt=="time") { - click m0,1 + //click m0,1 //get set time to global variable spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0