h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-19 20:54:43 +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-03-31 22:36:11 +00:00
committed by GitHub Actions
parent 9a832595f8
commit a867a9e6b3
10 changed files with 84 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
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-03-31 22:28:25.894497033 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:28:26.298518319 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:36:10.513854100 +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-03-31 22:28:25.898497244 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:28:26.298518319 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:36:10.513854100 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -118,7 +118,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : 
+ Max. Text Size : 30
+ Max. Text Size : 5
+
+Text tEntity6
+ Attributes
@@ -138,7 +138,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : 
+ Max. Text Size : 30
+ Max. Text Size : 5
+
Picture p0
Attributes
@@ -780,21 +780,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:28:26.298518319 +0000
@@ -20,7 +20,7 @@
Attributes
Scope : global
Text :
- Max. Text Size: 35
+ Max. Text Size: 30
Text tIcons
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:28:25.894497033 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:28:26.298518319 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:36:10.109846409 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:36:10.513854100 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled