Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-03-31 07:32:24 +00:00
committed by GitHub Actions
parent 210efd1384
commit f3933ab0e2
33 changed files with 327 additions and 750 deletions

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 07:13:40.773288311 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 07:13:41.229294068 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-31 07:32:23.198849247 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 07:32:23.602851692 +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 07:13:40.773288311 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 07:13:41.233294118 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 07:32:23.198849247 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 07:32:23.602851692 +0000
@@ -62,6 +62,26 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 07:13:40.773288311 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 07:13:41.233294118 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 07:32:23.198849247 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 07:32:23.602851692 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

View File

@@ -14,6 +14,10 @@ popupNotify
17 Component(s)
178 Line(s) of event code
117 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardMedia
30 Component(s)
287 Line(s) of event code
@@ -22,10 +26,6 @@ pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 23
Text : 24
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 23
Text : 24
Max. Text Size : 10
Picture p0