mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-23 16:04:25 +01:00
synced changes from eu version (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
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-04-08 20:20:20.188241544 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-04-08 20:30:53.290164509 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-08 20:20:20.960250343 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-08 20:30:54.170202708 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
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
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-04-08 20:20:20.188241544 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-04-08 20:30:53.290164509 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-08 20:20:20.960250343 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-08 20:30:54.174202881 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-04-08 20:20:20.188241544 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-04-08 20:30:53.290164509 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-08 20:20:20.576245966 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-08 20:30:53.734183782 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
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
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-04-08 20:20:20.188241544 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-04-08 20:30:53.290164509 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-08 20:20:20.580246012 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-08 20:30:53.738183956 +0000
|
||||||
@@ -62,6 +62,26 @@
|
@@ -62,6 +62,26 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -777,8 +777,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-04-08 20:20:20.188241544 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-04-08 20:30:53.290164509 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-08 20:20:20.576245966 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-08 20:30:53.734183782 +0000
|
||||||
@@ -142,7 +142,7 @@
|
@@ -142,7 +142,7 @@
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
@@ -798,8 +798,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||||
--- HMI/n2t-out/screensaver.txt 2022-04-08 20:20:20.188241544 +0000
|
--- HMI/n2t-out/screensaver.txt 2022-04-08 20:30:53.290164509 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-08 20:20:20.580246012 +0000
|
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-08 20:30:53.738183956 +0000
|
||||||
@@ -48,6 +48,26 @@
|
@@ -48,6 +48,26 @@
|
||||||
Scope: local
|
Scope: local
|
||||||
Value: 0
|
Value: 0
|
||||||
|
|||||||
@@ -199,7 +199,7 @@ Text tCode
|
|||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Font ID : 0
|
Font ID : 2
|
||||||
Back. Color : 10565
|
Back. Color : 10565
|
||||||
Font Color : 40179
|
Font Color : 40179
|
||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ Text tHeading
|
|||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Font ID : 1
|
Font ID : 2
|
||||||
Back. Color : 6371
|
Back. Color : 6371
|
||||||
Font Color : 65535
|
Font Color : 65535
|
||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ Text tHeading
|
|||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Font ID : 1
|
Font ID : 2
|
||||||
Back. Color : 6371
|
Back. Color : 6371
|
||||||
Font Color : 65535
|
Font Color : 65535
|
||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
|
|||||||
@@ -405,7 +405,7 @@ Text tHeading
|
|||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Font ID : 1
|
Font ID : 2
|
||||||
Back. Color : 6371
|
Back. Color : 6371
|
||||||
Font Color : 65535
|
Font Color : 65535
|
||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
|
|||||||
@@ -14,18 +14,18 @@ pageStartup
|
|||||||
19 Component(s)
|
19 Component(s)
|
||||||
150 Line(s) of event code
|
150 Line(s) of event code
|
||||||
113 Unique line(s) of event code
|
113 Unique line(s) of event code
|
||||||
cardGrid
|
popupNotify
|
||||||
39 Component(s)
|
17 Component(s)
|
||||||
418 Line(s) of event code
|
178 Line(s) of event code
|
||||||
243 Unique line(s) of event code
|
117 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
33 Component(s)
|
33 Component(s)
|
||||||
195 Line(s) of event code
|
195 Line(s) of event code
|
||||||
152 Unique line(s) of event code
|
152 Unique line(s) of event code
|
||||||
cardThermo
|
cardEntities
|
||||||
41 Component(s)
|
86 Component(s)
|
||||||
442 Line(s) of event code
|
1350 Line(s) of event code
|
||||||
246 Unique line(s) of event code
|
547 Unique line(s) of event code
|
||||||
cardMedia
|
cardMedia
|
||||||
30 Component(s)
|
30 Component(s)
|
||||||
329 Line(s) of event code
|
329 Line(s) of event code
|
||||||
@@ -34,18 +34,18 @@ cardAlarm
|
|||||||
35 Component(s)
|
35 Component(s)
|
||||||
343 Line(s) of event code
|
343 Line(s) of event code
|
||||||
213 Unique line(s) of event code
|
213 Unique line(s) of event code
|
||||||
cardEntities
|
cardGrid
|
||||||
86 Component(s)
|
39 Component(s)
|
||||||
1350 Line(s) of event code
|
418 Line(s) of event code
|
||||||
547 Unique line(s) of event code
|
243 Unique line(s) of event code
|
||||||
|
cardThermo
|
||||||
|
41 Component(s)
|
||||||
|
442 Line(s) of event code
|
||||||
|
246 Unique line(s) of event code
|
||||||
popupShutter
|
popupShutter
|
||||||
19 Component(s)
|
19 Component(s)
|
||||||
178 Line(s) of event code
|
178 Line(s) of event code
|
||||||
101 Unique line(s) of event code
|
101 Unique line(s) of event code
|
||||||
popupNotify
|
|
||||||
17 Component(s)
|
|
||||||
178 Line(s) of event code
|
|
||||||
117 Unique line(s) of event code
|
|
||||||
popupLight
|
popupLight
|
||||||
27 Component(s)
|
27 Component(s)
|
||||||
320 Line(s) of event code
|
320 Line(s) of event code
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ Text tHeading
|
|||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Font ID : 1
|
Font ID : 2
|
||||||
Back. Color : 6371
|
Back. Color : 6371
|
||||||
Font Color : 65535
|
Font Color : 65535
|
||||||
Horizontal Alignment : left
|
Horizontal Alignment : left
|
||||||
@@ -308,7 +308,7 @@ Button b2
|
|||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Font ID : 1
|
Font ID : 2
|
||||||
Back. Color : 6371
|
Back. Color : 6371
|
||||||
Back. Picture ID (Pressed) : 9
|
Back. Picture ID (Pressed) : 9
|
||||||
Back. Color (Pressed) : 1024
|
Back. Color (Pressed) : 1024
|
||||||
@@ -357,7 +357,7 @@ Button b1
|
|||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
Fill : solid color
|
Fill : solid color
|
||||||
Style : flat
|
Style : flat
|
||||||
Font ID : 1
|
Font ID : 2
|
||||||
Back. Color : 6371
|
Back. Color : 6371
|
||||||
Back. Picture ID (Pressed) : 9
|
Back. Picture ID (Pressed) : 9
|
||||||
Back. Color (Pressed) : 1024
|
Back. Color (Pressed) : 1024
|
||||||
|
|||||||
Reference in New Issue
Block a user