mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-10 23:36:34 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
baa6b6bcb1
commit
ea0f1f3825
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
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 16:05:10.964544420 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:05:11.768549110 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:09:55.031738318 +0000
|
||||||
@@ -11,6 +11,4 @@
|
@@ -11,6 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
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
|
- lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:05:11.768549110 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:09:55.031738318 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||||
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:05:10.968544443 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:05:11.768549110 +0000
|
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:09:55.031738318 +0000
|
||||||
@@ -535,12 +535,6 @@
|
@@ -535,12 +535,6 @@
|
||||||
vis pColorWheel,1
|
vis pColorWheel,1
|
||||||
}
|
}
|
||||||
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
|||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||||
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:05:11.768549110 +0000
|
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:09:55.031738318 +0000
|
||||||
@@ -109,7 +109,7 @@
|
@@ -109,7 +109,7 @@
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 20
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
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 16:05:10.964544420 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
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
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:05:10.968544443 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||||
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:05:10.968544443 +0000
|
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -71,25 +71,25 @@
|
@@ -71,25 +71,25 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -475,125 +475,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
|||||||
|
|
||||||
Text tHeading
|
Text tHeading
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
|
||||||
--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:05:10.964544420 +0000
|
|
||||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:05:11.352546659 +0000
|
|
||||||
@@ -25,19 +25,19 @@
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Text :
|
|
||||||
- Max. Text Size: 750
|
|
||||||
+ Max. Text Size: 500
|
|
||||||
|
|
||||||
Variable (string) entn
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Text :
|
|
||||||
- Max. Text Size: 80
|
|
||||||
+ Max. Text Size: 50
|
|
||||||
|
|
||||||
Variable (string) vaSpeakerList
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Text :
|
|
||||||
- Max. Text Size: 400
|
|
||||||
+ Max. Text Size: 200
|
|
||||||
|
|
||||||
Variable (int32) vaSpeakerPos
|
|
||||||
Attributes
|
|
||||||
@@ -135,7 +135,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
|
|
||||||
@@ -164,7 +164,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
|
|
||||||
@@ -193,7 +193,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
|
|
||||||
@@ -233,7 +233,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
|
|
||||||
@@ -263,7 +263,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
|
|
||||||
@@ -302,7 +302,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
|
|
||||||
@@ -353,7 +353,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
|
|
||||||
@@ -391,7 +391,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
|
|
||||||
@@ -416,7 +416,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
|
|
||||||
@@ -448,7 +448,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
|
|
||||||
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||||
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:05:10.964544420 +0000
|
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -30,7 +30,7 @@
|
@@ -30,7 +30,7 @@
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
@@ -613,8 +497,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
|||||||
Picture p0
|
Picture p0
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -142,7 +142,7 @@
|
@@ -142,7 +142,7 @@
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
@@ -634,8 +518,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||||
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:05:10.968544443 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -59,8 +59,8 @@
|
@@ -59,8 +59,8 @@
|
||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
@@ -661,8 +545,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
|||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||||
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:05:11.352546659 +0000
|
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
@@ -46,8 +46,8 @@
|
@@ -46,8 +46,8 @@
|
||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:05:11.368546754 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:09:54.651733438 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:05:10.964544420 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:05:10.968544443 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+@@ -62,6 +62,16 @@
|
+@@ -62,6 +62,16 @@
|
||||||
+ vis bPrev,0
|
+ vis bPrev,0
|
||||||
+ vis bNext,0
|
+ vis bNext,0
|
||||||
@@ -25,8 +25,8 @@
|
|||||||
+ if(tInstruction.txt=="pageType")
|
+ if(tInstruction.txt=="pageType")
|
||||||
+ {
|
+ {
|
||||||
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||||
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:05:10.968544443 +0000
|
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+@@ -71,25 +71,25 @@
|
+@@ -71,25 +71,25 @@
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
@@ -73,125 +73,9 @@
|
|||||||
+
|
+
|
||||||
+ Text tHeading
|
+ Text tHeading
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
|
||||||
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:05:10.964544420 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:05:11.352546659 +0000
|
|
||||||
+@@ -25,19 +25,19 @@
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Text :
|
|
||||||
+- Max. Text Size: 750
|
|
||||||
++ Max. Text Size: 500
|
|
||||||
+
|
|
||||||
+ Variable (string) entn
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Text :
|
|
||||||
+- Max. Text Size: 80
|
|
||||||
++ Max. Text Size: 50
|
|
||||||
+
|
|
||||||
+ Variable (string) vaSpeakerList
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Text :
|
|
||||||
+- Max. Text Size: 400
|
|
||||||
++ Max. Text Size: 200
|
|
||||||
+
|
|
||||||
+ Variable (int32) vaSpeakerPos
|
|
||||||
+ Attributes
|
|
||||||
+@@ -135,7 +135,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
|
|
||||||
+@@ -164,7 +164,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
|
|
||||||
+@@ -193,7 +193,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
|
|
||||||
+@@ -233,7 +233,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
|
|
||||||
+@@ -263,7 +263,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
|
|
||||||
+@@ -302,7 +302,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
|
|
||||||
+@@ -353,7 +353,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
|
|
||||||
+@@ -391,7 +391,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
|
|
||||||
+@@ -416,7 +416,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
|
|
||||||
+@@ -448,7 +448,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
|
|
||||||
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
|
||||||
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:05:10.964544420 +0000
|
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+@@ -30,7 +30,7 @@
|
+@@ -30,7 +30,7 @@
|
||||||
+ Send Component ID : disabled
|
+ Send Component ID : disabled
|
||||||
+ Associated Keyboard : none
|
+ Associated Keyboard : none
|
||||||
@@ -210,11 +94,11 @@
|
|||||||
+
|
+
|
||||||
+ Picture p0
|
+ Picture p0
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||||
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:05:10.968544443 +0000
|
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+@@ -59,8 +59,8 @@
|
+@@ -59,8 +59,8 @@
|
||||||
+ Variable (string) entn
|
+ Variable (string) entn
|
||||||
+ Attributes
|
+ Attributes
|
||||||
@@ -240,8 +124,8 @@
|
|||||||
+ if(tInstruction.txt=="time")
|
+ if(tInstruction.txt=="time")
|
||||||
+ {
|
+ {
|
||||||
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||||
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
|
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:05:11.352546659 +0000
|
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:09:54.639733284 +0000
|
||||||
+@@ -46,8 +46,8 @@
|
+@@ -46,8 +46,8 @@
|
||||||
+ Variable (string) entn
|
+ Variable (string) entn
|
||||||
+ Attributes
|
+ Attributes
|
||||||
|
|||||||
@@ -34,21 +34,21 @@ Variable (string) strCommand
|
|||||||
ID : 7
|
ID : 7
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 500
|
Max. Text Size: 750
|
||||||
|
|
||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
ID : 17
|
ID : 17
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 50
|
Max. Text Size: 80
|
||||||
|
|
||||||
Variable (string) vaSpeakerList
|
Variable (string) vaSpeakerList
|
||||||
Attributes
|
Attributes
|
||||||
ID : 26
|
ID : 26
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 200
|
Max. Text Size: 400
|
||||||
|
|
||||||
Variable (int32) vaSpeakerPos
|
Variable (int32) vaSpeakerPos
|
||||||
Attributes
|
Attributes
|
||||||
@@ -307,7 +307,7 @@ Text t2
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -356,7 +356,7 @@ Text tPlayPause
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -405,7 +405,7 @@ Text t0
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -485,7 +485,7 @@ Text t1
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -535,7 +535,7 @@ Text t3
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -614,7 +614,7 @@ Text tSpeaker
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -705,7 +705,7 @@ Text t5
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -768,7 +768,7 @@ Slider hVolume
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -815,7 +815,7 @@ Button bNext
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -869,7 +869,7 @@ Button bPrev
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
|
|||||||
@@ -25,19 +25,19 @@ Variable (string) strCommand
|
|||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 500
|
Max. Text Size: 750
|
||||||
|
|
||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 50
|
Max. Text Size: 80
|
||||||
|
|
||||||
Variable (string) vaSpeakerList
|
Variable (string) vaSpeakerList
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 200
|
Max. Text Size: 400
|
||||||
|
|
||||||
Variable (int32) vaSpeakerPos
|
Variable (int32) vaSpeakerPos
|
||||||
Attributes
|
Attributes
|
||||||
@@ -135,7 +135,7 @@ Text t2
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -164,7 +164,7 @@ Text tPlayPause
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -193,7 +193,7 @@ Text t0
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -233,7 +233,7 @@ Text t1
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -263,7 +263,7 @@ Text t3
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -302,7 +302,7 @@ Text tSpeaker
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -353,7 +353,7 @@ Text t5
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -391,7 +391,7 @@ Slider hVolume
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -416,7 +416,7 @@ Button bNext
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
@@ -448,7 +448,7 @@ Button bPrev
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
crcputh 55 bb
|
crcputh 55 bb
|
||||||
crcputs sys0,1
|
crcputs sys0,2
|
||||||
crcputs tSend.txt,0
|
crcputs tSend.txt,0
|
||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
printh 55 bb
|
||||||
|
|||||||
Reference in New Issue
Block a user