fix #807 and sync us-l/p (add nextion2text)

This commit is contained in:
joBr99
2023-03-27 16:18:06 +00:00
committed by github-actions[bot]
parent 350617d045
commit b023ff00d2
19 changed files with 83 additions and 249 deletions

View File

@@ -16,45 +16,6 @@
│ page pageStartup
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -124,15 +124,15 @@
│ Text :
│ Max. Text Size: 10
│ Variable (string) vaQR
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 70
│ + Max. Text Size: 80
│ Text tEntity1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -602,19 +602,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -751,15 +751,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
@@ -91,25 +52,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -15,16 +15,14 @@
│ popupNotify.bco=defaultBcoColor
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ - vis b1,0
│ - vis b2,0
│ popupNotify.bco=defaultBcoColor
│ tHeading.bco=defaultBcoColor
│ b0.bco=defaultBcoColor
│ tText.bco=defaultBcoColor
│ b1.bco=defaultBcoColor
│ b2.bco=defaultBcoColor
│ tIcon.bco=defaultBcoColor
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@

View File

@@ -907,11 +907,11 @@ Timer tmSerial
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}
if(tInstruction.txt=="time")

View File

@@ -22,10 +22,6 @@ popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
popupNotify
19 Component(s)
261 Line(s) of event code
168 Unique line(s) of event code
pageTest
26 Component(s)
68 Line(s) of event code
@@ -42,6 +38,10 @@ cardChart
33 Component(s)
433 Line(s) of event code
294 Unique line(s) of event code
popupNotify
19 Component(s)
263 Line(s) of event code
170 Unique line(s) of event code
cardPower
54 Component(s)
523 Line(s) of event code
@@ -66,10 +66,6 @@ cardAlarm
43 Component(s)
496 Line(s) of event code
271 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
cardThermo
57 Component(s)
536 Line(s) of event code
@@ -82,6 +78,10 @@ screensaver2
58 Component(s)
344 Line(s) of event code
243 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
cardEntities
67 Component(s)
1166 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
800 Component(s)
9222 Line(s) of event code
9224 Line(s) of event code
2331 Unique line(s) of event code

View File

@@ -27,6 +27,8 @@ Page popupNotify
vis tTmp,0
vis tInstruction,0
vis tId,0
vis b1,0
vis b2,0
popupNotify.bco=defaultBcoColor
tHeading.bco=defaultBcoColor
b0.bco=defaultBcoColor

View File

@@ -313,9 +313,9 @@ Text e1Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 35
x coordinate : 20
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -403,9 +403,9 @@ Text e2Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 109
x coordinate : 94
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -493,9 +493,9 @@ Text e3Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 183
x coordinate : 168
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -583,9 +583,9 @@ Text e4Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 260
x coordinate : 245
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -673,9 +673,9 @@ Text e5Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 334
x coordinate : 319
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -763,9 +763,9 @@ Text e6Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 407
x coordinate : 392
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0

View File

@@ -606,11 +606,11 @@ Timer tmSerial
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}
if(tInstruction.txt=="time")

View File

@@ -19,6 +19,8 @@ Page popupNotify
vis tTmp,0
vis tInstruction,0
vis tId,0
vis b1,0
vis b2,0
popupNotify.bco=defaultBcoColor
tHeading.bco=defaultBcoColor
b0.bco=defaultBcoColor

View File

