mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-19 22:24:15 +01:00
fixed navigation on subpages for cardThermo cardMedia and cardAlarm (add nextion2text)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-02 17:52:29.069163241 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-03 07:17:59.034353405 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 07:17:59.946371492 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-02 17:52:29.069163241 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:17:59.038353485 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 07:17:59.946371492 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 27
|
||||
Text : 28
|
||||
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 : 27
|
||||
Text : 28
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -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-04-02 17:52:28.361158189 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-02 17:52:28.717160730 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-03 07:17:59.034353405 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 07:17:59.478362211 +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-04-02 17:52:28.361158189 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-02 17:52:28.721160758 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-03 07:17:59.038353485 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:17:59.478362211 +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-04-02 17:52:28.361158189 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-02 17:52:28.717160730 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:17:59.038353485 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:17:59.478362211 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -6,14 +6,14 @@ pageSerialTest
|
||||
13 Component(s)
|
||||
48 Line(s) of event code
|
||||
43 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
pageIcons
|
||||
7 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 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)
|
||||
333 Line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 27
|
||||
Text : 28
|
||||
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 : 27
|
||||
Text : 28
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 27
|
||||
Text : 28
|
||||
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 : 27
|
||||
Text : 28
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
Reference in New Issue
Block a user