diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index b727571f..9acb5b36 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -100,6 +100,58 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +├── popupFan.txt +│ @@ -240,15 +240,15 @@ +│ Events +│ Touch Press Event +│ //craft command +│ tSend.txt="event,buttonPress2," +│ tSend.txt+=entn.txt+"," +│ sys2=vaModePos.val-3 +│ covx sys2,tTmp.txt,0,0 +│ - tSend.txt+="mode-preset_modes,"+tTmp.txt +│ + tSend.txt+="mode-sel,"+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 +│ @@ -270,15 +270,15 @@ +│ Events +│ Touch Press Event +│ //craft command +│ tSend.txt="event,buttonPress2," +│ tSend.txt+=entn.txt+"," +│ sys2=vaModePos.val-1 +│ covx sys2,tTmp.txt,0,0 +│ - tSend.txt+="mode-preset_modes,"+tTmp.txt +│ + tSend.txt+="mode-sel,"+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 +│ @@ -300,15 +300,15 @@ +│ Events +│ Touch Press Event +│ //craft command +│ tSend.txt="event,buttonPress2," +│ tSend.txt+=entn.txt+"," +│ sys2=vaModePos.val-2 +│ covx sys2,tTmp.txt,0,0 +│ - tSend.txt+="mode-preset_modes,"+tTmp.txt +│ + tSend.txt+="mode-sel,"+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 ├── screensaver.txt │ @@ -620,26 +620,14 @@ │ vis tNotifyHead,1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3a76a2f9..d1b31119 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -628,7 +628,6 @@ │ crcputs tSend.txt,0 │ //send cmd ├── popupFan.txt -│┄ ordering differences only │ @@ -78,31 +78,31 @@ │ Value: 1 │ @@ -668,7 +667,21 @@ │ Max. Text Size: 200 │ │ Text tEntity -│ @@ -253,60 +253,60 @@ +│ @@ -240,75 +240,75 @@ +│ Events +│ Touch Press Event +│ //craft command +│ tSend.txt="event,buttonPress2," +│ tSend.txt+=entn.txt+"," +│ sys2=vaModePos.val-3 +│ covx sys2,tTmp.txt,0,0 +│ - tSend.txt+="mode-preset_modes,"+tTmp.txt +│ + tSend.txt+="mode-sel,"+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 @@ -695,7 +708,8 @@ │ - sys2=vaModePos.val-1 │ + sys2=vaModePos.val-2 │ covx sys2,tTmp.txt,0,0 -│ tSend.txt+="mode-sel,"+tTmp.txt +│ - tSend.txt+="mode-preset_modes,"+tTmp.txt +│ + tSend.txt+="mode-sel,"+tTmp.txt │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC @@ -727,12 +741,15 @@ │ - sys2=vaModePos.val-2 │ + sys2=vaModePos.val-1 │ covx sys2,tTmp.txt,0,0 -│ tSend.txt+="mode-sel,"+tTmp.txt +│ - tSend.txt+="mode-preset_modes,"+tTmp.txt +│ + tSend.txt+="mode-sel,"+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 ├── popupNotify.txt │ @@ -21,25 +21,19 @@ │ vis tId,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c08dc9cc..e3ca25c5 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-23 14:41:10.580318674 +0000 ++++ /dev/fd/62 2022-10-23 17:44:27.201912812 +0000 ++9,8 @@ +tify.txt +utter.txt @@ -53,6 +53,25 @@ + Scope : global + Dragging : 0 + Disable release event after dragging: 0 ++75 +240,75 @@ ++nts ++ Touch Press Event ++ //craft command ++ tSend.txt="event,buttonPress2," ++ tSend.txt+=entn.txt+"," ++ sys2=vaModePos.val-3 ++ covx sys2,tTmp.txt,0,0 ++ tSend.txt+="mode-preset_modes,"+tTmp.txt ++ tSend.txt+="mode-sel,"+tTmp.txt ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ tSend.txt+="mode-preset_modes,"+tTmp.txt ++ tSend.txt+="mode-preset_modes,"+tTmp.txt ++ crcputs tSend.txt,0 ++ //send cmd +pupNotify.txt +5 +21,19 @@ + vis tId,0 diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index e253a829..1be84a2c 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -1475,7 +1475,7 @@ Dual-state Button btDetail Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 6371 Font Color (Unpressed) : 50712 - Font Color (Pressed) : 64512 + Font Color (Pressed) : 50712 Horizontal Alignment : center Vertical Alignment : center State : pressed diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5e377402..25895856 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -19,17 +19,13 @@ popupLight 391 Line(s) of event code 214 Unique line(s) of event code popupThermo - 24 Component(s) - 294 Line(s) of event code - 175 Unique line(s) of event code + 44 Component(s) + 512 Line(s) of event code + 269 Unique line(s) of event code popupNotify 19 Component(s) 253 Line(s) of event code 164 Unique line(s) of event code -popupFan - 27 Component(s) - 347 Line(s) of event code - 202 Unique line(s) of event code pageStartup 19 Component(s) 172 Line(s) of event code @@ -54,6 +50,10 @@ cardThermo 53 Component(s) 588 Line(s) of event code 309 Unique line(s) of event code +popupFan + 27 Component(s) + 347 Line(s) of event code + 202 Unique line(s) of event code cardAlarm 40 Component(s) 427 Line(s) of event code @@ -69,6 +69,6 @@ cardPower Total 16 Page(s) - 515 Component(s) - 6131 Line(s) of event code - 1590 Unique line(s) of event code + 535 Component(s) + 6349 Line(s) of event code + 1685 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt index 8d515c00..bd54e80f 100644 --- a/HMI/n2t-out-visual/popupFan.txt +++ b/HMI/n2t-out-visual/popupFan.txt @@ -449,7 +449,7 @@ Button bMode1 tSend.txt+=entn.txt+"," sys2=vaModePos.val-3 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -501,7 +501,7 @@ Button bMode3 tSend.txt+=entn.txt+"," sys2=vaModePos.val-1 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -553,7 +553,7 @@ Button bMode2 tSend.txt+=entn.txt+"," sys2=vaModePos.val-2 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/popupThermo.txt b/HMI/n2t-out-visual/popupThermo.txt index f1ab9f33..9f8c7cfa 100644 --- a/HMI/n2t-out-visual/popupThermo.txt +++ b/HMI/n2t-out-visual/popupThermo.txt @@ -63,56 +63,138 @@ Page popupThermo Variable (string) strCommand Attributes - ID : 9 + ID : 8 Scope : local Text : Max. Text Size: 500 Variable (string) entn Attributes - ID : 12 + ID : 9 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 13 + ID : 10 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 14 + ID : 11 Scope: local Value: 0 Variable (int32) vaModePos Attributes - ID : 20 + ID : 17 Scope: local Value: 0 Variable (string) vaModeList Attributes - ID : 21 + ID : 18 Scope : local Text : Max. Text Size: 400 Variable (string) vaModeCur + Attributes + ID : 19 + Scope : local + Text : + Max. Text Size: 40 + +Variable (string) tSend + Attributes + ID : 20 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tInstruction Attributes ID : 22 Scope : local Text : - Max. Text Size: 400 + Max. Text Size: 20 -Variable (string) tSend +Variable (string) tId Attributes ID : 23 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 20 + +Variable (int32) vaModePos2 + Attributes + ID : 35 + Scope: local + Value: 0 + +Variable (string) vaModeList2 + Attributes + ID : 36 + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur2 + Attributes + ID : 37 + Scope : local + Text : + Max. Text Size: 40 + +Variable (string) vaModeCur3 + Attributes + ID : 38 + Scope : local + Text : + Max. Text Size: 40 + +Variable (string) vaModeList3 + Attributes + ID : 39 + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vaModePos3 + Attributes + ID : 40 + Scope: local + Value: 0 + +Variable (string) vaType + Attributes + ID : 41 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) vaType2 + Attributes + ID : 42 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) vaType3 + Attributes + ID : 43 + Scope : local + Text : + Max. Text Size: 20 Text tEntity Attributes @@ -174,17 +256,17 @@ Text tIcon1 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tTmp +Text heading1 Attributes - ID : 5 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 343 - y coordinate : 277 - Width : 97 + x coordinate : 11 + y coordinate : 69 + Width : 262 Height : 30 Effect : load Effect Priority : 0 @@ -193,28 +275,28 @@ Text tTmp Style : flat Associated Keyboard : none Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : - Max. Text Size : 80 + Max. Text Size : 25 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 -Text tInstruction +Text heading2 Attributes - ID : 10 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 290 - Width : 100 + x coordinate : 11 + y coordinate : 155 + Width : 262 Height : 30 Effect : load Effect Priority : 0 @@ -223,28 +305,28 @@ Text tInstruction Style : flat Associated Keyboard : none Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : - Max. Text Size : 20 + Max. Text Size : 25 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 -Text tId +Text heading3 Attributes - ID : 11 + ID : 34 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 100 - y coordinate : 290 - Width : 100 + x coordinate : 11 + y coordinate : 236 + Width : 262 Height : 30 Effect : load Effect Priority : 0 @@ -253,13 +335,13 @@ Text tId Style : flat Associated Keyboard : none Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : - Max. Text Size : 20 + Max. Text Size : 25 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -330,16 +412,16 @@ Button b0 Button bMode1 Attributes - ID : 16 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 11 - y coordinate : 88 + y coordinate : 101 Width : 120 - Height : 50 + Height : 35 Effect : load Effect Priority : 0 Effect Time : 300 @@ -367,7 +449,7 @@ Button bMode1 tSend.txt+=entn.txt+"," sys2=vaModePos.val-3 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-"+vaType.txt+","+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -382,16 +464,16 @@ Button bMode1 Button bMode3 Attributes - ID : 17 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 259 - y coordinate : 88 + y coordinate : 101 Width : 120 - Height : 50 + Height : 35 Effect : load Effect Priority : 0 Effect Time : 300 @@ -419,7 +501,7 @@ Button bMode3 tSend.txt+=entn.txt+"," sys2=vaModePos.val-1 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-"+vaType.txt+","+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -434,16 +516,16 @@ Button bMode3 Button bMode2 Attributes - ID : 18 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 135 - y coordinate : 88 + y coordinate : 101 Width : 120 - Height : 50 + Height : 35 Effect : load Effect Priority : 0 Effect Time : 300 @@ -471,7 +553,7 @@ Button bMode2 tSend.txt+=entn.txt+"," sys2=vaModePos.val-2 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-"+vaType.txt+","+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -486,14 +568,14 @@ Button bMode2 Button bModeNext Attributes - ID : 19 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 388 - y coordinate : 88 + y coordinate : 76 Width : 50 Height : 50 Effect : load @@ -511,7 +593,7 @@ Button bModeNext Vertical Alignment : center State : unpressed Text :  - Max. Text Size : 5 + Max. Text Size : 3 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -555,9 +637,461 @@ Button bModeNext bMode3.pco=1374 } +Button cModeNext + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 388 + y coordinate : 162 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 3 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + spstr vaModeList2.txt,tTmp.txt,"?",vaModePos2.val + if(tTmp.txt=="") + { + vaModePos2.val=0 + spstr vaModeList2.txt,cMode1.txt,"?",vaModePos2.val + spstr vaModeList2.txt,cMode2.txt,"?",vaModePos2.val+1 + spstr vaModeList2.txt,cMode3.txt,"?",vaModePos2.val+2 + } + spstr vaModeList2.txt,cMode1.txt,"?",vaModePos2.val + spstr vaModeList2.txt,cMode2.txt,"?",vaModePos2.val+1 + spstr vaModeList2.txt,cMode3.txt,"?",vaModePos2.val+2 + vaModePos2.val+=3 + spstr vaModeList2.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis cModeNext,0 + }else + { + vis cModeNext,1 + } + cMode1.pco=defaultFontColor + cMode2.pco=defaultFontColor + cMode3.pco=defaultFontColor + if(cMode1.txt==vaModeCur.txt) + { + cMode1.pco=1374 + } + if(cMode2.txt==vaModeCur.txt) + { + cMode2.pco=1374 + } + if(cMode3.txt==vaModeCur.txt) + { + cMode3.pco=1374 + } + +Button cMode3 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 259 + y coordinate : 187 + Width : 120 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + 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 : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos2.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType2.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 cMode2 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 187 + Width : 120 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + 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 : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos2.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType2.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 cMode1 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 187 + Width : 120 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + 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 : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos2.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType2.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 dModeNext + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 388 + y coordinate : 243 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 3 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + spstr vaModeList3.txt,tTmp.txt,"?",vaModePos3.val + if(tTmp.txt=="") + { + vaModePos3.val=0 + spstr vaModeList3.txt,dMode1.txt,"?",vaModePos3.val + spstr vaModeList3.txt,dMode2.txt,"?",vaModePos3.val+1 + spstr vaModeList3.txt,dMode3.txt,"?",vaModePos3.val+2 + } + spstr vaModeList3.txt,dMode1.txt,"?",vaModePos3.val + spstr vaModeList3.txt,dMode2.txt,"?",vaModePos3.val+1 + spstr vaModeList3.txt,dMode3.txt,"?",vaModePos3.val+2 + vaModePos3.val+=3 + spstr vaModeList3.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis dModeNext,0 + }else + { + vis dModeNext,1 + } + dMode1.pco=defaultFontColor + dMode2.pco=defaultFontColor + dMode3.pco=defaultFontColor + if(dMode1.txt==vaModeCur.txt) + { + dMode1.pco=1374 + } + if(dMode2.txt==vaModeCur.txt) + { + dMode2.pco=1374 + } + if(dMode3.txt==vaModeCur.txt) + { + dMode3.pco=1374 + } + +Button dMode3 + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 259 + y coordinate : 268 + Width : 120 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + 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 : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos3.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType3.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 dMode2 + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 268 + Width : 120 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + 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 : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos3.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType3.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 dMode1 + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 268 + Width : 120 + Height : 35 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + 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 : 40 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos3.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType3.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 + Timer tmSleep Attributes - ID : 7 + ID : 6 Scope : local Period (ms): 1000 Enabled : yes @@ -577,7 +1111,7 @@ Timer tmSleep Timer tmSerial Attributes - ID : 8 + ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -637,10 +1171,14 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 + //mode 1 heading + spstr strCommand.txt,heading1.txt,"~",4 + //mode 1 type + spstr strCommand.txt,vaType.txt,"~",5 //current mode - spstr strCommand.txt,vaModeCur.txt,"~",4 + spstr strCommand.txt,vaModeCur.txt,"~",6 //mode list - spstr strCommand.txt,vaModeList.txt,"~",5 + spstr strCommand.txt,vaModeList.txt,"~",7 if(vaModeList.txt=="") { vis bMode1,0 @@ -668,6 +1206,76 @@ Timer tmSerial { bMode3.pco=1374 } + //mode 2 heading + spstr strCommand.txt,heading2.txt,"~",8 + //mode 2 type + spstr strCommand.txt,vaType2.txt,"~",9 + //current mode + spstr strCommand.txt,vaModeCur2.txt,"~",10 + //mode list + spstr strCommand.txt,vaModeList2.txt,"~",11 + if(vaModeList2.txt=="") + { + vis cMode1,0 + vis cMode2,0 + vis cMode3,0 + vis cModeNext,0 + } + if(cMode1.txt=="") + { + click cModeNext,1 + click cModeNext,0 + } + cMode1.pco=defaultFontColor + cMode2.pco=defaultFontColor + cMode3.pco=defaultFontColor + if(cMode1.txt==vaModeCur2.txt) + { + cMode1.pco=1374 + } + if(cMode2.txt==vaModeCur2.txt) + { + cMode2.pco=1374 + } + if(cMode3.txt==vaModeCur2.txt) + { + cMode3.pco=1374 + } + //mode 3 heading + spstr strCommand.txt,heading3.txt,"~",12 + //mode 3 type + spstr strCommand.txt,vaType3.txt,"~",13 + //current mode + spstr strCommand.txt,vaModeCur3.txt,"~",14 + //mode list + spstr strCommand.txt,vaModeList3.txt,"~",15 + if(vaModeList3.txt=="") + { + vis dMode1,0 + vis dMode2,0 + vis dMode3,0 + vis dModeNext,0 + } + if(dMode1.txt=="") + { + click dModeNext,1 + click dModeNext,0 + } + dMode1.pco=defaultFontColor + dMode2.pco=defaultFontColor + dMode3.pco=defaultFontColor + if(dMode1.txt==vaModeCur3.txt) + { + dMode1.pco=1374 + } + if(dMode2.txt==vaModeCur3.txt) + { + dMode2.pco=1374 + } + if(dMode3.txt==vaModeCur3.txt) + { + dMode3.pco=1374 + } } if(tInstruction.txt=="time") { @@ -785,7 +1393,7 @@ Timer tmSerial Timer tmCooldown Attributes - ID : 15 + ID : 12 Scope : local Period (ms): 100 Enabled : no @@ -796,7 +1404,7 @@ Timer tmCooldown TouchCap tc0 Attributes - ID : 6 + ID : 5 Scope: local Value: 0 diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt index 3512f075..dd78aca7 100644 --- a/HMI/n2t-out/popupFan.txt +++ b/HMI/n2t-out/popupFan.txt @@ -244,7 +244,7 @@ Button bMode1 tSend.txt+=entn.txt+"," sys2=vaModePos.val-3 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -274,7 +274,7 @@ Button bMode3 tSend.txt+=entn.txt+"," sys2=vaModePos.val-1 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -304,7 +304,7 @@ Button bMode2 tSend.txt+=entn.txt+"," sys2=vaModePos.val-2 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/popupThermo.txt b/HMI/n2t-out/popupThermo.txt index 6b329cbf..f0d14c16 100644 --- a/HMI/n2t-out/popupThermo.txt +++ b/HMI/n2t-out/popupThermo.txt @@ -90,7 +90,7 @@ Variable (string) vaModeCur Attributes Scope : local Text : - Max. Text Size: 400 + Max. Text Size: 40 Variable (string) tSend Attributes @@ -98,6 +98,76 @@ Variable (string) tSend Text : Max. Text Size: 200 +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (int32) vaModePos2 + Attributes + Scope: local + Value: 0 + +Variable (string) vaModeList2 + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (string) vaModeCur2 + Attributes + Scope : local + Text : + Max. Text Size: 40 + +Variable (string) vaModeCur3 + Attributes + Scope : local + Text : + Max. Text Size: 40 + +Variable (string) vaModeList3 + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vaModePos3 + Attributes + Scope: local + Value: 0 + +Variable (string) vaType + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) vaType2 + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) vaType3 + Attributes + Scope : local + Text : + Max. Text Size: 20 + Text tEntity Attributes Scope : local @@ -118,7 +188,7 @@ Text tIcon1 Text : Max. Text Size : 10 -Text tTmp +Text heading1 Attributes Scope : local Dragging : 0 @@ -126,9 +196,9 @@ Text tTmp Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 80 + Max. Text Size : 25 -Text tInstruction +Text heading2 Attributes Scope : local Dragging : 0 @@ -136,9 +206,9 @@ Text tInstruction Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 20 + Max. Text Size : 25 -Text tId +Text heading3 Attributes Scope : local Dragging : 0 @@ -146,7 +216,7 @@ Text tId Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 20 + Max. Text Size : 25 Picture p0 Attributes @@ -197,7 +267,7 @@ Button bMode1 tSend.txt+=entn.txt+"," sys2=vaModePos.val-3 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-"+vaType.txt+","+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -227,7 +297,7 @@ Button bMode3 tSend.txt+=entn.txt+"," sys2=vaModePos.val-1 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-"+vaType.txt+","+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -257,7 +327,7 @@ Button bMode2 tSend.txt+=entn.txt+"," sys2=vaModePos.val-2 covx sys2,tTmp.txt,0,0 - tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-"+vaType.txt+","+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -278,7 +348,7 @@ Button bModeNext Send Component ID : disabled State : unpressed Text :  - Max. Text Size : 5 + Max. Text Size : 3 Events Touch Press Event @@ -319,6 +389,282 @@ Button bModeNext bMode3.pco=1374 } +Button cModeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + spstr vaModeList2.txt,tTmp.txt,"?",vaModePos2.val + if(tTmp.txt=="") + { + vaModePos2.val=0 + spstr vaModeList2.txt,cMode1.txt,"?",vaModePos2.val + spstr vaModeList2.txt,cMode2.txt,"?",vaModePos2.val+1 + spstr vaModeList2.txt,cMode3.txt,"?",vaModePos2.val+2 + } + spstr vaModeList2.txt,cMode1.txt,"?",vaModePos2.val + spstr vaModeList2.txt,cMode2.txt,"?",vaModePos2.val+1 + spstr vaModeList2.txt,cMode3.txt,"?",vaModePos2.val+2 + vaModePos2.val+=3 + spstr vaModeList2.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis cModeNext,0 + }else + { + vis cModeNext,1 + } + cMode1.pco=defaultFontColor + cMode2.pco=defaultFontColor + cMode3.pco=defaultFontColor + if(cMode1.txt==vaModeCur.txt) + { + cMode1.pco=1374 + } + if(cMode2.txt==vaModeCur.txt) + { + cMode2.pco=1374 + } + if(cMode3.txt==vaModeCur.txt) + { + cMode3.pco=1374 + } + +Button cMode3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos2.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType2.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 cMode2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos2.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType2.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 cMode1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos2.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType2.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 dModeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + spstr vaModeList3.txt,tTmp.txt,"?",vaModePos3.val + if(tTmp.txt=="") + { + vaModePos3.val=0 + spstr vaModeList3.txt,dMode1.txt,"?",vaModePos3.val + spstr vaModeList3.txt,dMode2.txt,"?",vaModePos3.val+1 + spstr vaModeList3.txt,dMode3.txt,"?",vaModePos3.val+2 + } + spstr vaModeList3.txt,dMode1.txt,"?",vaModePos3.val + spstr vaModeList3.txt,dMode2.txt,"?",vaModePos3.val+1 + spstr vaModeList3.txt,dMode3.txt,"?",vaModePos3.val+2 + vaModePos3.val+=3 + spstr vaModeList3.txt,tTmp.txt,"?",3 + if(tTmp.txt=="") + { + vis dModeNext,0 + }else + { + vis dModeNext,1 + } + dMode1.pco=defaultFontColor + dMode2.pco=defaultFontColor + dMode3.pco=defaultFontColor + if(dMode1.txt==vaModeCur.txt) + { + dMode1.pco=1374 + } + if(dMode2.txt==vaModeCur.txt) + { + dMode2.pco=1374 + } + if(dMode3.txt==vaModeCur.txt) + { + dMode3.pco=1374 + } + +Button dMode3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos3.val-1 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType3.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 dMode2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos3.val-2 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType3.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 dMode1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 40 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + sys2=vaModePos3.val-3 + covx sys2,tTmp.txt,0,0 + tSend.txt+="mode-"+vaType3.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 + Timer tmSleep Attributes Scope : local @@ -399,10 +745,14 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 + //mode 1 heading + spstr strCommand.txt,heading1.txt,"~",4 + //mode 1 type + spstr strCommand.txt,vaType.txt,"~",5 //current mode - spstr strCommand.txt,vaModeCur.txt,"~",4 + spstr strCommand.txt,vaModeCur.txt,"~",6 //mode list - spstr strCommand.txt,vaModeList.txt,"~",5 + spstr strCommand.txt,vaModeList.txt,"~",7 if(vaModeList.txt=="") { vis bMode1,0 @@ -430,6 +780,76 @@ Timer tmSerial { bMode3.pco=1374 } + //mode 2 heading + spstr strCommand.txt,heading2.txt,"~",8 + //mode 2 type + spstr strCommand.txt,vaType2.txt,"~",9 + //current mode + spstr strCommand.txt,vaModeCur2.txt,"~",10 + //mode list + spstr strCommand.txt,vaModeList2.txt,"~",11 + if(vaModeList2.txt=="") + { + vis cMode1,0 + vis cMode2,0 + vis cMode3,0 + vis cModeNext,0 + } + if(cMode1.txt=="") + { + click cModeNext,1 + click cModeNext,0 + } + cMode1.pco=defaultFontColor + cMode2.pco=defaultFontColor + cMode3.pco=defaultFontColor + if(cMode1.txt==vaModeCur2.txt) + { + cMode1.pco=1374 + } + if(cMode2.txt==vaModeCur2.txt) + { + cMode2.pco=1374 + } + if(cMode3.txt==vaModeCur2.txt) + { + cMode3.pco=1374 + } + //mode 3 heading + spstr strCommand.txt,heading3.txt,"~",12 + //mode 3 type + spstr strCommand.txt,vaType3.txt,"~",13 + //current mode + spstr strCommand.txt,vaModeCur3.txt,"~",14 + //mode list + spstr strCommand.txt,vaModeList3.txt,"~",15 + if(vaModeList3.txt=="") + { + vis dMode1,0 + vis dMode2,0 + vis dMode3,0 + vis dModeNext,0 + } + if(dMode1.txt=="") + { + click dModeNext,1 + click dModeNext,0 + } + dMode1.pco=defaultFontColor + dMode2.pco=defaultFontColor + dMode3.pco=defaultFontColor + if(dMode1.txt==vaModeCur3.txt) + { + dMode1.pco=1374 + } + if(dMode2.txt==vaModeCur3.txt) + { + dMode2.pco=1374 + } + if(dMode3.txt==vaModeCur3.txt) + { + dMode3.pco=1374 + } } if(tInstruction.txt=="time") {