fixes #853 (add nextion2text)

This commit is contained in:
joBr99
2023-04-13 19:25:15 +00:00
committed by github-actions[bot]
parent 21d2e0b1f7
commit e00d7e7141
14 changed files with 486 additions and 120 deletions

View File

@@ -52,6 +52,146 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/landscape/n2t-out/popupFan.txt
│ @@ -210,15 +210,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupTimer,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/landscape/n2t-out/popupInSel.txt
│ @@ -158,15 +158,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupInSel,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/landscape/n2t-out/popupLight.txt
│ @@ -94,26 +94,14 @@
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 500
│ -Variable (string) tId
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ -
│ -Variable (string) tInstruction
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ -
│ Variable (string) tSend
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 200
│ Text t0
│ @@ -182,14 +170,34 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text : 
│ Max. Text Size : 10
│ +Text tId
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled
│ + Associated Keyboard : none
│ + Text :
│ + Max. Text Size : 20
│ +
│ +Text tInstruction
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled
│ + Associated Keyboard : none
│ + Text :
│ + Max. Text Size : 20
│ +
│ Text tTmp
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/landscape/n2t-out/popupThermo.txt
│ @@ -236,15 +236,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupThermo,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupTimer.txt
├── +++ HMI/US/landscape/n2t-out/popupTimer.txt
│ @@ -308,15 +308,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupTimer,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@

View File

@@ -1457,6 +1457,146 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/portrait/n2t-out/popupFan.txt
│ @@ -210,15 +210,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupTimer,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/portrait/n2t-out/popupInSel.txt
│ @@ -158,15 +158,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupInSel,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -94,26 +94,14 @@
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 500
│ -Variable (string) tId
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ -
│ -Variable (string) tInstruction
│ - Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ -
│ Variable (string) tSend
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 200
│ Text t0
│ @@ -182,14 +170,34 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text : 
│ Max. Text Size : 10
│ +Text tId
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled
│ + Associated Keyboard : none
│ + Text :
│ + Max. Text Size : 20
│ +
│ +Text tInstruction
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Disable release event after dragging: 0
│ + Send Component ID : disabled
│ + Associated Keyboard : none
│ + Text :
│ + Max. Text Size : 20
│ +
│ Text tTmp
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/portrait/n2t-out/popupThermo.txt
│ @@ -236,15 +236,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupThermo,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupTimer.txt
├── +++ HMI/US/portrait/n2t-out/popupTimer.txt
│ @@ -308,15 +308,15 @@
│ Send Component ID : disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupTimer,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- 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-04-08 15:35:50.059610175 +0000
+++ /dev/fd/62 2023-04-13 19:25:07.506299793 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,10 @@
@@ -57,13 +57,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +186,26 @@
+e (string) type6
@@ -844,6 +844,146 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+I/n2t-out/popupFan.txt
++ HMI/US/portrait/n2t-out/popupFan.txt
+15 +210,15 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupTimer,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/popupInSel.txt
++ HMI/US/portrait/n2t-out/popupInSel.txt
+15 +158,15 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupInSel,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+6 +94,14 @@
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 500
+
+e (string) tId
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+
+e (string) tInstruction
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+
+e (string) tSend
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 200
+
+
+14 +170,34 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : 
+ Max. Text Size : 10
+
+d
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 20
+
+nstruction
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 20
+
+mp
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+I/n2t-out/popupThermo.txt
++ HMI/US/portrait/n2t-out/popupThermo.txt
+15 +236,15 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupThermo,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/popupTimer.txt
++ HMI/US/portrait/n2t-out/popupTimer.txt
+15 +308,15 @@
+ Send Component ID : disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupTimer,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +29,14 @@

View File

@@ -10,10 +10,18 @@ popupNotify
19 Component(s)
263 Line(s) of event code
170 Unique line(s) of event code
popupThermo
44 Component(s)
519 Line(s) of event code
274 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
204 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
255 Unique line(s) of event code
popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
screensaver2
59 Component(s)
354 Line(s) of event code
@@ -34,10 +42,6 @@ cardAlarm
43 Component(s)
496 Line(s) of event code
271 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
204 Unique line(s) of event code
cardLChart
33 Component(s)
398 Line(s) of event code
@@ -50,14 +54,6 @@ cardThermo
57 Component(s)
536 Line(s) of event code
317 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
popupShutter
25 Component(s)
398 Line(s) of event code
@@ -78,10 +74,14 @@ cardPower
54 Component(s)
523 Line(s) of event code
345 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
255 Unique line(s) of event code
popupInSel
34 Component(s)
617 Line(s) of event code
295 Unique line(s) of event code
popupThermo
44 Component(s)
519 Line(s) of event code
274 Unique line(s) of event code
cardEntities
67 Component(s)
1166 Line(s) of event code
@@ -91,4 +91,4 @@ Total
21 Page(s)
802 Component(s)
9255 Line(s) of event code
2345 Unique line(s) of event code
2348 Unique line(s) of event code

View File

@@ -397,7 +397,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupTimer,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -254,7 +254,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupInSel,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -86,20 +86,20 @@ Page popupLight
Variable (string) entn
Attributes
ID : 20
ID : 18
Scope : local
Text :
Max. Text Size: 80
Variable (int32) mode
Attributes
ID : 22
ID : 20
Scope: local
Value: 1
Variable (int32) mode_temp
Attributes
ID : 23
ID : 21
Scope: local
Value: 0
@@ -110,16 +110,30 @@ Variable (string) strCommand
Text :
Max. Text Size: 500
Variable (string) tSend
Variable (string) tId
Attributes
ID : 27
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 26
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 24
Scope : local
Text :
Max. Text Size: 200
Text t0
Attributes
ID : 24
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -327,66 +341,6 @@ Text tIcon1
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 12
@@ -526,7 +480,7 @@ Slider hBrightness
Slider hTempSlider
Attributes
ID : 19
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -618,7 +572,7 @@ Button b0
Button bColor
Attributes
ID : 21
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -675,7 +629,7 @@ Button bColor
Button bEffect
Attributes
ID : 27
ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -760,7 +714,7 @@ Dual-state Button btOnOff1
Timer tmCooldown
Attributes
ID : 25
ID : 23
Scope : local
Period (ms): 100
Enabled : no

View File

@@ -400,7 +400,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupThermo,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -511,7 +511,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupTimer,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -214,7 +214,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupTimer,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -162,7 +162,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupInSel,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -98,6 +98,18 @@ Variable (string) strCommand
Text :
Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
Scope : local
@@ -174,26 +186,6 @@ Text tIcon1
Text : 
Max. Text Size : 10
Text tId
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tInstruction
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local

View File

@@ -240,7 +240,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupThermo,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -312,7 +312,7 @@ Button b0
Events
Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit"
tSend.txt="event,buttonPress2,popupTimer,bExit"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC