mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-17 02:17:01 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
cef1289579
commit
479b80caa4
@@ -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-07 08:29:46.318974628 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:29:46.698968636 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +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-07 08:29:46.318974628 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:29:46.698968636 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -427,8 +427,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-05-07 08:29:46.318974628 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:29:46.698968636 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:29:46.734968068 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 08:29:46.318974628 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:29:46.698968636 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:29:46.318974628 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:29:46.698968636 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:29:46.318974628 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:29:46.698968636 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:40:23.730293612 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000
|
||||
|
||||
@@ -14,6 +14,10 @@ popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
123 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
popupShutter
|
||||
20 Component(s)
|
||||
193 Line(s) of event code
|
||||
@@ -22,10 +26,6 @@ cardGrid
|
||||
39 Component(s)
|
||||
420 Line(s) of event code
|
||||
246 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
292 Line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 32
|
||||
Text : 33
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 32
|
||||
Text : 33
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
Reference in New Issue
Block a user