mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 07:24:24 +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
86c57bc5a6
commit
959b4f3f73
@@ -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:01:52.594305773 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:01:53.422317965 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:05:11.768549110 +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:01:52.594305773 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:01:53.422317965 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:05:11.768549110 +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:01:52.594305773 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:01:53.422317965 +0000
|
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:05:11.768549110 +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:01:52.594305773 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:01:53.422317965 +0000
|
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:05:11.768549110 +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:01:52.594305773 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -10,75 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
|||||||
+ // fix touch offset (Removed for US version)
|
+ // fix touch offset (Removed for US version)
|
||||||
+ //lcd_dev fffb 0002 0000 0020
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
|
||||||
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.594305773 +0000
|
|
||||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.978311427 +0000
|
|
||||||
@@ -46,7 +46,7 @@
|
|
||||||
Attributes
|
|
||||||
Scope : local
|
|
||||||
Text :
|
|
||||||
- Max. Text Size: 80
|
|
||||||
+ Max. Text Size: 50
|
|
||||||
|
|
||||||
Variable (string) tSend
|
|
||||||
Attributes
|
|
||||||
@@ -152,7 +152,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
|
|
||||||
@@ -184,7 +184,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
|
|
||||||
@@ -367,7 +367,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
|
|
||||||
@@ -397,7 +397,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
|
|
||||||
@@ -427,7 +427,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
|
|
||||||
@@ -457,7 +457,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/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:01:52.594305773 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -493,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:01:52.594305773 +0000
|
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -71,25 +71,25 @@
|
@@ -71,25 +71,25 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -542,8 +476,8 @@ 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
|
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||||
--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:01:52.594305773 +0000
|
--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -25,19 +25,19 @@
|
@@ -25,19 +25,19 @@
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -658,8 +592,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
|||||||
//send cmd
|
//send cmd
|
||||||
printh 55 bb
|
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:01:52.594305773 +0000
|
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -30,7 +30,7 @@
|
@@ -30,7 +30,7 @@
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
@@ -679,8 +613,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:01:52.594305773 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:05:11.352546659 +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
|
||||||
@@ -700,8 +634,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:01:52.594305773 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -59,8 +59,8 @@
|
@@ -59,8 +59,8 @@
|
||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
@@ -727,8 +661,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:01:52.594305773 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:01:52.978311427 +0000
|
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
@@ -46,8 +46,8 @@
|
@@ -46,8 +46,8 @@
|
||||||
Variable (string) entn
|
Variable (string) entn
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
@@ -1,74 +1,8 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:01:52.994311663 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:05:11.368546754 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:01:52.594305773 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.594305773 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.978311427 +0000
|
|
||||||
+@@ -46,7 +46,7 @@
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Text :
|
|
||||||
+- Max. Text Size: 80
|
|
||||||
++ Max. Text Size: 50
|
|
||||||
+
|
|
||||||
+ Variable (string) tSend
|
|
||||||
+ Attributes
|
|
||||||
+@@ -152,7 +152,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
|
|
||||||
+@@ -184,7 +184,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
|
|
||||||
+@@ -367,7 +367,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
|
|
||||||
+@@ -397,7 +397,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
|
|
||||||
+@@ -427,7 +427,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
|
|
||||||
+@@ -457,7 +457,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
|
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:01:52.594305773 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:01:52.978311427 +0000
|
|
||||||
+@@ -62,6 +62,16 @@
|
+@@ -62,6 +62,16 @@
|
||||||
+ vis bPrev,0
|
+ vis bPrev,0
|
||||||
+ vis bNext,0
|
+ vis bNext,0
|
||||||
@@ -91,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:01:52.594305773 +0000
|
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
+@@ -71,25 +71,25 @@
|
+@@ -71,25 +71,25 @@
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
@@ -140,8 +74,8 @@
|
|||||||
+ Text tHeading
|
+ Text tHeading
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||||
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:01:52.594305773 +0000
|
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
+@@ -25,19 +25,19 @@
|
+@@ -25,19 +25,19 @@
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
@@ -256,8 +190,8 @@
|
|||||||
+ //send cmd
|
+ //send cmd
|
||||||
+ printh 55 bb
|
+ 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:01:52.594305773 +0000
|
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
+@@ -30,7 +30,7 @@
|
+@@ -30,7 +30,7 @@
|
||||||
+ Send Component ID : disabled
|
+ Send Component ID : disabled
|
||||||
+ Associated Keyboard : none
|
+ Associated Keyboard : none
|
||||||
@@ -276,11 +210,11 @@
|
|||||||
+
|
+
|
||||||
+ Picture p0
|
+ Picture p0
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:01:52.594305773 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:05:10.964544420 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:05:11.352546659 +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:01:52.594305773 +0000
|
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
+@@ -59,8 +59,8 @@
|
+@@ -59,8 +59,8 @@
|
||||||
+ Variable (string) entn
|
+ Variable (string) entn
|
||||||
+ Attributes
|
+ Attributes
|
||||||
@@ -306,8 +240,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:01:52.594305773 +0000
|
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:01:52.978311427 +0000
|
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:05:11.352546659 +0000
|
||||||
+@@ -46,8 +46,8 @@
|
+@@ -46,8 +46,8 @@
|
||||||
+ Variable (string) entn
|
+ Variable (string) entn
|
||||||
+ Attributes
|
+ Attributes
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ Variable (string) entn
|
|||||||
ID : 9
|
ID : 9
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 50
|
Max. Text Size: 80
|
||||||
|
|
||||||
Variable (string) tSend
|
Variable (string) tSend
|
||||||
Attributes
|
Attributes
|
||||||
@@ -299,7 +299,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
|
||||||
@@ -353,7 +353,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
|
||||||
@@ -824,7 +824,7 @@ Button arm1
|
|||||||
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
|
||||||
@@ -878,7 +878,7 @@ Button arm3
|
|||||||
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
|
||||||
@@ -932,7 +932,7 @@ Button arm2
|
|||||||
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
|
||||||
@@ -986,7 +986,7 @@ Button arm4
|
|||||||
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
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ Variable (string) entn
|
|||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size: 50
|
Max. Text Size: 80
|
||||||
|
|
||||||
Variable (string) tSend
|
Variable (string) tSend
|
||||||
Attributes
|
Attributes
|
||||||
@@ -152,7 +152,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
|
||||||
@@ -184,7 +184,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
|
||||||
@@ -367,7 +367,7 @@ Button arm1
|
|||||||
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
|
||||||
@@ -397,7 +397,7 @@ Button arm3
|
|||||||
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
|
||||||
@@ -427,7 +427,7 @@ Button arm2
|
|||||||
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
|
||||||
@@ -457,7 +457,7 @@ Button arm4
|
|||||||
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