sync (add nextion2text)

This commit is contained in:
joBr99
2022-10-23 21:26:39 +00:00
committed by github-actions[bot]
parent a686222e0a
commit cb8bd661fe
15 changed files with 59 additions and 201 deletions

View File

@@ -1478,7 +1478,7 @@ Dual-state Button btDetail
Font Color (Pressed) : 50712 Font Color (Pressed) : 50712
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
State : pressed State : unpressed
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled

View File

@@ -58,14 +58,14 @@ popupThermo
44 Component(s) 44 Component(s)
515 Line(s) of event code 515 Line(s) of event code
272 Unique line(s) of event code 272 Unique line(s) of event code
cardEntities
65 Component(s)
1137 Line(s) of event code
522 Unique line(s) of event code
cardThermo cardThermo
53 Component(s) 53 Component(s)
596 Line(s) of event code 596 Line(s) of event code
313 Unique line(s) of event code 313 Unique line(s) of event code
cardEntities
65 Component(s)
1137 Line(s) of event code
522 Unique line(s) of event code
Total Total
16 Page(s) 16 Page(s)

View File

@@ -789,7 +789,7 @@ Dual-state Button btDetail
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : pressed State : unpressed
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10

View File

@@ -532,42 +532,6 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName
│ //write name of speical page to tId │ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1 │ spstr strCommand.txt,tId.txt,"~",1
├── cardThermo.txt
│ @@ -785,15 +785,15 @@
│ Dual-state Button btDetail
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ - State : pressed
│ + State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ pageIcons.tTmp1.txt=tHeading.txt
│ pageIcons.tTmp2.txt=entn.txt
├── pageIcons.txt
│ @@ -15,15 +15,15 @@
│ Scope : global
│ Text :
│ Max. Text Size: 15
│ Variable (string) vaDate
│ Attributes
│ Scope : global
│ - Text :
│ + Text :
│ Max. Text Size: 35
│ Text tTmp1
│ Attributes
│ Scope : global
│ Dragging : 0
│ Disable release event after dragging: 0
├── pageStartup.txt ├── pageStartup.txt
│ @@ -138,15 +138,15 @@ │ @@ -138,15 +138,15 @@
│ Text tMsg3 │ Text tMsg3
@@ -726,32 +690,6 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
├── popupNotify.txt
│ @@ -21,25 +21,19 @@
│ vis tId,0
│ popupNotify.bco=defaultBcoColor
│ tHeading.bco=defaultBcoColor
│ b0.bco=defaultBcoColor
│ tText.bco=defaultBcoColor
│ b1.bco=defaultBcoColor
│ b2.bco=defaultBcoColor
│ - tIcon.bco=defaultBcoColor
│ - tTextAlt.bco=defaultBcoColor
│ tHeading.pco=defaultFontColor
│ b0.pco=defaultFontColor
│ tText.pco=defaultFontColor
│ b1.pco=defaultFontColor
│ b2.pco=defaultFontColor
│ - vis tIcon,0
│ - vis tTextAlt,0
│ - tIcon.pco=defaultFontColor
│ - tTextAlt.pco=defaultFontColor
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 1000
├── screensaver.txt ├── screensaver.txt
│ @@ -71,15 +71,15 @@ │ @@ -71,15 +71,15 @@
│ Text tTime │ Text tTime
@@ -770,30 +708,3 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ @@ -620,26 +620,14 @@
│ vis tNotifyHead,1
│ vis tNotifyText,1
│ }else
│ {
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ }
│ - tNotifyHead.bco=tTime.bco
│ - tNotifyText.bco=tTime.bco
│ - spstr strCommand.txt,tTmp.txt,"~",3
│ - if(tTmp.txt!="")
│ - {
│ - covx tTmp.txt,tNotifyHead.pco,0,0
│ - }
│ - spstr strCommand.txt,tTmp.txt,"~",4
│ - if(tTmp.txt!="")
│ - {
│ - covx tTmp.txt,tNotifyText.pco,0,0
│ - }
│ }
│ if(tInstruction.txt=="pageType")
│ {
│ dim=100
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1

View File

@@ -1,40 +1,4 @@
+++ /dev/fd/62 2022-10-23 21:11:18.696978352 +0000 +++ /dev/fd/62 2022-10-23 21:26:32.359041592 +0000
+rdThermo.txt
+15 +785,15 @@
+
+ate Button btDetail
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : pressed
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ pageIcons.tTmp1.txt=tHeading.txt
+ pageIcons.tTmp2.txt=entn.txt
+geIcons.txt
+5 +15,15 @@
+ Scope : global
+ Text :
+ Max. Text Size: 15
+
+e (string) vaDate
+ributes
+ Scope : global
+ Text :
+ Text :
+ Max. Text Size: 35
+
+mp1
+ributes
+ Scope : global
+ Dragging : 0
+ Disable release event after dragging: 0
+75 +240,75 @@ +75 +240,75 @@
+nts +nts
+ Touch Press Event + Touch Press Event
@@ -54,32 +18,6 @@
+ tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+pupNotify.txt
+5 +21,19 @@
+ vis tId,0
+ popupNotify.bco=defaultBcoColor
+ tHeading.bco=defaultBcoColor
+ b0.bco=defaultBcoColor
+ tText.bco=defaultBcoColor
+ b1.bco=defaultBcoColor
+ b2.bco=defaultBcoColor
+ tIcon.bco=defaultBcoColor
+ tTextAlt.bco=defaultBcoColor
+ tHeading.pco=defaultFontColor
+ b0.pco=defaultFontColor
+ tText.pco=defaultFontColor
+ b1.pco=defaultFontColor
+ b2.pco=defaultFontColor
+ vis tIcon,0
+ vis tTextAlt,0
+ tIcon.pco=defaultFontColor
+ tTextAlt.pco=defaultFontColor
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 1000
+reensaver.txt +reensaver.txt
+5 +71,15 @@ +5 +71,15 @@
+ime +ime
@@ -98,30 +36,3 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+26 +620,14 @@
+ vis tNotifyHead,1
+ vis tNotifyText,1
+ }else
+ {
+ vis tNotifyHead,0
+ vis tNotifyText,0
+ }
+ tNotifyHead.bco=tTime.bco
+ tNotifyText.bco=tTime.bco
+ spstr strCommand.txt,tTmp.txt,"~",3
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,tNotifyHead.pco,0,0
+ }
+ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,tNotifyText.pco,0,0
+ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1

