From a380f19526cbcebde681a34410dc34b6b476d825 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 29 Apr 2023 14:58:15 +0000 Subject: [PATCH] sync us-p (add nextion2text) --- HMI/US/portrait/diff-eu-version.txt | 384 ++------ HMI/US/portrait/diff-filtered.txt | 338 ++----- HMI/US/portrait/n2t-out-visual/Program.s.txt | 1 + .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 +- HMI/US/portrait/n2t-out-visual/popupLight.txt | 923 +++++++++--------- HMI/US/portrait/n2t-out/Program.s.txt | 1 + HMI/US/portrait/n2t-out/popupLight.txt | 239 +++-- 7 files changed, 762 insertions(+), 1134 deletions(-) diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index fae141ce..1fe1e64b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2,7 +2,7 @@ +++ HMI/US/portrait/n2t-out │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt -│ @@ -10,11 +10,10 @@ +│ @@ -10,11 +10,11 @@ │ int sleepValue=0 │ // dim value │ int dimValue=40 @@ -12,9 +12,9 @@ │ int defaultBcoColor=6371 │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 -│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ + // fix touch offset (Removed for US version) │ + //lcd_dev fffb 0002 0000 0020 +│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ page pageStartup │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt @@ -2197,27 +2197,7 @@ │ //send cmd │ --- HMI/n2t-out/popupLight.txt ├── +++ HMI/US/portrait/n2t-out/popupLight.txt -│ @@ -1,31 +1,33 @@ -│ Page popupLight -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Locked : no -│ - Swide up page ID : disabled -│ - Swide down page ID : disabled -│ - Swide left page ID : disabled -│ - Swide right page ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Locked : no -│ + Swide up page ID : disabled -│ + Swide down page ID : disabled -│ + Swide left page ID : disabled -│ + Swide right page ID : disabled -│ +│ @@ -12,20 +12,21 @@ │ Events │ Preinitialize Event │ dim=dimValueNormal @@ -2240,7 +2220,7 @@ │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC -│ @@ -34,24 +36,24 @@ +│ @@ -34,24 +35,24 @@ │ crcputs tSend.txt,0 │ //send cmd │ printh 55 bb @@ -2271,7 +2251,7 @@ │ { │ if(b[sys0].type==98||b[sys0].type==116) │ { -│ @@ -62,26 +64,22 @@ +│ @@ -62,26 +63,22 @@ │ { │ b[sys0].pic=10 │ b[sys0].pic2=11 @@ -2303,7 +2283,7 @@ │ Max. Text Size: 80 │ │ Variable (int32) mode -│ @@ -96,52 +94,133 @@ +│ @@ -96,47 +93,116 @@ │ │ Variable (string) strCommand │ Attributes @@ -2312,177 +2292,133 @@ │ Max. Text Size: 500 │ │ -Variable (string) tId -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tInstruction -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ Variable (string) tSend +│ +Variable (string) tSend │ Attributes │ Scope : local │ Text : -│ Max. Text Size: 200 +│ - Max. Text Size: 20 +│ + Max. Text Size: 200 │ -│ -Variable (string) tTmp +│ -Variable (string) tInstruction │ +Text t0 │ Attributes │ - Scope : local │ - Text : -│ - Max. Text Size: 80 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : Color -│ + Max. Text Size : 50 -│ + +│ - Max. Text Size: 20 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text : Color +│ + Max. Text Size : 50 +│ +│ -Variable (string) tSend │ +Text t1 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : Brightness -│ + Max. Text Size : 50 -│ + +│ Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 200 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text : Brightness +│ + Max. Text Size : 50 +│ +│ -Variable (string) tTmp │ +Text t2 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 +│ Attributes +│ - Scope : local +│ - Text : +│ - Max. Text Size: 80 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text :  +│ + Max. Text Size : 10 │ + │ +Text t3 │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text :  +│ + Max. Text Size : 10 │ + │ +Text t4 │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : Temperature -│ + Max. Text Size : 50 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text : Temperature +│ + Max. Text Size : 50 │ │ Text tEntity │ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Associated Keyboard: none -│ - Text : tEntity1 -│ - Max. Text Size : 25 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : tEntity1 -│ + Max. Text Size : 25 -│ + +│ Scope : local +│ Dragging : 0 +│ Send Component ID : disabled +│ Associated Keyboard: none +│ Text : tEntity1 +│ Max. Text Size : 25 +│ │ +Text tIcon1 │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text :  +│ + Max. Text Size : 10 │ + │ +Text tId │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 20 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text : +│ + Max. Text Size : 20 │ + │ +Text tInstruction │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 20 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text : +│ + Max. Text Size : 20 │ + │ +Text tTmp │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 80 +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID : disabled +│ + Associated Keyboard: none +│ + Text : +│ + Max. Text Size : 80 │ + │ +Picture p0 │ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ +│ + Scope : local +│ + Dragging : 0 +│ + Send Component ID: disabled +│ + │ Picture pColorWheel │ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled +│ Scope : local +│ Dragging : 0 +│ Send Component ID: disabled │ │ Events -│ Touch Press Event -│ //craft command -│ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," -│ sys0=tch0 -│ sys0=sys0-pColorWheel.x -│ @@ -165,37 +244,24 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Slider hBrightness -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - Position : 50 -│ - Upper range limit: 100 -│ - Lower range limit: 0 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Position : 50 -│ + Upper range limit : 100 -│ + Lower range limit : 0 +│ @@ -174,28 +240,14 @@ +│ Send Component ID: disabled +│ Position : 50 +│ Upper range limit: 100 +│ Lower range limit: 0 │ │ Events │ Touch Release Event @@ -2507,85 +2443,7 @@ │ covx hBrightness.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt │ //send calc crc -│ @@ -208,20 +274,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Slider hTempSlider -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - Position : 50 -│ - Upper range limit: 100 -│ - Lower range limit: 0 -│ + 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 -│ tmCooldown.en=1 -│ tmCooldown.tim=2500 -│ //craft command -│ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -│ @@ -237,20 +304,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button b0 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + 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,popupLight,bExit" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -261,69 +329,73 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button bColor -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + State : unpressed -│ + Text :  -│ + Max. Text Size : 10 -│ -│ Events +│ @@ -276,27 +328,27 @@ │ Touch Press Event │ if(mode.val==1) │ { @@ -2616,19 +2474,10 @@ │ │ Button bEffect │ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + State : unpressed -│ + Text :  -│ + Max. Text Size : 10 +│ Scope : local +│ @@ -306,14 +358,15 @@ +│ Text :  +│ Max. Text Size : 10 │ │ Events │ Touch Press Event @@ -2639,27 +2488,10 @@ │ │ Dual-state Button btOnOff1 │ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text : -│ - Max. Text Size : 10 -│ + 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 -│ //craft command -│ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," -│ covx btOnOff1.val,tTmp.txt,0,0 -│ tSend.txt+=tTmp.txt -│ @@ -345,38 +417,14 @@ +│ Scope : local +│ Dragging : 0 +│ Send Component ID: disabled +│ @@ -345,38 +398,14 @@ │ Period (ms): 100 │ Enabled : no │ @@ -2698,7 +2530,7 @@ │ Enabled : yes │ │ Events -│ @@ -425,48 +473,48 @@ +│ @@ -425,48 +454,48 @@ │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) │ spstr strCommand.txt,tInstruction.txt,"~",0 │ spstr strCommand.txt,tTmp.txt,"~",1 @@ -2759,7 +2591,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -481,16 +529,16 @@ +│ @@ -481,16 +510,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -2778,7 +2610,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -501,36 +549,36 @@ +│ @@ -501,36 +530,36 @@ │ } │ } │ // get Color value diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 5e00c9d7..fe1cc7e2 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,7 @@ -+++ /dev/fd/62 2023-04-29 14:51:43.982371793 +0000 ++++ /dev/fd/62 2023-04-29 14:58:06.204485629 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt -+1 +10,10 @@ ++1 +10,11 @@ +nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt @@ -1587,27 +1587,7 @@ + //send cmd +I/n2t-out/popupLight.txt ++ HMI/US/portrait/n2t-out/popupLight.txt -+ +1,33 @@ -+pupLight -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID : disabled -+ Locked : no -+ Swide up page ID : disabled -+ Swide down page ID : disabled -+ Swide left page ID : disabled -+ Swide right page ID: disabled -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Locked : no -+ Swide up page ID : disabled -+ Swide down page ID : disabled -+ Swide left page ID : disabled -+ Swide right page ID : disabled -+ ++0 +12,21 @@ +nts + Preinitialize Event + dim=dimValueNormal @@ -1630,7 +1610,7 @@ + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC -+4 +36,24 @@ ++4 +35,24 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -1661,7 +1641,7 @@ + { + if(b[sys0].type==98||b[sys0].type==116) + { -+6 +64,22 @@ ++6 +63,22 @@ + { + b[sys0].pic=10 + b[sys0].pic2=11 @@ -1693,7 +1673,7 @@ + Max. Text Size: 80 + +e (int32) mode -+2 +94,133 @@ ++7 +93,116 @@ + +e (string) strCommand +ributes @@ -1702,76 +1682,69 @@ + Max. Text Size: 500 + +e (string) tId -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ -+e (string) tInstruction -+ributes -+ Scope : local -+ Text : -+ Max. Text Size: 20 -+ +e (string) tSend +ributes + Scope : local + Text : ++ Max. Text Size: 20 + Max. Text Size: 200 + ++e (string) tInstruction ++ ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 20 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : Color ++ Max. Text Size : 50 ++ ++e (string) tSend ++ ++ributes ++ Scope : local ++ Text : ++ Max. Text Size: 200 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : Brightness ++ Max. Text Size : 50 ++ +e (string) tTmp + +ributes + Scope : local + Text : + Max. Text Size: 80 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : Color -+ Max. Text Size : 50 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text :  ++ Max. Text Size : 10 + + +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : Brightness -+ Max. Text Size : 50 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text :  ++ Max. Text Size : 10 + + +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text :  -+ Max. Text Size : 10 -+ -+ -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text :  -+ Max. Text Size : 10 -+ -+ -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : Temperature -+ Max. Text Size : 50 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : Temperature ++ Max. Text Size : 50 + +ntity +ributes @@ -1781,98 +1754,61 @@ + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 25 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : tEntity1 -+ Max. Text Size : 25 + +con1 +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text :  -+ Max. Text Size : 10 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text :  ++ Max. Text Size : 10 + +d +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 20 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : ++ Max. Text Size : 20 + +nstruction +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 20 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : ++ Max. Text Size : 20 + +mp +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 80 ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : ++ Max. Text Size : 80 + + p0 +ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled ++ Scope : local ++ Dragging : 0 ++ Send Component ID: disabled + + pColorWheel +ributes + Scope : local + Dragging : 0 + Send Component ID: disabled -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled + +nts -+ Touch Press Event -+ //craft command -+ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," -+ sys0=tch0 -+ sys0=sys0-pColorWheel.x -+37 +244,24 @@ -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+hBrightness -+ributes -+ Scope : local -+ Dragging : 0 ++28 +240,14 @@ + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 -+ 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 @@ -1897,85 +1833,7 @@ + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc -+20 +274,21 @@ -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+hTempSlider -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID: disabled -+ Position : 50 -+ Upper range limit: 100 -+ Lower range limit: 0 -+ 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 -+ tmCooldown.en=1 -+ tmCooldown.tim=2500 -+ //craft command -+ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -+20 +304,21 @@ -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+b0 -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID: disabled -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ 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,popupLight,bExit" -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+69 +329,73 @@ -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+bColor -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID: disabled -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text :  -+ Max. Text Size : 10 -+ -+nts ++27 +328,27 @@ + Touch Press Event + if(mode.val==1) + { @@ -2007,18 +1865,9 @@ +bEffect +ributes + Scope : local -+ Dragging : 0 -+ Send Component ID: disabled -+ State : unpressed ++14 +358,15 @@ + Text :  + Max. Text Size : 10 -+ 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 @@ -2032,24 +1881,7 @@ + Scope : local + Dragging : 0 + Send Component ID: disabled -+ State : unpressed -+ Text : -+ Max. Text Size : 10 -+ 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 -+ //craft command -+ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," -+ covx btOnOff1.val,tTmp.txt,0,0 -+ tSend.txt+=tTmp.txt -+38 +417,14 @@ ++38 +398,14 @@ + Period (ms): 100 + Enabled : no + @@ -2088,7 +1920,7 @@ + Enabled : yes + +nts -+48 +473,48 @@ ++48 +454,48 @@ + // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) + spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tTmp.txt,"~",1 @@ -2149,7 +1981,7 @@ + // switch mode + click bColor,1 + click bColor,0 -+16 +529,16 @@ ++16 +510,16 @@ + click bColor,1 + click bColor,0 + } @@ -2168,7 +2000,7 @@ + } + // mode == 0 is rgb controls currently shown + if(mode.val==0) -+36 +549,36 @@ ++36 +530,36 @@ + } + } + // get Color value diff --git a/HMI/US/portrait/n2t-out-visual/Program.s.txt b/HMI/US/portrait/n2t-out-visual/Program.s.txt index 9f8fa6dd..4e8eb4c0 100644 --- a/HMI/US/portrait/n2t-out-visual/Program.s.txt +++ b/HMI/US/portrait/n2t-out-visual/Program.s.txt @@ -16,4 +16,5 @@ Program.s int defaultBcoColor=6371 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port page pageStartup 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 3592ac02..e443e206 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 @@ -1,7 +1,7 @@ Program.s 0 Component(s) - 12 Line(s) of event code - 12 Unique line(s) of event code + 13 Line(s) of event code + 13 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code @@ -88,7 +88,7 @@ cardEntities 703 Unique line(s) of event code Total - 21 Page(s) + 22 Page(s) 811 Component(s) - 9628 Line(s) of event code - 2453 Unique line(s) of event code + 9629 Line(s) of event code + 2454 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 0db4bd34..1f83aeff 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -1,22 +1,21 @@ Page popupLight Attributes - ID : 0 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - Width : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - Fill : solid color - Back. Color : 6371 + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + Width : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + Fill : solid color + Back. Color : 6371 Events Preinitialize Event @@ -119,337 +118,325 @@ Variable (string) tSend Text t0 Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 12 - y coordinate : 57 - Width : 141 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : left - Vertical Alignment : center - Input Type : character - Text : Color - Max. Text Size : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 57 + Width : 141 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : Color + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text t1 Attributes - ID : 6 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 60 - y coordinate : 374 - Width : 251 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : left - Vertical Alignment : center - Input Type : character - Text : Brightness - Max. Text Size : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 374 + Width : 251 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : Brightness + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text t2 Attributes - ID : 9 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 10 - y coordinate : 374 - Width : 45 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 6371 - Font Color : 40147 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 9 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 374 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 40147 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text t3 Attributes - ID : 10 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 10 - y coordinate : 267 - Width : 45 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 6371 - Font Color : 40147 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 267 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 40147 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text t4 Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 60 - y coordinate : 266 - Width : 250 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : left - Vertical Alignment : center - Input Type : character - Text : Temperature - Max. Text Size : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 11 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 266 + Width : 250 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : Temperature + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tEntity Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 60 - y coordinate : 21 - Width : 200 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : left - Vertical Alignment : center - Input Type : character - Text : tEntity1 - Max. Text Size : 25 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 21 + Width : 200 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 25 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tIcon1 Attributes - ID : 4 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 11 - y coordinate : 21 - Width : 45 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 6371 - Font Color : 17299 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 21 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tId Attributes - ID : 18 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 100 - y coordinate : 450 - Width : 100 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 450 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tInstruction Attributes - ID : 17 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 450 - Width : 100 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 20 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 450 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tTmp Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 282 - y coordinate : 446 - Width : 34 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 80 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 282 + y coordinate : 446 + Width : 34 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 80 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Picture p0 Attributes - ID : 1 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 1 - Width : 319 - Height : 479 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 + ID : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 1 + Width : 319 + Height : 479 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 Picture pColorWheel Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 67 - y coordinate : 89 - Width : 245 - Height : 245 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 3 + ID : 2 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 67 + y coordinate : 89 + Width : 245 + Height : 245 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 3 Events Touch Press Event @@ -481,28 +468,27 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 7 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 12 - y coordinate : 409 - Width : 300 - Height : 44 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Direction : horizontal - Fill : image - Cursor width : auto - Cursor height : 255 - Back. Picture ID : 5 - Slided Back. Picture ID : 4 - Position : 50 - Upper range limit : 100 - Lower range limit : 0 + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 409 + Width : 300 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID: 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 Events Touch Release Event @@ -526,28 +512,27 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 19 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 12 - y coordinate : 304 - Width : 300 - Height : 44 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Direction : horizontal - Fill : image - Cursor width : auto - Cursor height : 255 - Back. Picture ID : 7 - Slided Back. Picture ID : 8 - Position : 50 - Upper range limit : 100 - Lower range limit : 0 + ID : 19 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 304 + Width : 100 + Height : 25 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 7 + Slided Back. Picture ID: 8 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 Events Touch Release Event @@ -571,35 +556,34 @@ Slider hTempSlider Button b0 Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 266 - y coordinate : 14 - 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 + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 266 + y coordinate : 14 + 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 @@ -618,35 +602,34 @@ Button b0 Button bColor Attributes - ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 12 - y coordinate : 89 - 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 + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 89 + 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 @@ -675,35 +658,34 @@ 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 : 12 - y coordinate : 195 - 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 + ID : 27 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 195 + 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 @@ -714,31 +696,30 @@ Button bEffect Dual-state Button btOnOff1 Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 12 - y coordinate : 142 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 1 - Back. Picture ID (Pressed) : 2 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 142 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed): 1 + Back. Picture ID (Pressed) : 2 + 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 diff --git a/HMI/US/portrait/n2t-out/Program.s.txt b/HMI/US/portrait/n2t-out/Program.s.txt index 9f8fa6dd..4e8eb4c0 100644 --- a/HMI/US/portrait/n2t-out/Program.s.txt +++ b/HMI/US/portrait/n2t-out/Program.s.txt @@ -16,4 +16,5 @@ Program.s int defaultBcoColor=6371 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port page pageStartup diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 62684594..c9a5bf42 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -1,14 +1,13 @@ Page popupLight Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled Events Preinitialize Event @@ -106,117 +105,105 @@ Variable (string) tSend Text t0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Color - Max. Text Size : 50 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Color + Max. Text Size : 50 Text t1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Brightness - Max. Text Size : 50 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Brightness + Max. Text Size : 50 Text t2 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 Text t3 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 Text t4 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Temperature - Max. Text Size : 50 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Temperature + Max. Text Size : 50 Text tEntity Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : tEntity1 - Max. Text Size : 25 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 25 Text tIcon1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 Text tId Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 20 Text tInstruction Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 20 Text tTmp Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 80 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 80 Picture p0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Picture pColorWheel Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Events Touch Press Event @@ -248,13 +235,12 @@ Picture pColorWheel Slider hBrightness 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 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 Events Touch Release Event @@ -278,13 +264,12 @@ Slider hBrightness Slider hTempSlider 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 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 Events Touch Release Event @@ -308,13 +293,12 @@ Slider hTempSlider Button b0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -333,13 +317,12 @@ Button b0 Button bColor Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -368,13 +351,12 @@ 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 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -385,13 +367,12 @@ Button bEffect Dual-state Button btOnOff1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text : + Max. Text Size : 10 Events Touch Press Event