h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-29 02:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
Johannes
2022-05-06 17:07:14 +02:00
parent ab3301ffbd cbb875cc1b
commit 8f82d9465f
26 changed files with 371 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
HMI/US/landscape/diff-eu-version.txt
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 13:57:21.259205735 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 13:57:22.043215037 +0000
--- 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
@@ -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 13:57:21.259205735 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 13:57:22.043215037 +0000
--- 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
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

516
HMI/US/portrait/diff-eu-version.txt
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 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:57:21.639210244 +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
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,18 +11,9 @@ 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 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.639210244 +0000
@@ -33,8 +33,6 @@
vis b9,0
vis b10,0
vis tCode,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
@@ -46,7 +44,7 @@
--- 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
@@ -46,7 +46,7 @@
Attributes
Scope : local
Text :
@@ -31,7 +22,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Variable (string) tSend
Attributes
@@ -152,7 +150,7 @@
@@ -152,7 +152,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -40,7 +31,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -184,7 +182,7 @@
@@ -184,7 +184,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -49,7 +40,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -367,7 +365,7 @@
@@ -367,7 +367,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -58,7 +49,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -397,7 +395,7 @@
@@ -397,7 +397,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -67,7 +58,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -427,7 +425,7 @@
@@ -427,7 +427,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -76,7 +67,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -457,7 +455,7 @@
@@ -457,7 +457,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -85,24 +76,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -737,7 +735,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
--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:57:21.639210244 +0000
@@ -62,8 +62,16 @@
--- 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
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
vis nNum4,0
- vis bPrev,0
- vis bNext,0
+ //ui e5
+ vis btOnOff5,0
+ vis bUp5,0
@@ -113,10 +93,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ vis bText5,0
+ vis hSlider5,0
+ vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -119,6 +127,18 @@
@@ -119,6 +129,18 @@
Text :
Max. Text Size: 80
@@ -135,7 +115,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1
Attributes
Scope : local
@@ -155,6 +175,15 @@
@@ -155,6 +177,15 @@
Associated Keyboard : none
Value : 0
@@ -151,7 +131,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
Scope : local
@@ -285,6 +314,26 @@
@@ -285,6 +316,26 @@
Text :
Max. Text Size : 50
@@ -178,7 +158,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -404,6 +453,34 @@
@@ -404,6 +455,34 @@
prints tSend.txt,0
prints crcval,2
@@ -213,25 +193,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -728,7 +805,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
@@ -753,7 +830,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
@@ -861,6 +938,106 @@
@@ -861,6 +940,106 @@
prints tSend.txt,0
prints crcval,2
@@ -338,7 +300,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -969,6 +1146,33 @@
@@ -969,6 +1148,33 @@
prints tSend.txt,0
prints crcval,2
@@ -372,7 +334,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1074,6 +1278,28 @@
@@ -1074,6 +1280,28 @@
page popupLight
}
@@ -401,7 +363,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial
Attributes
Scope : local
@@ -1644,6 +1870,128 @@
@@ -1644,6 +1872,128 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
}
@@ -531,18 +493,9 @@ 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 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:57:21.639210244 +0000
@@ -34,8 +34,6 @@
vis tEntity4,0
vis tEntity5,0
vis tEntity6,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
@@ -71,25 +69,25 @@
--- 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
@@ -71,25 +71,25 @@
Attributes
Scope : local
Text :
@@ -572,7 +525,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Variable (string) type5
Attributes
@@ -107,13 +105,13 @@
@@ -107,13 +107,13 @@
Attributes
Scope : local
Text :
@@ -588,99 +541,10 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
@@ -256,7 +254,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
@@ -281,7 +279,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
@@ -317,7 +315,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 +351,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
@@ -389,7 +387,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
@@ -425,7 +423,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
@@ -461,7 +459,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
@@ -497,7 +495,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
@@ -840,7 +838,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:57:21.639210244 +0000
@@ -18,26 +18,25 @@
vis tTmp,0
vis tId,0
vis t5,0
- vis bPrev,0
- vis bNext,0
+ //vis nPageDisp,0
Variable (string) strCommand
--- 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
@@ -25,19 +25,19 @@
Attributes
Scope : local
Text :
@@ -703,7 +567,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (int32) vaSpeakerPos
Attributes
@@ -135,7 +134,7 @@
@@ -135,7 +135,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -712,7 +576,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -164,7 +163,7 @@
@@ -164,7 +164,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -721,7 +585,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -193,7 +192,7 @@
@@ -193,7 +193,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -730,7 +594,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -233,7 +232,7 @@
@@ -233,7 +233,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -739,7 +603,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -263,7 +262,7 @@
@@ -263,7 +263,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -748,7 +612,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -302,7 +301,7 @@
@@ -302,7 +302,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -757,7 +621,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -353,7 +352,7 @@
@@ -353,7 +353,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -766,7 +630,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -391,7 +390,7 @@
@@ -391,7 +391,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -775,7 +639,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -416,7 +415,7 @@
@@ -416,7 +416,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -784,7 +648,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -448,7 +447,7 @@
@@ -448,7 +448,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -793,28 +657,10 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -698,7 +697,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:57:21.639210244 +0000
@@ -31,8 +31,6 @@
vis bt6,0
vis bt7,0
vis bt8,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
@@ -44,7 +42,7 @@
--- 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
@@ -44,7 +44,7 @@
Attributes
Scope : local
Text :
@@ -823,7 +669,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Variable (string) va0
Attributes
@@ -239,7 +237,7 @@
@@ -239,7 +239,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -832,7 +678,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -275,7 +273,7 @@
@@ -275,7 +275,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -841,7 +687,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -311,7 +309,7 @@
@@ -311,7 +311,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -850,7 +696,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -343,7 +341,7 @@
@@ -343,7 +343,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -859,7 +705,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -370,7 +368,7 @@
@@ -370,7 +370,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -868,7 +714,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -397,7 +395,7 @@
@@ -397,7 +397,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -877,7 +723,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -424,7 +422,7 @@
@@ -424,7 +424,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -886,7 +732,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -451,7 +449,7 @@
@@ -451,7 +451,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -895,7 +741,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -478,7 +476,7 @@
@@ -478,7 +478,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -904,7 +750,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -505,7 +503,7 @@
@@ -505,7 +505,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -913,7 +759,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -532,7 +530,7 @@
@@ -532,7 +532,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -922,7 +768,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -559,7 +557,7 @@
@@ -559,7 +559,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -931,7 +777,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -586,7 +584,7 @@
@@ -586,7 +586,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -940,18 +786,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -950,7 +948,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
--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:57:21.639210244 +0000
--- 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
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -971,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 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:57:21.639210244 +0000
--- 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
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -982,7 +819,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
Max. Text Size : 100
Text tVersion
@@ -177,12 +177,12 @@
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
@@ -991,24 +828,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:57:21.639210244 +0000
@@ -29,7 +29,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/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
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -1020,93 +842,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
@@ -213,7 +213,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
@@ -243,7 +243,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
@@ -273,7 +273,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
@@ -298,7 +298,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
@@ -361,7 +361,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/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:57:21.639210244 +0000
@@ -120,7 +120,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
@@ -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
@@ -174,7 +174,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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:57:21.639210244 +0000
@@ -29,7 +29,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/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
@@ -1127,125 +865,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -172,7 +172,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
@@ -197,7 +197,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
@@ -222,7 +222,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
@@ -247,7 +247,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-06 13:57:21.259205735 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:57:21.639210244 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
vis p0,0
- vis tNotifyHead,0
- vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -292,26 +290,6 @@
Text :
Max. Text Size : 10
-Text tNotifyHead
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 35
-
-Text tNotifyText
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 35
-
Picture p0
Attributes
Scope : local
@@ -543,20 +521,6 @@
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
- if(tInstruction.txt=="notify")
- {
- spstr strCommand.txt,tNotifyHead.txt,"~",1
- spstr strCommand.txt,tNotifyText.txt,"~",2
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- vis tNotifyHead,1
- vis tNotifyText,1
- }else
- {
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
if(tInstruction.txt=="pageType")
{
dim=100
@@ -646,16 +610,6 @@
Events
Touch Press Event
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- if(dim!=0)
- {
- tNotifyHead.txt=""
- tNotifyText.txt=""
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
@@ -664,7 +618,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

515
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,19 +1,10 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 13:57:21.651210386 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:57:21.639210244 +0000
+++ 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
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -33,8 +33,6 @@
+ vis b9,0
+ vis b10,0
+ vis tCode,0
+- vis bPrev,0
+- vis bNext,0
+
+ Variable (string) strCommand
+ Attributes
+@@ -46,7 +44,7 @@
+--- 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
+@@ -46,7 +46,7 @@
+ Attributes
+ Scope : local
+ Text :
@@ -22,7 +13,7 @@
+
+ Variable (string) tSend
+ Attributes
+@@ -152,7 +150,7 @@
+@@ -152,7 +152,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -31,7 +22,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -184,7 +182,7 @@
+@@ -184,7 +184,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -40,7 +31,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -367,7 +365,7 @@
+@@ -367,7 +367,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -49,7 +40,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -397,7 +395,7 @@
+@@ -397,7 +397,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -58,7 +49,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -427,7 +425,7 @@
+@@ -427,7 +427,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -67,7 +58,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -457,7 +455,7 @@
+@@ -457,7 +457,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -76,69 +67,33 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -737,7 +735,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 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -62,8 +62,16 @@
+- vis bPrev,0
+- vis bNext,0
+@@ -119,6 +127,18 @@
+--- 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
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
+@@ -119,6 +129,18 @@
+ Max. Text Size: 80
++ Max. Text Size: 80
+@@ -155,6 +175,15 @@
+@@ -285,6 +314,26 @@
+@@ -404,6 +453,34 @@
+@@ -155,6 +177,15 @@
+@@ -285,6 +316,26 @@
+@@ -404,6 +455,34 @@
++ crcputs sys0,2
+@@ -728,7 +805,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
+@@ -753,7 +830,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
+@@ -861,6 +938,106 @@
+@@ -861,6 +940,106 @@
++ crcputs sys0,2
++ crcputs sys0,2
++ crcputs sys0,2
+@@ -969,6 +1146,33 @@
+@@ -969,6 +1148,33 @@
++ crcputs sys0,2
+@@ -1074,6 +1278,28 @@
+@@ -1644,6 +1870,128 @@
+@@ -1074,6 +1280,28 @@
+@@ -1644,6 +1872,128 @@
+ }
+ 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 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -34,8 +34,6 @@
+ vis tEntity4,0
+ vis tEntity5,0
+ vis tEntity6,0
+- vis bPrev,0
+- vis bNext,0
+
+ Variable (string) strCommand
+ Attributes
+@@ -71,25 +69,25 @@
+--- 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
+@@ -71,25 +71,25 @@
+ Attributes
+ Scope : local
+ Text :
@@ -168,7 +123,7 @@
+
+ Variable (string) type5
+ Attributes
+@@ -107,13 +105,13 @@
+@@ -107,13 +107,13 @@
+ Attributes
+ Scope : local
+ Text :
@@ -184,99 +139,10 @@
+
+ Text tHeading
+ Attributes
+@@ -256,7 +254,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
+@@ -281,7 +279,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
+@@ -317,7 +315,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 +351,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
+@@ -389,7 +387,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
+@@ -425,7 +423,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
+@@ -461,7 +459,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
+@@ -497,7 +495,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
+@@ -840,7 +838,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -18,26 +18,25 @@
+ vis tTmp,0
+ vis tId,0
+ vis t5,0
+- vis bPrev,0
+- vis bNext,0
++ //vis nPageDisp,0
+
+ Variable (string) strCommand
+--- 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
+@@ -25,19 +25,19 @@
+ Attributes
+ Scope : local
+ Text :
@@ -299,7 +165,7 @@
+
+ Variable (int32) vaSpeakerPos
+ Attributes
+@@ -135,7 +134,7 @@
+@@ -135,7 +135,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -308,7 +174,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -164,7 +163,7 @@
+@@ -164,7 +164,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -317,7 +183,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -193,7 +192,7 @@
+@@ -193,7 +193,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -326,7 +192,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -233,7 +232,7 @@
+@@ -233,7 +233,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -335,7 +201,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -263,7 +262,7 @@
+@@ -263,7 +263,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -344,7 +210,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -302,7 +301,7 @@
+@@ -302,7 +302,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -353,7 +219,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -353,7 +352,7 @@
+@@ -353,7 +353,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -362,7 +228,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -391,7 +390,7 @@
+@@ -391,7 +391,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -371,7 +237,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -416,7 +415,7 @@
+@@ -416,7 +416,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -380,7 +246,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -448,7 +447,7 @@
+@@ -448,7 +448,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -389,28 +255,10 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -698,7 +697,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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -31,8 +31,6 @@
+ vis bt6,0
+ vis bt7,0
+ vis bt8,0
+- vis bPrev,0
+- vis bNext,0
+
+ Variable (string) strCommand
+ Attributes
+@@ -44,7 +42,7 @@
+--- 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
+@@ -44,7 +44,7 @@
+ Attributes
+ Scope : local
+ Text :
@@ -419,7 +267,7 @@
+
+ Variable (string) va0
+ Attributes
+@@ -239,7 +237,7 @@
+@@ -239,7 +239,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -428,7 +276,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -275,7 +273,7 @@
+@@ -275,7 +275,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -437,7 +285,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -311,7 +309,7 @@
+@@ -311,7 +311,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -446,7 +294,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -343,7 +341,7 @@
+@@ -343,7 +343,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -455,7 +303,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -370,7 +368,7 @@
+@@ -370,7 +370,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -464,7 +312,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -397,7 +395,7 @@
+@@ -397,7 +397,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -473,7 +321,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -424,7 +422,7 @@
+@@ -424,7 +424,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -482,7 +330,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -451,7 +449,7 @@
+@@ -451,7 +451,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -491,7 +339,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -478,7 +476,7 @@
+@@ -478,7 +478,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -500,7 +348,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -505,7 +503,7 @@
+@@ -505,7 +505,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -509,7 +357,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -532,7 +530,7 @@
+@@ -532,7 +532,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -518,7 +366,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -559,7 +557,7 @@
+@@ -559,7 +559,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -527,7 +375,7 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -586,7 +584,7 @@
+@@ -586,7 +586,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -536,18 +384,9 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -950,7 +948,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
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:57:21.639210244 +0000
+--- 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
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -566,27 +405,11 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -177,12 +177,12 @@
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- 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
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -29,7 +29,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/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
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -598,93 +421,9 @@
+
+ Variable (int32) mode
+ Attributes
+@@ -213,7 +213,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
+@@ -243,7 +243,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
+@@ -273,7 +273,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
+@@ -298,7 +298,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
+@@ -361,7 +361,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/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -120,7 +120,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
+@@ -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
+@@ -174,7 +174,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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -29,7 +29,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/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
@@ -705,125 +444,3 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -172,7 +172,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
+@@ -197,7 +197,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
+@@ -222,7 +222,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
+@@ -247,7 +247,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-05-06 13:57:21.259205735 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:57:21.639210244 +0000
+@@ -17,8 +17,6 @@
+ vis tInstruction,0
+ vis tTmp,0
+ vis p0,0
+- vis tNotifyHead,0
+- vis tNotifyText,0
+ //load gloabl time string from pageIcons
+ //tTime.txt=vaTime.txt
+ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
+@@ -292,26 +290,6 @@
+ Text :
+ Max. Text Size : 10
+
+-Text tNotifyHead
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 35
+-
+-Text tNotifyText
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 35
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -543,20 +521,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",23
+ covx tTmp.txt,tMR.pco,0,0
+ }
+- if(tInstruction.txt=="notify")
+- {
+- spstr strCommand.txt,tNotifyHead.txt,"~",1
+- spstr strCommand.txt,tNotifyText.txt,"~",2
+- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+- {
+- vis tNotifyHead,1
+- vis tNotifyText,1
+- }else
+- {
+- vis tNotifyHead,0
+- vis tNotifyText,0
+- }
+- }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100
+@@ -646,16 +610,6 @@
+
+ Events
+ Touch Press Event
+- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+- {
+- if(dim!=0)
+- {
+- tNotifyHead.txt=""
+- tNotifyText.txt=""
+- vis tNotifyHead,0
+- vis tNotifyText,0
+- }
+- }
+ dim=dimValueNormal
+ vaTap.val+=1
+ covx vaTap.val,tTmp.txt,0,0
+@@ -664,7 +618,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

4
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -41,6 +41,8 @@ Page cardAlarm
vis b9,0
vis b10,0
vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -1266,7 +1268,7 @@ Timer tmSleep
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

6
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -80,6 +80,8 @@ Page cardEntities
vis bText5,0
vis hSlider5,0
vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -1600,7 +1602,7 @@ Button bPrev
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
@@ -1647,7 +1649,7 @@ Button bNext
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

20
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -42,6 +42,8 @@ Page cardGrid
vis tEntity4,0
vis tEntity5,0
vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -527,7 +529,7 @@ Button bPrev
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
@@ -574,7 +576,7 @@ Button bNext
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
@@ -632,7 +634,7 @@ Button bEntity1
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
@@ -690,7 +692,7 @@ Button bEntity2
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
@@ -748,7 +750,7 @@ Button bEntity3
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
@@ -806,7 +808,7 @@ Button bEntity4
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
@@ -864,7 +866,7 @@ Button bEntity5
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
@@ -922,7 +924,7 @@ Button bEntity6
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
@@ -1276,7 +1278,7 @@ Timer tmSleep
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

5
HMI/US/portrait/n2t-out-visual/cardMedia.txt
View File

@@ -26,7 +26,8 @@ Page cardMedia
vis tTmp,0
vis tId,0
vis t5,0
//vis nPageDisp,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -1120,7 +1121,7 @@ Timer tmSleep
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

4
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -39,6 +39,8 @@ Page cardThermo
vis bt6,0
vis bt7,0
vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -1502,7 +1504,7 @@ Timer tmSleep
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

46
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -17,42 +17,42 @@ popupNotify
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
108 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
182 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
screensaver
33 Component(s)
266 Line(s) of event code
218 Unique line(s) of event code
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
cardMedia
30 Component(s)
329 Line(s) of event code
169 Unique line(s) of event code
331 Line(s) of event code
171 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
cardGrid
39 Component(s)
418 Line(s) of event code
244 Unique line(s) of event code
345 Line(s) of event code
216 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
247 Unique line(s) of event code
444 Line(s) of event code
249 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
cardEntities
74 Component(s)
1157 Line(s) of event code
480 Unique line(s) of event code
1159 Line(s) of event code
482 Unique line(s) of event code
Total
12 Page(s)
353 Component(s)
3853 Line(s) of event code
1059 Unique line(s) of event code
355 Component(s)
3889 Line(s) of event code
1076 Unique line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -467,7 +467,7 @@ Button bSendStartup
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

12
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -37,7 +37,7 @@ Page popupLight
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
@@ -465,7 +465,7 @@ Picture pColorWheel
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
@@ -510,7 +510,7 @@ Slider hBrightness
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
@@ -555,7 +555,7 @@ Slider hTempSlider
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
@@ -602,7 +602,7 @@ Button b0
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
@@ -705,7 +705,7 @@ Dual-state Button btOnOff1
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

6
HMI/US/portrait/n2t-out-visual/popupNotify.txt
View File

@@ -283,7 +283,7 @@ Button b0
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
@@ -332,7 +332,7 @@ Button b2
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
@@ -381,7 +381,7 @@ Button b1
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

10
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -37,7 +37,7 @@ Page popupShutter
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
@@ -369,7 +369,7 @@ Button b0
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
@@ -416,7 +416,7 @@ Button bDown1
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
@@ -463,7 +463,7 @@ Button bStop1
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
@@ -510,7 +510,7 @@ Button bUp1
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

88
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -25,6 +25,8 @@ Page screensaver
vis tInstruction,0
vis tTmp,0
vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -763,6 +765,66 @@ Text tMR
Horizontal Spacing : 0
Vertical Spacing : 0
Text tNotifyHead
Attributes
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 240
Width : 320
Height : 58
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tNotifyText
Attributes
ID : 34
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 298
Width : 320
Height : 58
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 3
Back. Color : 0
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 35
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -1005,6 +1067,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType")
{
dim=100
@@ -1096,6 +1172,16 @@ TouchCap tc0
Events
Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
@@ -1104,7 +1190,7 @@ TouchCap tc0
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

4
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -33,6 +33,8 @@ Page cardAlarm
vis b9,0
vis b10,0
vis tCode,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -735,7 +737,7 @@ Timer tmSleep
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

6
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -72,6 +72,8 @@ Page cardEntities
vis bText5,0
vis hSlider5,0
vis nNum5,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -805,7 +807,7 @@ Button bPrev
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
@@ -830,7 +832,7 @@ Button bNext
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

20
HMI/US/portrait/n2t-out/cardGrid.txt
View File

@@ -34,6 +34,8 @@ Page cardGrid
vis tEntity4,0
vis tEntity5,0
vis tEntity6,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -254,7 +256,7 @@ Button bPrev
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
@@ -279,7 +281,7 @@ Button bNext
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
@@ -315,7 +317,7 @@ Button bEntity1
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
@@ -351,7 +353,7 @@ Button bEntity2
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
@@ -387,7 +389,7 @@ Button bEntity3
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
@@ -423,7 +425,7 @@ Button bEntity4
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
@@ -459,7 +461,7 @@ Button bEntity5
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
@@ -495,7 +497,7 @@ Button bEntity6
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
@@ -838,7 +840,7 @@ Timer tmSleep
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

5
HMI/US/portrait/n2t-out/cardMedia.txt
View File

@@ -18,7 +18,8 @@ Page cardMedia
vis tTmp,0
vis tId,0
vis t5,0
//vis nPageDisp,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -697,7 +698,7 @@ Timer tmSleep
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

4
HMI/US/portrait/n2t-out/cardThermo.txt
View File

@@ -31,6 +31,8 @@ Page cardThermo
vis bt6,0
vis bt7,0
vis bt8,0
vis bPrev,0
vis bNext,0
Variable (string) strCommand
Attributes
@@ -948,7 +950,7 @@ Timer tmSleep
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

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -182,7 +182,7 @@ Button bSendStartup
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

12
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -29,7 +29,7 @@ Page popupLight
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
@@ -213,7 +213,7 @@ Picture pColorWheel
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
@@ -243,7 +243,7 @@ Slider hBrightness
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
@@ -273,7 +273,7 @@ Slider hTempSlider
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
@@ -298,7 +298,7 @@ Button b0
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
@@ -361,7 +361,7 @@ Dual-state Button btOnOff1
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

6
HMI/US/portrait/n2t-out/popupNotify.txt
View File

@@ -120,7 +120,7 @@ Button b0
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
@@ -147,7 +147,7 @@ Button b2
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
@@ -174,7 +174,7 @@ Button b1
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

10
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -29,7 +29,7 @@ Page popupShutter
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
@@ -172,7 +172,7 @@ Button b0
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
@@ -197,7 +197,7 @@ Button bDown1
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
@@ -222,7 +222,7 @@ Button bStop1
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
@@ -247,7 +247,7 @@ Button bUp1
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

48
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -17,6 +17,8 @@ Page screensaver
vis tInstruction,0
vis tTmp,0
vis p0,0
vis tNotifyHead,0
vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -290,6 +292,26 @@ Text tMR
Text :
Max. Text Size : 10
Text tNotifyHead
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Text tNotifyText
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 35
Picture p0
Attributes
Scope : local
@@ -521,6 +543,20 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")
{
spstr strCommand.txt,tNotifyHead.txt,"~",1
spstr strCommand.txt,tNotifyText.txt,"~",2
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
vis tNotifyHead,1
vis tNotifyText,1
}else
{
vis tNotifyHead,0
vis tNotifyText,0
}
}
if(tInstruction.txt=="pageType")
{
dim=100
@@ -610,6 +646,16 @@ TouchCap tc0
Events
Touch Press Event
if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{
if(dim!=0)
{
tNotifyHead.txt=""
tNotifyText.txt=""
vis tNotifyHead,0
vis tNotifyText,0
}
}
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
@@ -618,7 +664,7 @@ TouchCap tc0
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

BIN
HMI/US/portrait/nspanel_US_P.HMI
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.tft
View File

Binary file not shown.