h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 23:44:25 +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-03-31 20:53:14 +02:00
parent 979c2587bb b24405e579
commit c17b95dca7
13 changed files with 266 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
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-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:35:25.187449610 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:39:21.711985254 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -9,7 +9,21 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm1,0 vis arm1,0
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
@@ -512,75 +513,48 @@ @@ -170,12 +171,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardAlarm,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardAlarm,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -517,75 +513,48 @@
{ {
//entn //entn
spstr strCommand.txt,entn.txt,",",1 spstr strCommand.txt,entn.txt,",",1
@@ -96,7 +110,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis b0,1 vis b0,1
@@ -595,23 +569,9 @@ @@ -600,23 +569,9 @@
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis tCode,1 vis tCode,1
@@ -122,9 +136,23 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
{ {
tmFlash.en=1 tmFlash.en=1
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-03-31 18:35:24.387440559 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:35:25.187449610 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:39:21.711985254 +0000
@@ -1120,33 +1120,6 @@ @@ -714,12 +714,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardEntities,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardEntities,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1125,33 +1120,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,",",1
@@ -159,9 +187,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
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-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:35:25.187449610 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:39:21.711985254 +0000
@@ -568,33 +568,6 @@ @@ -242,12 +242,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardGrid,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardGrid,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -573,33 +568,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,",",1
@@ -196,9 +238,23 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
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-03-31 18:35:24.387440559 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:35:25.187449610 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:39:21.711985254 +0000
@@ -501,55 +501,28 @@ @@ -435,12 +435,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardMedia,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardMedia,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -506,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
@@ -263,7 +319,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -558,14 +531,14 @@ @@ -563,14 +531,14 @@
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
@@ -281,9 +337,23 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
{ {
vis t5,0 vis t5,0
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-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:35:25.187449610 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:39:21.711985254 +0000
@@ -638,53 +638,26 @@ @@ -329,12 +329,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardThermo,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -643,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
@@ -346,7 +416,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
covx tTmp.txt,xTempStep.val,0,0 covx tTmp.txt,xTempStep.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -697,160 +670,190 @@ @@ -702,160 +670,190 @@
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
@@ -581,7 +651,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
@@ -906,28 +909,6 @@ @@ -911,28 +909,6 @@
page cardAlarm page cardAlarm
} }
} }

124
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:39:21.243969492 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:39:21.243969492 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -21,7 +21,21 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
vis arm1,0 vis arm1,0
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
@@ -512,75 +513,48 @@ @@ -170,12 +171,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardAlarm,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardAlarm,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -517,75 +513,48 @@
{ {
//entn //entn
spstr strCommand.txt,entn.txt,",",1 spstr strCommand.txt,entn.txt,",",1
@@ -108,7 +122,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis b0,1 vis b0,1
@@ -595,23 +569,9 @@ @@ -600,23 +569,9 @@
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis tCode,1 vis tCode,1
@@ -134,8 +148,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
{ {
tmFlash.en=1 tmFlash.en=1
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-03-31 18:35:24.387440559 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:39:21.243969492 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -329,7 +343,21 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -852,6 +1010,206 @@ @@ -714,12 +872,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardEntities,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardEntities,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -857,6 +1010,206 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -536,7 +564,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -960,6 +1318,60 @@ @@ -965,6 +1318,60 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -597,7 +625,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1065,6 +1477,50 @@ @@ -1070,6 +1477,50 @@
page popupLight page popupLight
} }
@@ -648,7 +676,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -1120,33 +1576,6 @@ @@ -1125,33 +1576,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,",",1
@@ -682,7 +710,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Type // get Type
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
@@ -1643,6 +2072,254 @@ @@ -1648,6 +2072,254 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -938,9 +966,23 @@ 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-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:39:21.243969492 +0000
@@ -568,33 +568,6 @@ @@ -242,12 +242,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardGrid,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardGrid,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -573,33 +568,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
spstr strCommand.txt,tHeading.txt,",",1 spstr strCommand.txt,tHeading.txt,",",1
@@ -975,9 +1017,23 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
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-03-31 18:35:24.387440559 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:39:21.243969492 +0000
@@ -501,55 +501,28 @@ @@ -435,12 +435,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardMedia,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardMedia,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -506,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
@@ -1042,7 +1098,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -558,14 +531,14 @@ @@ -563,14 +531,14 @@
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
@@ -1060,9 +1116,23 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
{ {
vis t5,0 vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:39:21.243969492 +0000
@@ -638,53 +638,26 @@ @@ -329,12 +329,7 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }
- tSend.txt+="bPrev"
+ tSend.txt="event,buttonPress2,cardThermo,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -643,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0 spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
@@ -1125,7 +1195,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
covx tTmp.txt,xTempStep.val,0,0 covx tTmp.txt,xTempStep.val,0,0
// disable all buttons // disable all buttons
vis bt0,0 vis bt0,0
@@ -697,160 +670,190 @@ @@ -702,160 +670,190 @@
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
@@ -1360,7 +1430,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
//command format pageType,specialPageName //command format pageType,specialPageName
@@ -906,28 +909,6 @@ @@ -911,28 +909,6 @@
page cardAlarm page cardAlarm
} }
} }
@@ -1390,8 +1460,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
udelete payloadLength-1 udelete payloadLength-1
bufferPos=0 bufferPos=0
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-03-31 18:35:24.383440514 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 18:39:20.775930111 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:35:24.787445085 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:39:21.243969492 +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

7
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -339,7 +339,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,bPrev" tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -1431,7 +1431,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardEntities,bPrev" tSend.txt="event,buttonPress2,cardEntities,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -515,7 +515,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardGrid,bPrev" tSend.txt="event,buttonPress2,cardGrid,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -856,7 +856,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardMedia,bPrev" tSend.txt="event,buttonPress2,cardMedia,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -683,7 +683,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardThermo,bPrev" tSend.txt="event,buttonPress2,cardThermo,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

40
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -22,10 +22,6 @@ popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
101 Unique line(s) of event code 101 Unique line(s) of event code
cardAlarm
35 Component(s)
338 Line(s) of event code
211 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
@@ -34,29 +30,33 @@ popupLight
27 Component(s) 27 Component(s)
322 Line(s) of event code 322 Line(s) of event code
173 Unique line(s) of event code 173 Unique line(s) of event code
cardGrid cardMedia
39 Component(s) 30 Component(s)
423 Line(s) of event code 331 Line(s) of event code
245 Unique line(s) of event code 169 Unique line(s) of event code
cardThermo cardAlarm
41 Component(s) 35 Component(s)
453 Line(s) of event code 343 Line(s) of event code
280 Unique line(s) of event code 214 Unique line(s) of event code
screensaver screensaver
29 Component(s) 29 Component(s)
182 Line(s) of event code 182 Line(s) of event code
137 Unique line(s) of event code 137 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
965 Line(s) of event code 970 Line(s) of event code
409 Unique line(s) of event code 412 Unique line(s) of event code
cardMedia cardGrid
30 Component(s) 39 Component(s)
326 Line(s) of event code 428 Line(s) of event code
166 Unique line(s) of event code 248 Unique line(s) of event code
cardThermo
41 Component(s)
458 Line(s) of event code
283 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
351 Component(s) 351 Component(s)
3587 Line(s) of event code 3612 Line(s) of event code
1032 Unique line(s) of event code 1035 Unique line(s) of event code

7
HMI/n2t-out/cardAlarm.txt
View File

@@ -170,7 +170,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardAlarm,bPrev" tSend.txt="event,buttonPress2,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out/cardEntities.txt
View File

@@ -714,7 +714,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardEntities,bPrev" tSend.txt="event,buttonPress2,cardEntities,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out/cardGrid.txt
View File

@@ -242,7 +242,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardGrid,bPrev" tSend.txt="event,buttonPress2,cardGrid,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out/cardMedia.txt
View File

@@ -435,7 +435,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardMedia,bPrev" tSend.txt="event,buttonPress2,cardMedia,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

7
HMI/n2t-out/cardThermo.txt
View File

@@ -329,7 +329,12 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardThermo,bPrev" tSend.txt="event,buttonPress2,cardThermo,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}
tSend.txt+="bPrev"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC