h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 15:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

refresh notification after weather update (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-06-01 15:15:07 +00:00
committed by github-actions[bot]
parent 5cdd897995
commit 1e15f8f5ef
6 changed files with 104 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-01 14:55:16.541020819 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 15:15:01.498019039 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 15:15:01.502019176 +0000
@@ -1925,10 +1925,6 @@ @@ -1925,10 +1925,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 15:15:01.502019176 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 15:15:01.502019176 +0000
@@ -636,10 +636,7 @@ @@ -636,10 +636,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,8 +52,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 15:15:01.502019176 +0000
@@ -1170,10 +1170,6 @@ @@ -1170,10 +1170,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -66,8 +66,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-01 15:15:00.357980010 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 15:15:01.502019176 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -89,8 +89,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-01 14:55:16.541020819 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 15:15:01.502019176 +0000
@@ -561,10 +561,6 @@ @@ -561,10 +561,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -103,8 +103,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-01 14:55:16.541020819 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 15:15:01.502019176 +0000
@@ -311,10 +311,6 @@ @@ -311,10 +311,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -117,8 +117,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-01 14:55:16.541020819 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 14:55:17.449030155 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 15:15:01.502019176 +0000
@@ -406,10 +406,6 @@ @@ -406,10 +406,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -131,8 +131,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 14:55:17.453030196 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 15:15:01.502019176 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -143,3 +143,18 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -501,14 +498,6 @@
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
- if(tNotifyHead.txt!="")
- {
- ref tNotifyHead
- }
- if(tNotifyText.txt!="")
- {
- ref tNotifyText
- }
}
if(tInstruction.txt=="color")
{

31
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-06-01 14:55:16.541020819 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:55:16.989025425 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:15:00.909998908 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
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-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-01 15:15:00.357980010 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:55:16.989025425 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:15:00.913999045 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,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/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-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-01 15:15:00.357980010 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:55:16.989025425 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:15:00.913999045 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -489,8 +489,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
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-06-01 14:55:16.545020860 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-01 15:15:00.353979873 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:55:16.989025425 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:15:00.913999045 +0000
@@ -474,22 +474,6 @@ @@ -474,22 +474,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1
@@ -514,3 +514,18 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
} }
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
@@ -501,14 +485,6 @@
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
- if(tNotifyHead.txt!="")
- {
- ref tNotifyHead
- }
- if(tNotifyText.txt!="")
- {
- ref tNotifyText
- }
}
if(tInstruction.txt=="color")
{

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 14:55:17.005025590 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 15:15:00.929999593 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-01 14:55:16.541020819 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-01 15:15:00.353979873 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:55:16.989025425 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:15:00.909998908 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:55:16.545020860 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:15:00.357980010 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:55:16.989025425 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:15:00.913999045 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -12,8 +12,23 @@
+@@ -970,6 +1149,33 @@ +@@ -970,6 +1149,33 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:55:16.545020860 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:15:00.357980010 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:55:16.989025425 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:15:00.913999045 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-01 14:55:16.545020860 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-01 15:15:00.353979873 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:55:16.989025425 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:15:00.913999045 +0000
+@@ -474,22 +474,6 @@ +@@ -474,22 +474,6 @@
+@@ -501,14 +485,6 @@
+ spstr strCommand.txt,tIcon2.txt,"~",19
+ spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,tIcon2.pco,0,0
+- if(tNotifyHead.txt!="")
+- {
+- ref tNotifyHead
+- }
+- if(tNotifyText.txt!="")
+- {
+- ref tNotifyText
+- }
+ }
+ if(tInstruction.txt=="color")
+ {

12
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -26,6 +26,10 @@ popupShutter
20 Component(s) 20 Component(s)
248 Line(s) of event code 248 Line(s) of event code
141 Unique line(s) of event code 141 Unique line(s) of event code
screensaver
37 Component(s)
315 Line(s) of event code
249 Unique line(s) of event code
cardMedia cardMedia
33 Component(s) 33 Component(s)
349 Line(s) of event code 349 Line(s) of event code
@@ -46,10 +50,6 @@ cardThermo
56 Component(s) 56 Component(s)
546 Line(s) of event code 546 Line(s) of event code
295 Unique line(s) of event code 295 Unique line(s) of event code
screensaver
37 Component(s)
307 Line(s) of event code
245 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
408 Component(s) 408 Component(s)
4521 Line(s) of event code 4529 Line(s) of event code
1193 Unique line(s) of event code 1197 Unique line(s) of event code

8
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1046,6 +1046,14 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {

8
HMI/n2t-out/screensaver.txt
View File

@@ -501,6 +501,14 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 covx tTmp.txt,tIcon2.pco,0,0
if(tNotifyHead.txt!="")
{
ref tNotifyHead
}
if(tNotifyText.txt!="")
{
ref tNotifyText
}
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {