mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-15 09:26:58 +01:00
sync (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
3357e07337
commit
4a99e1efbb
@@ -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-07-23 09:12:24.801739561 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -11,9 +11,4 @@
|
@@ -11,9 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||||
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -37,25 +37,6 @@
|
@@ -37,25 +37,6 @@
|
||||||
vis tCode,0
|
vis tCode,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -60,8 +60,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -65,26 +65,6 @@
|
@@ -65,26 +65,6 @@
|
||||||
vis nNum4,0
|
vis nNum4,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -153,8 +153,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||||
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -36,15 +36,6 @@
|
@@ -36,15 +36,6 @@
|
||||||
vis tEntity6,0
|
vis tEntity6,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -202,8 +202,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
|||||||
TouchCap tc0
|
TouchCap tc0
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||||
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -21,21 +21,6 @@
|
@@ -21,21 +21,6 @@
|
||||||
vis t5,0
|
vis t5,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -246,8 +246,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -32,25 +32,6 @@
|
@@ -32,25 +32,6 @@
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
tsw m0,0
|
tsw m0,0
|
||||||
@@ -294,8 +294,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||||
--- HMI/n2t-out/cardThermo.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardThermo.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -41,21 +41,6 @@
|
@@ -41,21 +41,6 @@
|
||||||
vis xTempDest1,0
|
vis xTempDest1,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -338,8 +338,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
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-07-23 09:12:24.801739561 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
@@ -370,8 +370,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
|||||||
{
|
{
|
||||||
Only in HMI/n2t-out: popupFan.txt
|
Only in HMI/n2t-out: popupFan.txt
|
||||||
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-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/popupLight.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -50,29 +50,6 @@
|
@@ -50,29 +50,6 @@
|
||||||
vis t0,0
|
vis t0,0
|
||||||
vis pColorWheel,0
|
vis pColorWheel,0
|
||||||
@@ -422,8 +422,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
|
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
|
||||||
--- HMI/n2t-out/popupNotify.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/popupNotify.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -12,24 +12,12 @@
|
@@ -12,24 +12,12 @@
|
||||||
|
|
||||||
Events
|
Events
|
||||||
@@ -469,8 +469,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
|
|||||||
if(tInstruction.txt=="timeout")
|
if(tInstruction.txt=="timeout")
|
||||||
{
|
{
|
||||||
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-07-23 09:12:24.801739561 +0000
|
--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -40,40 +40,6 @@
|
@@ -40,40 +40,6 @@
|
||||||
prints sys0,2
|
prints sys0,2
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
@@ -638,8 +638,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
|||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||||
--- HMI/n2t-out/screensaver.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/screensaver.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:12:26.089737302 +0000
|
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:17:39.867944253 +0000
|
||||||
@@ -406,22 +406,10 @@
|
@@ -406,22 +406,10 @@
|
||||||
// get value
|
// get value
|
||||||
spstr strCommand.txt,tTmp.txt,"~",1
|
spstr strCommand.txt,tTmp.txt,"~",1
|
||||||
|
|||||||
@@ -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-07-23 09:12:24.801739561 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:12:25.449738425 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
@@ -14,6 +14,6 @@
|
@@ -14,6 +14,6 @@
|
||||||
//color vars
|
//color vars
|
||||||
int defaultFontColor=65535
|
int defaultFontColor=65535
|
||||||
@@ -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-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:12:25.449738425 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
@@ -65,6 +65,16 @@
|
@@ -65,6 +65,16 @@
|
||||||
vis nNum4,0
|
vis nNum4,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -302,8 +302,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Hotspot mSwipeNext
|
Hotspot mSwipeNext
|
||||||
Attributes
|
Attributes
|
||||||
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-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:12:25.449738425 +0000
|
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
@@ -932,10 +932,6 @@
|
@@ -932,10 +932,6 @@
|
||||||
{
|
{
|
||||||
page popupLight
|
page popupLight
|
||||||
@@ -315,53 +315,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
|||||||
|
|
||||||
TouchCap tc0
|
TouchCap tc0
|
||||||
Attributes
|
Attributes
|
||||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
|
||||||
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:12:24.805739554 +0000
|
|
||||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:12:25.449738425 +0000
|
|
||||||
@@ -12,30 +12,26 @@
|
|
||||||
|
|
||||||
Events
|
|
||||||
Preinitialize Event
|
|
||||||
- dim=dimValueNormal
|
|
||||||
- vis p0,0
|
|
||||||
- vis tSend,0
|
|
||||||
- vis tInstruction,0
|
|
||||||
- vis tTmp,0
|
|
||||||
- vis tId,0
|
|
||||||
- vis t5,0
|
|
||||||
- vis bPrev,0
|
|
||||||
- vis bNext,0
|
|
||||||
- cardMedia.bco=defaultBcoColor
|
|
||||||
- for(sys0=0;sys0<34;sys0++)
|
|
||||||
- {
|
|
||||||
- if(b[sys0].type==98||b[sys0].type==116)
|
|
||||||
+ for(sys0=0;sys0<40;sys0++)
|
|
||||||
{
|
|
||||||
b[sys0].bco=defaultBcoColor
|
|
||||||
b[sys0].pco=defaultFontColor
|
|
||||||
}
|
|
||||||
- }
|
|
||||||
if(defaultBcoColor==0)
|
|
||||||
{
|
|
||||||
hVolume.pic=14
|
|
||||||
hVolume.pic1=13
|
|
||||||
hVolume.pic2=15
|
|
||||||
}
|
|
||||||
+ dim=dimValueNormal
|
|
||||||
+ vis p0,0
|
|
||||||
+ vis tSend,0
|
|
||||||
+ vis tInstruction,0
|
|
||||||
+ vis tTmp,0
|
|
||||||
+ vis tId,0
|
|
||||||
+ vis t5,0
|
|
||||||
+ vis bPrev,0
|
|
||||||
+ vis bNext,0
|
|
||||||
|
|
||||||
Variable (string) strCommand
|
|
||||||
Attributes
|
|
||||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:12:24.805739554 +0000
|
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:12:25.449738425 +0000
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
@@ -32,25 +32,6 @@
|
@@ -32,25 +32,6 @@
|
||||||
vis bText2,0
|
vis bText2,0
|
||||||
tsw m0,0
|
tsw m0,0
|
||||||
@@ -389,8 +345,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
|||||||
Variable (string) strCommand
|
Variable (string) strCommand
|
||||||
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-07-23 09:12:24.801739561 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:12:25.449738425 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:17:39.403938674 +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
|
||||||
@@ -409,24 +365,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|||||||
//send calc crc
|
//send calc crc
|
||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
|
||||||
--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:12:24.801739561 +0000
|
|
||||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:12:25.449738425 +0000
|
|
||||||
@@ -143,7 +143,7 @@
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text : Position
|
|
||||||
- Max. Text Size : 30
|
|
||||||
+ Max. Text Size : 15
|
|
||||||
|
|
||||||
Text tInfo1
|
|
||||||
Attributes
|
|
||||||
@@ -163,7 +163,7 @@
|
|
||||||
Send Component ID : disabled
|
|
||||||
Associated Keyboard : none
|
|
||||||
Text :
|
|
||||||
- Max. Text Size : 30
|
|
||||||
+ Max. Text Size : 15
|
|
||||||
|
|
||||||
Picture p0
|
|
||||||
Attributes
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:12:25.465738397 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:17:39.415938818 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:12:24.801739561 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:12:25.449738425 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
+@@ -14,6 +14,6 @@
|
+@@ -14,6 +14,6 @@
|
||||||
+ //color vars
|
+ //color vars
|
||||||
+ int defaultFontColor=65535
|
+ int defaultFontColor=65535
|
||||||
+ int defaultBcoColor=6371
|
+ int defaultBcoColor=6371
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:12:24.805739554 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:12:25.449738425 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
+@@ -65,6 +65,16 @@
|
+@@ -65,6 +65,16 @@
|
||||||
+ vis bPrev,0
|
+ vis bPrev,0
|
||||||
+ vis bNext,0
|
+ vis bNext,0
|
||||||
@@ -31,8 +31,8 @@
|
|||||||
++ }
|
++ }
|
||||||
+
|
+
|
||||||
+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-07-23 09:12:24.805739554 +0000
|
+--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:12:25.449738425 +0000
|
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
+@@ -932,10 +932,6 @@
|
+@@ -932,10 +932,6 @@
|
||||||
+ {
|
+ {
|
||||||
+ page popupLight
|
+ page popupLight
|
||||||
@@ -43,52 +43,9 @@
|
|||||||
+- }
|
+- }
|
||||||
+
|
+
|
||||||
+ TouchCap tc0
|
+ TouchCap tc0
|
||||||
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
|
||||||
+--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:12:24.805739554 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:12:25.449738425 +0000
|
|
||||||
+@@ -12,30 +12,26 @@
|
|
||||||
+ Events
|
|
||||||
+ Preinitialize Event
|
|
||||||
+- dim=dimValueNormal
|
|
||||||
+- vis p0,0
|
|
||||||
+- vis tSend,0
|
|
||||||
+- vis tInstruction,0
|
|
||||||
+- vis tTmp,0
|
|
||||||
+- vis tId,0
|
|
||||||
+- vis t5,0
|
|
||||||
+- vis bPrev,0
|
|
||||||
+- vis bNext,0
|
|
||||||
+- cardMedia.bco=defaultBcoColor
|
|
||||||
+- for(sys0=0;sys0<34;sys0++)
|
|
||||||
+- {
|
|
||||||
+- if(b[sys0].type==98||b[sys0].type==116)
|
|
||||||
++ for(sys0=0;sys0<40;sys0++)
|
|
||||||
+ {
|
|
||||||
+ b[sys0].bco=defaultBcoColor
|
|
||||||
+ b[sys0].pco=defaultFontColor
|
|
||||||
+ }
|
|
||||||
+- }
|
|
||||||
+ if(defaultBcoColor==0)
|
|
||||||
+ {
|
|
||||||
+ hVolume.pic=14
|
|
||||||
+ hVolume.pic1=13
|
|
||||||
+ hVolume.pic2=15
|
|
||||||
+ }
|
|
||||||
++ dim=dimValueNormal
|
|
||||||
++ vis p0,0
|
|
||||||
++ vis tSend,0
|
|
||||||
++ vis tInstruction,0
|
|
||||||
++ vis tTmp,0
|
|
||||||
++ vis tId,0
|
|
||||||
++ vis t5,0
|
|
||||||
++ vis bPrev,0
|
|
||||||
++ vis bNext,0
|
|
||||||
+
|
|
||||||
+ Variable (string) strCommand
|
|
||||||
+ Attributes
|
|
||||||
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||||
+--- HMI/n2t-out/cardQR.txt 2022-07-23 09:12:24.805739554 +0000
|
+--- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:12:25.449738425 +0000
|
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
+@@ -32,25 +32,6 @@
|
+@@ -32,25 +32,6 @@
|
||||||
+ vis bText2,0
|
+ vis bText2,0
|
||||||
+ tsw m0,0
|
+ tsw m0,0
|
||||||
@@ -114,26 +71,5 @@
|
|||||||
+- }
|
+- }
|
||||||
+
|
+
|
||||||
+ Variable (string) strCommand
|
+ Variable (string) strCommand
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:12:24.801739561 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:17:38.939933095 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:12:25.449738425 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:17:39.403938674 +0000
|
||||||
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
|
||||||
+--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:12:24.801739561 +0000
|
|
||||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:12:25.449738425 +0000
|
|
||||||
+@@ -143,7 +143,7 @@
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ Associated Keyboard : none
|
|
||||||
+ Text : Position
|
|
||||||
+- Max. Text Size : 30
|
|
||||||
++ Max. Text Size : 15
|
|
||||||
+
|
|
||||||
+ Text tInfo1
|
|
||||||
+ Attributes
|
|
||||||
+@@ -163,7 +163,7 @@
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ Associated Keyboard : none
|
|
||||||
+ Text :
|
|
||||||
+- Max. Text Size : 30
|
|
||||||
++ Max. Text Size : 15
|
|
||||||
+
|
|
||||||
+ Picture p0
|
|
||||||
+ Attributes
|
|
||||||
|
|||||||
@@ -20,17 +20,6 @@ Page cardMedia
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Preinitialize Event
|
Preinitialize Event
|
||||||
for(sys0=0;sys0<40;sys0++)
|
|
||||||
{
|
|
||||||
b[sys0].bco=defaultBcoColor
|
|
||||||
b[sys0].pco=defaultFontColor
|
|
||||||
}
|
|
||||||
if(defaultBcoColor==0)
|
|
||||||
{
|
|
||||||
hVolume.pic=14
|
|
||||||
hVolume.pic1=13
|
|
||||||
hVolume.pic2=15
|
|
||||||
}
|
|
||||||
dim=dimValueNormal
|
dim=dimValueNormal
|
||||||
vis p0,0
|
vis p0,0
|
||||||
vis tSend,0
|
vis tSend,0
|
||||||
@@ -40,6 +29,21 @@ Page cardMedia
|
|||||||
vis t5,0
|
vis t5,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
vis bNext,0
|
vis bNext,0
|
||||||
|
cardMedia.bco=defaultBcoColor
|
||||||
|
for(sys0=0;sys0<34;sys0++)
|
||||||
|
{
|
||||||
|
if(b[sys0].type==98||b[sys0].type==116)
|
||||||
|
{
|
||||||
|
b[sys0].bco=defaultBcoColor
|
||||||
|
b[sys0].pco=defaultFontColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(defaultBcoColor==0)
|
||||||
|
{
|
||||||
|
hVolume.pic=14
|
||||||
|
hVolume.pic1=13
|
||||||
|
hVolume.pic2=15
|
||||||
|
}
|
||||||
|
|
||||||
Variable (string) strCommand
|
Variable (string) strCommand
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ popupLight
|
|||||||
27 Component(s)
|
27 Component(s)
|
||||||
386 Line(s) of event code
|
386 Line(s) of event code
|
||||||
211 Unique line(s) of event code
|
211 Unique line(s) of event code
|
||||||
popupShutter
|
cardMedia
|
||||||
25 Component(s)
|
34 Component(s)
|
||||||
388 Line(s) of event code
|
388 Line(s) of event code
|
||||||
211 Unique line(s) of event code
|
209 Unique line(s) of event code
|
||||||
cardQR
|
cardQR
|
||||||
32 Component(s)
|
32 Component(s)
|
||||||
384 Line(s) of event code
|
384 Line(s) of event code
|
||||||
@@ -38,10 +38,10 @@ pageStartup
|
|||||||
19 Component(s)
|
19 Component(s)
|
||||||
167 Line(s) of event code
|
167 Line(s) of event code
|
||||||
122 Unique line(s) of event code
|
122 Unique line(s) of event code
|
||||||
cardMedia
|
popupShutter
|
||||||
34 Component(s)
|
25 Component(s)
|
||||||
384 Line(s) of event code
|
388 Line(s) of event code
|
||||||
207 Unique line(s) of event code
|
211 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
38 Component(s)
|
38 Component(s)
|
||||||
332 Line(s) of event code
|
332 Line(s) of event code
|
||||||
@@ -62,5 +62,5 @@ cardThermo
|
|||||||
Total
|
Total
|
||||||
14 Page(s)
|
14 Page(s)
|
||||||
444 Component(s)
|
444 Component(s)
|
||||||
5253 Line(s) of event code
|
5257 Line(s) of event code
|
||||||
1363 Unique line(s) of event code
|
1363 Unique line(s) of event code
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ Text tPosHeading
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 11
|
x coordinate : 11
|
||||||
y coordinate : 183
|
y coordinate : 183
|
||||||
Width : 100
|
Width : 114
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -233,7 +233,7 @@ Text tPosHeading
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : Position
|
Text : Position
|
||||||
Max. Text Size : 15
|
Max. Text Size : 30
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
@@ -278,7 +278,7 @@ Text tTiltHeading
|
|||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 11
|
x coordinate : 11
|
||||||
y coordinate : 335
|
y coordinate : 335
|
||||||
Width : 100
|
Width : 113
|
||||||
Height : 30
|
Height : 30
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
@@ -293,7 +293,7 @@ Text tTiltHeading
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 15
|
Max. Text Size : 30
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|||||||
@@ -12,17 +12,6 @@ Page cardMedia
|
|||||||
|
|
||||||
Events
|
Events
|
||||||
Preinitialize Event
|
Preinitialize Event
|
||||||
for(sys0=0;sys0<40;sys0++)
|
|
||||||
{
|
|
||||||
b[sys0].bco=defaultBcoColor
|
|
||||||
b[sys0].pco=defaultFontColor
|
|
||||||
}
|
|
||||||
if(defaultBcoColor==0)
|
|
||||||
{
|
|
||||||
hVolume.pic=14
|
|
||||||
hVolume.pic1=13
|
|
||||||
hVolume.pic2=15
|
|
||||||
}
|
|
||||||
dim=dimValueNormal
|
dim=dimValueNormal
|
||||||
vis p0,0
|
vis p0,0
|
||||||
vis tSend,0
|
vis tSend,0
|
||||||
@@ -32,6 +21,21 @@ Page cardMedia
|
|||||||
vis t5,0
|
vis t5,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
vis bNext,0
|
vis bNext,0
|
||||||
|
cardMedia.bco=defaultBcoColor
|
||||||
|
for(sys0=0;sys0<34;sys0++)
|
||||||
|
{
|
||||||
|
if(b[sys0].type==98||b[sys0].type==116)
|
||||||
|
{
|
||||||
|
b[sys0].bco=defaultBcoColor
|
||||||
|
b[sys0].pco=defaultFontColor
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(defaultBcoColor==0)
|
||||||
|
{
|
||||||
|
hVolume.pic=14
|
||||||
|
hVolume.pic1=13
|
||||||
|
hVolume.pic2=15
|
||||||
|
}
|
||||||
|
|
||||||
Variable (string) strCommand
|
Variable (string) strCommand
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ Text tPosHeading
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Text : Position
|
Text : Position
|
||||||
Max. Text Size : 15
|
Max. Text Size : 30
|
||||||
|
|
||||||
Text tInfo1
|
Text tInfo1
|
||||||
Attributes
|
Attributes
|
||||||
@@ -163,7 +163,7 @@ Text tTiltHeading
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 15
|
Max. Text Size : 30
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
Attributes
|
Attributes
|
||||||
|
|||||||
Reference in New Issue
Block a user