From fa30e0c862b4caaed3285ea30f31dbeef3fbfdcd Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Sep 2022 14:38:53 +0200 Subject: [PATCH] fix new diff --- .github/workflows/nextion2text.yml | 4 +- .../portrait/diff-eu-version-known-good.txt | 1208 ++++++++++------- 2 files changed, 692 insertions(+), 520 deletions(-) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index 6dc1a117..dcb8f4c2 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -62,8 +62,8 @@ jobs: - name: Run n2t US P DIFF DIFF continue-on-error: true run: | - diffoscope --exclude-directory-metadata=recursive HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt - #diff -u HMI/US/portrait/diff-eu-version-known-good.txt HMI/US/portrait/diff-eu-version.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt + diff -u <(cut -b13- HMI/US/portrait/diff-eu-version-known-good.txt) <(cut -b13- HMI/US/portrait/diff-eu-version.txt) | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt + #diff -u HMI/US/portrait/diff-eu-version-known-good.txt | grep -E "^\+" > HMI/US/portrait/diff-filtered.txt - name: Run n2t US L DIFF continue-on-error: true diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt index 4f080140..9a0659bf 100644 --- a/HMI/US/portrait/diff-eu-version-known-good.txt +++ b/HMI/US/portrait/diff-eu-version-known-good.txt @@ -1,518 +1,690 @@ -diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-24 14:34:14.167683442 +0000 -@@ -11,6 +11,6 @@ - // dim value - int dimValue=40 - int dimValueNormal=100 -- // fix touch offset -- lcd_dev fffb 0002 0000 0020 -+ // fix touch offset (Removed for US version) -+ //lcd_dev fffb 0002 0000 0020 - page pageStartup -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-24 14:34:14.171683489 +0000 -@@ -62,6 +62,16 @@ - vis bText4,0 - vis hSlider4,0 - vis nNum4,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 - vis bPrev,0 - vis bNext,0 - -@@ -119,6 +129,18 @@ - Text : - Max. Text Size: 80 - -+Variable (string) entn5 -+ Attributes -+ Scope : local -+ Text : -+ Max. Text Size: 80 -+ -+Variable (string) type5 -+ Attributes -+ Scope : local -+ Text : -+ Max. Text Size: 10 -+ - Number nNum1 - Attributes - Scope : local -@@ -155,6 +177,15 @@ - 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 -+ - Text tHeading - Attributes - Scope : local -@@ -285,6 +316,26 @@ - Text : - Max. Text Size : 50 - -+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 tIcon5 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text :  -+ Max. Text Size : 5 -+ - Picture p0 - Attributes - Scope : local -@@ -404,6 +455,34 @@ - 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 -+ - Button bDown1 - Attributes - Scope : local -@@ -861,6 +940,106 @@ - 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 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 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 bText5 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : -+ Max. Text Size : 20 -+ -+ 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 -+ - Dual-state Button btOnOff1 - Attributes - Scope : local -@@ -969,6 +1148,33 @@ - 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 -+ - Hotspot mSpecial - Attributes - Scope : local -@@ -1074,6 +1280,28 @@ - page popupLight - } - -+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 -+ 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 -+ } -+ - Hotspot mSwipeNext - Attributes - Scope : local -@@ -1892,6 +2120,169 @@ - covx tTmp.txt,sys0,0,0 - hSlider4.maxval=sys0 - } -+ // get Type -+ spstr strCommand.txt,type5.txt,"~",27 -+ // get internal name -+ spstr strCommand.txt,entn5.txt,"~",28 -+ 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,"~",29 -+ vis tIcon5,1 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",30 -+ covx tTmp.txt,sys0,0,0 -+ tIcon5.pco=sys0 -+ // set name -+ spstr strCommand.txt,tEntity5.txt,"~",31 -+ 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,"~",32 -+ // 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,"~",32 -+ covx tTmp.txt,sys0,0,0 -+ btOnOff5.val=sys0 -+ } -+ if(type5.txt=="text") -+ { -+ 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,"~",32 -+ } -+ if(type5.txt=="button") -+ { -+ 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,"~",32 -+ } -+ 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,"~",32 -+ //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 -+ } - } - if(tInstruction.txt=="pageType") - { -diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-24 14:34:14.167683442 +0000 -@@ -34,7 +34,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 275 -+ Max. Text Size: 270 - - Variable (string) entn - Attributes -diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-24 14:34:14.167683442 +0000 -@@ -142,7 +142,7 @@ - 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 tVersion -@@ -177,7 +177,7 @@ - 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 -diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-24 14:34:14.167683442 +0000 -@@ -455,22 +455,6 @@ - vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 -- vis tForecast1,0 -- vis tF1Icon,0 -- vis tForecast1Val,0 -- //move forecast values to the right -- tForecast4.txt=tForecast3.txt -- tForecast3.txt=tForecast2.txt -- tForecast2.txt=tForecast1.txt -- tForecast4Val.txt=tForecast3Val.txt -- tForecast3Val.txt=tForecast2Val.txt -- tForecast2Val.txt=tForecast1Val.txt -- tF4Icon.txt=tF3Icon.txt -- tF3Icon.txt=tF2Icon.txt -- tF2Icon.txt=tF1Icon.txt -- tF4Icon.pco=tF3Icon.pco -- tF3Icon.pco=tF2Icon.pco -- tF2Icon.pco=tF1Icon.pco - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 +--- HMI/n2t-out ++++ HMI/US/portrait/n2t-out +├── file list +│ @@ -1,13 +1,12 @@ +│ Program.s.txt +│ cardAlarm.txt +│ cardEntities.txt +│ cardGrid.txt +│ cardMedia.txt +│ -cardPower.txt +│ cardQR.txt +│ cardThermo.txt +│ pageIcons.txt +│ pageStartup.txt +│ pageTest.txt +│ popupFan.txt +│ popupLight.txt +├── 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 +├── cardEntities.txt +│ @@ -61,14 +61,24 @@ +│ 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 +│ 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 +│ @@ -136,14 +146,26 @@ +│ +│ Variable (string) entn4 +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 80 +│ +│ +Variable (string) entn5 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 80 +│ + +│ +Variable (string) type5 +│ + Attributes +│ + Scope : local +│ + Text : +│ + Max. Text Size: 10 +│ + +│ Variable (string) tSend +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 200 +│ +│ Number nNum1 +│ @@ -178,14 +200,23 @@ +│ 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 +│ + +│ Text tHeading +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ @@ -298,14 +329,34 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 50 +│ +│ +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 tIcon5 +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text :  +│ + Max. Text Size : 5 +│ + +│ Picture p0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -417,14 +468,42 @@ +│ 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 +│ + +│ Button bDown1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -874,14 +953,114 @@ +│ 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 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 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 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 +│ + +│ Dual-state Button btOnOff1 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ State : unpressed +│ @@ -982,14 +1161,41 @@ +│ 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 +│ + +│ Hotspot mSpecial +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -1107,14 +1313,41 @@ +│ page popupLight +│ } +│ if(type4.txt=="fan") +│ { +│ page popupFan +│ } +│ +│ +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 +│ + } +│ + +│ Hotspot mSwipeNext +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ +│ @@ -1826,14 +2059,163 @@ +│ 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,"~",27 +│ + // get internal name +│ + spstr strCommand.txt,entn5.txt,"~",28 +│ + 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,"~",29 +│ + vis tIcon5,1 +│ + // change icon color +│ + spstr strCommand.txt,tTmp.txt,"~",30 +│ + covx tTmp.txt,sys0,0,0 +│ + tIcon5.pco=sys0 +│ + // set name +│ + spstr strCommand.txt,tEntity5.txt,"~",31 +│ + 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,"~",32 +│ + // 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,"~",32 +│ + covx tTmp.txt,sys0,0,0 +│ + btOnOff5.val=sys0 +│ + } +│ + if(type5.txt=="text") +│ + { +│ + 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,"~",32 +│ + } +│ + if(type5.txt=="button") +│ + { +│ + 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,"~",32 +│ + } +│ + 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,"~",32 +│ + //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 +│ + } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ sleepValue=0 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +├── pageStartup.txt +│ @@ -138,15 +138,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 tVersion +│ 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 +├── popupFan.txt +│┄ ordering differences only +│ @@ -78,31 +78,31 @@ +│ Value: 1 +│ +│ Variable (int32) mode_temp +│ Attributes +│ Scope: local +│ Value: 0 +│ +│ -Variable (int32) vaModePos +│ - Attributes +│ - Scope: local +│ - Value: 0 +│ - +│ -Variable (string) vaModeList +│ +Variable (string) vaModeCur +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 400 +│ +│ -Variable (string) vaModeCur +│ +Variable (string) vaModeList +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 400 +│ +│ +Variable (int32) vaModePos +│ + Attributes +│ + Scope: local +│ + Value: 0 +│ + +│ Variable (string) tSend +│ Attributes +│ Scope : local +│ Text : +│ Max. Text Size: 200 +│ +│ Text tEntity +│ @@ -253,60 +253,60 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ -Button bMode3 +│ +Button bMode2 +│ 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=vaModePos.val-1 +│ + sys2=vaModePos.val-2 +│ covx sys2,tTmp.txt,0,0 +│ 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 +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ +│ -Button bMode2 +│ +Button bMode3 +│ 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=vaModePos.val-2 +│ + sys2=vaModePos.val-1 +│ covx sys2,tTmp.txt,0,0 +│ tSend.txt+="mode-sel,"+tTmp.txt +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC +│ crcputh 55 bb +│ crcputs sys0,2