View File

@@ -38,18 +38,18 @@ cardQR
32 Component(s) 32 Component(s)
409 Line(s) of event code 409 Line(s) of event code
238 Unique line(s) of event code 238 Unique line(s) of event code
popupNotify
19 Component(s)
253 Line(s) of event code
164 Unique line(s) of event code
cardMedia cardMedia
34 Component(s) 34 Component(s)
394 Line(s) of event code 394 Line(s) of event code
213 Unique line(s) of event code 213 Unique line(s) of event code
popupNotify
19 Component(s)
247 Line(s) of event code
158 Unique line(s) of event code
screensaver screensaver
38 Component(s) 38 Component(s)
338 Line(s) of event code 350 Line(s) of event code
262 Unique line(s) of event code 266 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
427 Line(s) of event code 427 Line(s) of event code
@@ -70,5 +70,5 @@ popupThermo
Total Total
16 Page(s) 16 Page(s)
541 Component(s) 541 Component(s)
6512 Line(s) of event code 6530 Line(s) of event code
1740 Unique line(s) of event code 1750 Unique line(s) of event code

View File

@@ -33,11 +33,17 @@ Page popupNotify
tText.bco=defaultBcoColor tText.bco=defaultBcoColor
b1.bco=defaultBcoColor b1.bco=defaultBcoColor
b2.bco=defaultBcoColor b2.bco=defaultBcoColor
tIcon.bco=defaultBcoColor
tTextAlt.bco=defaultBcoColor
tHeading.pco=defaultFontColor tHeading.pco=defaultFontColor
b0.pco=defaultFontColor b0.pco=defaultFontColor
tText.pco=defaultFontColor tText.pco=defaultFontColor
b1.pco=defaultFontColor b1.pco=defaultFontColor
b2.pco=defaultFontColor b2.pco=defaultFontColor
vis tIcon,0
vis tTextAlt,0
tIcon.pco=defaultFontColor
tTextAlt.pco=defaultFontColor
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -1189,6 +1189,18 @@ Timer tmSerial
vis tNotifyHead,0 vis tNotifyHead,0
vis tNotifyText,0 vis tNotifyText,0
} }
tNotifyHead.bco=tTime.bco
tNotifyText.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,tNotifyHead.pco,0,0
}
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,tNotifyText.pco,0,0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -25,11 +25,17 @@ Page popupNotify
tText.bco=defaultBcoColor tText.bco=defaultBcoColor
b1.bco=defaultBcoColor b1.bco=defaultBcoColor
b2.bco=defaultBcoColor b2.bco=defaultBcoColor
tIcon.bco=defaultBcoColor
tTextAlt.bco=defaultBcoColor
tHeading.pco=defaultFontColor tHeading.pco=defaultFontColor
b0.pco=defaultFontColor b0.pco=defaultFontColor
tText.pco=defaultFontColor tText.pco=defaultFontColor
b1.pco=defaultFontColor b1.pco=defaultFontColor
b2.pco=defaultFontColor b2.pco=defaultFontColor
vis tIcon,0
vis tTextAlt,0
tIcon.pco=defaultFontColor
tTextAlt.pco=defaultFontColor
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes

View File

@@ -624,6 +624,18 @@ Timer tmSerial
vis tNotifyHead,0 vis tNotifyHead,0
vis tNotifyText,0 vis tNotifyText,0
} }
tNotifyHead.bco=tTime.bco
tNotifyText.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,tNotifyHead.pco,0,0
}
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,tNotifyText.pco,0,0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {

View File

@@ -1478,7 +1478,7 @@ Dual-state Button btDetail
Font Color (Pressed) : 50712 Font Color (Pressed) : 50712
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
State : pressed State : unpressed
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled

View File

@@ -42,6 +42,10 @@ cardMedia
34 Component(s) 34 Component(s)
394 Line(s) of event code 394 Line(s) of event code
213 Unique line(s) of event code 213 Unique line(s) of event code
cardThermo
53 Component(s)
596 Line(s) of event code
313 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
347 Line(s) of event code 347 Line(s) of event code
@@ -62,10 +66,6 @@ cardPower
43 Component(s) 43 Component(s)
423 Line(s) of event code 423 Line(s) of event code
293 Unique line(s) of event code 293 Unique line(s) of event code
cardThermo
53 Component(s)
596 Line(s) of event code
313 Unique line(s) of event code
Total Total
16 Page(s) 16 Page(s)

View File

@@ -789,7 +789,7 @@ Dual-state Button btDetail
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : pressed State : unpressed
Text :  Text : 
Max. Text Size : 10 Max. Text Size : 10