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

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

Browse Source
This commit is contained in:
joBr99
2022-03-29 08:29:12 +00:00
committed by GitHub Actions
parent d00db892d4
commit 5fff820bcc
3 changed files with 29 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-29 08:19:54.588517083 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-29 08:29:11.540318620 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 08:29:11.984327520 +0000
@@ -5,11 +5,24 @@ @@ -5,11 +5,24 @@
int recvCrc=0 int recvCrc=0
int payloadLength=0 int payloadLength=0
@@ -29,8 +29,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 08:29:11.984327520 +0000
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -454,8 +454,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Value: 0 Value: 0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 08:29:11.988327601 +0000
@@ -59,6 +59,24 @@ @@ -59,6 +59,24 @@
vis tEntity4,0 vis tEntity4,0
vis bText4,0 vis bText4,0
@@ -1252,8 +1252,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 08:29:11.988327601 +0000
@@ -76,28 +76,28 @@ @@ -76,28 +76,28 @@
ID : 18 ID : 18
Scope : local Scope : local
@@ -1318,8 +1318,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 08:29:11.984327520 +0000
@@ -16,37 +16,34 @@ @@ -16,37 +16,34 @@
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -1749,8 +1749,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Value: 0 Value: 0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 08:29:11.988327601 +0000
@@ -269,7 +269,14 @@ @@ -269,7 +269,14 @@
Events Events
@@ -1784,8 +1784,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-29 08:19:54.588517083 +0000 --- HMI/n2t-out/pageIcons.txt 2022-03-29 08:29:11.540318620 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 08:29:11.984327520 +0000
@@ -30,8 +30,8 @@ @@ -30,8 +30,8 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -1798,8 +1798,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Text tTmp1 Text tTmp1
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 08:29:11.984327520 +0000
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -1822,8 +1822,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
Only in HMI/US/portrait/n2t-out: pageSwipeTest.txt Only in HMI/US/portrait/n2t-out: pageSwipeTest.txt
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/pageTest.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-03-29 08:29:11.984327520 +0000
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
Touch Press Event Touch Press Event
page pageSerialTest page pageSerialTest
@@ -1928,8 +1928,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/popupLight.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 08:29:11.988327601 +0000
@@ -252,8 +252,6 @@ @@ -252,8 +252,6 @@
Events Events
@@ -1948,21 +1948,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0 covx hTempSlider.val,tTmp.txt,0,0
@@ -314,7 +310,12 @@ @@ -493,11 +489,8 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,popupLight,bExit"
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -493,11 +494,8 @@
vis t2,1 vis t2,1
vis hBrightness,1 vis hBrightness,1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -1974,7 +1960,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,",",5 spstr strCommand.txt,tTmp.txt,",",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
@@ -529,11 +527,6 @@ @@ -529,11 +522,6 @@
vis hTempSlider,1 vis hTempSlider,1
vis t3,1 vis t3,1
vis t4,1 vis t4,1
@@ -1986,7 +1972,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// mode == 0 is rgb controls currently shown // mode == 0 is rgb controls currently shown
if(mode.val==0) if(mode.val==0)
{ {
@@ -635,17 +628,6 @@ @@ -635,17 +623,6 @@
} }
} }
@@ -2005,8 +1991,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Attributes Attributes
ID : 14 ID : 14
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/popupNotify.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 08:29:11.984327520 +0000
@@ -127,7 +127,12 @@ @@ -127,7 +127,12 @@
Events Events
Touch Press Event Touch Press Event
@@ -2017,30 +2003,13 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+ // craft command + // craft command
+ // convert pageNumber and write to tTmp + // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0 + covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-29 08:19:54.592517087 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 08:19:55.032517544 +0000
@@ -180,7 +180,12 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,popupShutter,bExit"
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt + tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-29 08:19:54.592517087 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-29 08:29:11.544318701 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 08:19:55.032517544 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 08:29:11.988327601 +0000
@@ -20,26 +20,12 @@ @@ -20,26 +20,12 @@
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0

7
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -310,12 +310,7 @@ Button b0
Events Events
Touch Press Event Touch Press Event
//page open event tSend.txt="event,buttonPress2,popupLight,bExit"
// event,pageOpen,cardEntities,pageNumber
// craft command
// convert pageNumber and write to tTmp
covx nPage,tTmp.txt,0,0
tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -180,12 +180,7 @@ Button b0
Events Events
Touch Press Event Touch Press Event
//page open event tSend.txt="event,buttonPress2,popupShutter,bExit"
// event,pageOpen,cardEntities,pageNumber
// craft command
// convert pageNumber and write to tTmp
covx nPage,tTmp.txt,0,0
tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC