h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 08:28:19 +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-05-06 16:21:35 +00:00
committed by github-actions[bot]
parent 0483ec1490
commit d18e928678
10 changed files with 55 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
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-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +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-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -426,58 +426,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) entn2
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) entn3
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) entn4
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 70
Variable (string) type5
Attributes
@@ -107,13 +107,13 @@
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 50
Variable (string) entn6
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 50
Text tHeading
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -496,43 +447,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Text tEntity
Attributes
@@ -127,7 +127,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 40
+ Max. Text Size : 25
Picture p0
Attributes
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000
@@ -157,7 +157,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC