mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-20 14:37:01 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
Johannes
@@ -1,6 +1,105 @@
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.962304989 +0000
|
||||
@@ -513,75 +513,48 @@
|
||||
{
|
||||
//entn
|
||||
spstr strCommand.txt,entn.txt,",",1
|
||||
- // navigation icons
|
||||
- spstr strCommand.txt,tId.txt,",",2
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bPrev,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î°"
|
||||
- }
|
||||
- if(tTmp.txt=="2")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î¶"
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bNext,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bNext.txt="î³"
|
||||
- }
|
||||
//text arm1
|
||||
- spstr strCommand.txt,arm1.txt,",",3
|
||||
+ spstr strCommand.txt,arm1.txt,",",2
|
||||
if(arm1.txt!="")
|
||||
{
|
||||
vis arm1,1
|
||||
}
|
||||
//id arm1
|
||||
- spstr strCommand.txt,va1.txt,",",4
|
||||
+ spstr strCommand.txt,va1.txt,",",3
|
||||
//text arm2
|
||||
- spstr strCommand.txt,arm2.txt,",",5
|
||||
+ spstr strCommand.txt,arm2.txt,",",4
|
||||
if(arm2.txt!="")
|
||||
{
|
||||
vis arm2,1
|
||||
}
|
||||
//id arm2
|
||||
- spstr strCommand.txt,va2.txt,",",6
|
||||
+ spstr strCommand.txt,va2.txt,",",5
|
||||
//text arm3
|
||||
- spstr strCommand.txt,arm3.txt,",",7
|
||||
+ spstr strCommand.txt,arm3.txt,",",6
|
||||
if(arm3.txt!="")
|
||||
{
|
||||
vis arm3,1
|
||||
}
|
||||
//id arm3
|
||||
- spstr strCommand.txt,va3.txt,",",8
|
||||
+ spstr strCommand.txt,va3.txt,",",7
|
||||
//text arm4
|
||||
- spstr strCommand.txt,arm4.txt,",",9
|
||||
+ spstr strCommand.txt,arm4.txt,",",8
|
||||
if(arm4.txt!="")
|
||||
{
|
||||
vis arm4,1
|
||||
}
|
||||
//id arm4
|
||||
- spstr strCommand.txt,va4.txt,",",10
|
||||
+ spstr strCommand.txt,va4.txt,",",9
|
||||
//icon
|
||||
- spstr strCommand.txt,tTmp.txt,",",11
|
||||
+ spstr strCommand.txt,tTmp.txt,",",10
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//icon color
|
||||
- spstr strCommand.txt,tTmp.txt,",",12
|
||||
+ spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon.pco=sys0
|
||||
//numpad status
|
||||
- spstr strCommand.txt,tTmp.txt,",",13
|
||||
+ spstr strCommand.txt,tTmp.txt,",",12
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis b0,1
|
||||
@@ -598,7 +571,7 @@
|
||||
vis tCode,1
|
||||
}
|
||||
//flashing status
|
||||
- spstr strCommand.txt,tTmp.txt,",",14
|
||||
+ spstr strCommand.txt,tTmp.txt,",",13
|
||||
if(tTmp.txt=="enable")
|
||||
{
|
||||
tmFlash.en=1
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 14:19:06.280373872 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 14:19:07.100374234 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 18:20:56.962304989 +0000
|
||||
@@ -1120,33 +1120,6 @@
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
|
||||
@@ -36,8 +135,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
spstr strCommand.txt,type1.txt,",",3
|
||||
// get internal name
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-03-31 14:19:06.276373870 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 14:19:07.100374234 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 18:20:56.962304989 +0000
|
||||
@@ -568,33 +568,6 @@
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
|
||||
@@ -72,9 +171,94 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
// get Type
|
||||
spstr strCommand.txt,type1.txt,",",3
|
||||
// get internal name
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 18:20:56.962304989 +0000
|
||||
@@ -501,55 +501,28 @@
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
- //heading
|
||||
- spstr strCommand.txt,tHeading.txt,"|",1
|
||||
- // navigation icons
|
||||
- spstr strCommand.txt,tId.txt,",",2
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bPrev,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î°"
|
||||
- }
|
||||
- if(tTmp.txt=="2")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î¶"
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bNext,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bNext.txt="î³"
|
||||
- }
|
||||
//entity name
|
||||
- spstr strCommand.txt,entn.txt,"|",3
|
||||
+ spstr strCommand.txt,entn.txt,"|",1
|
||||
+ //heading
|
||||
+ spstr strCommand.txt,tHeading.txt,"|",2
|
||||
//icon
|
||||
- spstr strCommand.txt,tTmp.txt,"|",4
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",3
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//title
|
||||
- spstr strCommand.txt,tTitle.txt,"|",5
|
||||
+ spstr strCommand.txt,tTitle.txt,"|",4
|
||||
//author
|
||||
- spstr strCommand.txt,tAuthor.txt,"|",6
|
||||
+ spstr strCommand.txt,tAuthor.txt,"|",5
|
||||
//volume
|
||||
- spstr strCommand.txt,tTmp.txt,"|",7
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",6
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hVolume.val=sys0
|
||||
//icon
|
||||
- spstr strCommand.txt,tTmp.txt,"|",8
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",7
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
|
||||
//speaker current
|
||||
- spstr strCommand.txt,tSpeaker.txt,"|",9
|
||||
+ spstr strCommand.txt,tSpeaker.txt,"|",8
|
||||
if(tSpeaker.txt!="")
|
||||
{
|
||||
tSpeaker.pco=1374
|
||||
@@ -558,14 +531,14 @@
|
||||
tSpeaker.pco=65535
|
||||
}
|
||||
//speaker list
|
||||
- spstr strCommand.txt,vaSpeakerList.txt,"|",10
|
||||
+ spstr strCommand.txt,vaSpeakerList.txt,"|",9
|
||||
if(vaSpeakerList.txt=="")
|
||||
{
|
||||
vis t6,0
|
||||
}
|
||||
vaSpeakerPos.val=0
|
||||
// on off button
|
||||
- spstr strCommand.txt,tTmp.txt,"|",11
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",10
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
vis t5,0
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-03-31 14:19:06.280373872 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 14:19:07.100374234 +0000
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 18:20:56.962304989 +0000
|
||||
@@ -638,53 +638,26 @@
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
|
||||
@@ -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-03-31 14:19:06.276373870 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 14:19:06.680374048 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:20:56.530304049 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -10,9 +10,108 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+ // fix touch offset (Removed for US version)
|
||||
+ //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-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:20:56.534304058 +0000
|
||||
@@ -513,75 +513,48 @@
|
||||
{
|
||||
//entn
|
||||
spstr strCommand.txt,entn.txt,",",1
|
||||
- // navigation icons
|
||||
- spstr strCommand.txt,tId.txt,",",2
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bPrev,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î°"
|
||||
- }
|
||||
- if(tTmp.txt=="2")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î¶"
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bNext,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bNext.txt="î³"
|
||||
- }
|
||||
//text arm1
|
||||
- spstr strCommand.txt,arm1.txt,",",3
|
||||
+ spstr strCommand.txt,arm1.txt,",",2
|
||||
if(arm1.txt!="")
|
||||
{
|
||||
vis arm1,1
|
||||
}
|
||||
//id arm1
|
||||
- spstr strCommand.txt,va1.txt,",",4
|
||||
+ spstr strCommand.txt,va1.txt,",",3
|
||||
//text arm2
|
||||
- spstr strCommand.txt,arm2.txt,",",5
|
||||
+ spstr strCommand.txt,arm2.txt,",",4
|
||||
if(arm2.txt!="")
|
||||
{
|
||||
vis arm2,1
|
||||
}
|
||||
//id arm2
|
||||
- spstr strCommand.txt,va2.txt,",",6
|
||||
+ spstr strCommand.txt,va2.txt,",",5
|
||||
//text arm3
|
||||
- spstr strCommand.txt,arm3.txt,",",7
|
||||
+ spstr strCommand.txt,arm3.txt,",",6
|
||||
if(arm3.txt!="")
|
||||
{
|
||||
vis arm3,1
|
||||
}
|
||||
//id arm3
|
||||
- spstr strCommand.txt,va3.txt,",",8
|
||||
+ spstr strCommand.txt,va3.txt,",",7
|
||||
//text arm4
|
||||
- spstr strCommand.txt,arm4.txt,",",9
|
||||
+ spstr strCommand.txt,arm4.txt,",",8
|
||||
if(arm4.txt!="")
|
||||
{
|
||||
vis arm4,1
|
||||
}
|
||||
//id arm4
|
||||
- spstr strCommand.txt,va4.txt,",",10
|
||||
+ spstr strCommand.txt,va4.txt,",",9
|
||||
//icon
|
||||
- spstr strCommand.txt,tTmp.txt,",",11
|
||||
+ spstr strCommand.txt,tTmp.txt,",",10
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//icon color
|
||||
- spstr strCommand.txt,tTmp.txt,",",12
|
||||
+ spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon.pco=sys0
|
||||
//numpad status
|
||||
- spstr strCommand.txt,tTmp.txt,",",13
|
||||
+ spstr strCommand.txt,tTmp.txt,",",12
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis b0,1
|
||||
@@ -598,7 +571,7 @@
|
||||
vis tCode,1
|
||||
}
|
||||
//flashing status
|
||||
- spstr strCommand.txt,tTmp.txt,",",14
|
||||
+ spstr strCommand.txt,tTmp.txt,",",13
|
||||
if(tTmp.txt=="enable")
|
||||
{
|
||||
tmFlash.en=1
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 14:19:06.280373872 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 14:19:06.680374048 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:20:56.534304058 +0000
|
||||
@@ -62,6 +62,26 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -815,8 +914,8 @@ 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-03-31 14:19:06.276373870 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 14:19:06.680374048 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:20:56.534304058 +0000
|
||||
@@ -568,33 +568,6 @@
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
|
||||
@@ -851,9 +950,94 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
// get Type
|
||||
spstr strCommand.txt,type1.txt,",",3
|
||||
// get internal name
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:20:56.534304058 +0000
|
||||
@@ -501,55 +501,28 @@
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
- //heading
|
||||
- spstr strCommand.txt,tHeading.txt,"|",1
|
||||
- // navigation icons
|
||||
- spstr strCommand.txt,tId.txt,",",2
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bPrev,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î°"
|
||||
- }
|
||||
- if(tTmp.txt=="2")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bPrev.txt="î¶"
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- vis bNext,0
|
||||
- }
|
||||
- if(tTmp.txt=="1")
|
||||
- {
|
||||
- vis bPrev,1
|
||||
- bNext.txt="î³"
|
||||
- }
|
||||
//entity name
|
||||
- spstr strCommand.txt,entn.txt,"|",3
|
||||
+ spstr strCommand.txt,entn.txt,"|",1
|
||||
+ //heading
|
||||
+ spstr strCommand.txt,tHeading.txt,"|",2
|
||||
//icon
|
||||
- spstr strCommand.txt,tTmp.txt,"|",4
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",3
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//title
|
||||
- spstr strCommand.txt,tTitle.txt,"|",5
|
||||
+ spstr strCommand.txt,tTitle.txt,"|",4
|
||||
//author
|
||||
- spstr strCommand.txt,tAuthor.txt,"|",6
|
||||
+ spstr strCommand.txt,tAuthor.txt,"|",5
|
||||
//volume
|
||||
- spstr strCommand.txt,tTmp.txt,"|",7
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",6
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hVolume.val=sys0
|
||||
//icon
|
||||
- spstr strCommand.txt,tTmp.txt,"|",8
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",7
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
|
||||
//speaker current
|
||||
- spstr strCommand.txt,tSpeaker.txt,"|",9
|
||||
+ spstr strCommand.txt,tSpeaker.txt,"|",8
|
||||
if(tSpeaker.txt!="")
|
||||
{
|
||||
tSpeaker.pco=1374
|
||||
@@ -558,14 +531,14 @@
|
||||
tSpeaker.pco=65535
|
||||
}
|
||||
//speaker list
|
||||
- spstr strCommand.txt,vaSpeakerList.txt,"|",10
|
||||
+ spstr strCommand.txt,vaSpeakerList.txt,"|",9
|
||||
if(vaSpeakerList.txt=="")
|
||||
{
|
||||
vis t6,0
|
||||
}
|
||||
vaSpeakerPos.val=0
|
||||
// on off button
|
||||
- spstr strCommand.txt,tTmp.txt,"|",11
|
||||
+ spstr strCommand.txt,tTmp.txt,"|",10
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
vis t5,0
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-03-31 14:19:06.280373872 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 14:19:06.680374048 +0000
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:20:56.534304058 +0000
|
||||
@@ -638,53 +638,26 @@
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
@@ -1181,8 +1365,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-03-31 14:19:06.276373870 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 14:19:06.680374048 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-03-31 18:20:56.082303075 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:20:56.534304058 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
@@ -1043,48 +1043,75 @@ Timer tmSerial
|
||||
{
|
||||
//entn
|
||||
spstr strCommand.txt,entn.txt,",",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,",",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bPrev,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//text arm1
|
||||
spstr strCommand.txt,arm1.txt,",",2
|
||||
spstr strCommand.txt,arm1.txt,",",3
|
||||
if(arm1.txt!="")
|
||||
{
|
||||
vis arm1,1
|
||||
}
|
||||
//id arm1
|
||||
spstr strCommand.txt,va1.txt,",",3
|
||||
spstr strCommand.txt,va1.txt,",",4
|
||||
//text arm2
|
||||
spstr strCommand.txt,arm2.txt,",",4
|
||||
spstr strCommand.txt,arm2.txt,",",5
|
||||
if(arm2.txt!="")
|
||||
{
|
||||
vis arm2,1
|
||||
}
|
||||
//id arm2
|
||||
spstr strCommand.txt,va2.txt,",",5
|
||||
spstr strCommand.txt,va2.txt,",",6
|
||||
//text arm3
|
||||
spstr strCommand.txt,arm3.txt,",",6
|
||||
spstr strCommand.txt,arm3.txt,",",7
|
||||
if(arm3.txt!="")
|
||||
{
|
||||
vis arm3,1
|
||||
}
|
||||
//id arm3
|
||||
spstr strCommand.txt,va3.txt,",",7
|
||||
spstr strCommand.txt,va3.txt,",",8
|
||||
//text arm4
|
||||
spstr strCommand.txt,arm4.txt,",",8
|
||||
spstr strCommand.txt,arm4.txt,",",9
|
||||
if(arm4.txt!="")
|
||||
{
|
||||
vis arm4,1
|
||||
}
|
||||
//id arm4
|
||||
spstr strCommand.txt,va4.txt,",",9
|
||||
spstr strCommand.txt,va4.txt,",",10
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,",",10
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon.pco=sys0
|
||||
//numpad status
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
spstr strCommand.txt,tTmp.txt,",",13
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis b0,1
|
||||
@@ -1101,7 +1128,7 @@ Timer tmSerial
|
||||
vis tCode,1
|
||||
}
|
||||
//flashing status
|
||||
spstr strCommand.txt,tTmp.txt,",",13
|
||||
spstr strCommand.txt,tTmp.txt,",",14
|
||||
if(tTmp.txt=="enable")
|
||||
{
|
||||
tmFlash.en=1
|
||||
|
||||
@@ -923,28 +923,55 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
//entity name
|
||||
spstr strCommand.txt,entn.txt,"|",1
|
||||
//heading
|
||||
spstr strCommand.txt,tHeading.txt,"|",2
|
||||
spstr strCommand.txt,tHeading.txt,"|",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,",",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bPrev,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//entity name
|
||||
spstr strCommand.txt,entn.txt,"|",3
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,"|",3
|
||||
spstr strCommand.txt,tTmp.txt,"|",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//title
|
||||
spstr strCommand.txt,tTitle.txt,"|",4
|
||||
spstr strCommand.txt,tTitle.txt,"|",5
|
||||
//author
|
||||
spstr strCommand.txt,tAuthor.txt,"|",5
|
||||
spstr strCommand.txt,tAuthor.txt,"|",6
|
||||
//volume
|
||||
spstr strCommand.txt,tTmp.txt,"|",6
|
||||
spstr strCommand.txt,tTmp.txt,"|",7
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hVolume.val=sys0
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,"|",7
|
||||
spstr strCommand.txt,tTmp.txt,"|",8
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
|
||||
//speaker current
|
||||
spstr strCommand.txt,tSpeaker.txt,"|",8
|
||||
spstr strCommand.txt,tSpeaker.txt,"|",9
|
||||
if(tSpeaker.txt!="")
|
||||
{
|
||||
tSpeaker.pco=1374
|
||||
@@ -953,14 +980,14 @@ Timer tmSerial
|
||||
tSpeaker.pco=65535
|
||||
}
|
||||
//speaker list
|
||||
spstr strCommand.txt,vaSpeakerList.txt,"|",9
|
||||
spstr strCommand.txt,vaSpeakerList.txt,"|",10
|
||||
if(vaSpeakerList.txt=="")
|
||||
{
|
||||
vis t6,0
|
||||
}
|
||||
vaSpeakerPos.val=0
|
||||
// on off button
|
||||
spstr strCommand.txt,tTmp.txt,"|",10
|
||||
spstr strCommand.txt,tTmp.txt,"|",11
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
vis t5,0
|
||||
|
||||
@@ -34,14 +34,10 @@ cardGrid
|
||||
39 Component(s)
|
||||
423 Line(s) of event code
|
||||
245 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
300 Line(s) of event code
|
||||
154 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
298 Line(s) of event code
|
||||
187 Unique line(s) of event code
|
||||
324 Line(s) of event code
|
||||
199 Unique line(s) of event code
|
||||
screensaver
|
||||
29 Component(s)
|
||||
182 Line(s) of event code
|
||||
@@ -54,9 +50,13 @@ cardThermo
|
||||
41 Component(s)
|
||||
453 Line(s) of event code
|
||||
279 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
326 Line(s) of event code
|
||||
166 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
13 Page(s)
|
||||
351 Component(s)
|
||||
3521 Line(s) of event code
|
||||
1015 Unique line(s) of event code
|
||||
3573 Line(s) of event code
|
||||
1020 Unique line(s) of event code
|
||||
|
||||
@@ -513,48 +513,75 @@ Timer tmSerial
|
||||
{
|
||||
//entn
|
||||
spstr strCommand.txt,entn.txt,",",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,",",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bPrev,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//text arm1
|
||||
spstr strCommand.txt,arm1.txt,",",2
|
||||
spstr strCommand.txt,arm1.txt,",",3
|
||||
if(arm1.txt!="")
|
||||
{
|
||||
vis arm1,1
|
||||
}
|
||||
//id arm1
|
||||
spstr strCommand.txt,va1.txt,",",3
|
||||
spstr strCommand.txt,va1.txt,",",4
|
||||
//text arm2
|
||||
spstr strCommand.txt,arm2.txt,",",4
|
||||
spstr strCommand.txt,arm2.txt,",",5
|
||||
if(arm2.txt!="")
|
||||
{
|
||||
vis arm2,1
|
||||
}
|
||||
//id arm2
|
||||
spstr strCommand.txt,va2.txt,",",5
|
||||
spstr strCommand.txt,va2.txt,",",6
|
||||
//text arm3
|
||||
spstr strCommand.txt,arm3.txt,",",6
|
||||
spstr strCommand.txt,arm3.txt,",",7
|
||||
if(arm3.txt!="")
|
||||
{
|
||||
vis arm3,1
|
||||
}
|
||||
//id arm3
|
||||
spstr strCommand.txt,va3.txt,",",7
|
||||
spstr strCommand.txt,va3.txt,",",8
|
||||
//text arm4
|
||||
spstr strCommand.txt,arm4.txt,",",8
|
||||
spstr strCommand.txt,arm4.txt,",",9
|
||||
if(arm4.txt!="")
|
||||
{
|
||||
vis arm4,1
|
||||
}
|
||||
//id arm4
|
||||
spstr strCommand.txt,va4.txt,",",9
|
||||
spstr strCommand.txt,va4.txt,",",10
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,",",10
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",11
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
covx tTmp.txt,sys0,0,0
|
||||
tIcon.pco=sys0
|
||||
//numpad status
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
spstr strCommand.txt,tTmp.txt,",",13
|
||||
if(tTmp.txt!="disable")
|
||||
{
|
||||
vis b0,1
|
||||
@@ -571,7 +598,7 @@ Timer tmSerial
|
||||
vis tCode,1
|
||||
}
|
||||
//flashing status
|
||||
spstr strCommand.txt,tTmp.txt,",",13
|
||||
spstr strCommand.txt,tTmp.txt,",",14
|
||||
if(tTmp.txt=="enable")
|
||||
{
|
||||
tmFlash.en=1
|
||||
|
||||
@@ -501,28 +501,55 @@ Timer tmSerial
|
||||
spstr strCommand.txt,tInstruction.txt,",",0
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
//entity name
|
||||
spstr strCommand.txt,entn.txt,"|",1
|
||||
//heading
|
||||
spstr strCommand.txt,tHeading.txt,"|",2
|
||||
spstr strCommand.txt,tHeading.txt,"|",1
|
||||
// navigation icons
|
||||
spstr strCommand.txt,tId.txt,",",2
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bPrev,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î°"
|
||||
}
|
||||
if(tTmp.txt=="2")
|
||||
{
|
||||
vis bPrev,1
|
||||
bPrev.txt="î¶"
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
vis bNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//entity name
|
||||
spstr strCommand.txt,entn.txt,"|",3
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,"|",3
|
||||
spstr strCommand.txt,tTmp.txt,"|",4
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
|
||||
//title
|
||||
spstr strCommand.txt,tTitle.txt,"|",4
|
||||
spstr strCommand.txt,tTitle.txt,"|",5
|
||||
//author
|
||||
spstr strCommand.txt,tAuthor.txt,"|",5
|
||||
spstr strCommand.txt,tAuthor.txt,"|",6
|
||||
//volume
|
||||
spstr strCommand.txt,tTmp.txt,"|",6
|
||||
spstr strCommand.txt,tTmp.txt,"|",7
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hVolume.val=sys0
|
||||
//icon
|
||||
spstr strCommand.txt,tTmp.txt,"|",7
|
||||
spstr strCommand.txt,tTmp.txt,"|",8
|
||||
covx tTmp.txt,sys0,0,0
|
||||
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
|
||||
//speaker current
|
||||
spstr strCommand.txt,tSpeaker.txt,"|",8
|
||||
spstr strCommand.txt,tSpeaker.txt,"|",9
|
||||
if(tSpeaker.txt!="")
|
||||
{
|
||||
tSpeaker.pco=1374
|
||||
@@ -531,14 +558,14 @@ Timer tmSerial
|
||||
tSpeaker.pco=65535
|
||||
}
|
||||
//speaker list
|
||||
spstr strCommand.txt,vaSpeakerList.txt,"|",9
|
||||
spstr strCommand.txt,vaSpeakerList.txt,"|",10
|
||||
if(vaSpeakerList.txt=="")
|
||||
{
|
||||
vis t6,0
|
||||
}
|
||||
vaSpeakerPos.val=0
|
||||
// on off button
|
||||
spstr strCommand.txt,tTmp.txt,"|",10
|
||||
spstr strCommand.txt,tTmp.txt,"|",11
|
||||
if(tTmp.txt=="disable")
|
||||
{
|
||||
vis t5,0
|
||||
|
||||
Reference in New Issue
Block a user