diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e69de29b..41502c67 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -0,0 +1,79 @@ +--- HMI/n2t-out ++++ HMI/US/landscape/n2t-out +│ --- HMI/n2t-out/Program.s.txt +├── +++ HMI/US/landscape/n2t-out/Program.s.txt +│ @@ -10,10 +10,8 @@ +│ int sleepValue=0 +│ // dim value +│ int dimValue=40 +│ int dimValueNormal=100 +│ //color vars +│ int defaultFontColor=65535 +│ int defaultBcoColor=6371 +│ - // fix touch offset +│ - lcd_dev fffb 0002 0000 0020 +│ page pageStartup +│ --- HMI/n2t-out/pageStartup.txt +├── +++ HMI/US/landscape/n2t-out/pageStartup.txt +│ @@ -173,15 +173,15 @@ +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ recmod=1 +│ bauds=115200 +│ // startup event +│ - tSend.txt="event,startup,"+tVersion.txt+",eu" +│ + tSend.txt="event,startup,"+tVersion.txt+",us-l" +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ --- HMI/n2t-out/screensaver.txt +├── +++ HMI/US/landscape/n2t-out/screensaver.txt +│ @@ -29,17 +29,14 @@ +│ } +│ 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 +│ @@ -103,24 +100,14 @@ +│ 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 +│ - +│ Text t10 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 988e1768..cbd6397f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -91,7 +91,7 @@ Variable (string) strCommand ID : 6 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) tSend Attributes 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 c41c0aa9..fb4db672 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 @@ -18,6 +18,10 @@ popupInSel 34 Component(s) 617 Line(s) of event code 295 Unique line(s) of event code +pageStartup + 19 Component(s) + 181 Line(s) of event code + 129 Unique line(s) of event code screensaver 46 Component(s) 429 Line(s) of event code @@ -34,10 +38,6 @@ popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -pageStartup - 19 Component(s) - 181 Line(s) of event code - 129 Unique line(s) of event code cardChart 33 Component(s) 425 Line(s) of event code @@ -58,14 +58,14 @@ cardThermo 57 Component(s) 528 Line(s) of event code 313 Unique line(s) of event code -cardPower - 45 Component(s) - 412 Line(s) of event code - 289 Unique line(s) of event code cardAlarm 42 Component(s) 415 Line(s) of event code 253 Unique line(s) of event code +cardPower + 45 Component(s) + 412 Line(s) of event code + 289 Unique line(s) of event code cardQR 34 Component(s) 398 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index e0fcf26b..d0494dd7 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 47 + Text : 48 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 6cc63a03..8e63de4b 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -79,7 +79,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) tSend Attributes diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 32cc6502..ae3e9107 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 47 + Text : 48 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e69de29b..0c48fba1 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -0,0 +1,1139 @@ +--- HMI/n2t-out ++++ HMI/US/portrait/n2t-out +│ --- HMI/n2t-out/Program.s.txt +├── +++ HMI/US/portrait/n2t-out/Program.s.txt +│ @@ -10,10 +10,10 @@ +│ int sleepValue=0 +│ // dim value +│ int dimValue=40 +│ int dimValueNormal=100 +│ //color vars +│ int defaultFontColor=65535 +│ int defaultBcoColor=6371 +│ - // fix touch offset +│ - lcd_dev fffb 0002 0000 0020 +│ + // fix touch offset (Removed for US version) +│ + //lcd_dev fffb 0002 0000 0020 +│ page pageStartup +│ --- HMI/n2t-out/cardEntities.txt +├── +++ HMI/US/portrait/n2t-out/cardEntities.txt +│ @@ -61,14 +61,34 @@ +│ vis tIcon4,0 +│ vis tEntity4,0 +│ vis bText4,0 +│ vis hSlider4,0 +│ vis nNum4,0 +│ vis bPrev,0 +│ vis bNext,0 +│ + //ui e5 +│ + vis btOnOff5,0 +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis tIcon5,0 +│ + vis tEntity5,0 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + //ui e6 +│ + vis btOnOff6,0 +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis tIcon6,0 +│ + vis tEntity6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ cardEntities.bco=defaultBcoColor +│ for(sys0=0;sys0<65;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ @@ -86,45 +106,57 @@ +│ } +│ } +│ +│ Variable (string) entn1 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ +│ Variable (string) entn2 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ +│ Variable (string) entn3 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ +│ Variable (string) entn4 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 65 +│ + +│ +Variable (string) entn5 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 65 +│ + +│ +Variable (string) entn6 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 65 +│ +│ Variable (string) nent1 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 40 +│ +│ Variable (string) nent2 +│ Attributes +│ Scope : local +│ Text : +│ - Max. Text Size: 80 +│ + Max. Text Size: 40 +│ +│ Variable (string) strCommand +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 500 +│ +│ @@ -154,14 +186,26 @@ +│ +│ Variable (string) type4 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 10 +│ +│ +Variable (string) type5 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 10 +│ + +│ +Variable (string) type6 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 10 +│ + +│ Number nNum1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -190,14 +234,32 @@ +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Value : 0 +│ +│ +Number nNum5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Value : 0 +│ + +│ +Number nNum6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Value : 0 +│ + +│ Text tEntity1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -230,14 +292,34 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : tEntity4 +│ Max. Text Size : 30 +│ +│ +Text tEntity5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : tEntity5 +│ + Max. Text Size : 30 +│ + +│ +Text tEntity6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : tEntity5 +│ + Max. Text Size : 30 +│ + +│ Text tHeading +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -280,14 +362,34 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text :  +│ Max. Text Size : 5 +│ +│ +Text tIcon5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text :  +│ + Max. Text Size : 5 +│ + +│ +Text tIcon6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text :  +│ + Max. Text Size : 5 +│ + +│ Text tId +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -429,14 +531,70 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Slider hSlider5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Position : 50 +│ + Upper range limit : 100 +│ + Lower range limit : 0 +│ + +│ + Events +│ + Touch Release Event +│ + nNum5.val=hSlider5.val +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",number-set," +│ + covx nNum5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //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 +│ + +│ +Slider hSlider6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Position : 50 +│ + Upper range limit : 100 +│ + Lower range limit : 0 +│ + +│ + Events +│ + Touch Release Event +│ + nNum5.val=hSlider5.val +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," +│ + covx nNum5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //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 +│ + +│ Button bDown1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -529,14 +687,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bDown5 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",down" +│ + //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 +│ + +│ +Button bDown6 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",down" +│ + //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 +│ + +│ Button bNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -679,14 +887,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bStop5 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",stop" +│ + //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 +│ + +│ +Button bStop6 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",stop" +│ + //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 +│ + +│ Button bText1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -779,14 +1037,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bText5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 45 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",button" +│ + //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 +│ + +│ +Button bText6 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + State : unpressed +│ + Text : +│ + Max. Text Size : 45 +│ + +│ + Events +│ + Touch Press Event +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button" +│ + //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 +│ + +│ Button bUp1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -879,14 +1187,64 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Button bUp5 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",up" +│ + //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 +│ + +│ +Button bUp6 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",up" +│ + //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 +│ + +│ Dual-state Button btOnOff1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -987,14 +1345,68 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ +Dual-state Button btOnOff5 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn5.txt+",OnOff," +│ + covx btOnOff5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //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 +│ + +│ +Dual-state Button btOnOff6 +│ + 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 +│ + tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff," +│ + covx btOnOff5.val,tTmp.txt,0,0 +│ + tSend.txt+=tTmp.txt +│ + //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 +│ + +│ Hotspot m0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -1127,14 +1539,84 @@ +│ page popupInSel +│ } +│ if(type4.txt=="timer") +│ { +│ page popupTimer +│ } +│ +│ +Hotspot m4 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + +│ + Events +│ + Touch Press Event +│ + pageIcons.tTmp1.txt=tEntity5.txt +│ + pageIcons.tTmp2.txt=entn5.txt +│ + pageIcons.tTmp3.txt=tIcon5.txt +│ + if(type5.txt=="shutter") +│ + { +│ + //popupShutter.tHeading.txt=tEntity5.txt +│ + page popupShutter +│ + } +│ + if(type5.txt=="light") +│ + { +│ + //popupLight.tEntity.txt=tEntity5.txt +│ + page popupLight +│ + } +│ + if(type5.txt=="fan") +│ + { +│ + page popupFan +│ + } +│ + if(type5.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ + if(type5.txt=="timer") +│ + { +│ + page popupTimer +│ + } +│ + +│ +Hotspot m5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + +│ + Events +│ + Touch Press Event +│ + pageIcons.tTmp1.txt=tEntity6.txt +│ + pageIcons.tTmp2.txt=entn6.txt +│ + pageIcons.tTmp3.txt=tIcon6.txt +│ + if(type6.txt=="shutter") +│ + { +│ + //popupShutter.tHeading.txt=tEntity5.txt +│ + page popupShutter +│ + } +│ + if(type6.txt=="light") +│ + { +│ + //popupLight.tEntity.txt=tEntity5.txt +│ + page popupLight +│ + } +│ + if(type6.txt=="fan") +│ + { +│ + page popupFan +│ + } +│ + if(type6.txt=="input_sel") +│ + { +│ + page popupInSel +│ + } +│ + if(type6.txt=="timer") +│ + { +│ + page popupTimer +│ + } +│ + +│ Hotspot mSpecial +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -1862,14 +2344,312 @@ +│ covx tTmp.txt,sys0,0,0 +│ hSlider4.minval=sys0 +│ //third value is max value +│ spstr bText4.txt,tTmp.txt,"|",2 +│ covx tTmp.txt,sys0,0,0 +│ hSlider4.maxval=sys0 +│ } +│ + // get Type +│ + spstr strCommand.txt,type5.txt,"~",38 +│ + // get internal name +│ + spstr strCommand.txt,entn5.txt,"~",39 +│ + if(type5.txt=="delete"||type5.txt=="") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis tEntity5,0 +│ + vis tIcon5,0 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + }else +│ + { +│ + // change icon +│ + spstr strCommand.txt,tIcon5.txt,"~",40 +│ + vis tIcon5,1 +│ + // change icon color +│ + spstr strCommand.txt,tTmp.txt,"~",41 +│ + covx tTmp.txt,sys0,0,0 +│ + tIcon5.pco=sys0 +│ + // set name +│ + spstr strCommand.txt,tEntity5.txt,"~",42 +│ + vis tEntity5,1 +│ + } +│ + if(type5.txt=="shutter") +│ + { +│ + vis bUp5,1 +│ + vis bStop5,1 +│ + vis bDown5,1 +│ + vis btOnOff5,0 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tId.txt,"~",43 +│ + // up button +│ + spstr tId.txt,tTmp.txt,"|",3 +│ + if(tTmp.txt=="disable") +│ + { +│ + bUp5.pco=27501 +│ + spstr tId.txt,bUp5.txt,"|",0 +│ + tsw bUp5,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bUp5.pco=65535 +│ + spstr tId.txt,bUp5.txt,"|",0 +│ + tsw bUp5,1 +│ + } +│ + // stop button +│ + spstr tId.txt,tTmp.txt,"|",4 +│ + if(tTmp.txt=="disable") +│ + { +│ + bStop5.pco=27501 +│ + spstr tId.txt,bStop5.txt,"|",1 +│ + tsw bStop5,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bStop5.pco=65535 +│ + spstr tId.txt,bStop5.txt,"|",1 +│ + tsw bStop5,1 +│ + } +│ + // down button +│ + spstr tId.txt,tTmp.txt,"|",5 +│ + if(tTmp.txt=="disable") +│ + { +│ + bDown5.pco=27501 +│ + spstr tId.txt,bDown5.txt,"|",2 +│ + tsw bDown5,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bDown5.pco=65535 +│ + spstr tId.txt,bDown5.txt,"|",2 +│ + tsw bDown5,1 +│ + } +│ + } +│ + if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,1 +│ + vis bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tTmp.txt,"~",43 +│ + covx tTmp.txt,sys0,0,0 +│ + btOnOff5.val=sys0 +│ + } +│ + if(type5.txt=="text"||type5.txt=="timer") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis bText5,1 +│ + tsw bText5,0 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + bText5.pco=65535 +│ + bText5.pco2=65535 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText5.txt,"~",43 +│ + } +│ + if(type5.txt=="button"||type5.txt=="input_sel") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis bText5,1 +│ + tsw bText5,1 +│ + vis hSlider5,0 +│ + vis nNum5,0 +│ + bText5.pco=1374 +│ + bText5.pco2=1374 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText5.txt,"~",43 +│ + } +│ + if(type5.txt=="number") +│ + { +│ + vis bUp5,0 +│ + vis bStop5,0 +│ + vis bDown5,0 +│ + vis btOnOff5,0 +│ + vis bText5,0 +│ + tsw bText5,0 +│ + vis hSlider5,1 +│ + vis nNum5,1 +│ + // get config (optional Value) (use bText as variable) +│ + spstr strCommand.txt,bText5.txt,"~",43 +│ + //first value is current value +│ + spstr bText5.txt,tTmp.txt,"|",0 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider5.val=sys0 +│ + nNum5.val=sys0 +│ + //second value is min value +│ + spstr bText5.txt,tTmp.txt,"|",1 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider5.minval=sys0 +│ + //third value is max value +│ + spstr bText5.txt,tTmp.txt,"|",2 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider5.maxval=sys0 +│ + } +│ + // get Type +│ + spstr strCommand.txt,type6.txt,"~",44 +│ + // get internal name +│ + spstr strCommand.txt,entn6.txt,"~",45 +│ + if(type6.txt=="delete"||type6.txt=="") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis tEntity6,0 +│ + vis tIcon6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + }else +│ + { +│ + // change icon +│ + spstr strCommand.txt,tIcon6.txt,"~",46 +│ + vis tIcon6,1 +│ + // change icon color +│ + spstr strCommand.txt,tTmp.txt,"~",47 +│ + covx tTmp.txt,sys0,0,0 +│ + tIcon6.pco=sys0 +│ + // set name +│ + spstr strCommand.txt,tEntity6.txt,"~",48 +│ + vis tEntity6,1 +│ + } +│ + if(type6.txt=="shutter") +│ + { +│ + vis bUp6,1 +│ + vis bStop6,1 +│ + vis bDown6,1 +│ + vis btOnOff6,0 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tId.txt,"~",49 +│ + // up button +│ + spstr tId.txt,tTmp.txt,"|",3 +│ + if(tTmp.txt=="disable") +│ + { +│ + bUp6.pco=27501 +│ + spstr tId.txt,bUp6.txt,"|",0 +│ + tsw bUp6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bUp6.pco=65535 +│ + spstr tId.txt,bUp6.txt,"|",0 +│ + tsw bUp6,1 +│ + } +│ + // stop button +│ + spstr tId.txt,tTmp.txt,"|",4 +│ + if(tTmp.txt=="disable") +│ + { +│ + bStop6.pco=27501 +│ + spstr tId.txt,bStop6.txt,"|",1 +│ + tsw bStop6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bStop6.pco=65535 +│ + spstr tId.txt,bStop6.txt,"|",1 +│ + tsw bStop6,1 +│ + } +│ + // down button +│ + spstr tId.txt,tTmp.txt,"|",5 +│ + if(tTmp.txt=="disable") +│ + { +│ + bDown6.pco=27501 +│ + spstr tId.txt,bDown6.txt,"|",2 +│ + tsw bDown6,0 +│ + }else if(tTmp.txt=="enable") +│ + { +│ + bDown6.pco=65535 +│ + spstr tId.txt,bDown6.txt,"|",2 +│ + tsw bDown6,1 +│ + } +│ + } +│ + if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,1 +│ + vis bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + // get Button State (optional Value) +│ + spstr strCommand.txt,tTmp.txt,"~",49 +│ + covx tTmp.txt,sys0,0,0 +│ + btOnOff6.val=sys0 +│ + } +│ + if(type6.txt=="text"||type6.txt=="timer") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,1 +│ + tsw bText6,0 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + bText6.pco=65535 +│ + bText6.pco2=65535 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText6.txt,"~",49 +│ + } +│ + if(type6.txt=="button"||type6.txt=="input_sel") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,1 +│ + tsw bText6,1 +│ + vis hSlider6,0 +│ + vis nNum6,0 +│ + bText6.pco=1374 +│ + bText6.pco2=1374 +│ + // get Text (optional Value) +│ + spstr strCommand.txt,bText6.txt,"~",49 +│ + } +│ + if(type6.txt=="number") +│ + { +│ + vis bUp6,0 +│ + vis bStop6,0 +│ + vis bDown6,0 +│ + vis btOnOff6,0 +│ + vis bText6,0 +│ + tsw bText6,0 +│ + vis hSlider6,1 +│ + vis nNum6,1 +│ + // get config (optional Value) (use bText as variable) +│ + spstr strCommand.txt,bText6.txt,"~",49 +│ + //first value is current value +│ + spstr bText6.txt,tTmp.txt,"|",0 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.val=sys0 +│ + nNum6.val=sys0 +│ + //second value is min value +│ + spstr bText6.txt,tTmp.txt,"|",1 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.minval=sys0 +│ + //third value is max value +│ + spstr bText6.txt,tTmp.txt,"|",2 +│ + covx tTmp.txt,sys0,0,0 +│ + hSlider6.maxval=sys0 +│ + } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ --- HMI/n2t-out/pageStartup.txt +├── +++ HMI/US/portrait/n2t-out/pageStartup.txt +│ @@ -118,15 +118,15 @@ +│ Text tMsg3 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ - Text : please check your backend configuration +│ + Text : pls check your backend configuration +│ Max. Text Size : 100 +│ +│ Text tSend +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ @@ -173,15 +173,15 @@ +│ Max. Text Size : 10 +│ +│ Events +│ Touch Press Event +│ recmod=1 +│ bauds=115200 +│ // startup event +│ - tSend.txt="event,startup,"+tVersion.txt+",eu" +│ + tSend.txt="event,startup,"+tVersion.txt+",us-p" +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2 +│ crcputs tSend.txt,0 +│ //send cmd +│ --- HMI/n2t-out/screensaver.txt +├── +++ HMI/US/portrait/n2t-out/screensaver.txt +│ @@ -29,29 +29,20 @@ +│ } +│ 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 +│ @@ -103,24 +94,14 @@ +│ 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 +│ - +│ Text t10 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index ef78c199..c50a715d 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1 +1,524 @@ -+++ /dev/fd/62 2023-01-06 14:11:20.674466368 +0000 ++++ /dev/fd/62 2023-01-07 10:46:36.908018136 +0000 ++I/n2t-out/Program.s.txt +++ HMI/US/portrait/n2t-out/Program.s.txt ++I/n2t-out/cardEntities.txt +++ HMI/US/portrait/n2t-out/cardEntities.txt ++4 +61,34 @@ ++ //ui e6 ++ vis btOnOff6,0 ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis tIcon6,0 ++ vis tEntity6,0 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++5 +106,57 @@ ++ } ++ } ++ ++e (string) entn1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ Max. Text Size: 65 ++ ++e (string) entn2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ Max. Text Size: 65 ++ ++e (string) entn3 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ Max. Text Size: 65 ++ Max. Text Size: 65 ++ Max. Text Size: 65 ++ ++e (string) entn6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 65 ++ ++e (string) nent1 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 80 ++ Max. Text Size: 40 ++ ++e (string) nent2 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 40 ++14 +186,26 @@ ++e (string) type6 ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 10 ++ ++14 +234,32 @@ ++nNum6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 ++ ++14 +292,34 @@ ++ntity6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : tEntity5 ++ Max. Text Size : 30 ++ ++14 +362,34 @@ ++con6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text :  ++ Max. Text Size : 5 ++ ++14 +531,70 @@ ++hSlider6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Position : 50 ++ Upper range limit : 100 ++ Lower range limit : 0 ++ ++nts ++ Touch Release Event ++ nNum5.val=hSlider5.val ++ tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," ++ covx nNum5.val,tTmp.txt,0,0 ++ tSend.txt+=tTmp.txt ++ //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 ++ ++14 +687,64 @@ ++bDown6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",down" ++ //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 ++ ++14 +887,64 @@ ++bStop6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",stop" ++ //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 ++ ++14 +1037,64 @@ ++bText6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : ++ Max. Text Size : 45 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",button" ++ //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 ++ ++14 +1187,64 @@ ++bUp6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text :  ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",up" ++ //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 ++ ++14 +1345,68 @@ ++ate Button btOnOff6 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++ Text : ++ Max. Text Size : 10 ++ ++nts ++ Touch Press Event ++ tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff," ++ covx btOnOff5.val,tTmp.txt,0,0 ++ tSend.txt+=tTmp.txt ++ //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 ++ ++,14 +1539,84 @@ ++ page popupInSel ++ if(type4.txt=="timer") ++ page popupTimer ++ if(type5.txt=="timer") ++ { ++ page popupTimer ++ } ++ ++ m5 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ ++nts ++ Touch Press Event ++ pageIcons.tTmp1.txt=tEntity6.txt ++ pageIcons.tTmp2.txt=entn6.txt ++ pageIcons.tTmp3.txt=tIcon6.txt ++ if(type6.txt=="shutter") ++ { ++ //popupShutter.tHeading.txt=tEntity5.txt ++ page popupShutter ++ } ++ if(type6.txt=="light") ++ { ++ //popupLight.tEntity.txt=tEntity5.txt ++ page popupLight ++ } ++ if(type6.txt=="fan") ++ { ++ page popupFan ++ } ++ if(type6.txt=="input_sel") ++ { ++ page popupInSel ++ } ++ if(type6.txt=="timer") ++ { ++ page popupTimer ++ } ++,14 +2344,312 @@ ++ spstr strCommand.txt,type5.txt,"~",38 ++ spstr strCommand.txt,entn5.txt,"~",39 ++ spstr strCommand.txt,tIcon5.txt,"~",40 ++ spstr strCommand.txt,tTmp.txt,"~",41 ++ spstr strCommand.txt,tEntity5.txt,"~",42 ++ spstr strCommand.txt,tId.txt,"~",43 ++ spstr strCommand.txt,tTmp.txt,"~",43 ++ if(type5.txt=="text"||type5.txt=="timer") ++ spstr strCommand.txt,bText5.txt,"~",43 ++ spstr strCommand.txt,bText5.txt,"~",43 ++ spstr strCommand.txt,bText5.txt,"~",43 ++ // get Type ++ spstr strCommand.txt,type6.txt,"~",44 ++ // get internal name ++ spstr strCommand.txt,entn6.txt,"~",45 ++ if(type6.txt=="delete"||type6.txt=="") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis tEntity6,0 ++ vis tIcon6,0 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ }else ++ { ++ // change icon ++ spstr strCommand.txt,tIcon6.txt,"~",46 ++ vis tIcon6,1 ++ // change icon color ++ spstr strCommand.txt,tTmp.txt,"~",47 ++ covx tTmp.txt,sys0,0,0 ++ tIcon6.pco=sys0 ++ // set name ++ spstr strCommand.txt,tEntity6.txt,"~",48 ++ vis tEntity6,1 ++ } ++ if(type6.txt=="shutter") ++ { ++ vis bUp6,1 ++ vis bStop6,1 ++ vis bDown6,1 ++ vis btOnOff6,0 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",49 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",3 ++ if(tTmp.txt=="disable") ++ { ++ bUp6.pco=27501 ++ spstr tId.txt,bUp6.txt,"|",0 ++ tsw bUp6,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bUp6.pco=65535 ++ spstr tId.txt,bUp6.txt,"|",0 ++ tsw bUp6,1 ++ } ++ // stop button ++ spstr tId.txt,tTmp.txt,"|",4 ++ if(tTmp.txt=="disable") ++ { ++ bStop6.pco=27501 ++ spstr tId.txt,bStop6.txt,"|",1 ++ tsw bStop6,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bStop6.pco=65535 ++ spstr tId.txt,bStop6.txt,"|",1 ++ tsw bStop6,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",5 ++ if(tTmp.txt=="disable") ++ { ++ bDown6.pco=27501 ++ spstr tId.txt,bDown6.txt,"|",2 ++ tsw bDown6,0 ++ }else if(tTmp.txt=="enable") ++ { ++ bDown6.pco=65535 ++ spstr tId.txt,bDown6.txt,"|",2 ++ tsw bDown6,1 ++ } ++ } ++ if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,1 ++ vis bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tTmp.txt,"~",49 ++ covx tTmp.txt,sys0,0,0 ++ btOnOff6.val=sys0 ++ } ++ if(type6.txt=="text"||type6.txt=="timer") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,1 ++ tsw bText6,0 ++ vis hSlider6,0 ++ vis nNum6,0 ++ bText6.pco=65535 ++ bText6.pco2=65535 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText6.txt,"~",49 ++ } ++ if(type6.txt=="button"||type6.txt=="input_sel") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,1 ++ tsw bText6,1 ++ vis hSlider6,0 ++ vis nNum6,0 ++ bText6.pco=1374 ++ bText6.pco2=1374 ++ // get Text (optional Value) ++ spstr strCommand.txt,bText6.txt,"~",49 ++ } ++ if(type6.txt=="number") ++ { ++ vis bUp6,0 ++ vis bStop6,0 ++ vis bDown6,0 ++ vis btOnOff6,0 ++ vis bText6,0 ++ tsw bText6,0 ++ vis hSlider6,1 ++ vis nNum6,1 ++ // get config (optional Value) (use bText as variable) ++ spstr strCommand.txt,bText6.txt,"~",49 ++ //first value is current value ++ spstr bText6.txt,tTmp.txt,"|",0 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.val=sys0 ++ nNum6.val=sys0 ++ //second value is min value ++ spstr bText6.txt,tTmp.txt,"|",1 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.minval=sys0 ++ //third value is max value ++ spstr bText6.txt,tTmp.txt,"|",2 ++ covx tTmp.txt,sys0,0,0 ++ hSlider6.maxval=sys0 ++ } ++I/n2t-out/pageStartup.txt +++ HMI/US/portrait/n2t-out/pageStartup.txt ++I/n2t-out/screensaver.txt +++ HMI/US/portrait/n2t-out/screensaver.txt ++9 +29,20 @@ ++ } ++ 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 ++ ++e (string) strCommand ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 200 ++ ++e (string) strTmp ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 2 ++ ++e (string) tId ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 25 ++ ++e (string) tInstruction ++24 +94,14 @@ ++ Value: 0 ++ ++e (int32) ycR ++ributes ++ Scope: local ++ Value: 0 ++ ++ ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++0 ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 97551ee3..0dc5a466 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -91,7 +91,7 @@ Variable (string) strCommand ID : 6 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) tSend Attributes 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 bd24b0e2..400ef47e 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 @@ -10,10 +10,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 181 Line(s) of event code - 129 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -26,6 +22,10 @@ popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code +pageStartup + 19 Component(s) + 181 Line(s) of event code + 129 Unique line(s) of event code cardQR 34 Component(s) 398 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 2e80aedf..04293d4c 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 47 + Text : 48 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 6cc63a03..8e63de4b 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -79,7 +79,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) tSend Attributes diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 7284aa87..3d108a2f 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 47 + Text : 48 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index dfe8f435..6ee9c08e 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -91,7 +91,7 @@ Variable (string) strCommand ID : 6 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) tSend Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 56f6a476..4a4bbe71 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,10 +18,10 @@ cardChart 33 Component(s) 425 Line(s) of event code 290 Unique line(s) of event code -pageStartup - 19 Component(s) - 181 Line(s) of event code - 129 Unique line(s) of event code +cardAlarm + 42 Component(s) + 415 Line(s) of event code + 253 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -38,6 +38,10 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 Unique line(s) of event code +pageStartup + 19 Component(s) + 181 Line(s) of event code + 129 Unique line(s) of event code cardQR 34 Component(s) 398 Line(s) of event code @@ -66,10 +70,6 @@ cardEntities 67 Component(s) 1158 Line(s) of event code 526 Unique line(s) of event code -cardAlarm - 42 Component(s) - 415 Line(s) of event code - 253 Unique line(s) of event code cardThermo 57 Component(s) 528 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 9dae5eb1..984698c2 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 47 + Text : 48 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 6cc63a03..8e63de4b 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -79,7 +79,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) tSend Attributes diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index d39c887e..bef0916d 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 47 + Text : 48 Max. Text Size : 10 Picture p0