h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-06 21:38:56 +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-06-06 17:53:08 +00:00
committed by github-actions[bot]
parent 632902cf62
commit b1c0ddeedf
10 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-06 17:53:02.496648542 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:53:02.920648767 +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-06-06 17:10:41.749533643 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:53:02.496648542 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:53:02.920648767 +0000
@@ -63,6 +63,16 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:53:02.496648542 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:53:02.920648767 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:53:02.496648542 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:53:02.920648767 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -539,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
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-06-06 17:10:41.745533696 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +0000
--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:53:02.920648767 +0000
@@ -19,12 +19,9 @@
entn.txt=pageIcons.tTmp2.txt
vis p0,0

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 17:10:42.181527903 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-06 17:10:41.745533696 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:10:42.165528115 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:10:41.749533643 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:10:42.169528062 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 17:53:02.932648774 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-06 17:53:02.496648542 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 17:53:02.920648767 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-06 17:53:02.496648542 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 17:53:02.920648767 +0000
+@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:10:41.745533696 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:10:42.169528062 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-06-06 17:53:02.496648542 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 17:53:02.920648767 +0000
+@@ -45,12 +45,6 @@
+ Scope: local
+ Value: 0
@@ -59,11 +59,11 @@
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:10:41.745533696 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:10:42.169528062 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-06-06 17:53:02.496648542 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 17:53:02.920648767 +0000
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:10:41.745533696 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:10:42.169528062 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-06-06 17:53:02.496648542 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-06 17:53:02.920648767 +0000
+@@ -19,12 +19,9 @@
+ entn.txt=pageIcons.tTmp2.txt
+ vis p0,0

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

@@ -862,7 +862,7 @@ Text tIcon2
Horizontal Spacing : 0
Vertical Spacing : 0
Text tDateAdd
Text tTimeAdd
Attributes
ID : 37
Scope : local
@@ -986,6 +986,7 @@ Timer tmSerial
{
vis tAMPM,0
}
spstr strCommand.txt,tTimeAdd.txt,"~",2
}
if(tInstruction.txt=="date")
{
@@ -1076,7 +1077,6 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tDateAdd.txt,"~",21
if(tNotifyHead.txt!="")
{
ref tNotifyHead
@@ -1114,7 +1114,7 @@ Timer tmSerial
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tDateAdd.bco=tTime.bco
tTimeAdd.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
@@ -1158,7 +1158,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tDateAdd.pco,0,0
covx tTmp.txt,tTimeAdd.pco,0,0
}
if(tInstruction.txt=="notify")
{

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

@@ -328,7 +328,7 @@ Text tIcon2
Text :
Max. Text Size : 5
Text tDateAdd
Text tTimeAdd
Attributes
Scope : local
Dragging : 0
@@ -421,6 +421,7 @@ Timer tmSerial
{
vis tAMPM,0
}
spstr strCommand.txt,tTimeAdd.txt,"~",2
}
if(tInstruction.txt=="date")
{
@@ -511,7 +512,6 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0
spstr strCommand.txt,tDateAdd.txt,"~",21
if(tNotifyHead.txt!="")
{
ref tNotifyHead
@@ -549,7 +549,7 @@ Timer tmSerial
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
tDateAdd.bco=tTime.bco
tTimeAdd.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
@@ -593,7 +593,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tDateAdd.pco,0,0
covx tTmp.txt,tTimeAdd.pco,0,0
}
if(tInstruction.txt=="notify")
{