h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-18 19:06:58 +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-07-23 09:31:12 +00:00
committed by github-actions[bot]
parent 814aee4a2c
commit 8f514aed7f
6 changed files with 51 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
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-07-23 09:22:23.835446505 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:22:24.299452515 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:31:08.214976414 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:31:08.670975085 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -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-07-23 09:22:23.839446557 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:22:24.299452515 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:31:08.214976414 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:31:08.674975073 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -301,23 +301,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
Attributes
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:22:24.299452515 +0000
@@ -932,10 +932,6 @@
{
page popupLight
}
- if(tTmp.txt=="fan")
- {
- page popupFan
- }
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:22:24.299452515 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:31:08.214976414 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:31:08.670975085 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled