h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 17:36:59 +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