h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-03-31 21:30:20 +00:00
committed by GitHub Actions
parent e3ef807c8a
commit 40cf7ca6ce
5 changed files with 144 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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 20:31:52.507584386 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 20:31:53.307593985 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:30:20.453497161 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
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 20:31:52.507584386 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 20:31:53.311594033 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:30:20.453497161 +0000
@@ -1125,33 +1125,6 @@ @@ -1125,33 +1125,6 @@
{ {
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -47,8 +47,8 @@ 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 20:31:52.507584386 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 20:31:53.311594033 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:30:20.453497161 +0000
@@ -12,28 +12,307 @@ @@ -12,28 +12,307 @@
Events Events
@@ -408,8 +408,8 @@ 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/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 20:31:52.507584386 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 20:31:53.307593985 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:30:20.453497161 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event

165
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 20:31:52.507584386 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:30:20.049491752 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,146 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 20:31:52.507584386 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 20:31:52.907589186 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
vis tId,0
+ //vis nPageDisp,0
vis arm1,0
vis arm2,0
vis arm3,0
@@ -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
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
@@ -600,23 +569,9 @@
vis b9,1
vis b10,1
vis tCode,1
- }else
- {
- vis b0,0
- vis b1,0
- vis b2,0
- vis b3,0
- vis b4,0
- vis b5,0
- vis b6,0
- vis b7,0
- vis b8,0
- vis b9,0
- vis b10,0
- vis tCode,0
}
//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 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 20:31:52.507584386 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:30:20.053491806 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -966,8 +829,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 20:31:52.507584386 +0000 --- HMI/n2t-out/cardGrid.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 21:30:20.053491806 +0000
@@ -242,12 +242,7 @@ @@ -242,12 +242,7 @@
Events Events
@@ -1017,8 +880,8 @@ 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 20:31:52.507584386 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:30:20.053491806 +0000
@@ -435,12 +435,7 @@ @@ -435,12 +435,7 @@
Events Events
@@ -1116,8 +979,8 @@ 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 20:31:52.507584386 +0000 --- HMI/n2t-out/cardThermo.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:30:20.053491806 +0000
@@ -329,12 +329,7 @@ @@ -329,12 +329,7 @@
Events Events
@@ -1460,8 +1323,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 20:31:52.507584386 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:30:20.053491806 +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
@@ -1481,8 +1344,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 20:31:52.507584386 +0000 --- HMI/n2t-out/screensaver.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 20:31:52.907589186 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:30:20.053491806 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event

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

@@ -25,7 +25,6 @@ Page cardAlarm
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
//vis nPageDisp,0
vis arm1,0 vis arm1,0
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
@@ -340,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
@@ -1043,48 +1047,75 @@ Timer tmSerial
{ {
//entn //entn
spstr strCommand.txt,entn.txt,",",1 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 //text arm1
spstr strCommand.txt,arm1.txt,",",2 spstr strCommand.txt,arm1.txt,",",3
if(arm1.txt!="") if(arm1.txt!="")
{ {
vis arm1,1 vis arm1,1
} }
//id arm1 //id arm1
spstr strCommand.txt,va1.txt,",",3 spstr strCommand.txt,va1.txt,",",4
//text arm2 //text arm2
spstr strCommand.txt,arm2.txt,",",4 spstr strCommand.txt,arm2.txt,",",5
if(arm2.txt!="") if(arm2.txt!="")
{ {
vis arm2,1 vis arm2,1
} }
//id arm2 //id arm2
spstr strCommand.txt,va2.txt,",",5 spstr strCommand.txt,va2.txt,",",6
//text arm3 //text arm3
spstr strCommand.txt,arm3.txt,",",6 spstr strCommand.txt,arm3.txt,",",7
if(arm3.txt!="") if(arm3.txt!="")
{ {
vis arm3,1 vis arm3,1
} }
//id arm3 //id arm3
spstr strCommand.txt,va3.txt,",",7 spstr strCommand.txt,va3.txt,",",8
//text arm4 //text arm4
spstr strCommand.txt,arm4.txt,",",8 spstr strCommand.txt,arm4.txt,",",9
if(arm4.txt!="") if(arm4.txt!="")
{ {
vis arm4,1 vis arm4,1
} }
//id arm4 //id arm4
spstr strCommand.txt,va4.txt,",",9 spstr strCommand.txt,va4.txt,",",10
//icon //icon
spstr strCommand.txt,tTmp.txt,",",10 spstr strCommand.txt,tTmp.txt,",",11
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//icon color //icon color
spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,",",12
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon.pco=sys0 tIcon.pco=sys0
//numpad status //numpad status
spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,tTmp.txt,",",13
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis b0,1 vis b0,1
@@ -1099,9 +1130,23 @@ Timer tmSerial
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis tCode,1 vis tCode,1
}else
{
vis b0,0
vis b1,0
vis b2,0
vis b3,0
vis b4,0
vis b5,0
vis b6,0
vis b7,0
vis b8,0
vis b9,0
vis b10,0
vis tCode,0
} }
//flashing status //flashing status
spstr strCommand.txt,tTmp.txt,",",13 spstr strCommand.txt,tTmp.txt,",",14
if(tTmp.txt=="enable") if(tTmp.txt=="enable")
{ {
tmFlash.en=1 tmFlash.en=1

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

@@ -16,8 +16,8 @@ popupNotify
117 Unique line(s) of event code 117 Unique line(s) of event code
cardAlarm cardAlarm
35 Component(s) 35 Component(s)
298 Line(s) of event code 343 Line(s) of event code
187 Unique line(s) of event code 214 Unique line(s) of event code
pageTest pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
375 Component(s) 375 Component(s)
3832 Line(s) of event code 3877 Line(s) of event code
1034 Unique line(s) of event code 1061 Unique line(s) of event code

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

@@ -17,7 +17,6 @@ Page cardAlarm
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
vis tId,0 vis tId,0
//vis nPageDisp,0
vis arm1,0 vis arm1,0
vis arm2,0 vis arm2,0
vis arm3,0 vis arm3,0
@@ -171,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
@@ -513,48 +517,75 @@ Timer tmSerial
{ {
//entn //entn
spstr strCommand.txt,entn.txt,",",1 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 //text arm1
spstr strCommand.txt,arm1.txt,",",2 spstr strCommand.txt,arm1.txt,",",3
if(arm1.txt!="") if(arm1.txt!="")
{ {
vis arm1,1 vis arm1,1
} }
//id arm1 //id arm1
spstr strCommand.txt,va1.txt,",",3 spstr strCommand.txt,va1.txt,",",4
//text arm2 //text arm2
spstr strCommand.txt,arm2.txt,",",4 spstr strCommand.txt,arm2.txt,",",5
if(arm2.txt!="") if(arm2.txt!="")
{ {
vis arm2,1 vis arm2,1
} }
//id arm2 //id arm2
spstr strCommand.txt,va2.txt,",",5 spstr strCommand.txt,va2.txt,",",6
//text arm3 //text arm3
spstr strCommand.txt,arm3.txt,",",6 spstr strCommand.txt,arm3.txt,",",7
if(arm3.txt!="") if(arm3.txt!="")
{ {
vis arm3,1 vis arm3,1
} }
//id arm3 //id arm3
spstr strCommand.txt,va3.txt,",",7 spstr strCommand.txt,va3.txt,",",8
//text arm4 //text arm4
spstr strCommand.txt,arm4.txt,",",8 spstr strCommand.txt,arm4.txt,",",9
if(arm4.txt!="") if(arm4.txt!="")
{ {
vis arm4,1 vis arm4,1
} }
//id arm4 //id arm4
spstr strCommand.txt,va4.txt,",",9 spstr strCommand.txt,va4.txt,",",10
//icon //icon
spstr strCommand.txt,tTmp.txt,",",10 spstr strCommand.txt,tTmp.txt,",",11
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//icon color //icon color
spstr strCommand.txt,tTmp.txt,",",11 spstr strCommand.txt,tTmp.txt,",",12
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon.pco=sys0 tIcon.pco=sys0
//numpad status //numpad status
spstr strCommand.txt,tTmp.txt,",",12 spstr strCommand.txt,tTmp.txt,",",13
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis b0,1 vis b0,1
@@ -569,9 +600,23 @@ Timer tmSerial
vis b9,1 vis b9,1
vis b10,1 vis b10,1
vis tCode,1 vis tCode,1
}else
{
vis b0,0
vis b1,0
vis b2,0
vis b3,0
vis b4,0
vis b5,0
vis b6,0
vis b7,0
vis b8,0
vis b9,0
vis b10,0
vis tCode,0
} }
//flashing status //flashing status
spstr strCommand.txt,tTmp.txt,",",13 spstr strCommand.txt,tTmp.txt,",",14
if(tTmp.txt=="enable") if(tTmp.txt=="enable")
{ {
tmFlash.en=1 tmFlash.en=1