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

Merge pull request #103 from jmbinette/main (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-03-31 06:31:08 +00:00
committed by GitHub Actions
parent cbf49483eb
commit b3cc89f12a
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 06:31:07.609591819 +0000
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
int sleepValue=0 int sleepValue=0
// dim value // dim value
@@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 06:31:07.609591819 +0000
@@ -583,12 +583,12 @@ @@ -583,12 +583,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -53,8 +53,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
} }
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-03-31 03:33:54.742386332 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 06:31:07.613591877 +0000
@@ -1675,12 +1675,12 @@ @@ -1675,12 +1675,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -94,8 +94,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
} }
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 06:31:07.613591877 +0000
@@ -765,12 +765,12 @@ @@ -765,12 +765,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -135,8 +135,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
} }
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 06:31:07.609591819 +0000
@@ -551,12 +551,12 @@ @@ -551,12 +551,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -176,8 +176,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
} }
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-03-31 03:33:54.742386332 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 06:31:07.609591819 +0000
@@ -835,12 +835,12 @@ @@ -835,12 +835,12 @@
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -217,8 +217,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
} }
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/pageIcons.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 06:31:07.609591819 +0000
@@ -10,18 +10,6 @@ @@ -10,18 +10,6 @@
Swide left page ID : disabled Swide left page ID : disabled
Swide right page ID : disabled Swide right page ID : disabled
@@ -248,8 +248,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tTmp1 Text tTmp1
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 06:31:07.609591819 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -275,8 +275,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/popupLight.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-03-31 06:31:07.609591819 +0000
@@ -382,6 +382,7 @@ @@ -382,6 +382,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -301,8 +301,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/popupNotify.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-03-31 06:31:07.609591819 +0000
@@ -195,6 +195,7 @@ @@ -195,6 +195,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -327,8 +327,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="dimmode") if(tInstruction.txt=="dimmode")
{ {
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/popupShutter.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-03-31 06:31:07.609591819 +0000
@@ -268,6 +268,7 @@ @@ -268,6 +268,7 @@
sleepValue+=1 sleepValue+=1
if(sleepTimeout<=sleepValue) if(sleepTimeout<=sleepValue)
@@ -353,8 +353,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 03:33:55.454391181 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 06:31:07.609591819 +0000
@@ -14,18 +14,19 @@ @@ -14,18 +14,19 @@
Preinitialize Event Preinitialize Event
recmod=1 recmod=1

12
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-31 03:33:54.738386306 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 03:33:55.098388657 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 06:31:07.213586116 +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-03-31 03:33:54.742386332 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 03:33:55.102388683 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 06:31:07.217586174 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -781,8 +781,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-03-31 03:33:54.738386306 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 06:31:06.861581047 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 03:33:55.098388657 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 06:31:07.217586174 +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