h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 01:18:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-12-21 18:56:15 +00:00
committed by github-actions[bot]
parent 11c9947e1b
commit 08a9fdd276
9 changed files with 2417 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,16 +1,5 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
├── file list
│ @@ -12,9 +12,8 @@
│ pageTest.txt
│ popupFan.txt
│ popupInSel.txt
│ popupLight.txt
│ popupNotify.txt
│ popupShutter.txt
│ popupThermo.txt
│ -popupTimer.txt
│ screensaver.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -10,10 +10,7 @@
@@ -121,93 +110,6 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -1367,15 +1351,15 @@
│ vis hSlider1,0
│ vis nNum1,0
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",8
│ covx tTmp.txt,sys0,0,0
│ btOnOff1.val=sys0
│ }
│ - if(type1.txt=="text"||type1.txt=="timer")
│ + if(type1.txt=="text")
│ {
│ vis bUp1,0
│ vis bStop1,0
│ vis bDown1,0
│ vis btOnOff1,0
│ vis bText1,1
│ tsw bText1,0
│ @@ -1516,15 +1500,15 @@
│ vis hSlider2,0
│ vis nNum2,0
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",14
│ covx tTmp.txt,sys0,0,0
│ btOnOff2.val=sys0
│ }
│ - if(type2.txt=="text"||type2.txt=="timer")
│ + if(type2.txt=="text")
│ {
│ vis bUp2,0
│ vis bStop2,0
│ vis bDown2,0
│ vis btOnOff2,0
│ vis bText2,1
│ tsw bText2,0
│ @@ -1665,15 +1649,15 @@
│ vis hSlider3,0
│ vis nNum3,0
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,sys0,0,0
│ btOnOff3.val=sys0
│ }
│ - if(type3.txt=="text"||type3.txt=="timer")
│ + if(type3.txt=="text")
│ {
│ vis bUp3,0
│ vis bStop3,0
│ vis bDown3,0
│ vis btOnOff3,0
│ vis bText3,1
│ tsw bText3,0
│ @@ -1814,15 +1798,15 @@
│ vis hSlider4,0
│ vis nNum4,0
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",26
│ covx tTmp.txt,sys0,0,0
│ btOnOff4.val=sys0
│ }
│ - if(type4.txt=="text"||type4.txt=="timer")
│ + if(type4.txt=="text")
│ {
│ vis bUp4,0
│ vis bStop4,0
│ vis bDown4,0
│ vis btOnOff4,0
│ vis bText4,1
│ tsw bText4,0
│ @@ -1935,14 +1919,18 @@
│ {
│ page cardQR
│ }
│ if(tId.txt=="cardPower")
│ {
│ page cardPower
│ }
│ + if(tId.txt=="cardChart")
│ + {
│ + page cardChart
│ + }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -258,18 +258,14 @@
@@ -400,20 +302,3 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -370,15 +351,15 @@
│ Text tTime
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ - Text : 21:32
│ + Text : 21:32
│ Max. Text Size : 15
│
│ Text tTimeAdd
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0