change entn length (add nextion2text)

This commit is contained in:
joBr99
2022-03-29 07:14:18 +00:00
committed by GitHub Actions
parent ca8d393219
commit ec43580e7f
4 changed files with 40 additions and 99 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/US/portrait/n2t-out/Program.s.txt HMI/n2t-out/Program.s.txt diff -bur HMI/US/portrait/n2t-out/Program.s.txt HMI/n2t-out/Program.s.txt
--- HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/Program.s.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/Program.s.txt 2022-03-29 07:14:17.957243620 +0000
@@ -10,6 +10,6 @@ @@ -10,6 +10,6 @@
int sleepValue=0 int sleepValue=0
// dim value // dim value
@@ -11,8 +11,8 @@ diff -bur HMI/US/portrait/n2t-out/Program.s.txt HMI/n2t-out/Program.s.txt
+ lcd_dev fffb 0002 0000 0020 + lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/US/portrait/n2t-out/cardAlarm.txt HMI/n2t-out/cardAlarm.txt diff -bur HMI/US/portrait/n2t-out/cardAlarm.txt HMI/n2t-out/cardAlarm.txt
--- HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/cardAlarm.txt 2022-03-29 07:10:47.529364006 +0000 +++ HMI/n2t-out/cardAlarm.txt 2022-03-29 07:14:17.957243620 +0000
@@ -148,7 +148,7 @@ @@ -148,7 +148,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -126,38 +126,12 @@ diff -bur HMI/US/portrait/n2t-out/cardAlarm.txt HMI/n2t-out/cardAlarm.txt
Attributes Attributes
ID : 12 ID : 12
diff -bur HMI/US/portrait/n2t-out/cardEntities.txt HMI/n2t-out/cardEntities.txt diff -bur HMI/US/portrait/n2t-out/cardEntities.txt HMI/n2t-out/cardEntities.txt
--- HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/cardEntities.txt 2022-03-29 07:10:47.529364006 +0000 +++ HMI/n2t-out/cardEntities.txt 2022-03-29 07:14:17.957243620 +0000
@@ -100,56 +100,28 @@ @@ -123,34 +123,6 @@
ID : 49
Scope : local
Text : Text :
- Max. Text Size: 50 Max. Text Size: 70
+ Max. Text Size: 70
Variable (string) entn2
Attributes
ID : 50
Scope : local
Text :
- Max. Text Size: 50
+ Max. Text Size: 70
Variable (string) entn3
Attributes
ID : 51
Scope : local
Text :
- Max. Text Size: 50
+ Max. Text Size: 70
Variable (string) entn4
Attributes
ID : 52
Scope : local
Text :
- Max. Text Size: 50
-
-Variable (string) entn5 -Variable (string) entn5
- Attributes - Attributes
- ID : 70 - ID : 70
@@ -185,10 +159,10 @@ diff -bur HMI/US/portrait/n2t-out/cardEntities.txt HMI/n2t-out/cardEntities.txt
- Scope : local - Scope : local
- Text : - Text :
- Max. Text Size: 10 - Max. Text Size: 10
+ Max. Text Size: 70 -
Text tHeading Text tHeading
Attributes Attributes
ID : 2
@@ -294,57 +266,57 @@ @@ -294,57 +266,57 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -638,41 +612,8 @@ diff -bur HMI/US/portrait/n2t-out/cardEntities.txt HMI/n2t-out/cardEntities.txt
Attributes Attributes
ID : 30 ID : 30
diff -bur HMI/US/portrait/n2t-out/cardGrid.txt HMI/n2t-out/cardGrid.txt diff -bur HMI/US/portrait/n2t-out/cardGrid.txt HMI/n2t-out/cardGrid.txt
--- HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/cardGrid.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/cardGrid.txt 2022-03-29 07:14:17.957243620 +0000
@@ -76,28 +76,28 @@
ID : 18
Scope : local
Text :
- Max. Text Size: 50
+ Max. Text Size: 70
Variable (string) entn2
Attributes
ID : 19
Scope : local
Text :
- Max. Text Size: 50
+ Max. Text Size: 70
Variable (string) entn3
Attributes
ID : 20
Scope : local
Text :
- Max. Text Size: 50
+ Max. Text Size: 70
Variable (string) entn4
Attributes
ID : 21
Scope : local
Text :
- Max. Text Size: 50
+ Max. Text Size: 70
Variable (string) type5
Attributes
@@ -269,13 +269,7 @@ @@ -269,13 +269,7 @@
Events Events
@@ -704,8 +645,8 @@ diff -bur HMI/US/portrait/n2t-out/cardGrid.txt HMI/n2t-out/cardGrid.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/US/portrait/n2t-out/cardMedia.txt HMI/n2t-out/cardMedia.txt diff -bur HMI/US/portrait/n2t-out/cardMedia.txt HMI/n2t-out/cardMedia.txt
--- HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/cardMedia.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/cardMedia.txt 2022-03-29 07:14:17.957243620 +0000
@@ -16,34 +16,37 @@ @@ -16,34 +16,37 @@
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
@@ -1135,8 +1076,8 @@ diff -bur HMI/US/portrait/n2t-out/cardMedia.txt HMI/n2t-out/cardMedia.txt
Value: 0 Value: 0
diff -bur HMI/US/portrait/n2t-out/cardThermo.txt HMI/n2t-out/cardThermo.txt diff -bur HMI/US/portrait/n2t-out/cardThermo.txt HMI/n2t-out/cardThermo.txt
--- HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/cardThermo.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/cardThermo.txt 2022-03-29 07:14:17.957243620 +0000
@@ -269,14 +269,7 @@ @@ -269,14 +269,7 @@
Events Events
@@ -1172,8 +1113,8 @@ diff -bur HMI/US/portrait/n2t-out/cardThermo.txt HMI/n2t-out/cardThermo.txt
Only in HMI/n2t-out: nspanel_Stats.txt Only in HMI/n2t-out: nspanel_Stats.txt
Only in HMI/US/portrait/n2t-out: nspanel_US_P_Stats.txt Only in HMI/US/portrait/n2t-out: nspanel_US_P_Stats.txt
diff -bur HMI/US/portrait/n2t-out/pageIcons.txt HMI/n2t-out/pageIcons.txt diff -bur HMI/US/portrait/n2t-out/pageIcons.txt HMI/n2t-out/pageIcons.txt
--- HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/pageIcons.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/pageIcons.txt 2022-03-29 07:14:17.957243620 +0000
@@ -30,8 +30,8 @@ @@ -30,8 +30,8 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -1186,8 +1127,8 @@ diff -bur HMI/US/portrait/n2t-out/pageIcons.txt HMI/n2t-out/pageIcons.txt
Text tTmp1 Text tTmp1
Attributes Attributes
diff -bur HMI/US/portrait/n2t-out/pageStartup.txt HMI/n2t-out/pageStartup.txt diff -bur HMI/US/portrait/n2t-out/pageStartup.txt HMI/n2t-out/pageStartup.txt
--- HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/pageStartup.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/pageStartup.txt 2022-03-29 07:14:17.957243620 +0000
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -1218,8 +1159,8 @@ diff -bur HMI/US/portrait/n2t-out/pageStartup.txt HMI/n2t-out/pageStartup.txt
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
diff -bur HMI/US/portrait/n2t-out/popupLight.txt HMI/n2t-out/popupLight.txt diff -bur HMI/US/portrait/n2t-out/popupLight.txt HMI/n2t-out/popupLight.txt
--- HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/popupLight.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/popupLight.txt 2022-03-29 07:14:17.957243620 +0000
@@ -252,6 +252,8 @@ @@ -252,6 +252,8 @@
Events Events
@@ -1295,8 +1236,8 @@ diff -bur HMI/US/portrait/n2t-out/popupLight.txt HMI/n2t-out/popupLight.txt
Attributes Attributes
ID : 14 ID : 14
diff -bur HMI/US/portrait/n2t-out/popupNotify.txt HMI/n2t-out/popupNotify.txt diff -bur HMI/US/portrait/n2t-out/popupNotify.txt HMI/n2t-out/popupNotify.txt
--- HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/popupNotify.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/popupNotify.txt 2022-03-29 07:14:17.957243620 +0000
@@ -127,12 +127,7 @@ @@ -127,12 +127,7 @@
Events Events
Touch Press Event Touch Press Event
@@ -1312,8 +1253,8 @@ diff -bur HMI/US/portrait/n2t-out/popupNotify.txt HMI/n2t-out/popupNotify.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/US/portrait/n2t-out/popupShutter.txt HMI/n2t-out/popupShutter.txt diff -bur HMI/US/portrait/n2t-out/popupShutter.txt HMI/n2t-out/popupShutter.txt
--- HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/popupShutter.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/popupShutter.txt 2022-03-29 07:14:17.957243620 +0000
@@ -180,12 +180,7 @@ @@ -180,12 +180,7 @@
Events Events
@@ -1329,8 +1270,8 @@ diff -bur HMI/US/portrait/n2t-out/popupShutter.txt HMI/n2t-out/popupShutter.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/US/portrait/n2t-out/screensaver.txt HMI/n2t-out/screensaver.txt diff -bur HMI/US/portrait/n2t-out/screensaver.txt HMI/n2t-out/screensaver.txt
--- HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 07:10:48.033368297 +0000 --- HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 07:14:18.385241458 +0000
+++ HMI/n2t-out/screensaver.txt 2022-03-29 07:10:47.525363972 +0000 +++ HMI/n2t-out/screensaver.txt 2022-03-29 07:14:17.957243620 +0000
@@ -20,12 +20,26 @@ @@ -20,12 +20,26 @@
vis tTmp,0 vis tTmp,0
vis p0,0 vis p0,0

