diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..c5cb60e7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,23 @@ +--- +name: Bug report +about: "[Bug] Create a report to help us improve" +title: "[BUG] " +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior + +**Screenshots** +If applicable, add a picture to help explain your problem. + +**AppDaemon Logs** +Please check the appdaemon log for any errors add the log to this issue. (Settings > Add-ons > AppDaemon > Log) + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 00000000..295c47fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,17 @@ +--- +name: Feature request +about: "[Feature Request] Suggest an idea for this project" +title: "[Feature Request] " +labels: enhancement +assignees: '' + +--- + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Additional context** +Add any other context or screenshots about the feature request here. + +**Panel / Firmware Version** +Please add the Panel/Firmware Version you are using (EU, US-L or US-P) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index d77612e4..accf6e3e 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -79,4 +79,4 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: ${{ steps.last-commit-message.outputs.msg }} (add nextion2text) - file_pattern: "**.txt" + #file_pattern: "**.txt" diff --git a/HMI/README.md b/HMI/README.md index 5b57dd70..9f0592f7 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -77,7 +77,7 @@ change the page type: `weatherUpdate~tMainIcon~tMainText~tForecast1~tF1Icon~tForecast1Val~tForecast2~tF2Icon~tForecast2Val~tForecast3~tF3Icon~tForecast3Val~tForecast4~tF4Icon~tForecast4Val~optionalLayoutIcon~optionalLayoutText` -`color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainIconAlt~tMainTextAlt~tMRIcon~tMR` +`color~background~time~timeAMPM~date~tMainIcon~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tF1Icon~tF2Icon~tF3Icon~tF4Icon~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMRIcon~tMR` `notify~heading~text` @@ -185,7 +185,7 @@ The following message can be used to update the content on the cardEntities Page `event,buttonPress2,internalNameEntity,colorTempSlider,50` -`event,buttonPress2,internalNameEntity,colorWheel,x|y` +`event,buttonPress2,internalNameEntity,colorWheel,x|y|wh` ### popupShutter Page diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6d6eb9f3..5373664e 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 06:20:45.196459256 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 21:20:55.900415426 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,21 +8,96 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -683,10 +683,7 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal ++ dim=dimValue + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -1924,10 +1924,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -846,10 +846,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -635,10 +635,7 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal ++ dim=dimValue + } + if(tInstruction.txt=="timeout") + { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 06:20:45.196459256 +0000 -@@ -34,7 +34,7 @@ - Attributes - Scope : local - Text : -- Max. Text Size: 275 -+ Max. Text Size: 270 - - Variable (string) entn - Attributes +--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -581,10 +581,7 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal ++ dim=dimValue + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -1169,10 +1169,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 06:20:45.196459256 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 21:20:55.900415426 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -32,3 +107,69 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +@@ -273,10 +273,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt +--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -560,10 +560,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-29 21:20:55.900415426 +0000 +@@ -310,10 +310,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -405,10 +405,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="time") + { +diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-29 21:20:55.904415457 +0000 +@@ -397,9 +397,6 @@ + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + dim=dimValue +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 + } + if(tInstruction.txt=="time") + { diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 0669f985..84e52341 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1013,24 +1013,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1050,24 +1033,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1087,24 +1053,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1168,25 +1117,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text arm1 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index a80481ef..28d83f18 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2036,24 +2036,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -2073,24 +2056,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -2110,24 +2076,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -2191,25 +2140,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 7115454f..537c73a9 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -976,24 +976,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1013,24 +996,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1050,24 +1016,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1131,25 +1080,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 52ba5c7a..15083a7c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -895,24 +895,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -932,24 +915,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -969,24 +935,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1050,25 +999,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index b0eb93c1..6f11a74b 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -43,7 +43,7 @@ Variable (string) strCommand ID : 6 Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes @@ -597,24 +597,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -634,24 +617,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -671,24 +637,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -753,25 +702,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text qrcode diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 77fcf2ea..5cdaea0c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -458,10 +458,10 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 26 - y coordinate : 200 - Width : 97 - Height : 30 + x coordinate : 22 + y coordinate : 186 + Width : 115 + Height : 60 Effect : load Effect Priority : 0 Effect Time : 300 @@ -475,8 +475,8 @@ Text tStatus Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 - Word wrap : disabled + Max. Text Size : 40 + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -518,9 +518,9 @@ Text tCurTempLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 28 - y coordinate : 85 - Width : 95 + x coordinate : 24 + y coordinate : 84 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -548,9 +548,9 @@ Text tStateLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 - y coordinate : 162 - Width : 95 + x coordinate : 23 + y coordinate : 152 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -608,9 +608,9 @@ Text tALbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 22 + x coordinate : 9 y coordinate : 260 - Width : 67 + Width : 80 Height : 30 Effect : load Effect Priority : 0 @@ -668,9 +668,9 @@ Text tCurTemp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 28 - y coordinate : 121 - Width : 95 + x coordinate : 24 + y coordinate : 118 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -1566,24 +1566,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1603,24 +1586,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1640,24 +1606,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1721,25 +1670,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 5c0fc908..a06ec260 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -18,45 +18,45 @@ pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code -screensaver - 35 Component(s) - 296 Line(s) of event code - 237 Unique line(s) of event code -cardAlarm - 38 Component(s) - 364 Line(s) of event code - 224 Unique line(s) of event code -cardGrid - 42 Component(s) - 439 Line(s) of event code - 254 Unique line(s) of event code +cardThermo + 56 Component(s) + 542 Line(s) of event code + 292 Unique line(s) of event code popupShutter 20 Component(s) 244 Line(s) of event code 138 Unique line(s) of event code -popupLight - 27 Component(s) - 345 Line(s) of event code - 187 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code -cardMedia - 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code cardQR 30 Component(s) - 363 Line(s) of event code - 207 Unique line(s) of event code + 359 Line(s) of event code + 209 Unique line(s) of event code +popupLight + 27 Component(s) + 348 Line(s) of event code + 188 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 256 Unique line(s) of event code +cardAlarm + 38 Component(s) + 360 Line(s) of event code + 226 Unique line(s) of event code +cardMedia + 33 Component(s) + 346 Line(s) of event code + 181 Unique line(s) of event code +screensaver + 37 Component(s) + 305 Line(s) of event code + 244 Unique line(s) of event code cardEntities 65 Component(s) - 1133 Line(s) of event code - 491 Unique line(s) of event code + 1129 Line(s) of event code + 493 Unique line(s) of event code Total 13 Page(s) - 402 Component(s) - 4458 Line(s) of event code - 1167 Unique line(s) of event code + 404 Component(s) + 4446 Line(s) of event code + 1177 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 6b1c61b9..b8d04f7e 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 35 + Text : 36 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 115a4ef2..386a4486 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -461,6 +461,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index b3756ba7..c2b90de5 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -50,27 +50,34 @@ Variable (string) strCommand Variable (string) tId Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 25 + ID : 24 Scope: local Value: 0 Variable (string) tInstruction Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 32 + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 34 Scope : local Text : Max. Text Size: 50 @@ -83,10 +90,10 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 52 y coordinate : 0 - Width : 451 - Height : 150 + Width : 376 + Height : 154 Effect : load Effect Priority : 0 Effect Time : 300 @@ -114,8 +121,8 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 150 - Width : 451 + y coordinate : 154 + Width : 450 Height : 38 Effect : load Effect Priority : 0 @@ -135,7 +142,7 @@ Text tDate Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tMainIcon Attributes ID : 7 Scope : local @@ -143,38 +150,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 420 - y coordinate : 2 - Width : 29 - 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 : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainIcon - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 x coordinate : 41 - y coordinate : 202 + y coordinate : 206 Width : 70 Height : 66 Effect : load @@ -197,14 +174,14 @@ Text tMainIcon Text tMainText Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 22 - y coordinate : 267 + y coordinate : 271 Width : 110 Height : 43 Effect : load @@ -227,14 +204,14 @@ Text tMainText Text tForecast1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 143 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 26 Effect : load @@ -257,14 +234,14 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 140 - y coordinate : 276 + y coordinate : 280 Width : 71 Height : 25 Effect : load @@ -287,14 +264,14 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 161 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -317,14 +294,14 @@ Text tF1Icon Text tForecast2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 227 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -347,14 +324,14 @@ Text tForecast2 Text tF2Icon Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 243 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -377,14 +354,14 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 227 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -407,14 +384,14 @@ Text tForecast2Val Text t10 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 61 - y coordinate : 195 + y coordinate : 199 Width : 360 Height : 2 Effect : load @@ -437,14 +414,14 @@ Text t10 Text tAMPM Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 358 - y coordinate : 48 + y coordinate : 49 Width : 104 Height : 57 Effect : load @@ -467,14 +444,14 @@ Text tAMPM Text tForecast3Val Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 307 - y coordinate : 277 + y coordinate : 281 Width : 71 Height : 25 Effect : load @@ -497,14 +474,14 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 324 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -527,14 +504,14 @@ Text tF3Icon Text tForecast3 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 308 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -557,14 +534,14 @@ Text tForecast3 Text tForecast4 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 389 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -587,14 +564,14 @@ Text tForecast4 Text tF4Icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 405 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -617,14 +594,14 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 389 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -647,14 +624,14 @@ Text tForecast4Val Text tMainTextAlt Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 119 - y coordinate : 210 + y coordinate : 214 Width : 106 Height : 42 Effect : load @@ -677,14 +654,14 @@ Text tMainTextAlt Text tMainIconAlt Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 221 + y coordinate : 225 Width : 100 Height : 66 Effect : load @@ -707,14 +684,14 @@ Text tMainIconAlt Text tMRIcon Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 116 - y coordinate : 266 + y coordinate : 270 Width : 40 Height : 35 Effect : load @@ -737,14 +714,14 @@ Text tMRIcon Text tMR Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 159 - y coordinate : 270 + y coordinate : 274 Width : 62 Height : 21 Effect : load @@ -767,14 +744,14 @@ Text tMR Text tNotifyHead Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 201 + y coordinate : 205 Width : 450 Height : 58 Effect : load @@ -797,14 +774,14 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 258 + y coordinate : 262 Width : 450 Height : 47 Effect : load @@ -825,6 +802,66 @@ Text tNotifyText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tIcon1 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 8 + y coordinate : 0 + Width : 38 + Height : 38 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 434 + y coordinate : 0 + Width : 38 + Height : 38 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -992,9 +1029,20 @@ Timer tmSerial 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 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -1010,6 +1058,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -1030,8 +1080,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -1059,12 +1111,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") @@ -1150,7 +1198,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 1000 Enabled : yes diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index f076f39d..3b44119a 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -475,24 +475,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -503,24 +486,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -531,24 +497,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -611,25 +560,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text arm1 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 0440bb4f..84a12478 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1083,24 +1083,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1111,24 +1094,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1139,24 +1105,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1219,25 +1168,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 12d623a0..90641005 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -531,24 +531,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -559,24 +542,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -587,24 +553,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -667,25 +616,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 3cfbfe02..35913768 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -465,24 +465,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -493,24 +476,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -521,24 +487,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -601,25 +550,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 50ada2f8..d9fe4bd4 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -34,7 +34,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes @@ -326,24 +326,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -354,24 +337,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -382,24 +348,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -463,25 +412,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text qrcode diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 34644168..4cf78ed9 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -227,7 +227,7 @@ Text tStatus Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 40 Text tCF1 Attributes @@ -804,24 +804,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -832,24 +815,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -860,24 +826,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -940,25 +889,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index ee1a0274..c69ffa5c 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 35 + Text : 36 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 3e3da25b..4c4b5703 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -209,6 +209,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 48a71dd0..bd952279 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -62,6 +62,12 @@ Variable (string) tTmp Text : Max. Text Size: 50 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -82,16 +88,6 @@ Text tDate Text : Tuesday, 08. March 2022 Max. Text Size : 35 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Text tMainIcon Attributes Scope : local @@ -312,6 +308,26 @@ Text tNotifyText Text : Max. Text Size : 35 +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + +Text tIcon2 + 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 @@ -468,9 +484,20 @@ Timer tmSerial 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 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -486,6 +513,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -506,8 +535,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -535,12 +566,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 66af8c32..ba393bfd 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index a6da9efe..269ffae2 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt index 3e84edcd..af11a2ff 100644 --- a/HMI/US/portrait/diff-eu-version-known-good.txt +++ b/HMI/US/portrait/diff-eu-version-known-good.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +0000 +--- 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 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //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-06 19:28:27.798491086 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000 +--- 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 @@ -294,10 +294,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + page popupLight + } + - Timer tmSerial + Hotspot mSwipeNext Attributes - Scope : local -@@ -1644,6 +1872,128 @@ + Scope : local +@@ -1892,6 +2120,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -340,24 +340,43 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 -+ spstr tId.txt,tTmp.txt,"|",0 -+ if(tTmp.txt=="0") ++ // 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 ++ }else if(tTmp.txt=="enable") + { + bUp5.pco=65535 ++ spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,1 + } -+ spstr tId.txt,tTmp.txt,"|",1 -+ if(tTmp.txt=="0") ++ // 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 ++ }else if(tTmp.txt=="enable") + { + bDown5.pco=65535 ++ spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,1 + } + } @@ -448,9 +467,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } 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-06 19:28:27.798491086 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +0000 +--- 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 @@ -469,3 +500,29 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //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 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 2acf4f1f..a48e1bff 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 21:20:55.500412348 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,24 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -683,10 +683,7 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal ++ dim=dimValue + } + if(tInstruction.txt=="timeout") + { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 21:20:55.500412348 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -297,7 +312,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes Scope : local -@@ -1892,6 +2120,169 @@ +@@ -1849,6 +2077,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -467,9 +482,49 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { +@@ -1924,10 +2315,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -846,10 +846,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -635,10 +635,7 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal ++ dim=dimValue + } + if(tInstruction.txt=="timeout") + { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 21:20:55.500412348 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -479,9 +534,35 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes +@@ -581,10 +581,7 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal ++ dim=dimValue + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -1169,10 +1169,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 21:20:55.500412348 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -500,3 +581,92 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC +@@ -273,10 +273,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -560,10 +560,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -310,10 +310,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="timeout") + { +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -405,10 +405,6 @@ + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 +- dim=dimValueNormal + } + if(tInstruction.txt=="time") + { +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -397,9 +397,6 @@ + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + dim=dimValue +- // get value normal +- spstr strCommand.txt,tTmp.txt,"~",2 +- covx tTmp.txt,dimValueNormal,0,0 + } + if(tInstruction.txt=="time") + { +@@ -474,22 +471,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 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 6a6d5af8..a4094d2a 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,47 +1,157 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-23 06:20:44.752453318 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-23 06:20:44.736453105 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-23 06:20:44.300447274 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-23 06:20:44.736453105 +0000 -+ Hotspot mSwipeNext -+ Scope : local -+@@ -1892,6 +2120,169 @@ -++ // up button -++ spstr tId.txt,tTmp.txt,"|",3 -++ if(tTmp.txt=="disable") -++ spstr tId.txt,bUp5.txt,"|",0 -++ }else if(tTmp.txt=="enable") -++ spstr tId.txt,bUp5.txt,"|",0 -++ // 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") -++ spstr tId.txt,bDown5.txt,"|",2 -++ }else if(tTmp.txt=="enable") -++ spstr tId.txt,bDown5.txt,"|",2 -+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-23 06:20:44.736453105 +0000 -+@@ -34,7 +34,7 @@ -+ Attributes -+ Scope : local -+ Text : -+- Max. Text Size: 275 -++ Max. Text Size: 270 -+ -+ Variable (string) entn -+ Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-23 06:20:44.736453105 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 21:20:55.512412440 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 21:20:55.500412348 +0000 ++diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ++--- HMI/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -683,10 +683,7 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal +++ dim=dimValue ++ } ++ if(tInstruction.txt=="timeout") ++ { ++--- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -1849,6 +2077,169 @@ ++@@ -1924,10 +2315,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="timeout") ++ { ++diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ++--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -846,10 +846,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="timeout") ++ { ++diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ++--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -635,10 +635,7 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal +++ dim=dimValue ++ } ++ if(tInstruction.txt=="timeout") ++ { ++--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -581,10 +581,7 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal +++ dim=dimValue ++ } ++ if(tInstruction.txt=="timeout") ++ { ++diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ++--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -1169,10 +1169,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="timeout") ++ { ++--- HMI/n2t-out/pageStartup.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -273,10 +273,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="timeout") ++ { ++diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ++--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -560,10 +560,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="timeout") ++ { ++diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ++--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -310,10 +310,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="timeout") ++ { ++diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ++--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -405,10 +405,6 @@ ++ // get value ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++- dim=dimValueNormal ++ } ++ if(tInstruction.txt=="time") ++ { ++--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 21:20:55.500412348 +0000 ++@@ -397,9 +397,6 @@ ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,dimValue,0,0 ++ dim=dimValue ++- // get value normal ++- spstr strCommand.txt,tTmp.txt,"~",2 ++- covx tTmp.txt,dimValueNormal,0,0 ++ } ++ if(tInstruction.txt=="time") ++ { ++@@ -474,22 +471,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index b25bdace..242b4086 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -1013,24 +1013,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1050,24 +1033,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1087,24 +1053,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1168,25 +1117,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text arm1 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 0efd53d3..3861fe1b 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2457,24 +2457,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -2494,24 +2477,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -2531,24 +2497,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -2612,25 +2561,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 85bcd160..f96db85a 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -976,24 +976,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1013,24 +996,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1050,24 +1016,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1131,25 +1080,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 5a041859..33d54b08 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -895,24 +895,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -932,24 +915,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -969,24 +935,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1050,25 +999,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 0ede21e2..3145a9e8 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -597,24 +597,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -634,24 +617,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -671,24 +637,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -753,25 +702,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text qrcode diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 785f3d1d..dff61ab0 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -159,7 +159,7 @@ XFloat xTempDest1 Send Component ID : disabled Opacity : 127 x coordinate : 174 - y coordinate : 219 + y coordinate : 227 Width : 120 Height : 60 Effect : load @@ -189,7 +189,7 @@ XFloat xTempMin1 Send Component ID : disabled Opacity : 127 x coordinate : 262 - y coordinate : 172 + y coordinate : 180 Width : 50 Height : 22 Effect : load @@ -219,7 +219,7 @@ XFloat xTempMax1 Send Component ID : disabled Opacity : 127 x coordinate : 262 - y coordinate : 194 + y coordinate : 202 Width : 45 Height : 20 Effect : load @@ -249,7 +249,7 @@ XFloat xTempStep1 Send Component ID : disabled Opacity : 127 x coordinate : 263 - y coordinate : 282 + y coordinate : 290 Width : 45 Height : 20 Effect : load @@ -279,7 +279,7 @@ XFloat xTempDest2 Send Component ID : disabled Opacity : 127 x coordinate : 21 - y coordinate : 219 + y coordinate : 227 Width : 120 Height : 60 Effect : load @@ -309,7 +309,7 @@ XFloat xTempMin2 Send Component ID : disabled Opacity : 127 x coordinate : 110 - y coordinate : 170 + y coordinate : 178 Width : 50 Height : 21 Effect : load @@ -339,7 +339,7 @@ XFloat xTempMax2 Send Component ID : disabled Opacity : 127 x coordinate : 110 - y coordinate : 192 + y coordinate : 200 Width : 45 Height : 20 Effect : load @@ -369,7 +369,7 @@ XFloat xTempStep2 Send Component ID : disabled Opacity : 127 x coordinate : 111 - y coordinate : 280 + y coordinate : 288 Width : 45 Height : 20 Effect : load @@ -399,7 +399,7 @@ XFloat xTempDest Send Component ID : disabled Opacity : 127 x coordinate : 100 - y coordinate : 220 + y coordinate : 228 Width : 120 Height : 60 Effect : load @@ -458,10 +458,10 @@ Text tStatus Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 191 - y coordinate : 119 - Width : 97 - Height : 30 + x coordinate : 174 + y coordinate : 110 + Width : 115 + Height : 56 Effect : load Effect Priority : 0 Effect Time : 300 @@ -475,8 +475,8 @@ Text tStatus Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 - Word wrap : disabled + Max. Text Size : 40 + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -489,7 +489,7 @@ Text tCF1 Send Component ID : disabled Opacity : 127 x coordinate : 295 - y coordinate : 217 + y coordinate : 225 Width : 25 Height : 30 Effect : load @@ -518,9 +518,9 @@ Text tCurTempLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 35 - y coordinate : 82 - Width : 95 + x coordinate : 30 + y coordinate : 76 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -548,9 +548,9 @@ Text tStateLbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 192 - y coordinate : 81 - Width : 95 + x coordinate : 174 + y coordinate : 75 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -579,7 +579,7 @@ Text tCF2 Send Component ID : disabled Opacity : 127 x coordinate : 142 - y coordinate : 217 + y coordinate : 225 Width : 25 Height : 30 Effect : load @@ -608,9 +608,9 @@ Text tALbl Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 - y coordinate : 403 - Width : 67 + x coordinate : 15 + y coordinate : 402 + Width : 83 Height : 30 Effect : load Effect Priority : 0 @@ -639,7 +639,7 @@ Text tCF Send Component ID : disabled Opacity : 127 x coordinate : 221 - y coordinate : 217 + y coordinate : 225 Width : 25 Height : 30 Effect : load @@ -668,9 +668,9 @@ Text tCurTemp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 35 - y coordinate : 118 - Width : 95 + x coordinate : 30 + y coordinate : 112 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -1209,7 +1209,7 @@ Dual-state Button btUp1 Send Component ID : disabled Opacity : 127 x coordinate : 210 - y coordinate : 168 + y coordinate : 176 Width : 50 Height : 50 Effect : load @@ -1267,7 +1267,7 @@ Dual-state Button btDown1 Send Component ID : disabled Opacity : 127 x coordinate : 210 - y coordinate : 280 + y coordinate : 288 Width : 50 Height : 50 Effect : load @@ -1325,7 +1325,7 @@ Dual-state Button bUp2 Send Component ID : disabled Opacity : 127 x coordinate : 57 - y coordinate : 168 + y coordinate : 176 Width : 50 Height : 50 Effect : load @@ -1383,7 +1383,7 @@ Dual-state Button bDown2 Send Component ID : disabled Opacity : 127 x coordinate : 57 - y coordinate : 280 + y coordinate : 288 Width : 50 Height : 50 Effect : load @@ -1441,7 +1441,7 @@ Dual-state Button btUp Send Component ID : disabled Opacity : 127 x coordinate : 136 - y coordinate : 169 + y coordinate : 177 Width : 50 Height : 50 Effect : load @@ -1499,7 +1499,7 @@ Dual-state Button btDown Send Component ID : disabled Opacity : 127 x coordinate : 136 - y coordinate : 281 + y coordinate : 289 Width : 50 Height : 50 Effect : load @@ -1566,24 +1566,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1603,24 +1586,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1640,24 +1606,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1721,25 +1670,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name 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 04503939..f6ce3b55 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 @@ -2,6 +2,10 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code +cardAlarm + 38 Component(s) + 360 Line(s) of event code + 226 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -14,49 +18,45 @@ popupNotify 17 Component(s) 200 Line(s) of event code 125 Unique line(s) of event code +cardGrid + 42 Component(s) + 435 Line(s) of event code + 256 Unique line(s) of event code +popupLight + 27 Component(s) + 348 Line(s) of event code + 188 Unique line(s) of event code +cardQR + 30 Component(s) + 359 Line(s) of event code + 209 Unique line(s) of event code +cardMedia + 33 Component(s) + 346 Line(s) of event code + 181 Unique line(s) of event code +cardThermo + 56 Component(s) + 542 Line(s) of event code + 292 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code 115 Unique line(s) of event code -cardGrid - 42 Component(s) - 439 Line(s) of event code - 254 Unique line(s) of event code -popupLight - 27 Component(s) - 345 Line(s) of event code - 187 Unique line(s) of event code -cardQR - 30 Component(s) - 363 Line(s) of event code - 207 Unique line(s) of event code -cardThermo - 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code -cardAlarm - 38 Component(s) - 364 Line(s) of event code - 224 Unique line(s) of event code -cardMedia - 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code -screensaver - 35 Component(s) - 296 Line(s) of event code - 237 Unique line(s) of event code popupShutter 20 Component(s) 244 Line(s) of event code 138 Unique line(s) of event code +screensaver + 37 Component(s) + 290 Line(s) of event code + 229 Unique line(s) of event code cardEntities 77 Component(s) - 1363 Line(s) of event code - 576 Unique line(s) of event code + 1359 Line(s) of event code + 578 Unique line(s) of event code Total 13 Page(s) - 414 Component(s) - 4688 Line(s) of event code - 1239 Unique line(s) of event code + 416 Component(s) + 4661 Line(s) of event code + 1234 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index ddbc233b..ecc64ae6 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 35 + Text : 36 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 3d5b2156..6a5b36c6 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -153,7 +153,7 @@ Text t1 Send Component ID : disabled Opacity : 127 x coordinate : 10 - y coordinate : 319 + y coordinate : 341 Width : 240 Height : 30 Effect : load @@ -183,7 +183,7 @@ Text t2 Send Component ID : disabled Opacity : 127 x coordinate : 10 - y coordinate : 360 + y coordinate : 382 Width : 45 Height : 30 Effect : load @@ -439,10 +439,10 @@ Picture pColorWheel Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 160 - y coordinate : 69 - Width : 160 - Height : 160 + x coordinate : 67 + y coordinate : 89 + Width : 245 + Height : 245 Effect : load Effect Priority : 0 Effect Time : 300 @@ -461,6 +461,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -482,7 +485,7 @@ Slider hBrightness Send Component ID : disabled Opacity : 127 x coordinate : 61 - y coordinate : 354 + y coordinate : 376 Width : 250 Height : 43 Effect : load diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index cb7debc3..ed75a9df 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -50,27 +50,34 @@ Variable (string) strCommand Variable (string) tId Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 25 + ID : 24 Scope: local Value: 0 Variable (string) tInstruction Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 32 + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 34 Scope : local Text : Max. Text Size: 50 @@ -135,7 +142,7 @@ Text tDate Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tMainIcon Attributes ID : 7 Scope : local @@ -143,38 +150,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 19 - y coordinate : 450 - Width : 27 - 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 : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainIcon - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 x coordinate : 125 - y coordinate : 241 + y coordinate : 254 Width : 70 Height : 65 Effect : load @@ -197,14 +174,14 @@ Text tMainIcon Text tMainText Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 111 - y coordinate : 305 + y coordinate : 318 Width : 110 Height : 42 Effect : load @@ -227,14 +204,14 @@ Text tMainText Text tForecast1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 5 - y coordinate : 368 + y coordinate : 377 Width : 71 Height : 25 Effect : load @@ -257,14 +234,14 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 2 - y coordinate : 434 + y coordinate : 443 Width : 70 Height : 24 Effect : load @@ -287,14 +264,14 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 23 - y coordinate : 397 + y coordinate : 406 Width : 40 Height : 34 Effect : load @@ -317,14 +294,14 @@ Text tF1Icon Text tForecast2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 86 - y coordinate : 369 + y coordinate : 378 Width : 71 Height : 24 Effect : load @@ -347,14 +324,14 @@ Text tForecast2 Text tF2Icon Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 103 - y coordinate : 397 + y coordinate : 406 Width : 40 Height : 34 Effect : load @@ -377,14 +354,14 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 83 - y coordinate : 434 + y coordinate : 443 Width : 71 Height : 24 Effect : load @@ -407,14 +384,14 @@ Text tForecast2Val Text t10 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 49 - y coordinate : 225 + y coordinate : 233 Width : 225 Height : 2 Effect : load @@ -437,7 +414,7 @@ Text t10 Text tAMPM Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -467,14 +444,14 @@ Text tAMPM Text tForecast3Val Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 435 + y coordinate : 444 Width : 70 Height : 23 Effect : load @@ -497,14 +474,14 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 183 - y coordinate : 398 + y coordinate : 407 Width : 40 Height : 33 Effect : load @@ -527,14 +504,14 @@ Text tF3Icon Text tForecast3 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 167 - y coordinate : 370 + y coordinate : 379 Width : 70 Height : 23 Effect : load @@ -557,14 +534,14 @@ Text tForecast3 Text tForecast4 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 247 - y coordinate : 370 + y coordinate : 379 Width : 70 Height : 23 Effect : load @@ -587,14 +564,14 @@ Text tForecast4 Text tF4Icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 263 - y coordinate : 398 + y coordinate : 407 Width : 40 Height : 33 Effect : load @@ -617,14 +594,14 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 246 - y coordinate : 435 + y coordinate : 444 Width : 70 Height : 23 Effect : load @@ -647,14 +624,14 @@ Text tForecast4Val Text tMainTextAlt Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 203 - y coordinate : 249 + x coordinate : 184 + y coordinate : 262 Width : 105 Height : 41 Effect : load @@ -677,14 +654,14 @@ Text tMainTextAlt Text tMainIconAlt Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 100 - y coordinate : 260 + x coordinate : 44 + y coordinate : 273 Width : 100 Height : 65 Effect : load @@ -707,14 +684,14 @@ Text tMainIconAlt Text tMRIcon Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 201 - y coordinate : 304 + x coordinate : 182 + y coordinate : 317 Width : 40 Height : 34 Effect : load @@ -737,14 +714,14 @@ Text tMRIcon Text tMR Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 243 - y coordinate : 309 + x coordinate : 224 + y coordinate : 322 Width : 61 Height : 20 Effect : load @@ -767,14 +744,14 @@ Text tMR Text tNotifyHead Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 240 + y coordinate : 253 Width : 320 Height : 58 Effect : load @@ -797,14 +774,14 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 298 + y coordinate : 311 Width : 320 Height : 58 Effect : load @@ -825,6 +802,66 @@ Text tNotifyText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tIcon1 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 8 + y coordinate : 220 + Width : 33 + 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 : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 282 + y coordinate : 220 + Width : 33 + 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 : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -979,22 +1016,17 @@ Timer tmSerial 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 } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -1010,6 +1042,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -1030,8 +1064,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -1059,12 +1095,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") @@ -1150,7 +1182,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 1000 Enabled : yes diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index f076f39d..3b44119a 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -475,24 +475,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -503,24 +486,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -531,24 +497,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -611,25 +560,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text arm1 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 8805505a..96e2e362 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1311,24 +1311,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1339,24 +1322,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1367,24 +1333,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1447,25 +1396,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 12d623a0..90641005 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -531,24 +531,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -559,24 +542,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -587,24 +553,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -667,25 +616,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 3cfbfe02..35913768 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -465,24 +465,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -493,24 +476,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -521,24 +487,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -601,25 +550,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 50ada2f8..348cea14 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -326,24 +326,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -354,24 +337,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -382,24 +348,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -463,25 +412,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text qrcode diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 34644168..4cf78ed9 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -227,7 +227,7 @@ Text tStatus Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 40 Text tCF1 Attributes @@ -804,24 +804,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -832,24 +815,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -860,24 +826,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -940,25 +889,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 8c5a41dc..f1ab9aef 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 35 + Text : 36 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 3e3da25b..4c4b5703 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -209,6 +209,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 48a71dd0..96c870e3 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -62,6 +62,12 @@ Variable (string) tTmp Text : Max. Text Size: 50 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -82,16 +88,6 @@ Text tDate Text : Tuesday, 08. March 2022 Max. Text Size : 35 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Text tMainIcon Attributes Scope : local @@ -312,6 +308,26 @@ Text tNotifyText Text : Max. Text Size : 35 +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + +Text tIcon2 + 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 @@ -455,22 +471,17 @@ Timer tmSerial 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 } //tMR spstr strCommand.txt,tMR.txt,"~",16 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -486,6 +497,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -506,8 +519,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -535,12 +550,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 3c12e6a7..42cefbcc 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index c91f8f7e..caeda4c7 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index fb94fe66..d0537d4a 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -7,7 +7,7 @@ head = sharedhead + """ """ + navigation print(head) start = 3 -for i in range(1,6): +for i in range(1,5): idxstart = start + (i-1)*6 item = f""" // get Type diff --git a/HMI/code_gen/pages/font-char.py b/HMI/code_gen/pages/font-char.py new file mode 100644 index 00000000..5853044d --- /dev/null +++ b/HMI/code_gen/pages/font-char.py @@ -0,0 +1,159 @@ +unicode_ranges="0000-007F," #Basic Latin +unicode_ranges+="0080-00FF," #C1 Controls and Latin-1 Supplement +unicode_ranges+="0100-017F," #Latin Extended-A +unicode_ranges+="0180-024F," #Latin Extended-B +#unicode_ranges+="0250-02AF," #IPA Extensions +#unicode_ranges+="02B0-02FF," #Spacing Modifier Letters +#unicode_ranges+="0300-036F," #Combining Diacritical Marks +unicode_ranges+="0370-03FF," #Greek/Coptic +unicode_ranges+="0400-04FF," #Cyrillic +#unicode_ranges+="0500-052F," #Cyrillic Supplement +#unicode_ranges+="0530-058F," #Armenian +unicode_ranges+="0590-05FF," #Hebrew +unicode_ranges+="0600-06FF," #Arabic +#unicode_ranges+="0700-074F," #Syriac +#unicode_ranges+="0750-077F," #Undefined +#unicode_ranges+="0780-07BF," #Thaana +#unicode_ranges+="07C0-08FF," #Undefined +#unicode_ranges+="0900-097F," #Devanagari +#unicode_ranges+="0980-09FF," #Bengali/Assamese +#unicode_ranges+="0A00-0A7F," #Gurmukhi +#unicode_ranges+="0A80-0AFF," #Gujarati +#unicode_ranges+="0B00-0B7F," #Oriya +#unicode_ranges+="0B80-0BFF," #Tamil +#unicode_ranges+="0C00-0C7F," #Telugu +#unicode_ranges+="0C80-0CFF," #Kannada +#unicode_ranges+="0D00-0DFF," #Malayalam +#unicode_ranges+="0D80-0DFF," #Sinhala +#unicode_ranges+="0E00-0E7F," #Thai +#unicode_ranges+="0E80-0EFF," #Lao +#unicode_ranges+="0F00-0FFF," #Tibetan +#unicode_ranges+="1000-109F," #Myanmar +unicode_ranges+="10A0-10FF," #Georgian +#unicode_ranges+="1100-11FF," #Hangul Jamo +#unicode_ranges+="1200-137F," #Ethiopic +#unicode_ranges+="1380-139F," #Undefined +#unicode_ranges+="13A0-13FF," #Cherokee +#unicode_ranges+="1400-167F," #Unified Canadian Aboriginal Syllabics +#unicode_ranges+="1680-169F," #Ogham +#unicode_ranges+="16A0-16FF," #Runic +#unicode_ranges+="1700-171F," #Tagalog +#unicode_ranges+="1720-173F," #Hanunoo +#unicode_ranges+="1740-175F," #Buhid +#unicode_ranges+="1760-177F," #Tagbanwa +#unicode_ranges+="1780-17FF," #Khmer +#unicode_ranges+="1800-18AF," #Mongolian +#unicode_ranges+="18B0-18FF," #Undefined +#unicode_ranges+="1900-194F," #Limbu +#unicode_ranges+="1950-197F," #Tai Le +#unicode_ranges+="1980-19DF," #Undefined +#unicode_ranges+="19E0-19FF," #Khmer Symbols +#unicode_ranges+="1A00-1CFF," #Undefined +#unicode_ranges+="1D00-1D7F," #Phonetic Extensions +#unicode_ranges+="1D80-1DFF," #Undefined +#unicode_ranges+="1E00-1EFF," #Latin Extended Additional +#unicode_ranges+="1F00-1FFF," #Greek Extended +#unicode_ranges+="2000-206F," #General Punctuation +#unicode_ranges+="2070-209F," #Superscripts and Subscripts +#unicode_ranges+="20A0-20CF," #Currency Symbols +#unicode_ranges+="20D0-20FF," #Combining Diacritical Marks for Symbols +#unicode_ranges+="2100-214F," #Letterlike Symbols +#unicode_ranges+="2150-218F," #Number Forms +#unicode_ranges+="2190-21FF," #Arrows +#unicode_ranges+="2200-22FF," #Mathematical Operators +#unicode_ranges+="2300-23FF," #Miscellaneous Technical +#unicode_ranges+="2400-243F," #Control Pictures +#unicode_ranges+="2440-245F," #Optical Character Recognition +#unicode_ranges+="2460-24FF," #Enclosed Alphanumerics +#unicode_ranges+="2500-257F," #Box Drawing +#unicode_ranges+="2580-259F," #Block Elements +#unicode_ranges+="25A0-25FF," #Geometric Shapes +#unicode_ranges+="2600-26FF," #Miscellaneous Symbols +#unicode_ranges+="2700-27BF," #Dingbats +#unicode_ranges+="27C0-27EF," #Miscellaneous Mathematical Symbols-A +#unicode_ranges+="27F0-27FF," #Supplemental Arrows-A +#unicode_ranges+="2800-28FF," #Braille Patterns +#unicode_ranges+="2900-297F," #Supplemental Arrows-B +#unicode_ranges+="2980-29FF," #Miscellaneous Mathematical Symbols-B +#unicode_ranges+="2A00-2AFF," #Supplemental Mathematical Operators +#unicode_ranges+="2B00-2BFF," #Miscellaneous Symbols and Arrows +#unicode_ranges+="2C00-2E7F," #Undefined +#unicode_ranges+="2E80-2EFF," #CJK Radicals Supplement +#unicode_ranges+="2F00-2FDF," #Kangxi Radicals +#unicode_ranges+="2FE0-2EEF," #Undefined +#unicode_ranges+="2FF0-2FFF," #Ideographic Description Characters +#unicode_ranges+="3000-303F," #CJK Symbols and Punctuation +#unicode_ranges+="3040-309F," #Hiragana +#unicode_ranges+="30A0-30FF," #Katakana +#unicode_ranges+="3100-312F," #Bopomofo +#unicode_ranges+="3130-318F," #Hangul Compatibility Jamo +#unicode_ranges+="3190-319F," #Kanbun (Kunten) +#unicode_ranges+="31A0-31BF," #Bopomofo Extended +#unicode_ranges+="31C0-31EF," #Undefined +#unicode_ranges+="31F0-31FF," #Katakana Phonetic Extensions +#unicode_ranges+="3200-32FF," #Enclosed CJK Letters and Months +#unicode_ranges+="3300-33FF," #CJK Compatibility +#unicode_ranges+="3400-4DBF," #CJK Unified Ideographs Extension A +#unicode_ranges+="4DC0-4DFF," #Yijing Hexagram Symbols +#unicode_ranges+="4E00-9FAF," #CJK Unified Ideographs +#unicode_ranges+="9FB0-9FFF," #Undefined +#unicode_ranges+="A000-A48F," #Yi Syllables +#unicode_ranges+="A490-A4CF," #Yi Radicals +#unicode_ranges+="A4D0-ABFF," #Undefined +#unicode_ranges+="AC00-D7AF," #Hangul Syllables +#unicode_ranges+="D7B0-D7FF," #Undefined +#unicode_ranges+="D800-DBFF," #High Surrogate Area +#unicode_ranges+="DC00-DFFF," #Low Surrogate Area +#unicode_ranges+="E000-F8FF," #Private Use Area +#unicode_ranges+="F900-FAFF," #CJK Compatibility Ideographs +#unicode_ranges+="FB00-FB4F," #Alphabetic Presentation Forms +#unicode_ranges+="FB50-FDFF," #Arabic Presentation Forms-A +#unicode_ranges+="FE00-FE0F," #Variation Selectors +#unicode_ranges+="FE10-FE1F," #Undefined +#unicode_ranges+="FE20-FE2F," #Combining Half Marks +#unicode_ranges+="FE30-FE4F," #CJK Compatibility Forms +#unicode_ranges+="FE50-FE6F," #Small Form Variants +#unicode_ranges+="FE70-FEFF," #Arabic Presentation Forms-B +#unicode_ranges+="FF00-FFEF," #Halfwidth and Fullwidth Forms +#unicode_ranges+="FFF0-FFFF," #Specials +#unicode_ranges+="10000-1007F," #Linear B Syllabary +#unicode_ranges+="10080-100FF," #Linear B Ideograms +#unicode_ranges+="10100-1013F," #Aegean Numbers +#unicode_ranges+="10140-102FF," #Undefined +#unicode_ranges+="10300-1032F," #Old Italic +#unicode_ranges+="10330-1034F," #Gothic +#unicode_ranges+="10380-1039F," #Ugaritic +#unicode_ranges+="10400-1044F," #Deseret +#unicode_ranges+="10450-1047F," #Shavian +#unicode_ranges+="10480-104AF," #Osmanya +#unicode_ranges+="104B0-107FF," #Undefined +#unicode_ranges+="10800-1083F," #Cypriot Syllabary +#unicode_ranges+="10840-1CFFF," #Undefined +#unicode_ranges+="1D000-1D0FF," #Byzantine Musical Symbols +#unicode_ranges+="1D100-1D1FF," #Musical Symbols +#unicode_ranges+="1D200-1D2FF," #Undefined +#unicode_ranges+="1D300-1D35F," #Tai Xuan Jing Symbols +#unicode_ranges+="1D360-1D3FF," #Undefined +#unicode_ranges+="1D400-1D7FF," #Mathematical Alphanumeric Symbols +#unicode_ranges+="1D800-1FFFF," #Undefined +#unicode_ranges+="20000-2A6DF," #CJK Unified Ideographs Extension B +#unicode_ranges+="2A6E0-2F7FF," #Undefined +#unicode_ranges+="2F800-2FA1F," #CJK Compatibility Ideographs Supplement +#unicode_ranges+="2FAB0-DFFFF," #Unused +#unicode_ranges+="E0000-E007F," #Tags +#unicode_ranges+="E0080-E00FF," #Unused +#unicode_ranges+="E0100-E01EF," #Variation Selectors Supplement +#unicode_ranges+="E01F0-EFFFF," #Unused +#unicode_ranges+="F0000-FFFFD," #Supplementary Private Use Area-A +#unicode_ranges+="FFFFE-FFFFF," #Unused +#unicode_ranges+="100000-10FFFD," #Supplementary Private Use Area-B + +char_res_string = "" + +for r in unicode_ranges[:-1].split(","): + start = int('0x'+r.split('-')[0], 16) + end = int('0x'+r.split('-')[1], 16)+1 + print(start, end) + char_res_string += ''.join(chr(i) for i in range(start, end)) + +print(char_res_string) \ No newline at end of file diff --git a/HMI/code_gen/pages/shared.py b/HMI/code_gen/pages/shared.py index e0d61ece..78354d46 100644 --- a/HMI/code_gen/pages/shared.py +++ b/HMI/code_gen/pages/shared.py @@ -119,6 +119,10 @@ sharedfoot = """ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { @@ -146,25 +150,33 @@ navigation = """ if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } """ \ No newline at end of file diff --git a/HMI/fonts/(C) HMI NotoSans-Regular 24 (UTF_8).zi b/HMI/fonts/(C) HMI NotoSans-Regular 24 (UTF_8).zi new file mode 100644 index 00000000..a435ee5c Binary files /dev/null and b/HMI/fonts/(C) HMI NotoSans-Regular 24 (UTF_8).zi differ diff --git a/HMI/fonts/(C) HMI NotoSans-Regular 32 (UTF_8).zi b/HMI/fonts/(C) HMI NotoSans-Regular 32 (UTF_8).zi new file mode 100644 index 00000000..e9ea4ff5 Binary files /dev/null and b/HMI/fonts/(C) HMI NotoSans-Regular 32 (UTF_8).zi differ diff --git a/HMI/fonts/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi b/HMI/fonts/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi new file mode 100644 index 00000000..0127a05f Binary files /dev/null and b/HMI/fonts/(CJK) HMI NotoSans-Regular 24 (UTF_8).zi differ diff --git a/HMI/fonts/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi b/HMI/fonts/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi new file mode 100644 index 00000000..18f7066a Binary files /dev/null and b/HMI/fonts/(CJK) HMI NotoSans-Regular 32 (UTF_8).zi differ diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 1751be37..5a01ce8f 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1013,24 +1013,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1050,24 +1033,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1087,24 +1053,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1168,25 +1117,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text arm1 @@ -1283,7 +1240,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index e663d0b8..ec54ba94 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -2036,24 +2036,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -2073,24 +2056,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -2110,24 +2076,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -2191,25 +2140,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type @@ -2939,6 +2896,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 51e7c78e..6bafa672 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -976,24 +976,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1013,24 +996,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1050,24 +1016,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1131,25 +1080,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type @@ -1353,6 +1310,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index b2433dd3..4c082fca 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -895,24 +895,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -932,24 +915,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -969,24 +935,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1050,25 +999,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name @@ -1127,7 +1084,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 2c97a278..a46379fa 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -597,24 +597,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -634,24 +617,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -671,24 +637,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -753,25 +702,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text qrcode @@ -914,7 +871,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index fadb7fd9..0a6ad2db 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -459,9 +459,9 @@ Text tStatus Send Component ID : disabled Opacity : 127 x coordinate : 11 - y coordinate : 200 - Width : 97 - Height : 30 + y coordinate : 190 + Width : 115 + Height : 54 Effect : load Effect Priority : 0 Effect Time : 300 @@ -472,11 +472,11 @@ Text tStatus Back. Color : 6371 Font Color : 50712 Horizontal Alignment : center - Vertical Alignment : center + Vertical Alignment : top Input Type : character Text : - Max. Text Size : 10 - Word wrap : disabled + Max. Text Size : 40 + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -520,7 +520,7 @@ Text tCurTempLbl Opacity : 127 x coordinate : 13 y coordinate : 85 - Width : 95 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -549,8 +549,8 @@ Text tStateLbl Send Component ID : disabled Opacity : 127 x coordinate : 12 - y coordinate : 162 - Width : 95 + y coordinate : 156 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -610,7 +610,7 @@ Text tALbl Opacity : 127 x coordinate : 7 y coordinate : 260 - Width : 67 + Width : 74 Height : 30 Effect : load Effect Priority : 0 @@ -669,8 +669,8 @@ Text tCurTemp Send Component ID : disabled Opacity : 127 x coordinate : 13 - y coordinate : 121 - Width : 95 + y coordinate : 119 + Width : 115 Height : 30 Effect : load Effect Priority : 0 @@ -1566,24 +1566,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1603,24 +1586,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1640,24 +1606,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1721,25 +1670,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name @@ -1993,6 +1950,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 722f3d98..214aad4e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -10,53 +10,53 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 154 Line(s) of event code - 115 Unique line(s) of event code -cardMedia - 33 Component(s) - 350 Line(s) of event code - 179 Unique line(s) of event code popupNotify 17 Component(s) - 200 Line(s) of event code - 125 Unique line(s) of event code -screensaver - 35 Component(s) - 296 Line(s) of event code - 237 Unique line(s) of event code -popupLight - 27 Component(s) - 345 Line(s) of event code - 187 Unique line(s) of event code -cardQR - 30 Component(s) - 363 Line(s) of event code - 207 Unique line(s) of event code -popupShutter - 20 Component(s) - 244 Line(s) of event code - 138 Unique line(s) of event code -cardGrid - 42 Component(s) - 439 Line(s) of event code - 254 Unique line(s) of event code + 203 Line(s) of event code + 127 Unique line(s) of event code cardAlarm 38 Component(s) - 364 Line(s) of event code - 224 Unique line(s) of event code + 362 Line(s) of event code + 227 Unique line(s) of event code +popupShutter + 20 Component(s) + 247 Line(s) of event code + 140 Unique line(s) of event code +cardGrid + 42 Component(s) + 438 Line(s) of event code + 258 Unique line(s) of event code +popupLight + 27 Component(s) + 351 Line(s) of event code + 190 Unique line(s) of event code +cardMedia + 33 Component(s) + 348 Line(s) of event code + 182 Unique line(s) of event code +screensaver + 37 Component(s) + 307 Line(s) of event code + 245 Unique line(s) of event code +pageStartup + 19 Component(s) + 157 Line(s) of event code + 117 Unique line(s) of event code cardThermo 56 Component(s) - 546 Line(s) of event code - 290 Unique line(s) of event code + 545 Line(s) of event code + 294 Unique line(s) of event code cardEntities 65 Component(s) - 1133 Line(s) of event code - 491 Unique line(s) of event code + 1132 Line(s) of event code + 495 Unique line(s) of event code +cardQR + 30 Component(s) + 361 Line(s) of event code + 210 Unique line(s) of event code Total 13 Page(s) - 402 Component(s) - 4459 Line(s) of event code - 1168 Unique line(s) of event code + 404 Component(s) + 4476 Line(s) of event code + 1180 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 157539bd..68701029 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 35 + Text : 36 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -568,6 +568,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 62a672ea..a8890d71 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -461,6 +461,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -903,6 +906,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index e4ce7e39..a86ef261 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -519,6 +519,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index 9b7dc8a9..b49f09a6 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -690,6 +690,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 29e98118..fbf12811 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -50,27 +50,34 @@ Variable (string) strCommand Variable (string) tId Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 25 Variable (int32) vaTap Attributes - ID : 25 + ID : 24 Scope: local Value: 0 Variable (string) tInstruction Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 32 + ID : 31 + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + ID : 34 Scope : local Text : Max. Text Size: 50 @@ -83,10 +90,10 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 37 y coordinate : 0 - Width : 451 - Height : 150 + Width : 376 + Height : 154 Effect : load Effect Priority : 0 Effect Time : 300 @@ -114,8 +121,8 @@ Text tDate Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 150 - Width : 451 + y coordinate : 154 + Width : 450 Height : 38 Effect : load Effect Priority : 0 @@ -135,7 +142,7 @@ Text tDate Horizontal Spacing : 0 Vertical Spacing : 0 -Text tSend +Text tMainIcon Attributes ID : 7 Scope : local @@ -143,38 +150,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 405 - y coordinate : 2 - Width : 29 - 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 : 50 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMainIcon - Attributes - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 x coordinate : 26 - y coordinate : 202 + y coordinate : 206 Width : 70 Height : 66 Effect : load @@ -197,14 +174,14 @@ Text tMainIcon Text tMainText Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 7 - y coordinate : 267 + y coordinate : 271 Width : 110 Height : 43 Effect : load @@ -227,14 +204,14 @@ Text tMainText Text tForecast1 Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 128 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 26 Effect : load @@ -257,14 +234,14 @@ Text tForecast1 Text tForecast1Val Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 125 - y coordinate : 276 + y coordinate : 280 Width : 71 Height : 25 Effect : load @@ -287,14 +264,14 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 146 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -317,14 +294,14 @@ Text tF1Icon Text tForecast2 Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 212 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -347,14 +324,14 @@ Text tForecast2 Text tF2Icon Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 228 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -377,14 +354,14 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 212 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -407,14 +384,14 @@ Text tForecast2Val Text t10 Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 46 - y coordinate : 195 + y coordinate : 199 Width : 360 Height : 2 Effect : load @@ -437,14 +414,14 @@ Text t10 Text tAMPM Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 343 - y coordinate : 48 + y coordinate : 49 Width : 104 Height : 57 Effect : load @@ -467,14 +444,14 @@ Text tAMPM Text tForecast3Val Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 292 - y coordinate : 277 + y coordinate : 281 Width : 71 Height : 25 Effect : load @@ -497,14 +474,14 @@ Text tForecast3Val Text tF3Icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 309 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -527,14 +504,14 @@ Text tF3Icon Text tForecast3 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 293 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -557,14 +534,14 @@ Text tForecast3 Text tForecast4 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 374 - y coordinate : 210 + y coordinate : 214 Width : 72 Height : 25 Effect : load @@ -587,14 +564,14 @@ Text tForecast4 Text tF4Icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 390 - y coordinate : 239 + y coordinate : 243 Width : 40 Height : 35 Effect : load @@ -617,14 +594,14 @@ Text tF4Icon Text tForecast4Val Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 374 - y coordinate : 277 + y coordinate : 281 Width : 72 Height : 25 Effect : load @@ -647,14 +624,14 @@ Text tForecast4Val Text tMainTextAlt Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 104 - y coordinate : 210 + y coordinate : 214 Width : 106 Height : 42 Effect : load @@ -677,14 +654,14 @@ Text tMainTextAlt Text tMainIconAlt Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 221 + y coordinate : 225 Width : 100 Height : 66 Effect : load @@ -707,14 +684,14 @@ Text tMainIconAlt Text tMRIcon Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 101 - y coordinate : 266 + y coordinate : 270 Width : 40 Height : 35 Effect : load @@ -737,14 +714,14 @@ Text tMRIcon Text tMR Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 144 - y coordinate : 270 + y coordinate : 274 Width : 62 Height : 21 Effect : load @@ -767,14 +744,14 @@ Text tMR Text tNotifyHead Attributes - ID : 33 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 201 + y coordinate : 205 Width : 450 Height : 58 Effect : load @@ -797,14 +774,14 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 34 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 258 + y coordinate : 262 Width : 450 Height : 47 Effect : load @@ -825,6 +802,66 @@ Text tNotifyText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tIcon1 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 38 + Height : 38 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 413 + y coordinate : 0 + Width : 38 + Height : 38 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 0 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -905,6 +942,9 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 } if(tInstruction.txt=="time") { @@ -992,9 +1032,20 @@ Timer tmSerial 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 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -1010,6 +1061,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -1030,8 +1083,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -1059,12 +1114,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") @@ -1150,7 +1201,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 26 + ID : 25 Scope : local Period (ms): 1000 Enabled : yes diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index f076f39d..81e53cc7 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -475,24 +475,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -503,24 +486,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -531,24 +497,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -611,25 +560,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text arm1 @@ -726,7 +683,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 0440bb4f..24da68fb 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1083,24 +1083,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -1111,24 +1094,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -1139,24 +1105,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -1219,25 +1168,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type @@ -1967,6 +1924,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 12d623a0..ef68a62e 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -531,24 +531,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -559,24 +542,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -587,24 +553,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -667,25 +616,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } // get Type @@ -889,6 +846,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 3cfbfe02..4ea1c305 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -465,24 +465,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -493,24 +476,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -521,24 +487,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -601,25 +550,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name @@ -678,7 +635,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 7f60a8ea..442ce9f6 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -326,24 +326,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -354,24 +337,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -382,24 +348,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -463,25 +412,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //text qrcode @@ -624,7 +581,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 34644168..f86ac666 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -227,7 +227,7 @@ Text tStatus Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 40 Text tCF1 Attributes @@ -804,24 +804,7 @@ Hotspot mSwipeNext Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing right button if swiped on the right side of the screen - // - spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt=="1") - { - click bNext,1 - } + click bNext,1 Hotspot mSwipeUp Attributes @@ -832,24 +815,7 @@ Hotspot mSwipeUp Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing up button if swiped on the top side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="2") - { - click bPrev,1 - } + click bPrev,1 Hotspot mSwipePrev Attributes @@ -860,24 +826,7 @@ Hotspot mSwipePrev Events Touch Press Event - //This thin hotspot down the edge will intercept swipes - //from the bezel into the screen area before the - //Nextion register touch for any other components - - //IF the hotspot is 'layered' at the top (use the up - //arrow at the far left of the Nextion Editor Tool Bar). - // - //Calibrate how wide the edge hotspot has to be on your - //own physical device using this screen to test the - //x & y coordinates where the swipe is first detected.) - //--------------------------- - //The navigation text is stored as local variable within tld.txt - //Pressing left button if swiped on the left side of the screen - // - spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt=="1") - { - click bPrev,1 - } + click bPrev,1 Timer tmSerial Attributes @@ -940,25 +889,33 @@ Timer tmSerial if(tTmp.txt=="0") { vis bPrev,0 + tsw mSwipePrev,0 + tsw mSwipeUp,0 } if(tTmp.txt=="1") { vis bPrev,1 + tsw mSwipePrev,1 + tsw mSwipeUp,0 bPrev.txt="" } if(tTmp.txt=="2") { vis bPrev,1 + tsw mSwipePrev,0 + tsw mSwipeUp,1 bPrev.txt="" } spstr tId.txt,tTmp.txt,"|",1 if(tTmp.txt=="0") { vis bNext,0 + tsw mSwipeNext,0 } if(tTmp.txt=="1") { vis bNext,1 + tsw mSwipeNext,1 bNext.txt="" } //entity name @@ -1212,6 +1169,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 23c2525b..ba2760d4 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 35 + Text : 36 Max. Text Size : 10 Picture p0 @@ -273,6 +273,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 3e3da25b..437085c1 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -209,6 +209,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -557,6 +560,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 0f032184..58cbb0d5 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -310,6 +310,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 6c7b272d..f19300b7 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -405,6 +405,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 48a71dd0..0c688fa8 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -62,6 +62,12 @@ Variable (string) tTmp Text : Max. Text Size: 50 +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tTime Attributes Scope : local @@ -82,16 +88,6 @@ Text tDate Text : Tuesday, 08. March 2022 Max. Text Size : 35 -Text tSend - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - Text tMainIcon Attributes Scope : local @@ -312,6 +308,26 @@ Text tNotifyText Text : Max. Text Size : 35 +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 5 + +Text tIcon2 + 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 @@ -381,6 +397,9 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 } if(tInstruction.txt=="time") { @@ -468,9 +487,20 @@ Timer tmSerial 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 + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",20 + covx tTmp.txt,tIcon2.pco,0,0 } if(tInstruction.txt=="color") { @@ -486,6 +516,8 @@ Timer tmSerial tMRIcon.bco=tTime.bco tMR.bco=tTime.bco tMRIcon.bco=tTime.bco + tIcon1.bco=tTime.bco + tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco tForecast1Val.bco=tTime.bco tF1Icon.bco=tTime.bco @@ -506,8 +538,10 @@ Timer tmSerial covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 + tMainTextAlt.pco=tMainText.pco spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast1.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",8 @@ -535,12 +569,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMainIconAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMainTextAlt.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",21 covx tTmp.txt,tMR.pco,0,0 } if(tInstruction.txt=="notify") diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index c987175b..5d3fa909 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index fcc61be2..865c0a51 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/Nextion2Text.py b/Nextion2Text.py new file mode 100644 index 00000000..b6d51484 --- /dev/null +++ b/Nextion2Text.py @@ -0,0 +1,1842 @@ +""" +Nextion2Text by Max Zuidberg + +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. +""" + +from string import whitespace +import sys +from pathlib import Path +import struct +from typing import List +import argparse +import copy +import json + + +class IndentList(list): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.indent = 4 + self.indentLevel = 0 + self.indentStr = " " + self.emptyLinesLimit = 1 + self.emptyLinesCount = 0 + + def appendIndent(self, newStr): + newStr: str + if not newStr.strip(whitespace): + if self.emptyLinesCount < self.emptyLinesLimit: + self.emptyLinesCount += 1 + else: + return + else: + self.emptyLinesCount = 0 + self.append(self.indentLevel * self.indent * self.indentStr + newStr) + + def appendIndentLine(self, newStr): + newStr: str + if not newStr.endswith("\n"): + newStr += "\n" + self.appendIndent(newStr) + + +class Component: + """ + How the attributes dict is organized: + attributes: + "encoded" name: + -1: default interpretation: + name: Name by which the encoded name will be replaced + type: int/str/strlist/bool - how to decode the content + mapping: optional: replace the values by a string + 12: Optional interpretation if attribute is part of a component of type 12 + """ + codeEvents = { + "codesload": "Preinitialize Event", + "codesloadend": "Postinitialize Event", + "codesdown": "Touch Press Event", + "codesup": "Touch Release Event", + "codesunload": "Page Exit Event", + "codestimer": "Timer Event", + "codesplayend": "Play Complete Event", + } + attributes = { + "type": { + "name": "Type", + "struct": "i", + "mapping": { + #Needs to contain all types, even if some get overridden afterwards. Order here is used for sorting later + 121: "Page", + 52: "Variable", + 54: "Number", + 59: "XFloat", + 116: "Text", + 55: "Scrolling Text", + 112: "Picture", + 113: "Crop Picture", + 58: "QR Code", + 106: "Progress Bar", + 122: "Gauge", + 0: "Waveform", + 1: "Slider", + 98: "Button", + 53: "Dual-state Button", + 56: "Checkbox", + 57: "Radio", + 67: "Switch", + 61: "Combo Box", + 68: "Text Select", + 62: "SLText", + 4: "Audio", + 60: "External Picture", + 2: "Gmov", + 3: "Video", + 66: "Data Record", + 63: "File Stream", + 65: "File Browser", + 109: "Hotspot", + 51: "Timer", + 5: "TouchCap", + -1: "Unknown", + }, + "type": { + 52: { + "sta": { + 0: { + "mapping": { + 52: "Variable (int32)", + }, + }, + 1: { + "mapping": { + 52: "Variable (string)", + }, + }, + }, + }, + }, + + }, + "id": { + "name": "ID", + "struct": "i", + }, + "vscope": { + "name": "Scope", + "struct": "i", + "mapping": { + 0: "local", + 1: "global", + }, + }, + "objname": { + "name": "Object Name", + "struct": "s", + }, + "sta": { + "name": "Fill", + "struct": "i", + "vis": True, + "mapping": { + 0: "crop image", + 1: "solid color", + 2: "image", + }, + "type": { + 52: {#Variable + "vis": False, + "ignore": True, + "mapping": { + 0: "int32", + 1: "string", + }, + }, + 58: {#QR Code + "name": "Logo overlay", + "mapping": { + 0: "no", + 1: "yes", + }, + }, + 121: {#Page + "mapping": { + 0: "no background (white)", + 1: "solid color", + 2: "picture", + }, + }, + 106: {#Progress Bar + "mapping": { + 0: "solid color", + 1: "image", + }, + }, + }, + "model": { + "P": { + "mapping": { + 0: "crop image", + 1: "solid color", + 2: "image", + 3: "transparent", + }, + "type": { + 121: {# Page + "mapping": { + 0: "no background (transparent)", + 1: "solid color", + 2: "picture", + }, + }, + }, + }, + }, + }, + "psta": { + "struct": "i", + "name": "Cursor Fill", + "vis": True, + "mapping": { + 0: "circular", + 1: "image", + 2: "square", + }, + "model": { + -1: { + "ignore": True, + }, + "P": { + "ignore": False, + }, + }, + }, + "style": { + "name": "Style", + "struct": "i", + "vis": True, + "mapping": { + 0: "flat", + 1: "border", + 2: "3D down", + 3: "3D up", + 4: "3D auto", + }, + "sta": { + -1: { + "ignore": True, + }, + 1: { + "ignore": False, + } + } + }, + "key": { + "struct": "i", + "name": "Associated Keyboard", + "mapping": { + 255: "none", + }, + }, + "font": { + "struct": "i", + "name": "Font ID", + "vis": True, + }, + "pw": { + "struct": "i", + "name": "Input Type", + "vis": True, + "mapping": { + 0: "character", + 1: "password", + }, + }, + "val": { + "name": "Value", + "struct": "i", + "type": { + 1: { + "name": "Position", + }, + 52: { + "sta": { + 1 : { + "ignore": True, + }, + }, + }, + 53: { + "name": "State", + "mapping": { + 0: "unpressed", + 1: "pressed", + }, + }, + 98: 53, + 56: { + "name": "State", + "mapping": { + 0: "unpressed", + 1: "pressed", + }, + }, + 57: 56, + 122: { + "name": "Angle (deg)", + } + }, + }, + "txt": { + "name": "Text", + "struct": "s", + "type": { + 52: { + "sta": { + 0 : { + "ignore": True, + }, + }, + }, + }, + }, + "txt_maxl":{ + "name": "Max. Text Size", + "struct": "i", + "type": { + 52: { + "sta": { + 0 : { + "ignore": True, + }, + }, + }, + }, + }, + "isbr": { + "struct": "i", + "name": "Word wrap", + "vis": True, + "mapping": { + 0: "disabled", + 1: "enabled", + }, + }, + "vvs0": { + "struct": "i", + "name": "Significant digits left", + "vis": True, + "type": { + 55: {# Scrolling Text + "ignore": True, + }, + 122: {# Gauge + "model": { + -1: { + "ignore": True, + }, + "P": { + "name": "Head width" + }, + }, + }, + }, + }, + "vvs1": { + "struct": "i", + "name": "Significant digits right", + "vis": True, + "type": { + 55: {# Scrolling Text + "ignore": True, + }, + 122: { # Gauge + "model": { + -1: { + "ignore": True, + }, + "P": { + "name": "Center width" + }, + }, + }, + }, + }, + "vvs2": { + "struct": "i", + "vis": True, + "type": { + 55: {# Scrolling Text + "ignore": True, + }, + 122: { # Gauge + "model": { + -1: { + "ignore": True, + }, + "P": { + "name": "Foot width" + }, + }, + }, + }, + }, + "vvs3": { + "struct": "i", + "vis": True, + "type": { + 55: {# Scrolling Text + "ignore": True, + }, + }, + }, + "lenth": { + "struct": "i", + "name": "Significant digits shown", + "vis": True, + "mapping": { + 0: "all", + }, + }, + "format": { + "struct": "i", + "name": "Format", + "vis": True, + "mapping": { + 0: "decimal", + 1: "hexadecimal", + 2: "decimal with digit grouping" + }, + "type": { + 122: {# Gauge + "name": "Angle offset", + "mapping": dict(), #disable default mapping + }, + }, + }, + "tim": { + "struct": "i", + "name": "Period (ms)", + "type": { + -1: { + "vis": True, + }, + 51: {# Timer + "vis": False, + }, + }, + }, + "en": { + "struct": "i", + "name": "Enabled", + "mapping": { + 0: "no", + 1: "yes", + }, + "type": { + -1: { + "vis": True, + }, + 51: {# Timer + "vis": False, + }, + }, + }, + "dis": { + "struct": "i", + "name": "Corner Radius (Perc.)", + "vis": True, + "model": { + -1: { + "ignore": True, + }, + "P": { + "ignore": False, + "type": { + 0: { # Waveform + "ignore": True, + }, + 122: { # Gauge + "ignore": True, + }, + }, + }, + }, + }, + "spax": { + "struct": "i", + "name": "Horizontal Spacing", + "vis": True, + }, + "spay": { + "struct": "i", + "name": "Vertical Spacing", + "vis": True, + }, + "xcen": { + "struct": "i", + "name": "Horizontal Alignment", + "vis": True, + "mapping": { + 0: "left", + 1: "center", + 2: "right", + }, + }, + "ycen": { + "struct": "i", + "name": "Vertical Alignment", + "vis": True, + "mapping": { + 0: "top", + 1: "center", + 2: "bottom", + }, + }, + "x": { + "name": "x coordinate", + "struct": "i", + "vis": True, + "type": { + 121: {# Page + "ignore": True, + }, + }, + #"model": { + # "P": { + # "drag": { + # 1: { + # "name": "Initial x coord." + # }, + # }, + # }, + #}, + }, + "y": { + "name": "y coordinate", + "struct": "i", + "vis": True, + "type": { + 121: {# Page + "ignore": True, + }, + }, + #"model": { + # "P": { + # "drag": { + # 1: { + # "name": "Initial y coord." + # }, + # }, + # }, + #}, + }, + "w": { + "name": "Width", + "struct": "i", + "vis": True, + type: { + 121: {# Page + "ignore": True, + }, + }, + }, + "h": { + "name": "Height", + "struct": "i", + "vis": True, + "type": { + 121: {# Page + "ignore": True, + }, + }, + }, + "bco": { + "name": "Back. Color", + "struct": "i", + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 2: 0, + }, + "type": { + 53: {# Button + "name": "Back. Color (Unpressed)", + } + } + }, + "bco1": { + "name": "Slided Back. Color", + "struct": "i", + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 2: 0, + }, + }, + "bco2": { + "struct": "i", + "name": "Back. Color (Pressed)", + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 2: 0, + }, + }, + "pco": { + "name": "Font Color", + "struct": "i", + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 2: 0, + }, + "type": { + 58: { + "name": "Foreground Color" + }, + 53: { + "name": "Font Color (Unpressed)" + }, + 98: 53, + }, + }, + "pco0": { + "struct": "i", + "name": "Channel 0 Color", + "vis": True, + }, + "pco1": { + "struct": "i", + "name": "Channel 1 Color", + "vis": True, + "ch": { + 1: { + "ignore": True, + }, + }, + }, + "pco2": { + "name": "Font Color (Pressed)", + "struct": "i", + "vis": True, + "ignore": True, + "type": { + 53: { + "sta": { + 1: { + "ignore": False, + }, + }, + }, + 98: 53, + 0: {# Waveform + "name": "Channel 2 Color", + "ch": { + 3: { + "ignore": False, + }, + 4: { + "ignore": False, + }, + }, + }, + }, + }, + "pco3": { + "struct": "i", + "name": "Channel 3 Color", + "vis": True, + "ignore": True, + "ch": { + 4: { + "ignore": False, + }, + }, + }, + "pic": { + "name": "Back. Picture ID", + "struct": "i", + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 1: 0, + }, + "type": { + 112: {#Picture + "name": "Picture ID", + }, + 53: {#Button + "name": "Background Picture ID (Unpressed)" + }, + 98: 53, #Dual-State Button + 58: {#QR Code + "sta": { + 0: { + "ignore": True, + }, + 1: { + "ignore": False, + }, + }, + }, + }, + }, + "pic1": { + "name": "Slided Back. Picture ID", + "struct": "i", + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 1: 0, + }, + }, + "pic2": { + "name": "Back. Picture ID (Pressed)", + "struct": "i", + "ignore": True, + "vis": True, + "sta": { + 0: { + "ignore": True, + }, + 1: 0, + }, + "type": { + 53: {#Button + "ignore": False, + }, + 98: 53, + }, + }, + "picc": { + "name": "Cropped Back. Picture ID", + "struct": "i", + "vis": True, + "sta": { + 1: { + "ignore": True, + }, + 2: 1, + }, + "type": { + 53: { + "name": "Cropped Back. Picture ID (Unpressed)" + }, + 98: 53, + }, + }, + "picc1": { + "name": "Cropped Slided Back. Picture ID", + "struct": "i", + "vis": True, + "sta": { + 1: { + "ignore": True, + }, + 2: 1, + }, + }, + "picc2": { + "name": "Cropped Back. Picture ID (Pressed)", + "struct": "i", + "vis": True, + "sta": { + 1: { + "ignore": True, + }, + 2: 1, + }, + }, + "bpic": { + "struct": "i", + "name": "Background Picture ID", + "vis": True, + }, + "ppic": { + "struct": "i", + "name": "Foreground Picture ID", + "vis": True, + }, + + "dez": { + "name": "Direction", + "struct": "i", + "vis": True, + "mapping": { + 0: "horizontal", + 1: "vertical", + }, + }, + "dir": { + "struct": "i", + "name": "Direction", + "vis": True, + "type": { + 55: {# Scrolling Text + "mapping": { + 0: "left->right", + 1: "right->left", + 2: "top->bottom", + 3: "bottom->top", + }, + }, + 0: {# Waveform + "name": "Flow Direction", + "mapping": { + 0: "left->right", + 1: "right->left", + 2: "right aligned", + }, + }, + }, + }, + "borderc": { + "struct": "i", + "name": "Border Color", + "vis": True, + "style": { + -1: { + "ignore": True, + }, + 1: { + "ignore": False, + }, + }, + }, + "borderw": { + "struct": "i", + "name": "Border Width", + "vis": True, + "style": { + -1: { + "ignore": True, + }, + 1: { + "ignore": False, + }, + }, + }, + "mode": { + "name": "Direction", + "struct": "i", + "vis": True, + "mapping": { + 0: "horizontal", + 1: "vertical", + }, + "type": { + -1: { + "ignore": True, + }, + 1: { + "ignore": False, + }, + }, + }, + "maxval": { + "name": "Upper range limit", + "struct": "i", + "type": { + -1: { + "ignore": True, + }, + 1: { + "ignore": False, + }, + }, + }, + "minval": { + "name": "Lower range limit", + "struct": "i", + "type": { + -1: { + "ignore": True, + }, + 1: { + "ignore": False, + }, + }, + }, + "drag": { + "name": "Dragging", + "struct": "i", + "model": { + "T": { + "ignore": True, + }, + "K": "T", + "P": { + "type": { + 121: {# Page + "ignore": True + }, + }, + }, + }, + }, + "disup": { + "name": "Disable release event after dragging", + "struct": "i", + "model": { + "T": { + "ignore": True + }, + "K": "T", + "P": { + "type": { + 121: {# Page + "ignore": True + }, + }, + "drag": { + 0: { + "ignore": True + } + } + }, + }, + }, + "aph": { + "name": "Opacity", + "struct": "i", + "vis": True, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + }, + }, + "first": { + "name": "Effect Priority", + "struct": "i", + "vis": True, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + "P": { + "effect": { + 0: { + "ignore": True, + }, + }, + }, + }, + }, + "time": { + "name": "Effect Time", + "struct": "i", + "vis": True, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + "P": { + "effect": { + 0: { + "ignore": True, + }, + }, + }, + }, + }, + "sendkey": { + "name": "Send Component ID", + "struct": "i", + "mapping": { + 0: "disabled", + 1: "on release", + 2: "on press", + 3: "on press and release", + }, + }, + "movex": { + "name": "", + "struct": "i", + "vis": True, + "ignore": True + }, + "movey": { + "name": "", + "struct": "i", + "vis": True, + "ignore": True + }, + "endx": { + "name": "", + "struct": "i", + "vis": True, + "ignore": True + }, + "endy": { + "name": "", + "struct": "i", + "vis": True, + "ignore": True + }, + "effect": { + "name": "Effect", + "struct": "i", + "vis": True, + "mapping": { + 0: "load", + 1: "top fly into", + 2: "bottom fly into", + 3: "left fly into", + 4: "right fly into", + 5: "top left fly into", + 6: "top right fly into", + 7: "bottom left fly into", + 8: "bottom right fly into", + 9: "fade into the gradual change", + 10: "middle zoom", + }, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + }, + }, + "lockobj": { + "name": "Locked", + "struct": "i", + "mapping": { + 0: "no", + 1: "yes", + }, + "type": { + -1: { + "ignore": True, + }, + 121: { + "ignore": False, + }, + }, + }, + "groupid0": { + "struct": "i", + "ignore": True + }, + "groupid1": { + "struct": "i", + "ignore": True + }, + "ch": { + "struct": "i", + "ignore": True, + "type": { + 0: {# Waveform + "ignore": False, + }, + }, + "name": "Channel count", + }, + "gdc": { + "struct": "i", + "name": "Grid Color", + "vis": True, + }, + "gdw": { + "struct": "i", + "name": "Grid hor. spacing", + "vis": True, + }, + "gdh": { + "struct": "i", + "name": "Grid ver. spacing", + "vis": True, + }, + "wid": { + "struct": "i", + "vis": True, + "type": { + 1: {# Slider + "name": "Cursor width", + "mapping": { + 255: "auto", + }, + }, + 122: {# Gauge + "model": { + -1: { + "ignore": True, + }, + "P": { + "ignore": False, + "name": "Gauge Thickness", + }, + }, + }, + }, + }, + "hig": { + "struct": "i", + "vis": True, + "type": { + 1: {# Slider + "name": "Cursor height", + }, + 122: {# Gauge + "model": { + -1: { + "ignore": True, + }, + "P": { + "ignore": False, + "name": "Center circle dia.", + }, + }, + }, + }, + }, + "up": { + "name": "Swide up page ID", + "struct": "i", + "mapping": { + 255: "disabled", + }, + "type": { + 122: { # Gauge + "vis": True, + "name": "Head Length", + "mapping": { + 32767: "auto", + }, + }, + }, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + }, + }, + "down": { + "name": "Swide down page ID", + "struct": "i", + "mapping": { + 255: "disabled", + }, + "type": { + 122: { # Gauge + "vis": True, + "name": "Foot Length" + }, + }, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + }, + }, + "left": { + "name": "Swide left page ID", + "struct": "i", + "mapping": { + 255: "disabled", + }, + "type": { + 122: { # Gauge + "vis": True, + "name": "Head off-center" + }, + }, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + }, + }, + "right": { + "name": "Swide right page ID", + "struct": "i", + "mapping": { + 255: "disabled", + }, + "type": { + 122: { # Gauge + "vis": True, + "name": "Gauge Head Length" + }, + }, + "model": { + "T": { + "ignore": True, + }, + "K": "T", + }, + }, + "objWid": { + "struct": "i", + "ignore": True, + }, + "objHig": { + "struct": "i", + "ignore": True, + }, + "inittrue": { + "struct": "i", + "ignore": True, + }, + "molloc": { + "struct": "i", + "ignore": True, + }, + "molloc_s": { + "struct": "i", + "ignore": True, + }, + } + + def __init__(self, raw, modelSeries="T"): + self.components = [] + self.data = dict() + self.rawData = dict() + self.sloc = 0 + self.uniqueSloc = set() + self.propNameMaxLength = 0 + self.raw = raw + self.modelSeries = modelSeries + self.loadRawProperties() + + def __repr__(self): + repr = self.rawData["att"]["objname"] + data = self.parseRawProperties(customInclude=("type",), inplace=False) + if data and "Attributes" in data and Component.attributes["type"]["name"] in data["Attributes"]: + repr = data["Attributes"][Component.attributes["type"]["name"]] + " " + repr + return repr + + def getText(self, *args, **kwargs): + return "".join(self.getTextLines(*args, **kwargs)) + + def getTextLines(self, indentLevel=0, indent=4, emptyLinesLimit=1, + customExclude=("type", "objname"), **kwargs): + # Initialize resulting IndentList + result = IndentList() + result.indentStr = " " + result.indentLevel = indentLevel + result.indent = indent + result.emptyLinesLimit = emptyLinesLimit + result.appendIndentLine(self.__repr__()) + result.indentLevel += 1 + + # Parse rawData according to the given parameters + self.parseRawProperties(customExclude=customExclude, **kwargs) + if "Attributes" in self.data: + result.appendIndentLine("Attributes") + result.indentLevel += 1 + propNameMaxLength = max([len(k) for k in self.data["Attributes"].keys()]) + for prop, val in self.data["Attributes"].items(): + try: + val = val.replace("\r\n", "\\r\\n") + except: + pass + line = prop.ljust(propNameMaxLength, " ") + ": " + str(val) + result.appendIndentLine(line) + result.indentLevel -= 1 + result.appendIndentLine("") + if "Events" in self.data: + result.appendIndentLine("Events") + result.indentLevel += 1 + for event, code in self.data["Events"].items(): + code: str + result.appendIndentLine(event) + result.indentLevel += 1 + codeLines = code.split("\n") + for cl in codeLines: + originalLength = len(cl) + clStripped = cl.lstrip(" ") + clIndentLevel = (originalLength - len(clStripped)) // 2 + clStripped = result.indentStr * result.indent * clIndentLevel + clStripped + result.appendIndentLine(clStripped) + result.indentLevel -= 1 + result.appendIndentLine("") + result.indentLevel -=1 + result.appendIndentLine("") + return result + + def parseRawProperties(self, customInclude=tuple(), customExclude=tuple(), + includeVisual:bool=False, includeUnknown:int=0, + inplace=True, emptyEvents=False, + keepNames=False, keepValues=False, **kwargs): + + data = dict() + # Model name is considered as an "attribute", too. (needed to know the right interpretation; see below) + self.rawData["att"]["model"] = self.modelSeries + attributes = dict() + # The interpretation of any attribute can depend on other attributes. (see code below) + dependencies = set(Component.attributes.keys()) + dependencies.add("model") + for attName, attData in self.rawData["att"].items(): + if attName in customExclude: + continue + if attName in Component.attributes.keys(): + # Build dictionary that interpretes and ignores the right attributes. + # attProperties = dict() + # attProperties.update(self.attributes[attName]) + # Enforce deep copy + attProperties = copy.deepcopy(Component.attributes[attName]) + done = False + while not done: + done = True + keys = [k for k in attProperties.keys()] + for d in keys: + if d in dependencies: + done = False + if d in self.rawData["att"]: + val = self.rawData["att"][d] + foundVal = True + if val in attProperties[d]: + i = val + elif -1 in attProperties[d]: + i = -1 + else: + foundVal = False + if foundVal: + while not type(attProperties[d][i]) is dict: + vOld = i + i = attProperties[d][i] + attProperties[d].pop(vOld) + attProperties.update(attProperties[d][i]) + attProperties.pop(d) + if customInclude and attName not in customInclude: + attProperties["ignore"] = True + if ("vis" in attProperties and attProperties["vis"]) and not includeVisual: + attProperties["ignore"] = True + if (not "ignore" in attProperties or not attProperties["ignore"]): + if "name" in attProperties and not keepNames: + attName = attProperties["name"] + if "mapping" in attProperties and not keepValues: + if attData in attProperties["mapping"]: + attData = attProperties["mapping"][attData] + attributes[attName] = attData + elif attName != "model" and (includeUnknown or attName in customInclude): + if not attName in customInclude: + attName = "UNKNOWN " + attName + if len(attData) > 4 or includeUnknown == 2:#raw + attData = attData.decode("iso_8859_1") + elif includeUnknown == 3:#hex + attData = " ".join([hex(d)[2:] for d in attData]) + elif len(attData) <= 4: + val = 0 + for b in reversed(attData): + val = (val << 8) + b + attData = val + attributes[attName] = attData + data["Attributes"] = attributes + # model "attribute" is no longer needed and doesnt belong here anymore + self.rawData["att"].pop("model") + for attName, attData in self.rawData.items(): + if not attName.startswith("codes") or (not includeUnknown and attName not in Component.codeEvents): + continue + if not emptyEvents and not attData: + continue + if not "Events" in data: + data["Events"] = dict() + if attName in Component.codeEvents: + attName = Component.codeEvents[attName] + data["Events"][attName] = attData + if inplace: + self.data = data + else: + return data + + def loadRawProperties(self): + # First level parsing. Find all property entries + index = 0 + properties = list() + while index < len(self.raw): + length = struct.unpack_from(" +Seperate Page +
+ + This is the notification used by the backend for updates, opening it requires to the following commands to the CustomSend Topic: + + `pageType popupNotify` + + `entityUpdateDetail~internalName~heading~headingColor~button1text~button1color~button2text~tB2Color~notificationText~textColor~sleepTimeout` + + It is possible to exit from the page by sending `exitPopup` + +Send Message to the Panel combined with a buzzer sound: + + ```yaml +nspanel_popup_notification: + alias: Popup Notification + sequence: + - service: mqtt.publish + data: + topic: cmnd/tasmota_NsPanelTerrasse/Backlog + payload: CustomSend pageType~popupNotify; CustomSend entityUpdateDetail~id~{{ + title }}~65535~~~~~{{ message }}~65535~{{ timeout }}; Buzzer 2,2,2 + mode: single + icon: mdi:message-badge + ``` + +Send Message to the Panel: + + ```yaml +nspanel_popup_notification: + alias: Popup Notification + sequence: + - service: mqtt.publish + data: + topic: cmnd/tasmota_NsPanelTerrasse/Backlog + payload: CustomSend pageType~popupNotify; CustomSend entityUpdateDetail~id~{{ + title }}~65535~~~~~{{ message }}~65535~{{ timeout }} + mode: single + icon: mdi:message-badge + ``` + + + +
+Notification on screensaver +
+ + The screensaver can display Notifications by sending this command to the CustomSend topic: `notify~heading~text` + + +Send Message to the Screensaver combined with a buzzer sound: + + ```yaml +nspanel_screensaver_notification: + alias: Screensaver Notification + sequence: + - service: mqtt.publish + data: + topic: cmnd/tasmota_NsPanelTerrasse/Backlog + payload: CustomSend notify~{{ heading }}~{{ message }}; Buzzer 2,2,2 + mode: single + icon: mdi:message-badge + ``` + +Send Message to the Screensaver: + + ```yaml +nspanel_screensaver_notification: + alias: Screensaver Notification + sequence: + - service: mqtt.publish + data: + topic: cmnd/tasmota_NsPanelTerrasse/Backlog + payload: CustomSend notify~{{ heading }}~{{ message }} + mode: single + icon: mdi:message-badge + ``` + +
+ ## How to update @@ -641,9 +751,11 @@ Click redownload in the menu of the app in HACS. Select main version. +**!!! Wait for it to load, dropdown needs to be selectable again, otherwise it will download the latest release !!!** + ![hacs-main](doc-pics/hacs-main.png) -**Wait for it to load, dropdown needs to be selectable again** +**!!! Wait for it to load, dropdown needs to be selectable again, otherwise it will download the latest release !!!** Click download. diff --git a/appdaemon/README.md b/appdaemon/README.md index 230a0804..6c94b1f5 100644 --- a/appdaemon/README.md +++ b/appdaemon/README.md @@ -6,7 +6,14 @@ This folder contains some example configs Example config for appademon itself -## apps.yaml +## apps-simple.yaml "Simple" Example Config with all possible entity types +## screensaver-theme.yaml + +Example screensaver theme configuration. All entries are commented out but you can uncomment as appropriate to enable. + +## screensaver-theme-include + +Exmaple for screensaver theme configuration in seperate file to reuse it on muliple nspanels \ No newline at end of file diff --git a/appdaemon/appdaemon.yaml b/appdaemon/appdaemon.yaml index 567a072b..c979b64e 100644 --- a/appdaemon/appdaemon.yaml +++ b/appdaemon/appdaemon.yaml @@ -5,6 +5,7 @@ appdaemon: longitude: 4.0 elevation: 2 time_zone: Europe/Berlin +# invalid_yaml_warnings: 1 plugins: HASS: type: hass diff --git a/appdaemon/apps.yaml b/appdaemon/apps-simple.yaml similarity index 100% rename from appdaemon/apps.yaml rename to appdaemon/apps-simple.yaml diff --git a/appdaemon/apps-theme.yaml b/appdaemon/apps-theme.yaml new file mode 100644 index 00000000..75f9cc60 --- /dev/null +++ b/appdaemon/apps-theme.yaml @@ -0,0 +1,56 @@ +--- +nspanel-1: + module: nspanel-lovelace-ui + class: NsPanelLovelaceUIManager + config: + panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT" + panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend" + screensaver: + entity: weather.k3ll3r + theme: !include /config/appdaemon/apps/screensaver-theme.yaml + #background: [220, 0, 0] + #time: [220, 0, 255] + #timeAMPM: [220, 0, 255] + #date: [220, 0, 255] + #tMainIcon: [220, 0, 255] + #tMainText: [220, 0, 255] + #tForecast1: [220, 0, 255] + #tForecast2: [220, 0, 255] + #tForecast3: [220, 0, 255] + #tForecast4: [220, 0, 255] + #tF1Icon: [220, 0, 255] + #tF2Icon: [220, 0, 255] + #tF3Icon: [220, 0, 255] + #tF4Icon: [220, 0, 255] + #tForecast1Val: [220, 0, 255] + #tForecast2Val: [220, 0, 255] + #tForecast3Val: [220, 0, 255] + #tForecast4Val: [220, 0, 255] + #bar: [220, 0, 255] + #tMRIcon: [220, 0, 255] + #tMR: [220, 0, 255] + + #autoWeather automatically colors the screensaver weather icons based upon weather. Uncomment the following line to enable. + #autoWeather: true + + #If you have enabled autoWeather, the following options allow you to customise the colors used for autoWeather. + + #clear-night: [150, 150, 100] + #cloudy: [75, 75, 75] + #exceptional: [255, 50, 50] + #fog: [150, 150, 150] + #hail: [200, 200, 200] + #lightning: [200, 200, 0] + #lightning-rainy: [200, 200, 150] + #partlycloudy: [150, 150, 150] + #pouring: [50, 50, 255] + #rainy: [100, 100, 255] + #snowy: [150, 150, 150] + #snowy-rainy: [150, 150, 255] + #sunny: [255, 255, 0] + #windy: [150, 150, 150] + #windy-variant: [255, 125, 125] + cards: + - type: cardEntities + entities: + - entity: switch.example_item \ No newline at end of file diff --git a/appdaemon/screensaver-theme-include/apps.yaml b/appdaemon/screensaver-theme-include/apps.yaml new file mode 100644 index 00000000..dadd1545 --- /dev/null +++ b/appdaemon/screensaver-theme-include/apps.yaml @@ -0,0 +1,15 @@ +--- +nspanel-1: + module: nspanel-lovelace-ui + class: NsPanelLovelaceUIManager + config: + panelRecvTopic: "tele/tasmota_your_mqtt_topic/RESULT" + panelSendTopic: "cmnd/tasmota_your_mqtt_topic/CustomSend" + updateMode: "auto-notify" + screensaver: + entity: weather.k3ll3r + theme: !include /config/appdaemon/apps/screensaver-theme.yaml + cards: + - type: cardEntities + entities: + - entity: switch.example_item \ No newline at end of file diff --git a/appdaemon/screensaver-theme-include/screensaver-theme.yaml b/appdaemon/screensaver-theme-include/screensaver-theme.yaml new file mode 100644 index 00000000..77cf2ced --- /dev/null +++ b/appdaemon/screensaver-theme-include/screensaver-theme.yaml @@ -0,0 +1,46 @@ +#Uncomment by deleting the '#' and configure as you see fit. +#Colors are in the format [Red, Green, Blue] and can be numbers from 0-255 +#The items shoud be self-explanatory but tMRIcon affects the humidity icon and tMR affects the humidity text. + +#background: [220, 0, 0] +#time: [220, 0, 255] +#timeAMPM: [220, 0, 255] +#date: [220, 0, 255] +#tMainIcon: [220, 0, 255] +#tMainText: [220, 0, 255] +#tForecast1: [220, 0, 255] +#tForecast2: [220, 0, 255] +#tForecast3: [220, 0, 255] +#tForecast4: [220, 0, 255] +#tF1Icon: [220, 0, 255] +#tF2Icon: [220, 0, 255] +#tF3Icon: [220, 0, 255] +#tF4Icon: [220, 0, 255] +#tForecast1Val: [220, 0, 255] +#tForecast2Val: [220, 0, 255] +#tForecast3Val: [220, 0, 255] +#tForecast4Val: [220, 0, 255] +#bar: [220, 0, 255] +#tMRIcon: [220, 0, 255] +#tMR: [220, 0, 255] + +#autoWeather automatically colors the screensaver weather icons based upon weather. Uncomment the following line to enable. +#autoWeather: true + +#If you have enabled autoWeather, the following options allow you to customise the colors used for autoWeather. + +#clear-night: [150, 150, 100] +#cloudy: [75, 75, 75] +#exceptional: [255, 50, 50] +#fog: [150, 150, 150] +#hail: [200, 200, 200] +#lightning: [200, 200, 0] +#lightning-rainy: [200, 200, 150] +#partlycloudy: [150, 150, 150] +#pouring: [50, 50, 255] +#rainy: [100, 100, 255] +#snowy: [150, 150, 150] +#snowy-rainy: [150, 150, 255] +#sunny: [255, 255, 0] +#windy: [150, 150, 150] +#windy-variant: [255, 125, 125] diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py index 7ed583f5..9a6f5482 100644 --- a/apps/nspanel-lovelace-ui/luibackend/config.py +++ b/apps/nspanel-lovelace-ui/luibackend/config.py @@ -36,7 +36,7 @@ class Card(object): for e in self.entities: entityIds.append(e.entityId) # additional keys to check - add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4'] + add_ent_keys = ['weatherOverrideForecast1', 'weatherOverrideForecast2', 'weatherOverrideForecast3', 'weatherOverrideForecast4', 'statusIcon1', 'statusIcon2'] for ent_key in add_ent_keys: val = self.raw_config.get(ent_key) if val is not None: diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index 6025451a..bb1597d8 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -258,7 +258,7 @@ class LuiController(object): if button_type == "colorWheel": self._ha_api.log(value) value = value.split('|') - color = pos_to_color(int(value[0]), int(value[1])) + color = pos_to_color(int(value[0]), int(value[1]), int(value[2])) self._ha_api.log(color) self._ha_api.get_entity(entity_id).call_service("turn_on", rgb_color=color) diff --git a/apps/nspanel-lovelace-ui/luibackend/helper.py b/apps/nspanel-lovelace-ui/luibackend/helper.py index 035851e3..16e75d6f 100644 --- a/apps/nspanel-lovelace-ui/luibackend/helper.py +++ b/apps/nspanel-lovelace-ui/luibackend/helper.py @@ -11,8 +11,9 @@ def hsv2rgb(h, s, v): hsv = colorsys.hsv_to_rgb(h,s,v) return tuple(round(i * 255) for i in hsv) -def pos_to_color(x, y): - r = 160/2 +def pos_to_color(x, y, wh): + #r = 160/2 + r = wh/2 x = round((x - r) / r * 100) / 100 y = round((r - y) / r * 100) / 100 diff --git a/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py b/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py index 2c343cdc..232c8190 100644 --- a/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py +++ b/apps/nspanel-lovelace-ui/luibackend/icon_mapping.py @@ -6898,6 +6898,8 @@ icons = { } def get_icon_id(ma_name): + if "text:" in ma_name: + return ma_name.replace("text:","") ma_name = ma_name.replace("mdi:","") if ma_name in icons: return icons[ma_name] diff --git a/apps/nspanel-lovelace-ui/luibackend/icons.py b/apps/nspanel-lovelace-ui/luibackend/icons.py index 851ebdf5..c81cc58a 100644 --- a/apps/nspanel-lovelace-ui/luibackend/icons.py +++ b/apps/nspanel-lovelace-ui/luibackend/icons.py @@ -114,7 +114,13 @@ def map_to_mdi_name(ha_type, state=None, device_class=None, cardType=None): def get_icon_id_ha(ha_type, state=None, device_class=None, overwrite=None): if overwrite is not None: - return get_icon_id(overwrite) + if type(overwrite) is str: + return get_icon_id(overwrite) + if type(overwrite) is dict: + for overwrite_state, overwrite_icon in overwrite.items(): + if overwrite_state == state: + return get_icon_id(overwrite_icon) + return get_icon_id(map_to_mdi_name(ha_type, state, device_class)) def get_action_id_ha(ha_type, action, device_class=None, overwrite=None): diff --git a/apps/nspanel-lovelace-ui/luibackend/localization.py b/apps/nspanel-lovelace-ui/luibackend/localization.py index 51cf9618..7c50f543 100644 --- a/apps/nspanel-lovelace-ui/luibackend/localization.py +++ b/apps/nspanel-lovelace-ui/luibackend/localization.py @@ -2,6 +2,7 @@ translations = { 'af': { 'ACTIVATE': "Aktiveer", 'aux_heat': "Aanvullende hitte", + 'away_mode': "Wegmodus", 'cooling': "Koel Af", 'drying': "Droog Uit", 'fan': "Waaier", @@ -20,10 +21,16 @@ translations = { 'brightness': "Helderheid", 'color_temperature': "Kleur temperatuur", 'position': "Posisie", + 'state': "Toestand", + 'currently': "Tans", + 'operation': "Operasie", + 'fan_mode': "Waaier modus", + 'heating': "Verhit", }, 'ar': { 'ACTIVATE': "تفعيل", 'aux_heat': "حرارة Aux", + 'away_mode': "خارج المنزل", 'cooling': "تبريد", 'drying': "تجفيف", 'fan': "مروحة", @@ -42,10 +49,16 @@ translations = { 'brightness': "السطوع", 'color_temperature': "درجة حرارة اللون", 'position': "موضع", + 'state': "الحالة", + 'currently': "حاليا", + 'operation': "الوضع", + 'fan_mode': "وضع المروحة", + 'heating': "تدفئة", }, 'bg': { 'ACTIVATE': "Активирай", 'aux_heat': "Помощен нагревател", + 'away_mode': "Режим на отсъствие", 'cooling': "Охлаждане", 'drying': "Изсушаване", 'fan': "Вентилатор", @@ -65,11 +78,17 @@ translations = { 'brightness': "Яркост", 'color_temperature': "Цветова температура", 'position': "Позиция", + 'state': "Състояние", + 'currently': "В момента", + 'operation': "Режим", + 'fan_mode': "Режим на вентилатора", + 'heating': "Отопление", }, 'ca': { 'PRESS': "Prem", 'ACTIVATE': "Activar", 'aux_heat': "Calefactor auxiliar", + 'away_mode': "Mode absent", 'cooling': "Refredant", 'drying': "Assecant", 'fan': "Ventilació", @@ -89,11 +108,17 @@ translations = { 'brightness': "Brillantor", 'color_temperature': "Temperatura de color", 'position': "Posició", + 'state': "Estat", + 'currently': "Actual", + 'operation': "Funcionament", + 'fan_mode': "Velocitat ventilador", + 'heating': "Escalfant", }, 'cs': { 'PRESS': "Stisknutí", 'ACTIVATE': "Aktivovat", 'aux_heat': "Pomocné teplo", + 'away_mode': "Úsporný režim", 'cooling': "Chlazení", 'drying': "Sušení", 'fan': "Ventilátor", @@ -113,11 +138,17 @@ translations = { 'brightness': "Jas", 'color_temperature': "Teplota barvy", 'position': "Pozice", + 'state': "Stav", + 'currently': "Aktuálně", + 'operation': "Provoz", + 'fan_mode': "Režim ventilátoru", + 'heating': "Topení", }, 'da': { 'PRESS': "Tryk", 'ACTIVATE': "Aktiver", 'aux_heat': "Støtte-varme", + 'away_mode': "Ude af huset-modus", 'cooling': "Køling", 'drying': "Tørring", 'fan': "Blæser", @@ -137,11 +168,17 @@ translations = { 'brightness': "Lysstyrke", 'color_temperature': "Farvetemperatur", 'position': "Position", + 'state': "Tilstand", + 'currently': "Aktuelt", + 'operation': "Drifttype", + 'fan_mode': "Blæsertilstand", + 'heating': "Opvarmning", }, 'de': { 'PRESS': "Drücken", 'ACTIVATE': "Aktivieren", 'aux_heat': "Hilfswärme", + 'away_mode': "Abwesenheitsmodus", 'cooling': "Kühlung", 'drying': "Trocknen", 'fan': "Ventilator", @@ -161,11 +198,17 @@ translations = { 'brightness': "Helligkeit", 'color_temperature': "Farbtemperatur", 'position': "Position", + 'state': "Zustand", + 'currently': "Aktuell", + 'operation': "Aktion", + 'fan_mode': "Ventilator-Modus", + 'heating': "Heizung", }, 'el': { 'PRESS': "Πατήστε", 'ACTIVATE': "Ενεργοποίηση", 'aux_heat': "Βοηθητική θέρμανση", + 'away_mode': "Λειτουργία εκτός σπιτιού", 'cooling': "Ψύξη", 'drying': "Αφύγρανση", 'fan': "Ανεμιστήρας", @@ -185,11 +228,17 @@ translations = { 'brightness': "Φωτεινότητα", 'color_temperature': "Θερμοκρασία χρώματος", 'position': "Θέση", + 'state': "Κατάσταση", + 'currently': "Αυτή τη στιγμή", + 'operation': "Λειτουργία", + 'fan_mode': "Λειτουργία ανεμιστήρα", + 'heating': "Θέρμανση", }, 'en': { 'PRESS': "Press", 'ACTIVATE': "Activate", 'aux_heat': "Aux heat", + 'away_mode': "Away mode", 'cooling': "Cooling", 'drying': "Drying", 'fan': "Fan", @@ -209,11 +258,17 @@ translations = { 'brightness': "Brightness", 'color_temperature': "Color temperature", 'position': "Position", + 'state': "State", + 'currently': "Currently", + 'operation': "Operation", + 'fan_mode': "Fan mode", + 'heating': "Heating", }, 'es': { 'PRESS': "Pulsa", 'ACTIVATE': "Activar", 'aux_heat': "Calor auxiliar", + 'away_mode': "Fuera de casa", 'cooling': "Enfriando", 'drying': "Secando", 'fan': "Ventilador", @@ -233,11 +288,17 @@ translations = { 'brightness': "Brillo", 'color_temperature': "Temperatura del color", 'position': "Posición", + 'state': "Estado", + 'currently': "Actualmente", + 'operation': "Modo", + 'fan_mode': "Modo del ventilador", + 'heating': "Calentando", }, 'et': { 'PRESS': "Vajuta nuppu", 'ACTIVATE': "Aktiveeri", 'aux_heat': "Abiküte", + 'away_mode': "Eemal", 'cooling': "Jahutamine", 'drying': "Kuivatamine", 'fan': "Ventilaator", @@ -257,10 +318,16 @@ translations = { 'brightness': "Heledus", 'color_temperature': "Värvustemperatuur", 'position': "Asend", + 'state': "Olek", + 'currently': "Hetkel", + 'operation': "Töörežiim", + 'fan_mode': "Ventilaatori režiim", + 'heating': "Küte", }, 'fa': { 'ACTIVATE': "فعال سازی", 'aux_heat': "Aux گرما", + 'away_mode': "حالت بیرون", 'cooling': "خنک کننده", 'drying': "خشك كردن", 'fan': "فن", @@ -279,11 +346,17 @@ translations = { 'brightness': "روشنایی", 'color_temperature': "دمای رنگ", 'position': "موقعیت", + 'state': "حالت", + 'currently': "در حال حاضر", + 'operation': "عملیات", + 'fan_mode': "حالت فن", + 'heating': "گرمایش", }, 'fi': { 'PRESS': "Paina", 'ACTIVATE': "Aktivoi", 'aux_heat': "Lisälämpö", + 'away_mode': "Poissa kotoa -tila", 'cooling': "Jäähdytys", 'drying': "Kuivaus", 'fan': "Tuuletin", @@ -303,11 +376,17 @@ translations = { 'brightness': "Kirkkaus", 'color_temperature': "Värilämpötila", 'position': "Sijainti", + 'state': "Tila", + 'currently': "Tällä hetkellä", + 'operation': "Toiminto", + 'fan_mode': "Tuuletustila", + 'heating': "Lämmitys", }, 'fr': { 'PRESS': "Appui", 'ACTIVATE': "Activer", 'aux_heat': "Chauffage d'appoint", + 'away_mode': "Mode \"Absent\"", 'cooling': "Refroidissement", 'drying': "Séchage", 'fan': "Ventilateur", @@ -327,11 +406,17 @@ translations = { 'brightness': "Luminosité", 'color_temperature': "Température de couleur", 'position': "Position", + 'state': "État", + 'currently': "Actuellement", + 'operation': "Opération", + 'fan_mode': "Mode de ventilation", + 'heating': "En chauffe", }, 'he': { 'PRESS': "לחיצה", 'ACTIVATE': "הפעל", 'aux_heat': "מסייע חום", + 'away_mode': "מצב לא בבית", 'cooling': "קירור", 'drying': "מייבש", 'fan': "מאוורר", @@ -351,10 +436,16 @@ translations = { 'brightness': "בהירות", 'color_temperature': "טמפרטורת הצבע", 'position': "מיקום", + 'state': "מצב", + 'currently': "כעת", + 'operation': "פעולה", + 'fan_mode': "מצב מאורר", + 'heating': "חימום", }, 'hr': { 'ACTIVATE': "Aktivirati", 'aux_heat': "Pomoćno grijanje", + 'away_mode': "Način rada: Odsutan", 'cooling': "Hlađenje", 'drying': "Sušenje", 'fan': "Ventilator", @@ -373,11 +464,17 @@ translations = { 'brightness': "Svjetlina", 'color_temperature': "Temperatura boje", 'position': "Pozicija", + 'state': "Stanje", + 'currently': "Trenutno", + 'operation': "operacija", + 'fan_mode': "Način rada s ventilatorom", + 'heating': "Grijanje", }, 'hu': { 'PRESS': "Gombnyomás", 'ACTIVATE': "Aktiválás", 'aux_heat': "Külső hőforrás", + 'away_mode': "Távol mód", 'cooling': "Hűtés", 'drying': "Párátlanítás", 'fan': "Ventilátor", @@ -397,10 +494,16 @@ translations = { 'brightness': "Fényerő", 'color_temperature': "Színhőmérséklet", 'position': "Pozíció", + 'state': "Állapot", + 'currently': "Jelenleg", + 'operation': "Működés", + 'fan_mode': "Ventilátor", + 'heating': "Fűtés", }, 'hy': { 'ACTIVATE': "Ակտիվացնել", 'aux_heat': "Aux ջերմությունը", + 'away_mode': "հեռու ռեժիմ", 'cooling': "հովացում", 'drying': "Չորացում", 'fan': "Երկրպագու", @@ -418,11 +521,17 @@ translations = { 'brightness': "Պայծառություն", 'color_temperature': "Գունային ջերմաստիճան", 'position': "Դիրք", + 'state': "Պետություն", + 'currently': "Ներկայումս", + 'operation': "Գործողություն", + 'fan_mode': "Երկրպագուների ռեժիմ", + 'heating': "Տաքացում", }, 'id': { 'PRESS': "Tekan", 'ACTIVATE': "Aktifkan", 'aux_heat': "Pemanasan tambahan", + 'away_mode': "Mode keluar rumah", 'cooling': "Mendinginkan", 'drying': "Mengeringkan", 'fan': "Kipas", @@ -442,10 +551,16 @@ translations = { 'brightness': "Kecerahan", 'color_temperature': "Temperatur warna", 'position': "Posisi", + 'state': "Status", + 'currently': "Saat ini", + 'operation': "Operasi", + 'fan_mode': "Mode kipas", + 'heating': "Memanaskan", }, 'is': { 'PRESS': "Ýttu á", 'ACTIVATE': "Virkja", + 'away_mode': "Fjarverandi hamur", 'cooling': "Kæling", 'drying': "Þurrkun", 'fan': "Vifta", @@ -465,11 +580,17 @@ translations = { 'brightness': "Birtustig", 'color_temperature': "Litastig", 'position': "Staðsetning", + 'state': "Staða", + 'currently': "Er núna", + 'operation': "Aðgerð", + 'fan_mode': "Viftuhamur", + 'heating': "Kynding", }, 'it': { 'PRESS': "Premi", 'ACTIVATE': "Attiva", 'aux_heat': "Riscaldamento ausiliario", + 'away_mode': "Modalità assente", 'cooling': "Raffreddamento", 'drying': "Deumidificazione", 'fan': "Ventilatore", @@ -489,10 +610,16 @@ translations = { 'brightness': "Luminosità", 'color_temperature': "Temperatura colore", 'position': "Apertura", + 'state': "Stato", + 'currently': "Attualmente", + 'operation': "Operazione", + 'fan_mode': "Ventilazione", + 'heating': "Riscaldamento", }, 'lb': { 'ACTIVATE': "Aktivéieren", 'aux_heat': "Zousätzlech Heizung", + 'away_mode': "Modus Keen Doheem", 'cooling': "Ofkillen", 'drying': "Dréchnen", 'fan': "Ventilator", @@ -511,9 +638,15 @@ translations = { 'brightness': "Hellegkeet", 'color_temperature': "Faarf Temperatur", 'position': "Positioun", + 'state': "Zoustand", + 'currently': "Momentan", + 'operation': "Aktioun", + 'fan_mode': "Ventilatioun Modus", + 'heating': "Hëtzen", }, 'lt': { 'ACTIVATE': "Suaktyvinti", + 'away_mode': "Išvykimo režimas", 'cooling': "Aušinimas", 'drying': "Džiovinimas", 'fan': "Ventiliatorius", @@ -532,10 +665,16 @@ translations = { 'brightness': "Ryškumas", 'color_temperature': "Spalvos temperatūra", 'position': "Padėtis", + 'state': "Būsena", + 'currently': "Šiuo metu", + 'operation': "Operacija", + 'fan_mode': "Ventiliatoriaus režimas", + 'heating': "Šildymas", }, 'lv': { 'ACTIVATE': "Aktivizēt", 'aux_heat': "Ārējais sildītājs", + 'away_mode': "Prombūtnes režīms", 'cooling': "Dzesēšana", 'drying': "Žāvēšana", 'fan': "Ventilators", @@ -553,11 +692,17 @@ translations = { 'brightness': "Spilgtums", 'color_temperature': "Krāsu temperatūra", 'position': "Pozīcija", + 'state': "Stāvoklis", + 'currently': "Pašlaik", + 'operation': "Darbība", + 'fan_mode': "Ventilatora režīms", + 'heating': "Sildīšana", }, 'nb': { 'PRESS': "trykk", 'ACTIVATE': "Aktiver", 'aux_heat': "Aux varme", + 'away_mode': "Bortemodus", 'cooling': "Kjøling", 'drying': "Tørking", 'fan': "Vifte", @@ -577,11 +722,17 @@ translations = { 'brightness': "Lysstyrke", 'color_temperature': "Fargetemperatur", 'position': "Posisjon", + 'state': "Tilstand", + 'currently': "Er nå", + 'operation': "Operasjon", + 'fan_mode': "Viftemodus", + 'heating': "Oppvarming", }, 'nl': { 'PRESS': "Klik", 'ACTIVATE': "Activeren", 'aux_heat': "Extra warmte", + 'away_mode': "Afwezigheidsmodus", 'cooling': "Koelen", 'drying': "Ontvochtigen", 'fan': "Ventilator", @@ -601,10 +752,16 @@ translations = { 'brightness': "Helderheid", 'color_temperature': "Kleurtemperatuur", 'position': "Positie", + 'state': "Staat", + 'currently': "Momenteel", + 'operation': "Werking", + 'fan_mode': "Ventilatormodus", + 'heating': "Verwarmen", }, 'nn': { 'ACTIVATE': "Aktiver", 'aux_heat': "Aux-varme", + 'away_mode': "Bortemodus", 'cooling': "Nedkjøling", 'drying': "Tørkar", 'fan': "Vifte", @@ -624,11 +781,17 @@ translations = { 'brightness': "Lysstyrke", 'color_temperature': "Fargetemperatur", 'position': "Posisjon", + 'state': "Tilstand", + 'currently': "Akkurat no", + 'operation': "Operasjon", + 'fan_mode': "Viftemodus", + 'heating': "Oppvarming", }, 'pl': { 'PRESS': "Naciśnij", 'ACTIVATE': "Aktywuj", 'aux_heat': "Zewnętrznie podłączone źródło", + 'away_mode': "Tryb poza domem", 'cooling': "chłodzenie", 'drying': "osuszanie", 'fan': "wentylator", @@ -648,11 +811,17 @@ translations = { 'brightness': "Jasność", 'color_temperature': "Temperatura barwy", 'position': "Pozycja", + 'state': "Stan", + 'currently': "Obecnie", + 'operation': "Tryb pracy", + 'fan_mode': "Tryb nawiewu", + 'heating': "grzanie", }, 'pt': { 'PRESS': "Pressione", 'ACTIVATE': "Ativar", 'aux_heat': "Calor auxiliar", + 'away_mode': "Modo ausente", 'cooling': "Resfriar", 'drying': "Secagem", 'fan': "Ventoinha", @@ -671,10 +840,16 @@ translations = { 'brightness': "Brilho", 'color_temperature': "Temperatura de cor", 'position': "Posição", + 'state': "Estado", + 'currently': "Atualmente", + 'operation': "Operação", + 'fan_mode': "Modo ventilar", + 'heating': "Aquecimento", }, 'ro': { 'ACTIVATE': "Activați", 'aux_heat': "Încălzire auxiliară", + 'away_mode': "Mod plecat", 'cooling': "Racește", 'drying': "Usucă", 'fan': "Ventilator", @@ -694,11 +869,17 @@ translations = { 'brightness': "Luminozitate", 'color_temperature': "Temperatură de culoare", 'position': "Poziţie", + 'state': "Status", + 'currently': "În prezent", + 'operation': "Operație", + 'fan_mode': "Mod ventilator", + 'heating': "Încălzește", }, 'ru': { 'PRESS': "Нажать", 'ACTIVATE': "Активировать", 'aux_heat': "Дополнительный нагрев", + 'away_mode': "Режим \"не дома\"", 'cooling': "Охлаждение", 'drying': "Осушение", 'fan': "Вентиляция", @@ -718,10 +899,16 @@ translations = { 'brightness': "Яркость", 'color_temperature': "Цветовая температура", 'position': "Положение", + 'state': "Состояние", + 'currently': "Сейчас", + 'operation': "Режим работы", + 'fan_mode': "Режим вентиляции", + 'heating': "Обогрев", }, 'sk': { 'ACTIVATE': "Aktivovať", 'aux_heat': "Prídavné kúrenie", + 'away_mode': "Režim neprítomnosti", 'cooling': "Chladenie", 'drying': "Sušenie", 'fan': "Ventilátor", @@ -741,11 +928,17 @@ translations = { 'brightness': "Jas", 'color_temperature': "Teplota farby", 'position': "Poloha", + 'state': "Stav", + 'currently': "Aktuálne", + 'operation': "Prevádzka", + 'fan_mode': "Režim ventilátora", + 'heating': "Kúrenie", }, 'sl': { 'PRESS': "Pritisnite", 'ACTIVATE': "Aktiviraj", 'aux_heat': "Dodatna toplota", + 'away_mode': "Način odsotnosti", 'cooling': "Hlajenje", 'drying': "Sušenje", 'fan': "Ventilator", @@ -764,11 +957,17 @@ translations = { 'brightness': "Svetlost", 'color_temperature': "Temperatura barve", 'position': "Položaj", + 'state': "Stanje", + 'currently': "Trenutno", + 'operation': "Delovanje", + 'fan_mode': "Način ventilatorja", + 'heating': "Ogrevanje", }, 'sv': { 'PRESS': "Tryck", 'ACTIVATE': "Aktivera", 'aux_heat': "Underhållsvärme", + 'away_mode': "Bortaläge", 'cooling': "Kyler", 'drying': "Avfuktar", 'fan': "Fläkt", @@ -788,11 +987,17 @@ translations = { 'brightness': "Ljusstyrka", 'color_temperature': "Färgtemperatur", 'position': "Position", + 'state': "Tillstånd", + 'currently': "Nuvarande", + 'operation': "Driftläge", + 'fan_mode': "Fläktläge", + 'heating': "Värmer", }, 'th': { 'PRESS': "กด", 'ACTIVATE': "กระตุ้น", 'aux_heat': "ความร้อน Aux", + 'away_mode': "โหมดไม่อยู่บ้าน", 'cooling': "โหมดเย็น", 'drying': "โหมดแห้ง", 'fan': "พัดลม", @@ -810,11 +1015,17 @@ translations = { 'brightness': "ความสว่าง", 'color_temperature': "อุณหภูมิสี", 'position': "ตำแหน่ง", + 'state': "สถานะ", + 'currently': "ในขณะนี้", + 'operation': "การทำงาน", + 'fan_mode': "โหมดของพัดลม", + 'heating': "โหมดอบอุ่น", }, 'tr': { 'PRESS': "Basınız", 'ACTIVATE': "Etkinleştir", 'aux_heat': "Yardımcı ısı", + 'away_mode': "Dışarıda modu", 'cooling': "Soğutma", 'drying': "Kurutma", 'fan': "Fan", @@ -834,11 +1045,17 @@ translations = { 'brightness': "Parlaklık", 'color_temperature': "Renk sıcaklığı", 'position': "Pozisyon", + 'state': "Durum", + 'currently': "Şu an", + 'operation': "İşlem", + 'fan_mode': "Fan modu", + 'heating': "Isıtma", }, 'uk': { 'PRESS': "Натисніть", 'ACTIVATE': "Активувати", 'aux_heat': "Додатковий нагрів", + 'away_mode': "Режим \"Не вдома\"", 'cooling': "Охолодження", 'drying': "Осушення", 'fan': "Вентилятор", @@ -857,10 +1074,16 @@ translations = { 'brightness': "Яскравість", 'color_temperature': "Кольорова температура", 'position': "Положення", + 'state': "Статус", + 'currently': "В даний час", + 'operation': "Режим", + 'fan_mode': "Режим вентиляції", + 'heating': "Нагрівання", }, 'vi': { 'ACTIVATE': "Kích hoạt", 'aux_heat': "Nhiệt phụ trợ", + 'away_mode': "Chế độ đi vắng", 'cooling': "Làm mát", 'drying': "Làm khô", 'fan': "Quạt", @@ -879,13 +1102,26 @@ translations = { 'brightness': "Độ sáng", 'color_temperature': "Nhiệt độ màu", 'position': "Vị trí", + 'state': "Trạng thái", + 'currently': "Hiện tại", + 'operation': "Chế độ hoạt động", + 'fan_mode': "Chế độ quạt", + 'heating': "Làm ấm", }, } -def get_translation(locale, input): +def lookup(locale, inputstr): locale = locale.split("_")[0] - en_fallback_res = translations.get("en").get(input, input) - if locale in translations: - return translations.get(locale).get(input, en_fallback_res) + en_fallback_res = translations.get("en").get(inputstr, inputstr) + if locale in translations: + return translations.get(locale).get(inputstr, en_fallback_res) else: return en_fallback_res + +def get_translation(locale, inputstr): + inputstr = inputstr.replace("heat", "heating").replace("dry", "drying").replace("cool", "cooling").replace("fan_only", "fan") + if inputstr == "heating_cooling": + return f'{lookup(locale, "heating")}/{lookup(locale, "cooling")}' + + return lookup(locale, inputstr) + diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 45f00a59..c8690854 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -122,15 +122,27 @@ class LuiPagesGen(object): down = f"{entity.state} {unit_of_measurement}" weather_res+=f"~{up}~{icon}~{down}" - altLayout = "" + altLayout = "~~" if self._config._config_screensaver.raw_config.get("alternativeLayout", False): altLayout = f"~{get_icon_id('water-percent')}~{we.attributes.humidity} %" - self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}") + # status icons + status_res = "" + for i in range(1,3): + statusIcon = self._config._config_screensaver.raw_config.get(f"statusIcon{i}") + if statusIcon is not None: + icon = statusIcon.get("icon") + entity = self._ha_api.get_entity(statusIcon.get("entity")) + entityType = statusIcon.get("entity").split(".")[0] + icon = get_icon_id_ha(entityType, state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon) + color = self.get_entity_color(entity) + status_res += f"~{icon}~{color}" + + self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}{altLayout}{status_res}") # send color if configured in screensaver if theme is not None: - if not ("AutoWeather" in theme and theme["AutoWeather"] == "auto"): + if not ("autoWeather" in theme and theme["autoWeather"]): state = None self._send_mqtt_msg(get_screensaver_color_output(theme=theme, state=state)) @@ -250,7 +262,7 @@ class LuiPagesGen(object): command += self.generate_entities_item(item, cardType) self._send_mqtt_msg(command) - def generate_thermo_page(self, navigation, entity, temp_unit): + def generate_thermo_page(self, navigation, title, entity, temp_unit): item = entity.entityId if(temp_unit == "celsius"): @@ -265,11 +277,16 @@ class LuiPagesGen(object): command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~" else: entity = self._ha_api.get_entity(item) - heading = entity.attributes.friendly_name + heading = title if title != "unknown" else entity.attributes.friendly_name current_temp = get_attr_safe(entity, "current_temperature", "") dest_temp = int(get_attr_safe(entity, "temperature", 0)*10) status = get_attr_safe(entity, "hvac_action", "") - status = get_translation(self._locale,status) + state_value = "" + if status != "": + state_value += f"{get_translation(self._locale, status)}\r\n(" + state_value += f"{get_translation(self._locale, entity.state)}" + if status != "": + state_value += ")" min_temp = int(get_attr_safe(entity, "min_temp", 0)*10) max_temp = int(get_attr_safe(entity, "max_temp", 0)*10) step_temp = int(get_attr_safe(entity, "target_temp_step", 0.5)*10) @@ -278,7 +295,7 @@ class LuiPagesGen(object): for mode in hvac_modes: icon_id = get_icon_id('alert-circle-outline') color_on = 64512 - if mode == "auto": + if mode in ["auto", "heat_cool"]: icon_id = get_icon_id("calendar-sync") color_on = 1024 if mode == "heat": @@ -305,16 +322,20 @@ class LuiPagesGen(object): padding_len = 8-len_hvac_modes icon_res = icon_res + "~"*4*padding_len - command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}~Currently~State~Action~{temperature_unit_icon}" + currently_translation = get_translation(self._locale, "currently") + state_translation = get_translation(self._locale, "state") + action_translation = get_translation(self._locale, "operation") + + command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{state_value}~{min_temp}~{max_temp}~{step_temp}{icon_res}~{currently_translation}~{state_translation}~{action_translation}~{temperature_unit_icon}" self._send_mqtt_msg(command) - def generate_media_page(self, navigation, entity): + def generate_media_page(self, navigation, title, entity): item = entity.entityId if not self._ha_api.entity_exists(item): command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable" else: entity = self._ha_api.get_entity(item) - heading = entity.attributes.friendly_name + heading = title if title != "unknown" else entity.attributes.friendly_name icon = get_icon_id('speaker-off') title = get_attr_safe(entity, "media_title", "") author = get_attr_safe(entity, "media_artist", "") @@ -338,7 +359,7 @@ class LuiPagesGen(object): if entity.state == "off": onoffbutton = 1374 else: - onoffbutton = rgb_dec565([255,255,255]) + onoffbutton = rgb_dec565([255,152,0]) command = f"entityUpd~{heading}~{navigation}~{item}~{icon}~{title}~{author}~{volume}~{iconplaypause}~{source}~{speakerlist[:200]}~{onoffbutton}" self._send_mqtt_msg(command) @@ -347,7 +368,7 @@ class LuiPagesGen(object): if not self._ha_api.entity_exists(item): command = f"entityUpd~{item}~{navigation}~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0" else: - entity = self._ha_api.get_entity(item) + entity = self._ha_api.get_entity(item) icon = get_icon_id("shield-off") color = rgb_dec565([255,255,255]) supported_modes = [] @@ -429,9 +450,9 @@ class LuiPagesGen(object): return if card.cardType == "cardThermo": temp_unit = card.raw_config.get("temperatureUnit", "celsius") - self.generate_thermo_page(navigation, card.entity, temp_unit) + self.generate_thermo_page(navigation, card.title, card.entity, temp_unit) if card.cardType == "cardMedia": - self.generate_media_page(navigation, card.entity) + self.generate_media_page(navigation, card.title, card.entity) if card.cardType == "cardAlarm": self.generate_alarm_page(navigation, card.entity) if card.cardType == "screensaver": diff --git a/apps/nspanel-lovelace-ui/luibackend/theme.py b/apps/nspanel-lovelace-ui/luibackend/theme.py index a7de37d2..b344bee9 100644 --- a/apps/nspanel-lovelace-ui/luibackend/theme.py +++ b/apps/nspanel-lovelace-ui/luibackend/theme.py @@ -22,8 +22,6 @@ default_screensaver_color_mapping = { "tForecast3Val": "65535", "tForecast4Val": "65535", "bar": "65535", - "tMainIconAlt": "65535", - "tMainTextAlt": "65535", "tMRIcon": "65535", "tMR": "65535" } @@ -61,11 +59,13 @@ def map_color(key, theme, state=None): # Use Autocolouring for weather elif state is not None: if key in ["tMainIcon", "tF1Icon", "tF2Icon", "tF3Icon", "tF4Icon"]: - config_color = map_weather_icon_color(key=key, state=state) + config_color = map_weather_icon_color(key=key, theme=theme, state=state) return config_color -def map_weather_icon_color(key, state): - if state[key] in default_weather_icon_color_mapping: +def map_weather_icon_color(key, theme, state): + if key in state and state[key] in theme: + config_color = rgb_dec565(theme[state[key]]) + elif key in state and state[key] in default_weather_icon_color_mapping: config_color = default_weather_icon_color_mapping[state[key]] else: config_color = "65535" diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 586c121d..20268b01 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass): controller = LuiController(self, cfg, send_mqtt_msg) - desired_display_firmware_version = 34 - version = "v2.8.1" + desired_display_firmware_version = 36 + version = "v2.9.0" model = cfg.get("model") if model == "us-l": diff --git a/ignore-id.py b/ignore-id.py new file mode 100644 index 00000000..10c2646b --- /dev/null +++ b/ignore-id.py @@ -0,0 +1,7 @@ +attributes = { + "id": { + "ignore": True, + "name": "ID", + "struct": "i", + } +} \ No newline at end of file diff --git a/out.txt b/out.txt new file mode 100644 index 00000000..061a9726 --- /dev/null +++ b/out.txt @@ -0,0 +1,320 @@ + +// data available +if(usize>1) +{ + bufferPos=0 + while(bufferPos