h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 22:24:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix dim bug in firmware (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-08-30 17:57:19 +00:00
committed by github-actions[bot]
parent 306bcf643c
commit 8b771319ad
16 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
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
--- HMI/n2t-out/Program.s.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-29 19:17:30.983925693 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-08-30 17:57:13.223987935 +0000
@@ -14,6 +14,3 @@
//color vars
int defaultFontColor=65535
@@ -9,8 +9,17 @@ 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-08-29 19:17:29.751914398 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-29 19:17:30.983925693 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-08-30 17:57:13.223987935 +0000
@@ -152,7 +152,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 41
+ Text : 42
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,8 +30,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-29 19:17:30.983925693 +0000
--- HMI/n2t-out/pageTest.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-08-30 17:57:13.223987935 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event

10
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,6 +10,10 @@ popupNotify
17 Component(s)
226 Line(s) of event code
143 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
popupFan
20 Component(s)
236 Line(s) of event code
@@ -38,10 +42,6 @@ pageTest
14 Component(s)
14 Line(s) of event code
14 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
@@ -63,4 +63,4 @@ Total
14 Page(s)
432 Component(s)
5150 Line(s) of event code
1358 Unique line(s) of event code
1359 Unique line(s) of event code

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

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

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

@@ -971,10 +971,10 @@ Timer tmSerial
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")

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

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

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

@@ -406,10 +406,10 @@ Timer tmSerial
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")

25
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
--- HMI/n2t-out/Program.s.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 19:17:30.347919862 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-30 17:57:12.635936141 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -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-08-29 19:17:29.751914398 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 19:17:30.347919862 +0000
--- HMI/n2t-out/cardEntities.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-30 17:57:12.635936141 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -458,8 +458,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-08-29 19:17:29.751914398 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 19:17:30.347919862 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-30 17:57:12.635936141 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -469,6 +469,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
Max. Text Size : 100
Text tVersion
@@ -152,7 +152,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 41
+ Text : 42
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -479,8 +488,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-29 19:17:29.747914361 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 19:17:30.347919862 +0000
--- HMI/n2t-out/pageTest.txt 2022-08-30 17:57:12.079887165 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-30 17:57:12.635936141 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 19:17:30.363920009 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-29 19:17:29.747914361 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 19:17:30.347919862 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-30 17:57:12.663938607 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-30 17:57:12.079887165 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-30 17:57:12.635936141 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-08-29 19:17:29.751914398 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 19:17:30.347919862 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-08-30 17:57:12.079887165 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-30 17:57:12.635936141 +0000
+@@ -65,6 +65,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -33,11 +33,20 @@
++ spstr strCommand.txt,tTmp.txt,"~",32
++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0
+--- HMI/n2t-out/pageStartup.txt 2022-08-29 19:17:29.751914398 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 19:17:30.347919862 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-08-30 17:57:12.079887165 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-30 17:57:12.635936141 +0000
+@@ -152,7 +152,7 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Text : 41
++ Text : 42
+ Max. Text Size : 10
+
+ Picture p0
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-08-29 19:17:29.747914361 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 19:17:30.347919862 +0000
+--- HMI/n2t-out/pageTest.txt 2022-08-30 17:57:12.079887165 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-30 17:57:12.635936141 +0000
+@@ -13,36 +13,6 @@
+ Events
+ Preinitialize Event

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

@@ -18,6 +18,10 @@ popupLight
27 Component(s)
386 Line(s) of event code
211 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
cardMedia
34 Component(s)
388 Line(s) of event code
@@ -38,10 +42,10 @@ cardQR
32 Component(s)
403 Line(s) of event code
234 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
cardGrid
42 Component(s)
462 Line(s) of event code
@@ -50,10 +54,6 @@ cardAlarm
40 Component(s)
421 Line(s) of event code
254 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
cardThermo
53 Component(s)
580 Line(s) of event code
@@ -63,4 +63,4 @@ Total
14 Page(s)
444 Component(s)
5372 Line(s) of event code
1431 Unique line(s) of event code
1432 Unique 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
Vertical Alignment : center
Input Type : character
Text : 41
Text : 42
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

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

@@ -971,10 +971,10 @@ Timer tmSerial
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")

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

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

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

@@ -406,10 +406,10 @@ Timer tmSerial
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")

18
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -10,18 +10,14 @@ pageTest
19 Component(s)
64 Line(s) of event code
61 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
211 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
popupShutter
25 Component(s)
388 Line(s) of event code
211 Unique line(s) of event code
popupNotify
17 Component(s)
226 Line(s) of event code
@@ -50,6 +46,10 @@ cardAlarm
40 Component(s)
421 Line(s) of event code
254 Unique line(s) of event code
screensaver
38 Component(s)
341 Line(s) of event code
263 Unique line(s) of event code
cardThermo
53 Component(s)
580 Line(s) of event code
@@ -63,4 +63,4 @@ Total
14 Page(s)
437 Component(s)
5202 Line(s) of event code
1372 Unique line(s) of event code
1373 Unique line(s) of event code

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

@@ -971,10 +971,10 @@ Timer tmSerial
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")

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

@@ -406,10 +406,10 @@ Timer tmSerial
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")