diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e1d65fe4..42bbca29 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -47,113 +47,24 @@ │ vis bModeNext,0 │ //page open event │ // event,pageOpenDetail,typeOfPage,tEntityName -│ @@ -69,15 +70,15 @@ -│ Scope: local -│ Value: 0 -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 960 -│ + Max. Text Size: 500 -│ -│ Variable (string) tId -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 20 -│ -│ @@ -105,15 +106,15 @@ -│ Text : -│ Max. Text Size: 40 -│ -│ Variable (string) vaModeList -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 900 -│ + Max. Text Size: 400 -│ -│ Variable (int32) vaModePos -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ Variable (string) vaType ├── popupLight.txt -│ @@ -19,15 +19,14 @@ -│ entn.txt=pageIcons.tTmp2.txt -│ tIcon1.txt=pageIcons.tTmp3.txt -│ vis p0,0 -│ vis tSend,0 -│ vis tTmp,0 -│ vis tInstruction,0 -│ vis tId,0 -│ - vis bEffect,0 -│ //page open event -│ // event,pageOpenDetail,typeOfPage,tEntityName -│ // craft command -│ tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -362,31 +361,14 @@ -│ //enable color temp -│ vis t4,1 -│ vis t3,1 -│ vis hTempSlider,1 -│ } -│ } -│ -│ -Button bEffect -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ - -│ - Events -│ - Touch Press Event -│ - pageIcons.tTmp1.txt=tEntity.txt -│ - pageIcons.tTmp2.txt=entn.txt -│ - pageIcons.tTmp3.txt=tIcon1.txt -│ - page popupInSel -│ - -│ Dual-state Button btOnOff1 +│ @@ -369,15 +369,15 @@ +│ Button bEffect │ Attributes │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled │ State : unpressed -│ @@ -571,23 +553,14 @@ -│ } -│ // set t0 Color (Localization) -│ spstr strCommand.txt,t0.txt,"~",8 -│ // set t4 Temperature (Localization) -│ spstr strCommand.txt,t4.txt,"~",9 -│ // set t1 Brightness (Localization) -│ spstr strCommand.txt,t1.txt,"~",10 -│ - // activate effect button -│ - spstr strCommand.txt,tTmp.txt,"~",11 -│ - if(tTmp.txt=="enable") -│ - { -│ - vis bEffect,1 -│ - }else -│ - { -│ - vis bEffect,0 -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") +│ - Text :  +│ + Text :  +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ pageIcons.tTmp1.txt=tEntity.txt +│ pageIcons.tTmp2.txt=entn.txt +│ pageIcons.tTmp3.txt=tIcon1.txt ├── screensaver.txt │ @@ -351,15 +351,15 @@ │ Text tTime 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 096dbf1d..319d55ed 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 @@ -23,9 +23,9 @@ cardPower 435 Line(s) of event code 297 Unique line(s) of event code popupLight - 27 Component(s) - 391 Line(s) of event code - 214 Unique line(s) of event code + 28 Component(s) + 404 Line(s) of event code + 223 Unique line(s) of event code popupShutter 25 Component(s) 394 Line(s) of event code @@ -46,10 +46,6 @@ cardThermo 53 Component(s) 608 Line(s) of event code 316 Unique line(s) of event code -popupInSel - 34 Component(s) - 529 Line(s) of event code - 257 Unique line(s) of event code cardAlarm 40 Component(s) 439 Line(s) of event code @@ -70,9 +66,13 @@ screensaver 45 Component(s) 389 Line(s) of event code 288 Unique line(s) of event code +popupInSel + 34 Component(s) + 529 Line(s) of event code + 257 Unique line(s) of event code Total 17 Page(s) - 570 Component(s) - 6979 Line(s) of event code - 1796 Unique line(s) of event code + 571 Component(s) + 6992 Line(s) of event code + 1801 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupInSel.txt b/HMI/US/landscape/n2t-out-visual/popupInSel.txt index 69e22ade..f7bbc199 100644 --- a/HMI/US/landscape/n2t-out-visual/popupInSel.txt +++ b/HMI/US/landscape/n2t-out-visual/popupInSel.txt @@ -86,7 +86,7 @@ Variable (string) strCommand ID : 8 Scope : local Text : - Max. Text Size: 500 + Max. Text Size: 960 Variable (string) tId Attributes @@ -128,7 +128,7 @@ Variable (string) vaModeList ID : 18 Scope : local Text : - Max. Text Size: 400 + Max. Text Size: 900 Variable (int32) vaModePos Attributes diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 9b3a1180..f0e24489 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -31,6 +31,7 @@ Page popupLight vis tTmp,0 vis tInstruction,0 vis tId,0 + vis bEffect,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -672,6 +673,45 @@ Button bColor } } +Button bEffect + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 415 + y coordinate : 79 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity.txt + pageIcons.tTmp2.txt=entn.txt + pageIcons.tTmp3.txt=tIcon1.txt + page popupInSel + Dual-state Button btOnOff1 Attributes ID : 8 @@ -680,7 +720,7 @@ Dual-state Button btOnOff1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 385 + x coordinate : 356 y coordinate : 79 Width : 50 Height : 50 @@ -884,6 +924,15 @@ Timer tmSerial spstr strCommand.txt,t4.txt,"~",9 // set t1 Brightness (Localization) spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/popupInSel.txt b/HMI/US/landscape/n2t-out/popupInSel.txt index eafd7096..37f29287 100644 --- a/HMI/US/landscape/n2t-out/popupInSel.txt +++ b/HMI/US/landscape/n2t-out/popupInSel.txt @@ -74,7 +74,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 500 + Max. Text Size: 960 Variable (string) tId Attributes @@ -110,7 +110,7 @@ Variable (string) vaModeList Attributes Scope : local Text : - Max. Text Size: 400 + Max. Text Size: 900 Variable (int32) vaModePos Attributes diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 57881254..a8c07789 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -23,6 +23,7 @@ Page popupLight vis tTmp,0 vis tInstruction,0 vis tId,0 + vis bEffect,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -365,6 +366,23 @@ Button bColor } } +Button bEffect + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity.txt + pageIcons.tTmp2.txt=entn.txt + pageIcons.tTmp3.txt=tIcon1.txt + page popupInSel + Dual-state Button btOnOff1 Attributes Scope : local @@ -557,6 +575,15 @@ Timer tmSerial spstr strCommand.txt,t4.txt,"~",9 // set t1 Brightness (Localization) spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index de0d4bbc..e2376a8b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-11-03 19:06:12.228899058 +0000 ++++ /dev/fd/62 2022-11-03 19:53:37.881971155 +0000 +14 +116,20 @@ +e (string) strCommand + Max. Text Size: 500