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

fix exit from popup pages to screensaver (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-12 19:02:34 +00:00
committed by github-actions[bot]
parent 188323a5cc
commit bac8e96932
10 changed files with 666 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
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-04-12 16:33:01.294111694 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:33:02.242117899 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 19:02:33.614166242 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:33:02.242117899 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 19:02:33.618166267 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -22,3 +22,167 @@ 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-04-12 19:02:32.758160910 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-12 19:02:33.618166267 +0000
@@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-12 19:02:33.618166267 +0000
@@ -339,43 +339,25 @@
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
- }
- if(tId.txt=="popupShutter")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
- }
- if(tId.txt=="popupNotify")
+ if(tId.txt=="cardMedia")
{
- page popupNotify
+ page cardMedia
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
- if(tId.txt=="cardMedia")
+ if(tId.txt=="pageStartup")
{
- page cardMedia
+ page pageStartup
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-12 19:02:33.618166267 +0000
@@ -366,43 +366,30 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
+ if(tId.txt=="popupLight")
{
- page screensaver
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{

180
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-04-12 16:33:01.294111694 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:33:01.762114752 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:02:33.138163241 +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-04-12 16:33:01.294111694 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:33:01.762114752 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:02:33.142163267 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -463,8 +463,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:33:01.762114752 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:02:33.138163241 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -483,9 +483,173 @@ 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-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:02:33.142163267 +0000
@@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-12 19:02:33.138163241 +0000
@@ -339,43 +339,25 @@
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
- }
- if(tId.txt=="popupShutter")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
- }
- if(tId.txt=="popupNotify")
+ if(tId.txt=="cardMedia")
{
- page popupNotify
+ page cardMedia
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
- if(tId.txt=="cardMedia")
+ if(tId.txt=="pageStartup")
{
- page cardMedia
+ page pageStartup
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-12 19:02:33.142163267 +0000
@@ -366,43 +366,30 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
+ if(tId.txt=="popupLight")
{
- page screensaver
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-12 16:33:01.294111694 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:33:01.762114752 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:02:33.138163241 +0000
@@ -48,6 +48,26 @@
Scope: local
Value: 0

182
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 16:33:01.782114883 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-12 16:33:01.294111694 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:33:01.762114752 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:33:01.294111694 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:33:01.762114752 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 19:02:33.222163771 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:02:33.138163241 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:02:33.142163267 +0000
+@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@
@@ -49,11 +49,175 @@
+@@ -967,6 +1146,33 @@
+@@ -1072,6 +1278,28 @@
+@@ -1642,6 +1870,128 @@
+--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:33:01.762114752 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:02:33.138163241 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:02:33.142163267 +0000
+@@ -570,43 +570,25 @@
+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
+ udelete payloadLength-1
+ bufferPos=0
+- if(tId.txt=="pageStartup")
+- {
+- page pageStartup
+- }
+- if(tId.txt=="screensaver")
+- {
+- page screensaver
+- }
+ if(tId.txt=="cardEntities")
+ {
+ page cardEntities
+ }
+- if(tId.txt=="cardGrid")
+- {
+- page cardGrid
+- }
+- if(tId.txt=="popupLight")
++ if(tId.txt=="cardMedia")
+ {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupLight
++ page cardMedia
+ }
+- if(tId.txt=="popupShutter")
++ if(tId.txt=="pageStartup")
+ {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupShutter
++ page pageStartup
+ }
+ if(tId.txt=="popupNotify")
+ {
+ page popupNotify
+ }
+- if(tId.txt=="cardThermo")
+- {
+- page cardThermo
+- }
+- if(tId.txt=="cardMedia")
++ if(tId.txt=="cardGrid")
+ {
+- page cardMedia
++ page cardGrid
+ }
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-12 19:02:33.138163241 +0000
+@@ -339,43 +339,25 @@
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+- if(tId.txt=="pageStartup")
+- {
+- page pageStartup
+- }
+- if(tId.txt=="screensaver")
+- {
+- page screensaver
+- }
+ if(tId.txt=="cardEntities")
+ {
+ page cardEntities
+ }
+- if(tId.txt=="cardGrid")
+- {
+- page cardGrid
+- }
+- if(tId.txt=="popupLight")
+- {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupLight
+- }
+- if(tId.txt=="popupShutter")
+- {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupShutter
+- }
+- if(tId.txt=="popupNotify")
++ if(tId.txt=="cardMedia")
+ {
+- page popupNotify
++ page cardMedia
+ }
+ if(tId.txt=="cardThermo")
+ {
+ page cardThermo
+ }
+- if(tId.txt=="cardMedia")
++ if(tId.txt=="pageStartup")
+ {
+- page cardMedia
++ page pageStartup
++ }
++ if(tId.txt=="cardGrid")
++ {
++ page cardGrid
+ }
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-12 19:02:33.142163267 +0000
+@@ -366,43 +366,30 @@
+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
+ udelete payloadLength-1
+ bufferPos=0
+- if(tId.txt=="pageStartup")
+- {
+- page pageStartup
+- }
+- if(tId.txt=="screensaver")
++ if(tId.txt=="popupLight")
+ {
+- page screensaver
++ pageIcons.tTmp1.txt=tTmp.txt
++ page popupLight
+ }
+ if(tId.txt=="cardEntities")
+ {
+ page cardEntities
+ }
+- if(tId.txt=="cardGrid")
+- {
+- page cardGrid
+- }
+- if(tId.txt=="popupLight")
++ if(tId.txt=="cardMedia")
+ {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupLight
++ page cardMedia
+ }
+- if(tId.txt=="popupShutter")
++ if(tId.txt=="pageStartup")
+ {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupShutter
++ page pageStartup
+ }
+ if(tId.txt=="popupNotify")
+ {
+ page popupNotify
+ }
+- if(tId.txt=="cardThermo")
+- {
+- page cardThermo
+- }
+- if(tId.txt=="cardMedia")
++ if(tId.txt=="cardGrid")
+ {
+- page cardMedia
++ page cardGrid
+ }
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-12 16:33:01.294111694 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:33:01.762114752 +0000
+--- HMI/n2t-out/screensaver.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:02:33.138163241 +0000
+@@ -48,6 +48,26 @@
+ Scope: local
+ Value: 0