h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-14 00:48:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump fw version (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-27 14:55:08 +00:00
committed by github-actions[bot]
parent b43f4871a9
commit 5933182e3e
10 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
HMI/US/landscape/diff-eu-version.txt
View File

@@ -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-27 14:25:38.476109147 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:25:39.344117744 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:55:08.183641171 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:25:39.344117744 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:55:08.183641171 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-27 14:25:38.476109147 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:25:39.344117744 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:55:08.183641171 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

2
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 35 Text : 36
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

2
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 35 Text : 36
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

20
HMI/US/portrait/diff-eu-version.txt
View File

@@ -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-27 14:25:38.476109147 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:25:38.884113188 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +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-27 14:25:38.480109187 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-27 14:55:07.303628300 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:25:38.888113228 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +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-27 14:25:38.480109187 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:25:38.888113228 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +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-27 14:25:38.476109147 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:25:38.888113228 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +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-27 14:25:38.480109187 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:25:38.888113228 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000
@@ -455,22 +455,6 @@ @@ -455,22 +455,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

22
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,11 +1,11 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:25:38.900113346 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:55:07.791635235 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-27 14:25:38.476109147 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:25:38.884113188 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:25:38.480109187 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:55:07.303628300 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:25:38.888113228 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-27 14:25:38.480109187 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:25:38.888113228 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:25:38.476109147 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:25:38.888113228 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-27 14:25:38.480109187 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:25:38.888113228 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -14,10 +14,6 @@ popupNotify
17 Component(s) 17 Component(s)
200 Line(s) of event code 200 Line(s) of event code
125 Unique line(s) of event code 125 Unique line(s) of event code
pageStartup
19 Component(s)
154 Line(s) of event code
115 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
439 Line(s) of event code 439 Line(s) of event code
@@ -46,6 +42,10 @@ screensaver
35 Component(s) 35 Component(s)
282 Line(s) of event code 282 Line(s) of event code
223 Unique line(s) of event code 223 Unique line(s) of event code
pageStartup
19 Component(s)
154 Line(s) of event code
115 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 244 Line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 35 Text : 36
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 35 Text : 36
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 35 Text : 36
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

2
HMI/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 35 Text : 36
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0