synced popup shutter (add nextion2text)

This commit is contained in:
joBr99
2022-05-06 15:15:13 +00:00
committed by github-actions[bot]
parent fa0e68e68e
commit cf5afe3ede
6 changed files with 48 additions and 94 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:00:31.684228675 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:00:32.468241140 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:15:12.706604053 +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:00:31.684228675 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:00:32.468241140 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:15:12.706604053 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:15:11.666433006 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000
@@ -44,7 +44,7 @@
Attributes
Scope : local
@@ -787,8 +787,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -808,8 +808,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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -829,8 +829,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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -842,26 +842,3 @@ 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:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Text tEntity
Attributes
@@ -147,7 +147,7 @@
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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:00:32.080234971 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:15:12.202541951 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:15:11.666433006 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:15:11.666433006 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +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:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000
+@@ -25,19 +25,19 @@
+ Attributes
+ Scope : local
@@ -256,8 +256,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:15:11.666433006 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000
+@@ -44,7 +44,7 @@
+ Attributes
+ Scope : local
@@ -385,8 +385,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:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -405,11 +405,11 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -421,26 +421,3 @@
+
+ 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:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
+ Scope : local
+- Text :
+- Max. Text Size: 80
++ Text : newtxt
++ Max. Text Size: 50
+
+ Text tEntity
+ Attributes
+@@ -147,7 +147,7 @@
+ 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

@@ -17,7 +17,7 @@ popupNotify
popupShutter
19 Component(s)
191 Line(s) of event code
108 Unique line(s) of event code
107 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code

View File

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

View File

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