@@ -1383,45 +1383,6 @@
│ Enabled : yes
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -124,15 +124,15 @@
│ Text :
│ Max. Text Size: 10
│ Variable (string) vaQR
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 70
│ + Max. Text Size: 80
│ Text tEntity1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -602,19 +602,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
│ + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ @@ -751,15 +751,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
@@ -1496,25 +1457,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -15,16 +15,14 @@
│ popupNotify.bco=defaultBcoColor
│ dim=dimValueNormal
│ vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ - vis b1,0
│ - vis b2,0
│ popupNotify.bco=defaultBcoColor
│ tHeading.bco=defaultBcoColor
│ b0.bco=defaultBcoColor
│ tText.bco=defaultBcoColor
│ b1.bco=defaultBcoColor
│ b2.bco=defaultBcoColor
│ tIcon.bco=defaultBcoColor
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-03-27 15:57:43.735088348 +0000
+++ /dev/fd/62 2023-03-27 16:17:58.208991272 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@
@@ -804,45 +804,6 @@
+ Enabled : yes
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+15 +124,15 @@
+ Text :
+ Max. Text Size: 10
+
+e (string) vaQR
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 70
+ Max. Text Size: 80
+
+ntity1
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+19 +602,19 @@
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",26
+ }
+ if(type2.txt=="delete"||type2.txt=="")
+ {
+ if(type1.txt=="delete"||type1.txt=="")
+ {
+ qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
+ qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
+ }
+ }else
+ {
+ qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
+ qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+15 +751,15 @@
+ if(sleepTimeout!=0&&dimValue!=dim)
+ {
@@ -883,25 +844,6 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+6 +15,14 @@
+ popupNotify.bco=defaultBcoColor
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tTmp,0
+ vis tInstruction,0
+ vis tId,0
+ vis b1,0
+ vis b2,0
+ popupNotify.bco=defaultBcoColor
+ tHeading.bco=defaultBcoColor
+ b0.bco=defaultBcoColor
+ tText.bco=defaultBcoColor
+ b1.bco=defaultBcoColor
+ b2.bco=defaultBcoColor
+ tIcon.bco=defaultBcoColor
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +29,14 @@

View File

@@ -907,11 +907,11 @@ Timer tmSerial
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}
if(tInstruction.txt=="time")

View File

@@ -14,14 +14,14 @@ popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
screensaver2
58 Component(s)
344 Line(s) of event code
243 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
204 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
cardPower
54 Component(s)
517 Line(s) of event code
@@ -56,12 +56,16 @@ pageStartup
133 Unique line(s) of event code
popupNotify
19 Component(s)
261 Line(s) of event code
168 Unique line(s) of event code
263 Line(s) of event code
170 Unique line(s) of event code
cardMedia
59 Component(s)
645 Line(s) of event code
320 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
@@ -78,10 +82,6 @@ popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
screensaver2
58 Component(s)
344 Line(s) of event code
243 Unique line(s) of event code
cardEntities
91 Component(s)
1626 Line(s) of event code
@@ -90,5 +90,5 @@ cardEntities
Total
21 Page(s)
811 Component(s)
9626 Line(s) of event code
9628 Line(s) of event code
2453 Unique line(s) of event code

View File

@@ -27,6 +27,8 @@ Page popupNotify
vis tTmp,0
vis tInstruction,0
vis tId,0
vis b1,0
vis b2,0
popupNotify.bco=defaultBcoColor
tHeading.bco=defaultBcoColor
b0.bco=defaultBcoColor

View File

@@ -313,9 +313,9 @@ Text e1Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 35
x coordinate : 20
y coordinate : 286
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -403,9 +403,9 @@ Text e2Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 109
x coordinate : 94
y coordinate : 286
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -493,9 +493,9 @@ Text e3Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 183
x coordinate : 168
y coordinate : 286
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -583,9 +583,9 @@ Text e4Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 35
x coordinate : 20
y coordinate : 372
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -673,9 +673,9 @@ Text e5Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 109
x coordinate : 94
y coordinate : 372
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -763,9 +763,9 @@ Text e6Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 182
x coordinate : 167
y coordinate : 372
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0

View File

@@ -606,11 +606,11 @@ Timer tmSerial
{
if(type1.txt=="delete"||type1.txt=="")
{
qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}else
{
qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt
}
}
if(tInstruction.txt=="time")

View File

@@ -19,6 +19,8 @@ Page popupNotify
vis tTmp,0
vis tInstruction,0
vis tId,0
vis b1,0
vis b2,0
popupNotify.bco=defaultBcoColor
tHeading.bco=defaultBcoColor
b0.bco=defaultBcoColor

View File

@@ -149,7 +149,7 @@ Variable (string) vaQR
ID : 31
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Text tEntity1
Attributes

View File

@@ -14,10 +14,10 @@ popupThermo
44 Component(s)
519 Line(s) of event code
274 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
screensaver2
59 Component(s)
354 Line(s) of event code
251 Unique line(s) of event code
pageStartup
20 Component(s)
189 Line(s) of event code
@@ -62,6 +62,10 @@ popupShutter
25 Component(s)
398 Line(s) of event code
218 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
cardMedia
59 Component(s)
645 Line(s) of event code
@@ -82,10 +86,6 @@ cardEntities
67 Component(s)
1166 Line(s) of event code
530 Unique line(s) of event code
screensaver2
59 Component(s)
354 Line(s) of event code
251 Unique line(s) of event code
Total
21 Page(s)

View File

@@ -316,9 +316,9 @@ Text e1Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 20
x coordinate : 5
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -406,9 +406,9 @@ Text e2Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 94
x coordinate : 79
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -496,9 +496,9 @@ Text e3Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 168
x coordinate : 153
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -586,9 +586,9 @@ Text e4Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 245
x coordinate : 230
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -676,9 +676,9 @@ Text e5Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 319
x coordinate : 304
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0
@@ -766,9 +766,9 @@ Text e6Icon
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 392
x coordinate : 377
y coordinate : 221
Width : 40
Width : 70
Height : 30
Effect : load
Effect Priority : 0

View File

@@ -128,7 +128,7 @@ Variable (string) vaQR
Attributes
Scope : local
Text :
Max. Text Size: 70
Max. Text Size: 80
Text tEntity1
Attributes