View File

@@ -100,28 +100,28 @@ Variable (string) entn1
ID : 49 ID : 49
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 50 ID : 50
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 51 ID : 51
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 52 ID : 52
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn5 Variable (string) entn5
Attributes Attributes

View File

@@ -76,28 +76,28 @@ Variable (string) entn1
ID : 18 ID : 18
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 19 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 20 ID : 20
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 70
Variable (string) type5 Variable (string) type5
Attributes Attributes

View File

@@ -30,10 +30,6 @@ cardMedia
22 Component(s) 22 Component(s)
200 Line(s) of event code 200 Line(s) of event code
115 Unique line(s) of event code 115 Unique line(s) of event code
cardGrid
39 Component(s)
392 Line(s) of event code
226 Unique line(s) of event code
cardThermo cardThermo
42 Component(s) 42 Component(s)
412 Line(s) of event code 412 Line(s) of event code
@@ -50,6 +46,10 @@ popupLight
26 Component(s) 26 Component(s)
307 Line(s) of event code 307 Line(s) of event code
168 Unique line(s) of event code 168 Unique line(s) of event code
cardGrid
39 Component(s)
392 Line(s) of event code
226 Unique line(s) of event code
cardEntities cardEntities
74 Component(s) 74 Component(s)
970 Line(s) of event code 970 Line(s) of event code