Merge branch 'main' into pr/179 (add nextion2text)

This commit is contained in:
joBr99
2022-05-06 15:52:05 +00:00
committed by github-actions[bot]
parent d0d14e48a0
commit 70b9f6a65b
12 changed files with 191 additions and 66 deletions

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-05-06 15:50:18.520343411 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:50:19.364520916 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:52:04.461122807 +0000
@@ -11,6 +11,4 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:50:18.520343411 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:50:19.364520916 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:52:04.461122807 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -20,3 +20,32 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 15:52:04.461122807 +0000
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
-Text tInfo1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 40
-
Picture p0
Attributes
Scope : local
@@ -341,8 +331,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
- // set tinfo1 text
- spstr strCommand.txt,tInfo1.txt,"~",2
}
if(tInstruction.txt=="dimmode")
{

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-05-06 15:50:18.520343411 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:52:04.049120145 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:50:18.524345319 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:52:04.049120145 +0000
@@ -46,7 +46,7 @@
Attributes
Scope : local
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:50:18.524345319 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:52:04.049120145 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:50:18.520343411 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:52:04.049120145 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
@@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:50:18.520343411 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:52:04.049120145 +0000
@@ -25,19 +25,19 @@
Attributes
Scope : local
@@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:50:18.520343411 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:52:04.049120145 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -679,8 +679,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Picture p0
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:50:18.520343411 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:52:04.049120145 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -700,8 +700,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 15:50:18.524345319 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:52:04.049120145 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -714,8 +714,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:50:18.524345319 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:50:18.920520744 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:52:03.665117664 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:52:04.049120145 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -727,7 +727,24 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
@@ -147,7 +147,7 @@
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
-Text tInfo1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 40
-
Picture p0
Attributes
Scope : local
@@ -157,7 +147,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -736,3 +753,12 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -341,8 +331,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
- // set tinfo1 text
- spstr strCommand.txt,tInfo1.txt,"~",2
}
if(tInstruction.txt=="dimmode")
{

View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:50:18.932520749 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:50:18.520343411 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:50:18.920520744 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:52:04.065120248 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:52:04.049120145 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:50:18.524345319 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -46,7 +46,7 @@
+ Attributes
+ Scope : local
@@ -67,8 +67,8 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:50:18.524345319 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -91,8 +91,8 @@
+ if(tInstruction.txt=="pageType")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:50:18.520343411 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -71,25 +71,25 @@
+ Attributes
+ Scope : local
@@ -140,8 +140,8 @@
+ Text tHeading
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:50:18.520343411 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -25,19 +25,19 @@
+ Attributes
+ Scope : local
@@ -256,8 +256,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:50:18.520343411 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -276,11 +276,11 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:50:18.520343411 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:52:04.049120145 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:50:18.524345319 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -293,8 +293,8 @@
+ Variable (int32) mode
+ Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:50:18.524345319 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:50:18.920520744 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:52:03.665117664 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:52:04.049120145 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
@@ -306,7 +306,24 @@
+
+ Text tEntity
+ Attributes
+@@ -147,7 +147,7 @@
+@@ -119,16 +119,6 @@
+ Text : Position
+ Max. Text Size : 15
+
+-Text tInfo1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 40
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -157,7 +147,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -315,3 +332,12 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -341,8 +331,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sys0,0,0
+ hPosition.val=sys0
+- // set tinfo1 text
+- spstr strCommand.txt,tInfo1.txt,"~",2
+ }
+ if(tInstruction.txt=="dimmode")
+ {

View File

@@ -57,7 +57,7 @@ Text tTmp1
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -87,7 +87,7 @@ Text tTmp2
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

View File

@@ -69,8 +69,8 @@ Variable (string) entn
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Variable (int32) mode
Attributes

View File

@@ -56,8 +56,8 @@ Variable (string) entn
Attributes
ID : 18
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Text tEntity
Attributes
@@ -322,7 +322,7 @@ Slider hPosition
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 80
Max. Text Size : 50
Text tTmp2
Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 80
Max. Text Size : 50
Picture p0
Attributes

View File

@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Variable (int32) mode
Attributes

View File

@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Text tEntity
Attributes
@@ -147,7 +147,7 @@ Slider hPosition
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -30,14 +30,14 @@ popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
182 Unique line(s) of event code
popupShutter
20 Component(s)
192 Line(s) of event code
108 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
@@ -53,6 +53,6 @@ cardThermo
Total
12 Page(s)
343 Component(s)
3697 Line(s) of event code
1020 Unique line(s) of event code
344 Component(s)
3698 Line(s) of event code
1021 Unique line(s) of event code

View File

@@ -68,7 +68,7 @@ Text tEntity
Send Component ID : disabled
Opacity : 127
x coordinate : 65
y coordinate : 108
y coordinate : 94
Width : 195
Height : 30
Effect : load
@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 109
y coordinate : 108
Width : 45
Height : 30
Effect : load
@@ -269,6 +269,36 @@ Text t1
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInfo1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 65
y coordinate : 122
Width : 195
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 38066
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -596,6 +626,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
}
if(tInstruction.txt=="dimmode")
{

View File

@@ -119,6 +119,16 @@ Text t1
Text : Position
Max. Text Size : 15
Text tInfo1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Picture p0
Attributes
Scope : local
@@ -331,6 +341,8 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
}
if(tInstruction.txt=="dimmode")
{