h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 21:24:44 +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-30 20:07:59 +00:00
committed by GitHub Actions
parent 75078020f7
commit 3321b993c3
21 changed files with 577 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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-03-30 16:55:42.160038424 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 16:55:43.136039156 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-30 20:07:58.195056766 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 20:07:59.147136815 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -10,9 +10,139 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-30 20:07:59.147136815 +0000
@@ -670,20 +670,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardAlarm,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-30 20:07:59.147136815 +0000
@@ -1719,20 +1719,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardEntities,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-30 20:07:59.147136815 +0000
@@ -809,20 +809,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardGrid,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-30 20:07:59.147136815 +0000
@@ -647,20 +647,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardMedia,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-30 20:07:59.147136815 +0000
@@ -921,20 +921,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardThermo,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 16:55:43.136039156 +0000
--- HMI/n2t-out/pageIcons.txt 2022-03-30 20:07:58.195056766 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-30 20:07:59.147136815 +0000
@@ -17,7 +17,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -23,8 +153,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 16:55:43.136039156 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 20:07:59.147136815 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -34,3 +164,63 @@ 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
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-30 20:07:59.147136815 +0000
@@ -382,6 +382,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-30 20:07:59.147136815 +0000
@@ -195,6 +195,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-30 20:07:59.147136815 +0000
@@ -268,6 +268,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-30 20:07:59.147136815 +0000
@@ -14,6 +14,7 @@
Preinitialize Event
recmod=1
bauds=115200
+ vis originPage,0
vis tInstruction,0
vis tTmp,0
vis p0,0
@@ -80,6 +81,15 @@
Scope: local
Value: 0
+Number originPage
+ Attributes
+ Scope : global
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
Text tInstruction
Attributes
Scope : local

204
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
--- HMI/n2t-out/Program.s.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 16:55:42.648038790 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-30 20:07:58.195056766 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 20:07:58.635093763 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -10,9 +10,35 @@ 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-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-30 20:07:58.635093763 +0000
@@ -670,20 +670,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardAlarm,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 16:55:42.652038793 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 20:07:58.639094100 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -780,9 +806,84 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
@@ -1719,20 +2423,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardEntities,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-30 20:07:58.639094100 +0000
@@ -809,20 +809,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardGrid,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-30 20:07:58.639094100 +0000
@@ -647,20 +647,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardMedia,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 16:55:42.652038793 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 20:07:58.639094100 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
@@ -807,9 +908,32 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
XFloat xTempCurr
Attributes
Scope : local
@@ -921,20 +931,9 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
- dim=dimValue
- tSend.txt="event,buttonPress2,cardThermo,sleepReached"
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
- crcputh 55 bb
- crcputs sys0,1
- crcputs tSend.txt,0
- //send cmd
- printh 55 bb
- prints sys0,2
- prints tSend.txt,0
- prints crcval,2
+ page screensaver
}
}
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 16:55:42.648038790 +0000
--- HMI/n2t-out/pageIcons.txt 2022-03-30 20:07:58.195056766 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-30 20:07:58.635093763 +0000
@@ -17,7 +17,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -820,8 +944,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Text tTmp1
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-30 16:55:42.160038424 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 16:55:42.652038793 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 20:07:58.639094100 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -840,3 +964,63 @@ 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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-30 20:07:58.639094100 +0000
@@ -382,6 +382,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-30 20:07:58.635093763 +0000
@@ -195,6 +195,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-30 20:07:58.635093763 +0000
@@ -268,6 +268,7 @@
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
+ screensaver.originPage.val=dp
sleepValue=0
click b0,1
click b0,0
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-30 20:07:58.199057102 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-30 20:07:58.639094100 +0000
@@ -14,6 +14,7 @@
Preinitialize Event
recmod=1
bauds=115200
+ vis originPage,0
vis tInstruction,0
vis tTmp,0
vis p0,0
@@ -80,6 +81,15 @@
Scope: local
Value: 0
+Number originPage
+ Attributes
+ Scope : global
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
Text tInstruction
Attributes
Scope : local