mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-18 10:57:01 +01:00
change state width (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
4f1824a902
commit
6fd1ff7376
@@ -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-05-28 20:18:16.481462743 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 20:18:17.549463034 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 21:37:53.907823982 +0000
|
||||||
@@ -11,6 +11,4 @@
|
@@ -11,6 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -9,8 +9,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-05-28 20:18:16.481462743 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 20:18:17.549463034 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 21:37:53.907823982 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -458,9 +458,9 @@ Text tStatus
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 26
|
x coordinate : 22
|
||||||
y coordinate : 186
|
y coordinate : 186
|
||||||
Width : 97
|
Width : 115
|
||||||
Height : 60
|
Height : 60
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -518,9 +518,9 @@ Text tCurTempLbl
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 28
|
x coordinate : 24
|
||||||
y coordinate : 84
|
y coordinate : 84
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -548,9 +548,9 @@ Text tStateLbl
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 27
|
x coordinate : 23
|
||||||
y coordinate : 152
|
y coordinate : 152
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -668,9 +668,9 @@ Text tCurTemp
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 28
|
x coordinate : 24
|
||||||
y coordinate : 118
|
y coordinate : 118
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
|
|||||||
@@ -42,6 +42,10 @@ cardMedia
|
|||||||
33 Component(s)
|
33 Component(s)
|
||||||
350 Line(s) of event code
|
350 Line(s) of event code
|
||||||
179 Unique line(s) of event code
|
179 Unique line(s) of event code
|
||||||
|
cardThermo
|
||||||
|
56 Component(s)
|
||||||
|
546 Line(s) of event code
|
||||||
|
290 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
37 Component(s)
|
37 Component(s)
|
||||||
305 Line(s) of event code
|
305 Line(s) of event code
|
||||||
@@ -50,10 +54,6 @@ cardEntities
|
|||||||
65 Component(s)
|
65 Component(s)
|
||||||
1133 Line(s) of event code
|
1133 Line(s) of event code
|
||||||
491 Unique line(s) of event code
|
491 Unique line(s) of event code
|
||||||
cardThermo
|
|
||||||
56 Component(s)
|
|
||||||
546 Line(s) of event code
|
|
||||||
290 Unique line(s) of event code
|
|
||||||
|
|
||||||
Total
|
Total
|
||||||
13 Page(s)
|
13 Page(s)
|
||||||
|
|||||||
@@ -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-05-28 20:18:16.481462743 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 21:37:53.495818005 +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-05-28 20:18:16.485462744 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-28 21:37:53.111812433 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -468,8 +468,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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
@@ -34,7 +34,7 @@
|
@@ -34,7 +34,7 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
|||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
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-05-28 20:18:16.481462743 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 21:37:53.495818005 +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
|
||||||
@@ -501,8 +501,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-05-28 20:18:16.485462744 +0000
|
--- HMI/n2t-out/screensaver.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000
|
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
@@ -471,22 +471,6 @@
|
@@ -471,22 +471,6 @@
|
||||||
vis tMainIconAlt,1
|
vis tMainIconAlt,1
|
||||||
vis tMRIcon,1
|
vis tMRIcon,1
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 20:18:17.037462894 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 21:37:53.507818179 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-28 20:18:16.481462743 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 20:18:16.997462884 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 20:18:16.485462744 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 21:37:53.111812433 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 20:18:16.997462884 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
+--- HMI/n2t-out/cardQR.txt 2022-05-28 20:18:16.485462744 +0000
|
+--- HMI/n2t-out/cardQR.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 20:18:16.997462884 +0000
|
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 20:18:16.481462743 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 20:18:16.997462884 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
+--- HMI/n2t-out/screensaver.txt 2022-05-28 20:18:16.485462744 +0000
|
+--- HMI/n2t-out/screensaver.txt 2022-05-28 21:37:53.107812375 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 20:18:16.997462884 +0000
|
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 21:37:53.495818005 +0000
|
||||||
+@@ -471,22 +471,6 @@
|
+@@ -471,22 +471,6 @@
|
||||||
|
|||||||
@@ -458,9 +458,9 @@ Text tStatus
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 190
|
x coordinate : 174
|
||||||
y coordinate : 110
|
y coordinate : 110
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 56
|
Height : 56
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -518,9 +518,9 @@ Text tCurTempLbl
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 35
|
x coordinate : 30
|
||||||
y coordinate : 76
|
y coordinate : 76
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -548,9 +548,9 @@ Text tStateLbl
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 192
|
x coordinate : 174
|
||||||
y coordinate : 75
|
y coordinate : 75
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -668,9 +668,9 @@ Text tCurTemp
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 35
|
x coordinate : 30
|
||||||
y coordinate : 112
|
y coordinate : 112
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
|
|||||||
@@ -26,10 +26,6 @@ cardQR
|
|||||||
30 Component(s)
|
30 Component(s)
|
||||||
363 Line(s) of event code
|
363 Line(s) of event code
|
||||||
207 Unique line(s) of event code
|
207 Unique line(s) of event code
|
||||||
cardThermo
|
|
||||||
56 Component(s)
|
|
||||||
546 Line(s) of event code
|
|
||||||
290 Unique line(s) of event code
|
|
||||||
cardAlarm
|
cardAlarm
|
||||||
38 Component(s)
|
38 Component(s)
|
||||||
364 Line(s) of event code
|
364 Line(s) of event code
|
||||||
@@ -54,6 +50,10 @@ cardEntities
|
|||||||
77 Component(s)
|
77 Component(s)
|
||||||
1363 Line(s) of event code
|
1363 Line(s) of event code
|
||||||
576 Unique line(s) of event code
|
576 Unique line(s) of event code
|
||||||
|
cardThermo
|
||||||
|
56 Component(s)
|
||||||
|
546 Line(s) of event code
|
||||||
|
290 Unique line(s) of event code
|
||||||
|
|
||||||
Total
|
Total
|
||||||
13 Page(s)
|
13 Page(s)
|
||||||
|
|||||||
@@ -460,7 +460,7 @@ Text tStatus
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 11
|
x coordinate : 11
|
||||||
y coordinate : 190
|
y coordinate : 190
|
||||||
Width : 97
|
Width : 115
|
||||||
Height : 54
|
Height : 54
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -520,7 +520,7 @@ Text tCurTempLbl
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 13
|
x coordinate : 13
|
||||||
y coordinate : 85
|
y coordinate : 85
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -550,7 +550,7 @@ Text tStateLbl
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 12
|
x coordinate : 12
|
||||||
y coordinate : 156
|
y coordinate : 156
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -670,7 +670,7 @@ Text tCurTemp
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 13
|
x coordinate : 13
|
||||||
y coordinate : 119
|
y coordinate : 119
|
||||||
Width : 95
|
Width : 115
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
|
|||||||
@@ -26,10 +26,6 @@ popupLight
|
|||||||
27 Component(s)
|
27 Component(s)
|
||||||
348 Line(s) of event code
|
348 Line(s) of event code
|
||||||
188 Unique line(s) of event code
|
188 Unique line(s) of event code
|
||||||
cardThermo
|
|
||||||
56 Component(s)
|
|
||||||
546 Line(s) of event code
|
|
||||||
290 Unique line(s) of event code
|
|
||||||
cardQR
|
cardQR
|
||||||
30 Component(s)
|
30 Component(s)
|
||||||
363 Line(s) of event code
|
363 Line(s) of event code
|
||||||
@@ -50,6 +46,10 @@ cardAlarm
|
|||||||
38 Component(s)
|
38 Component(s)
|
||||||
364 Line(s) of event code
|
364 Line(s) of event code
|
||||||
224 Unique line(s) of event code
|
224 Unique line(s) of event code
|
||||||
|
cardThermo
|
||||||
|
56 Component(s)
|
||||||
|
546 Line(s) of event code
|
||||||
|
290 Unique line(s) of event code
|
||||||
cardEntities
|
cardEntities
|
||||||
65 Component(s)
|
65 Component(s)
|
||||||
1133 Line(s) of event code
|
1133 Line(s) of event code
|
||||||
|
|||||||
Reference in New Issue
Block a user