h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 05:04:44 +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
2023-07-31 16:25:33 +00:00
committed by github-actions[bot]
parent 3ddef89431
commit 1b57cdbe62
39 changed files with 6728 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,18 +2,141 @@
+++ HMI/US/landscape/n2t-out
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -11,10 +11,10 @@
│ // dim value
│ int dimValue=40
│ @@ -13,10 +13,10 @@
│ int dimValueNormal=100
│ //color vars
│ int defaultFontColor=65535
│ int defaultBcoColor=6371
│ //feature flags
│ int featNewSliders=0
│ // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -961,21 +961,16 @@
│ if(type1.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity1.txt
│ page popupShutter
│ }
│ if(type1.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity1.txt
│ + page popupLight
│ }
│ if(type1.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type1.txt=="input_sel")
│ {
│ @@ -1000,21 +995,16 @@
│ if(type2.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity2.txt
│ page popupShutter
│ }
│ if(type2.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity2.txt
│ + page popupLight
│ }
│ if(type2.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type2.txt=="input_sel")
│ {
│ @@ -1039,21 +1029,16 @@
│ if(type3.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity3.txt
│ page popupShutter
│ }
│ if(type3.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity3.txt
│ + page popupLight
│ }
│ if(type3.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type3.txt=="input_sel")
│ {
│ @@ -1078,21 +1063,16 @@
│ if(type4.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity4.txt
│ page popupShutter
│ }
│ if(type4.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity4.txt
│ + page popupLight
│ }
│ if(type4.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type4.txt=="input_sel")
│ {
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -601,21 +601,15 @@
│ Period (ms): 500
│ Enabled : no
│
│ Events
│ Timer Event
│ if(tTmp.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + page popupLight
│ }
│ if(tTmp.txt=="fan")
│ {
│ page popupFan
│ }
│
│ Timer tmSerial
│ --- HMI/n2t-out/cardGrid2.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid2.txt
│ @@ -555,34 +555,34 @@
@@ -102,6 +225,29 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -735,21 +735,15 @@
│ Period (ms): 500
│ Enabled : no
│
│ Events
│ Timer Event
│ if(tTmp.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + page popupLight
│ }
│ if(tTmp.txt=="fan")
│ {
│ page popupFan
│ }
│
│ Timer tmSerial
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -960,18 +960,14 @@
@@ -142,6 +288,27 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -275,20 +275,14 @@
│ }
│ // get font color
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ - // get feature flag popup
│ - spstr strCommand.txt,tTmp.txt,"~",5
│ - if(tTmp.txt!="")
│ - {
│ - covx tTmp.txt,featNewSliders,0,0
│ - }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@