synced serial code and fonts to us portrait version (add nextion2text)

This commit is contained in:
joBr99
2022-04-06 21:34:52 +00:00
committed by GitHub Actions
parent 3d53ac6794
commit 28fb265166
25 changed files with 634 additions and 1913 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-05 21:14:10.888441480 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-06 21:34:51.675351557 +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/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-05 21:14:10.888441480 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-06 21:34:51.675351557 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-05 21:14:10.308440588 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-06 21:34:51.215324112 +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-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-05 21:14:10.312440595 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-06 21:34:51.215324112 +0000
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -22,20 +22,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Max. Text Size : 10 Max. Text Size : 10
Text tIcon Text tIcon
@@ -579,7 +579,9 @@
//id arm4
spstr strCommand.txt,va4.txt,"~",10
//icon
- spstr strCommand.txt,tIcon.txt,"~",11
+ 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,"~",12
covx tTmp.txt,sys0,0,0
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-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-05 21:14:10.312440595 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-06 21:34:51.215324112 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -548,51 +537,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
@@ -1172,7 +1628,9 @@ @@ -1642,6 +2098,250 @@
}else
{
// change icon
- spstr strCommand.txt,tIcon1.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"~",5
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",6
@@ -1294,7 +1752,9 @@
}else
{
// change icon
- spstr strCommand.txt,tIcon2.txt,"~",11
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
vis tIcon2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",12
@@ -1416,7 +1876,9 @@
}else
{
// change icon
- spstr strCommand.txt,tIcon3.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",17
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
vis tIcon3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",18
@@ -1538,7 +2000,9 @@
}else
{
// change icon
- spstr strCommand.txt,tIcon4.txt,"~",23
+ spstr strCommand.txt,tTmp.txt,"~",23
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
vis tIcon4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",24
@@ -1642,6 +2106,254 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -614,9 +559,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ }else + }else
+ { + {
+ // change icon + // change icon
+ spstr strCommand.txt,tTmp.txt,"~",29 + spstr strCommand.txt,tIcon5.txt,"~",29
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
+ vis tIcon5,1 + vis tIcon5,1
+ // change icon color + // change icon color
+ spstr strCommand.txt,tTmp.txt,"~",30 + spstr strCommand.txt,tTmp.txt,"~",30
@@ -738,9 +681,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ }else + }else
+ { + {
+ // change icon + // change icon
+ spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tIcon6.txt,"~",35
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
+ vis tIcon6,1 + vis tIcon6,1
+ // change icon color + // change icon color
+ spstr strCommand.txt,tTmp.txt,"~",36 + spstr strCommand.txt,tTmp.txt,"~",36
@@ -847,294 +788,9 @@ 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
--- HMI/n2t-out/cardGrid.txt 2022-04-05 21:14:09.784439783 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-05 21:14:10.312440595 +0000
@@ -613,7 +613,9 @@
}else
{
// change icon
- spstr strCommand.txt,bEntity1.txt,"~",5
+ spstr strCommand.txt,tTmp.txt,"~",5
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
vis bEntity1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",6
@@ -634,7 +636,9 @@
}else
{
// change icon
- spstr strCommand.txt,bEntity2.txt,"~",11
+ spstr strCommand.txt,tTmp.txt,"~",11
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
vis bEntity2,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",12
@@ -655,7 +659,9 @@
}else
{
// change icon
- spstr strCommand.txt,bEntity3.txt,"~",17
+ spstr strCommand.txt,tTmp.txt,"~",17
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
vis bEntity3,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",18
@@ -676,7 +682,9 @@
}else
{
// change icon
- spstr strCommand.txt,bEntity4.txt,"~",23
+ spstr strCommand.txt,tTmp.txt,"~",23
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
vis bEntity4,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",24
@@ -697,7 +705,9 @@
}else
{
// change icon
- spstr strCommand.txt,bEntity5.txt,"~",29
+ spstr strCommand.txt,tTmp.txt,"~",29
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
vis bEntity5,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",30
@@ -718,7 +728,9 @@
}else
{
// change icon
- spstr strCommand.txt,bEntity6.txt,"~",35
+ spstr strCommand.txt,tTmp.txt,"~",35
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
vis bEntity6,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",36
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-05 21:14:09.784439783 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-05 21:14:10.312440595 +0000
@@ -540,7 +540,9 @@
//entity name
spstr strCommand.txt,entn.txt,"~",3
//icon
- spstr strCommand.txt,tIcon.txt,"~",4
+ 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,"~",5
//author
@@ -550,7 +552,9 @@
covx tTmp.txt,sys0,0,0
hVolume.val=sys0
//icon
- spstr strCommand.txt,tPlayPause.txt,"~",8
+ 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,"~",9
if(tSpeaker.txt!="")
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-05 21:14:09.784439783 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-05 21:14:10.312440595 +0000
@@ -704,9 +704,12 @@
vis bt7,0
vis bt8,0
//bt0
- spstr strCommand.txt,bt0.txt,"~",10
- if(bt0.txt!="")
+ spstr strCommand.txt,tTmp.txt,"~",10
+ if(tTmp.txt!="")
{
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt0.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0
@@ -717,11 +720,13 @@
spstr strCommand.txt,va0.txt,"~",13
//enable
vis bt0,1
- }
- //bt1
- spstr strCommand.txt,bt1.txt,"~",14
- if(bt1.txt!="")
- {
+ } //bt1
+ spstr strCommand.txt,tTmp.txt,"~",14
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt1.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,bt1.pco2,0,0
@@ -732,11 +737,13 @@
spstr strCommand.txt,va1.txt,"~",17
//enable
vis bt1,1
- }
- //bt2
- spstr strCommand.txt,bt2.txt,"~",18
- if(bt2.txt!="")
- {
+ } //bt2
+ spstr strCommand.txt,tTmp.txt,"~",18
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt2.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,bt2.pco2,0,0
@@ -747,11 +754,13 @@
spstr strCommand.txt,va2.txt,"~",21
//enable
vis bt2,1
- }
- //bt3
- spstr strCommand.txt,bt3.txt,"~",22
- if(bt3.txt!="")
- {
+ } //bt3
+ spstr strCommand.txt,tTmp.txt,"~",22
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt3.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,bt3.pco2,0,0
@@ -762,11 +771,13 @@
spstr strCommand.txt,va3.txt,"~",25
//enable
vis bt3,1
- }
- //bt4
- spstr strCommand.txt,bt4.txt,"~",26
- if(bt4.txt!="")
- {
+ } //bt4
+ spstr strCommand.txt,tTmp.txt,"~",26
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt4.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,bt4.pco2,0,0
@@ -777,11 +788,13 @@
spstr strCommand.txt,va4.txt,"~",29
//enable
vis bt4,1
- }
- //bt5
- spstr strCommand.txt,bt5.txt,"~",30
- if(bt5.txt!="")
- {
+ } //bt5
+ spstr strCommand.txt,tTmp.txt,"~",30
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt5.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",31
covx tTmp.txt,bt5.pco2,0,0
@@ -792,11 +805,13 @@
spstr strCommand.txt,va5.txt,"~",33
//enable
vis bt5,1
- }
- //bt6
- spstr strCommand.txt,bt6.txt,"~",34
- if(bt6.txt!="")
- {
+ } //bt6
+ spstr strCommand.txt,tTmp.txt,"~",34
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt6.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",35
covx tTmp.txt,bt6.pco2,0,0
@@ -807,11 +822,13 @@
spstr strCommand.txt,va6.txt,"~",37
//enable
vis bt6,1
- }
- //bt7
- spstr strCommand.txt,bt7.txt,"~",38
- if(bt7.txt!="")
- {
+ } //bt7
+ spstr strCommand.txt,tTmp.txt,"~",38
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt7.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt7.pco2,0,0
@@ -822,11 +839,13 @@
spstr strCommand.txt,va7.txt,"~",41
//enable
vis bt7,1
- }
- //bt8
- spstr strCommand.txt,bt8.txt,"~",42
- if(bt8.txt!="")
- {
+ } //bt8
+ spstr strCommand.txt,tTmp.txt,"~",42
+ if(tTmp.txt!="")
+ {
+ // set icon
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,bt8.txt,sys0,1
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-05 21:14:09.784439783 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-05 21:14:10.308440588 +0000
@@ -22,6 +22,16 @@
Text :
Max. Text Size: 35
+Text tIcons
+ Attributes
+ Scope : global
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text : 
+ Max. Text Size : 185
+
Text tTmp1
Attributes
Scope : global
Only in HMI/US/portrait/n2t-out: pageSerialTest.txt
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-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-05 21:14:10.308440588 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-06 21:34:51.215324112 +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
@@ -1144,15 +800,6 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
Max. Text Size : 100 Max. Text Size : 100
Text tVersion Text tVersion
@@ -152,7 +152,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 30
+ Text : 29
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -1162,65 +809,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-04-05 21:14:09.784439783 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-04-05 21:14:10.312440595 +0000
@@ -35,6 +35,20 @@
Touch Press Event
page cardEntities
+Button b1
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+ Text : serial
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+ page pageSerialTest
+
Button b3
Attributes
Scope : local
@@ -162,17 +176,3 @@
Touch Press Event
page cardGrid
-Button b1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : bauds=115200
- Max. Text Size : 20
-
- Events
- Touch Press Event
- bauds=115200
-
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-05 21:14:09.784439783 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-05 21:14:10.312440595 +0000
@@ -442,7 +442,9 @@
if(tInstruction.txt=="entityUpdateDetail")
{
// change icon
- spstr strCommand.txt,tIcon1.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1
// change icon color
spstr strCommand.txt,tTmp.txt,"~",2
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-04-05 21:14:09.784439783 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-06 21:34:50.751296428 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-05 21:14:10.312440595 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-06 21:34:51.215324112 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -1275,62 +866,3 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -400,7 +400,9 @@
vis tMRIcon,0
vis tMR,0
//tMainIcon
- spstr strCommand.txt,tMainIcon.txt,"~",1
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
tMainIconAlt.txt=tMainIcon.txt
//tMainText
spstr strCommand.txt,tMainText.txt,"~",2
@@ -408,31 +410,41 @@
//tForecast1
spstr strCommand.txt,tForecast1.txt,"~",3
//tF1Icon
- spstr strCommand.txt,tF1Icon.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
//tForecast1Val
spstr strCommand.txt,tForecast1Val.txt,"~",5
//tForecast2
spstr strCommand.txt,tForecast2.txt,"~",6
//tF2Icon
- spstr strCommand.txt,tF2Icon.txt,"~",7
+ spstr strCommand.txt,tTmp.txt,"~",7
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
//tForecast2Val
spstr strCommand.txt,tForecast2Val.txt,"~",8
//tForecast3
spstr strCommand.txt,tForecast3.txt,"~",9
//tF3Icon
- spstr strCommand.txt,tF3Icon.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"~",10
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
//tForecast3Val
spstr strCommand.txt,tForecast3Val.txt,"~",11
//tForecast4
spstr strCommand.txt,tForecast4.txt,"~",12
//tF4Icon
- spstr strCommand.txt,tF4Icon.txt,"~",13
+ spstr strCommand.txt,tTmp.txt,"~",13
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
//tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"~",14
//alternative layout
//tMRIcon
- spstr strCommand.txt,tMRIcon.txt,"~",15
- if(tMRIcon.txt!="")
+ spstr strCommand.txt,tTmp.txt,"~",15
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
+ if(tTmp.txt!="")
{
//value for tMRIcon, activate alternative layout
vis tMainIcon,0

View File

@@ -229,7 +229,7 @@ Text tIcon
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -275,7 +275,7 @@ Button bNext
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -322,7 +322,7 @@ Button bPrev
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -1109,9 +1109,7 @@ Timer tmSerial
//id arm4 //id arm4
spstr strCommand.txt,va4.txt,"~",10 spstr strCommand.txt,va4.txt,"~",10
//icon //icon
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tIcon.txt,"~",11
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//icon color //icon color
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0

View File

@@ -371,7 +371,7 @@ Text tHeading
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 60 x coordinate : 60
y coordinate : 24 y coordinate : 22
Width : 200 Width : 200
Height : 30 Height : 30
Effect : load Effect : load
@@ -380,7 +380,7 @@ Text tHeading
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 1 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -1728,7 +1728,7 @@ Button bPrev
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -1782,7 +1782,7 @@ Button bNext
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -2959,9 +2959,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tIcon1.txt,"~",5
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
@@ -3083,9 +3081,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tIcon2.txt,"~",11
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
vis tIcon2,1 vis tIcon2,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
@@ -3207,9 +3203,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,tIcon3.txt,"~",17
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
vis tIcon3,1 vis tIcon3,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",18 spstr strCommand.txt,tTmp.txt,"~",18
@@ -3331,9 +3325,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tIcon4.txt,"~",23
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
vis tIcon4,1 vis tIcon4,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",24 spstr strCommand.txt,tTmp.txt,"~",24
@@ -3455,9 +3447,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",29 spstr strCommand.txt,tIcon5.txt,"~",29
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
vis tIcon5,1 vis tIcon5,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",30 spstr strCommand.txt,tTmp.txt,"~",30
@@ -3579,9 +3569,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",35 spstr strCommand.txt,tIcon6.txt,"~",35
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
vis tIcon6,1 vis tIcon6,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",36

View File

@@ -498,7 +498,7 @@ Button bPrev
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -552,7 +552,7 @@ Button bNext
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -599,7 +599,7 @@ Button bEntity1
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -657,7 +657,7 @@ Button bEntity2
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -715,7 +715,7 @@ Button bEntity3
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -773,7 +773,7 @@ Button bEntity4
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -831,7 +831,7 @@ Button bEntity5
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -889,7 +889,7 @@ Button bEntity6
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -1050,9 +1050,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,bEntity1.txt,"~",5
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
vis bEntity1,1 vis bEntity1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
@@ -1073,9 +1071,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,bEntity2.txt,"~",11
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
vis bEntity2,1 vis bEntity2,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
@@ -1096,9 +1092,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,bEntity3.txt,"~",17
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
vis bEntity3,1 vis bEntity3,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",18 spstr strCommand.txt,tTmp.txt,"~",18
@@ -1119,9 +1113,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,bEntity4.txt,"~",23
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
vis bEntity4,1 vis bEntity4,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",24 spstr strCommand.txt,tTmp.txt,"~",24
@@ -1142,9 +1134,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",29 spstr strCommand.txt,bEntity5.txt,"~",29
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
vis bEntity5,1 vis bEntity5,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",30 spstr strCommand.txt,tTmp.txt,"~",30
@@ -1165,9 +1155,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",35 spstr strCommand.txt,bEntity6.txt,"~",35
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
vis bEntity6,1 vis bEntity6,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",36

View File

@@ -283,7 +283,7 @@ Text t2
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -332,7 +332,7 @@ Text tPlayPause
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -381,7 +381,7 @@ Text t0
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -430,7 +430,7 @@ Text tIcon
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -460,7 +460,7 @@ Text t1
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -510,7 +510,7 @@ Text t3
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -560,7 +560,7 @@ Text t4
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -639,7 +639,7 @@ Text t6
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -681,7 +681,7 @@ Text t5
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
@@ -792,7 +792,7 @@ Button bNext
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -839,7 +839,7 @@ Button bPrev
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -962,9 +962,7 @@ Timer tmSerial
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tIcon.txt,"~",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"~",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
@@ -974,9 +972,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tPlayPause.txt,"~",8
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"~",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")

View File

@@ -135,7 +135,7 @@ XFloat xTempCurr
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 3 Font ID : 4
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -511,7 +511,7 @@ Button bNext
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -666,7 +666,7 @@ Button bPrev
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : flat Style : flat
Font ID : 2 Font ID : 3
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -1257,12 +1257,9 @@ Timer tmSerial
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,bt0.txt,"~",10
if(tTmp.txt!="") if(bt0.txt!="")
{ {
// set icon
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bt0.txt,sys0,1
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
@@ -1273,232 +1270,216 @@ Timer tmSerial
spstr strCommand.txt,va0.txt,"~",13 spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 }
spstr strCommand.txt,tTmp.txt,"~",14 //bt1
if(tTmp.txt!="") spstr strCommand.txt,bt1.txt,"~",14
{ if(bt1.txt!="")
// set icon {
covx tTmp.txt,sys0,0,0 // set text color on active state
substr pageIcons.tIcons.txt,bt1.txt,sys0,1 spstr strCommand.txt,tTmp.txt,"~",15
// set text color on active state covx tTmp.txt,bt1.pco2,0,0
spstr strCommand.txt,tTmp.txt,"~",15 // set state
covx tTmp.txt,bt1.pco2,0,0 spstr strCommand.txt,tTmp.txt,"~",16
// set state covx tTmp.txt,bt1.val,0,0
spstr strCommand.txt,tTmp.txt,"~",16 // save action
covx tTmp.txt,bt1.val,0,0 spstr strCommand.txt,va1.txt,"~",17
// save action //enable
spstr strCommand.txt,va1.txt,"~",17 vis bt1,1
//enable }
vis bt1,1 //bt2
} //bt2 spstr strCommand.txt,bt2.txt,"~",18
spstr strCommand.txt,tTmp.txt,"~",18 if(bt2.txt!="")
if(tTmp.txt!="") {
{ // set text color on active state
// set icon spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,sys0,0,0 covx tTmp.txt,bt2.pco2,0,0
substr pageIcons.tIcons.txt,bt2.txt,sys0,1 // set state
// set text color on active state spstr strCommand.txt,tTmp.txt,"~",20
spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,bt2.val,0,0
covx tTmp.txt,bt2.pco2,0,0 // save action
// set state spstr strCommand.txt,va2.txt,"~",21
spstr strCommand.txt,tTmp.txt,"~",20 //enable
covx tTmp.txt,bt2.val,0,0 vis bt2,1
// save action }
spstr strCommand.txt,va2.txt,"~",21 //bt3
//enable spstr strCommand.txt,bt3.txt,"~",22
vis bt2,1 if(bt3.txt!="")
} //bt3 {
spstr strCommand.txt,tTmp.txt,"~",22 // set text color on active state
if(tTmp.txt!="") spstr strCommand.txt,tTmp.txt,"~",23
{ covx tTmp.txt,bt3.pco2,0,0
// set icon // set state
covx tTmp.txt,sys0,0,0 spstr strCommand.txt,tTmp.txt,"~",24
substr pageIcons.tIcons.txt,bt3.txt,sys0,1 covx tTmp.txt,bt3.val,0,0
// set text color on active state // save action
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,va3.txt,"~",25
covx tTmp.txt,bt3.pco2,0,0 //enable
// set state vis bt3,1
spstr strCommand.txt,tTmp.txt,"~",24 }
covx tTmp.txt,bt3.val,0,0 //bt4
// save action spstr strCommand.txt,bt4.txt,"~",26
spstr strCommand.txt,va3.txt,"~",25 if(bt4.txt!="")
//enable {
vis bt3,1 // set text color on active state
} //bt4 spstr strCommand.txt,tTmp.txt,"~",27
spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,bt4.pco2,0,0
if(tTmp.txt!="") // set state
{ spstr strCommand.txt,tTmp.txt,"~",28
// set icon covx tTmp.txt,bt4.val,0,0
covx tTmp.txt,sys0,0,0 // save action
substr pageIcons.tIcons.txt,bt4.txt,sys0,1 spstr strCommand.txt,va4.txt,"~",29
// set text color on active state //enable
spstr strCommand.txt,tTmp.txt,"~",27 vis bt4,1
covx tTmp.txt,bt4.pco2,0,0 }
// set state //bt5
spstr strCommand.txt,tTmp.txt,"~",28 spstr strCommand.txt,bt5.txt,"~",30
covx tTmp.txt,bt4.val,0,0 if(bt5.txt!="")
// save action {
spstr strCommand.txt,va4.txt,"~",29 // set text color on active state
//enable spstr strCommand.txt,tTmp.txt,"~",31
vis bt4,1 covx tTmp.txt,bt5.pco2,0,0
} //bt5 // set state
spstr strCommand.txt,tTmp.txt,"~",30 spstr strCommand.txt,tTmp.txt,"~",32
if(tTmp.txt!="") covx tTmp.txt,bt5.val,0,0
{ // save action
// set icon spstr strCommand.txt,va5.txt,"~",33
covx tTmp.txt,sys0,0,0 //enable
substr pageIcons.tIcons.txt,bt5.txt,sys0,1 vis bt5,1
// set text color on active state }
spstr strCommand.txt,tTmp.txt,"~",31 //bt6
covx tTmp.txt,bt5.pco2,0,0 spstr strCommand.txt,bt6.txt,"~",34
// set state if(bt6.txt!="")
spstr strCommand.txt,tTmp.txt,"~",32 {
covx tTmp.txt,bt5.val,0,0 // set text color on active state
// save action spstr strCommand.txt,tTmp.txt,"~",35
spstr strCommand.txt,va5.txt,"~",33 covx tTmp.txt,bt6.pco2,0,0
//enable // set state
vis bt5,1 spstr strCommand.txt,tTmp.txt,"~",36
} //bt6 covx tTmp.txt,bt6.val,0,0
spstr strCommand.txt,tTmp.txt,"~",34 // save action
if(tTmp.txt!="") spstr strCommand.txt,va6.txt,"~",37
{ //enable
// set icon vis bt6,1
covx tTmp.txt,sys0,0,0 }
substr pageIcons.tIcons.txt,bt6.txt,sys0,1 //bt7
// set text color on active state spstr strCommand.txt,bt7.txt,"~",38
spstr strCommand.txt,tTmp.txt,"~",35 if(bt7.txt!="")
covx tTmp.txt,bt6.pco2,0,0 {
// set state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt7.pco2,0,0
// save action // set state
spstr strCommand.txt,va6.txt,"~",37 spstr strCommand.txt,tTmp.txt,"~",40
//enable covx tTmp.txt,bt7.val,0,0
vis bt6,1 // save action
} //bt7 spstr strCommand.txt,va7.txt,"~",41
spstr strCommand.txt,tTmp.txt,"~",38 //enable
if(tTmp.txt!="") vis bt7,1
{ }
// set icon //bt8
covx tTmp.txt,sys0,0,0 spstr strCommand.txt,bt8.txt,"~",42
substr pageIcons.tIcons.txt,bt7.txt,sys0,1 if(bt8.txt!="")
// set text color on active state {
spstr strCommand.txt,tTmp.txt,"~",39 // set text color on active state
covx tTmp.txt,bt7.pco2,0,0 spstr strCommand.txt,tTmp.txt,"~",43
// set state covx tTmp.txt,bt8.pco2,0,0
spstr strCommand.txt,tTmp.txt,"~",40 // set state
covx tTmp.txt,bt7.val,0,0 spstr strCommand.txt,tTmp.txt,"~",44
// save action covx tTmp.txt,bt8.val,0,0
spstr strCommand.txt,va7.txt,"~",41 // save action
//enable spstr strCommand.txt,va8.txt,"~",45
vis bt7,1 //enable
} //bt8 vis bt8,1
spstr strCommand.txt,tTmp.txt,"~",42 }
if(tTmp.txt!="") }
{ if(tInstruction.txt=="pageType")
// set icon {
covx tTmp.txt,sys0,0,0 //command format pageType,specialPageName
substr pageIcons.tIcons.txt,bt8.txt,sys0,1 //write name of speical page to tId
// set text color on active state spstr strCommand.txt,tId.txt,"~",1
spstr strCommand.txt,tTmp.txt,"~",43 //save second arg if there's one
covx tTmp.txt,bt8.pco2,0,0 spstr strCommand.txt,tTmp.txt,"~",2
// set state //save third arg if there's one
spstr strCommand.txt,tTmp.txt,"~",44 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
covx tTmp.txt,bt8.val,0,0 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
// save action udelete payloadLength-1
spstr strCommand.txt,va8.txt,"~",45 bufferPos=0
//enable if(tId.txt=="pageStartup")
vis bt8,1 {
} page pageStartup
} }
if(tInstruction.txt=="pageType") if(tId.txt=="screensaver")
{ {
//command format pageType,specialPageName page screensaver
//write name of speical page to tId }
spstr strCommand.txt,tId.txt,"~",1 if(tId.txt=="cardEntities")
//save second arg if there's one {
spstr strCommand.txt,tTmp.txt,"~",2 page cardEntities
//save third arg if there's one }
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 if(tId.txt=="cardGrid")
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... {
udelete payloadLength-1 page cardGrid
bufferPos=0 }
if(tId.txt=="pageStartup") if(tId.txt=="popupLight")
{ {
page pageStartup pageIcons.tTmp1.txt=tTmp.txt
} page popupLight
if(tId.txt=="screensaver") }
{ if(tId.txt=="popupShutter")
page screensaver {
} pageIcons.tTmp1.txt=tTmp.txt
if(tId.txt=="cardEntities") page popupShutter
{ }
page cardEntities if(tId.txt=="popupNotify")
} {
if(tId.txt=="cardGrid") page popupNotify
{ }
page cardGrid if(tId.txt=="cardThermo")
} {
if(tId.txt=="popupLight") page cardThermo
{ }
pageIcons.tTmp1.txt=tTmp.txt if(tId.txt=="cardMedia")
page popupLight {
} page cardMedia
if(tId.txt=="popupShutter") }
{ if(tId.txt=="cardAlarm")
pageIcons.tTmp1.txt=tTmp.txt {
page popupShutter page cardAlarm
} }
if(tId.txt=="popupNotify") }
{ if(tInstruction.txt=="time")
page popupNotify {
} // get set time to global variable
if(tId.txt=="cardThermo") spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
{ }
page cardThermo if(tInstruction.txt=="date")
} {
if(tId.txt=="cardMedia") // get set date to global variable
{ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
page cardMedia }
} if(tInstruction.txt=="dimmode")
if(tId.txt=="cardAlarm") {
{ // get value
page cardAlarm spstr strCommand.txt,tTmp.txt,"~",1
} covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="timeout")
{ {
// get set time to global variable //set timeout to global var
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
} covx tTmp.txt,sleepTimeout,0,0
if(tInstruction.txt=="date") }
{ // end of user code
// get set date to global variable udelete payloadLength-1
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 bufferPos=0
} }
if(tInstruction.txt=="dimmode") }
{ }
// get value }
spstr strCommand.txt,tTmp.txt,"~",1 // next character
covx tTmp.txt,dimValue,0,0 bufferPos++
} }
if(tInstruction.txt=="timeout") }
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep Timer tmSleep
Attributes Attributes

View File

@@ -2,61 +2,57 @@ Program.s
0 Component(s) 0 Component(s)
10 Line(s) of event code 10 Line(s) of event code
10 Unique line(s) of event code 10 Unique line(s) of event code
pageSerialTest pageTest
13 Component(s) 13 Component(s)
48 Line(s) of event code 13 Line(s) of event code
43 Unique line(s) of event code 13 Unique line(s) of event code
pageIcons pageIcons
7 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 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
113 Unique line(s) of event code 113 Unique line(s) of event code
popupNotify cardGrid
17 Component(s) 39 Component(s)
178 Line(s) of event code 418 Line(s) of event code
117 Unique line(s) of event code 243 Unique line(s) of event code
pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
173 Unique line(s) of event code
screensaver screensaver
33 Component(s) 33 Component(s)
207 Line(s) of event code 195 Line(s) of event code
158 Unique line(s) of event code 152 Unique line(s) of event code
cardThermo
41 Component(s)
442 Line(s) of event code
246 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
333 Line(s) of event code 329 Line(s) of event code
170 Unique line(s) of event code 168 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
213 Unique line(s) of event code
cardEntities
86 Component(s)
1350 Line(s) of event code
547 Unique line(s) of event code
popupShutter 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 popupNotify
35 Component(s) 17 Component(s)
345 Line(s) of event code 178 Line(s) of event code
214 Unique line(s) of event code 117 Unique line(s) of event code
cardGrid popupLight
39 Component(s) 27 Component(s)
430 Line(s) of event code 320 Line(s) of event code
249 Unique line(s) of event code 173 Unique line(s) of event code
cardThermo
41 Component(s)
460 Line(s) of event code
284 Unique line(s) of event code
cardEntities
86 Component(s)
1362 Line(s) of event code
553 Unique line(s) of event code
Total Total
13 Page(s) 12 Page(s)
379 Component(s) 365 Component(s)
4036 Line(s) of event code 3926 Line(s) of event code
1153 Unique line(s) of event code 1059 Unique line(s) of event code

View File

@@ -20,51 +20,21 @@ Page pageIcons
Variable (string) vaTime Variable (string) vaTime
Attributes Attributes
ID : 5 ID : 4
Scope : global Scope : global
Text : Text :
Max. Text Size: 15 Max. Text Size: 15
Variable (string) vaDate Variable (string) vaDate
Attributes Attributes
ID : 6 ID : 5
Scope : global Scope : global
Text : Text :
Max. Text Size: 35 Max. Text Size: 35
Text tIcons
Attributes
ID : 2
Scope : global
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
y coordinate : 161
Width : 295
Height : 285
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 65535
Font Color : 0
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text : 
Max. Text Size : 185
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp1 Text tTmp1
Attributes Attributes
ID : 3 ID : 2
Scope : global Scope : global
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -94,7 +64,7 @@ Text tTmp1
Text tTmp2 Text tTmp2
Attributes Attributes
ID : 4 ID : 3
Scope : global Scope : global
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0

View File

@@ -1,434 +0,0 @@
Page pageSerialTest
Attributes
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Fill : solid color
Back. Color : 65535
Events
Preinitialize Event
//vis p0,0
//recmod=1
//bauds=115200
Number nCrcRecv
Attributes
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 5
y coordinate : 205
Width : 88
Height : 29
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal with digit grouping
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Number nCrcCalc
Attributes
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 4
y coordinate : 236
Width : 90
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal with digit grouping
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Number nIt
Attributes
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 181
y coordinate : 168
Width : 52
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Number nLength
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 181
y coordinate : 78
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits shown : all
Format : decimal
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tStatus
Attributes
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 5
y coordinate : 267
Width : 271
Height : 90
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : newtxt
Max. Text Size : 100
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tCmd
Attributes
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 5
y coordinate : 358
Width : 272
Height : 80
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : newtxt
Max. Text Size : 500
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tBuffer
Attributes
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 5
y coordinate : 443
Width : 310
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : newtxt
Max. Text Size : 100
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tDesc
Attributes
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 159
Height : 204
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
Max. Text Size : 60
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 319
Height : 479
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Button b0
Attributes
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 181
y coordinate : 9
Width : 46
Height : 46
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 4
Back. Color : 50712
Back. Picture ID (Pressed) : 0
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : bck
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
recmod=0
page pageTest
Button b1
Attributes
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 249
y coordinate : 9
Width : 48
Height : 48
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 4
Back. Color : 50712
Back. Picture ID (Pressed) : 0
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : ON
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
recmod=1
bauds=115200
Timer tmSerial
Attributes
ID : 2
Scope : local
Period (ms): 400
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
tStatus.txt="init command detected"
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
//payloadLength=u[2]
ucopy payloadLength,2,2,0
nLength.val=payloadLength
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
tStatus.txt="reached"
// calculate crc
crcrest 1,0xFFFF
// payload length -1 to exclude crc
crcputu 0,payloadLength-1 //u[2]+3
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
nCrcRecv.val=recvCrc
// compare crc with recived value
if(crcval==recvCrc)
{
tStatus.txt="crc ok"
nIt.val=nIt.val+1
ucopy tCmd.txt,4,payloadLength-5,0
udelete payloadLength-1
bufferPos=0
// here is the location where acual code should be
}
// copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
nCrcRecv.val=recvCrc
nCrcCalc.val=crcval
//ucopy nCrcCalc.val,u[2]+3,3,0
}
}
}
// next character
bufferPos++
}
if(bufferPos==usize)
{
// copy whole buffer to tCmd.txt, for debugging
//ucopy tBuffer.txt,0,usize,0
// ucopy nIt.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
}

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 29 Text : 30
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -56,7 +56,7 @@ Button b0
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -75,7 +75,7 @@ Button b0
Touch Press Event Touch Press Event
page cardEntities page cardEntities
Button b1 Button b3
Attributes Attributes
ID : 3 ID : 3
Scope : local Scope : local
@@ -83,8 +83,8 @@ Button b1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 190 x coordinate : 39
y coordinate : 380 y coordinate : 395
Width : 100 Width : 100
Height : 50 Height : 50
Effect : load Effect : load
@@ -92,43 +92,7 @@ Button b1
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : serial
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
page pageSerialTest
Button b3
Attributes
ID : 4
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 35
y coordinate : 380
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 4
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 0 Back. Picture ID (Pressed) : 0
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -149,7 +113,7 @@ Button b3
Button b6 Button b6
Attributes Attributes
ID : 5 ID : 4
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -164,7 +128,7 @@ Button b6
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -185,7 +149,7 @@ Button b6
Button b4 Button b4
Attributes Attributes
ID : 6 ID : 5
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -200,7 +164,7 @@ Button b4
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -221,7 +185,7 @@ Button b4
Button b5 Button b5
Attributes Attributes
ID : 7 ID : 6
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -236,7 +200,7 @@ Button b5
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -257,7 +221,7 @@ Button b5
Button b7 Button b7
Attributes Attributes
ID : 8 ID : 7
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -272,7 +236,7 @@ Button b7
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -293,7 +257,7 @@ Button b7
Button b8 Button b8
Attributes Attributes
ID : 9 ID : 8
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -308,7 +272,7 @@ Button b8
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -330,7 +294,7 @@ Button b8
Button b9 Button b9
Attributes Attributes
ID : 10 ID : 9
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -345,7 +309,7 @@ Button b9
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -366,7 +330,7 @@ Button b9
Button b10 Button b10
Attributes Attributes
ID : 11 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -381,7 +345,7 @@ Button b10
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -402,7 +366,7 @@ Button b10
Button b11 Button b11
Attributes Attributes
ID : 12 ID : 11
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -417,7 +381,7 @@ Button b11
Effect Time : 300 Effect Time : 300
Fill : solid color Fill : solid color
Style : 3D auto Style : 3D auto
Font ID : 4 Font ID : 3
Back. Color : 50712 Back. Color : 50712
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
@@ -436,3 +400,39 @@ Button b11
Touch Press Event Touch Press Event
page cardGrid page cardGrid
Button b1
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 175
y coordinate : 402
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 3
Back. Color : 50712
Back. Picture ID (Pressed) : 0
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : bauds=115200
Max. Text Size : 20
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
bauds=115200

View File

@@ -788,9 +788,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tIcon1.txt,"~",1
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2

View File

@@ -227,7 +227,7 @@ Text tMainIcon
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 3 Font ID : 4
Back. Color : 0 Back. Color : 0
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -257,7 +257,7 @@ Text tMainText
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 0 Back. Color : 0
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -497,7 +497,7 @@ Text tAMPM
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 3 Font ID : 4
Back. Color : 0 Back. Color : 0
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -707,7 +707,7 @@ Text tMainTextAlt
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 3
Back. Color : 0 Back. Color : 0
Font Color : 65535 Font Color : 65535
Horizontal Alignment : left Horizontal Alignment : left
@@ -737,7 +737,7 @@ Text tMainIconAlt
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 3 Font ID : 4
Back. Color : 0 Back. Color : 0
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : center
@@ -922,9 +922,7 @@ Timer tmSerial
vis tMRIcon,0 vis tMRIcon,0
vis tMR,0 vis tMR,0
//tMainIcon //tMainIcon
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tMainIcon.txt,"~",1
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
tMainIconAlt.txt=tMainIcon.txt tMainIconAlt.txt=tMainIcon.txt
//tMainText //tMainText
spstr strCommand.txt,tMainText.txt,"~",2 spstr strCommand.txt,tMainText.txt,"~",2
@@ -932,41 +930,31 @@ Timer tmSerial
//tForecast1 //tForecast1
spstr strCommand.txt,tForecast1.txt,"~",3 spstr strCommand.txt,tForecast1.txt,"~",3
//tF1Icon //tF1Icon
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tF1Icon.txt,"~",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
//tForecast1Val //tForecast1Val
spstr strCommand.txt,tForecast1Val.txt,"~",5 spstr strCommand.txt,tForecast1Val.txt,"~",5
//tForecast2 //tForecast2
spstr strCommand.txt,tForecast2.txt,"~",6 spstr strCommand.txt,tForecast2.txt,"~",6
//tF2Icon //tF2Icon
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tF2Icon.txt,"~",7
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
//tForecast2Val //tForecast2Val
spstr strCommand.txt,tForecast2Val.txt,"~",8 spstr strCommand.txt,tForecast2Val.txt,"~",8
//tForecast3 //tForecast3
spstr strCommand.txt,tForecast3.txt,"~",9 spstr strCommand.txt,tForecast3.txt,"~",9
//tF3Icon //tF3Icon
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tF3Icon.txt,"~",10
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
//tForecast3Val //tForecast3Val
spstr strCommand.txt,tForecast3Val.txt,"~",11 spstr strCommand.txt,tForecast3Val.txt,"~",11
//tForecast4 //tForecast4
spstr strCommand.txt,tForecast4.txt,"~",12 spstr strCommand.txt,tForecast4.txt,"~",12
//tF4Icon //tF4Icon
spstr strCommand.txt,tTmp.txt,"~",13 spstr strCommand.txt,tF4Icon.txt,"~",13
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
//tForecast4Val //tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"~",14 spstr strCommand.txt,tForecast4Val.txt,"~",14
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tTmp.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
covx tTmp.txt,sys0,0,0 if(tMRIcon.txt!="")
substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
if(tTmp.txt!="")
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0

View File

@@ -579,9 +579,7 @@ Timer tmSerial
//id arm4 //id arm4
spstr strCommand.txt,va4.txt,"~",10 spstr strCommand.txt,va4.txt,"~",10
//icon //icon
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tIcon.txt,"~",11
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//icon color //icon color
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0

View File

@@ -1628,9 +1628,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tIcon1.txt,"~",5
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
@@ -1752,9 +1750,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tIcon2.txt,"~",11
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
vis tIcon2,1 vis tIcon2,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
@@ -1876,9 +1872,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,tIcon3.txt,"~",17
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
vis tIcon3,1 vis tIcon3,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",18 spstr strCommand.txt,tTmp.txt,"~",18
@@ -2000,9 +1994,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,tIcon4.txt,"~",23
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
vis tIcon4,1 vis tIcon4,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",24 spstr strCommand.txt,tTmp.txt,"~",24
@@ -2124,9 +2116,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",29 spstr strCommand.txt,tIcon5.txt,"~",29
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
vis tIcon5,1 vis tIcon5,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",30 spstr strCommand.txt,tTmp.txt,"~",30
@@ -2248,9 +2238,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",35 spstr strCommand.txt,tIcon6.txt,"~",35
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
vis tIcon6,1 vis tIcon6,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",36

View File

@@ -613,9 +613,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,bEntity1.txt,"~",5
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
vis bEntity1,1 vis bEntity1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
@@ -636,9 +634,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,bEntity2.txt,"~",11
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
vis bEntity2,1 vis bEntity2,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",12 spstr strCommand.txt,tTmp.txt,"~",12
@@ -659,9 +655,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",17 spstr strCommand.txt,bEntity3.txt,"~",17
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
vis bEntity3,1 vis bEntity3,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",18 spstr strCommand.txt,tTmp.txt,"~",18
@@ -682,9 +676,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,bEntity4.txt,"~",23
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
vis bEntity4,1 vis bEntity4,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",24 spstr strCommand.txt,tTmp.txt,"~",24
@@ -705,9 +697,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",29 spstr strCommand.txt,bEntity5.txt,"~",29
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
vis bEntity5,1 vis bEntity5,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",30 spstr strCommand.txt,tTmp.txt,"~",30
@@ -728,9 +718,7 @@ Timer tmSerial
}else }else
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",35 spstr strCommand.txt,bEntity6.txt,"~",35
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
vis bEntity6,1 vis bEntity6,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",36

View File

@@ -540,9 +540,7 @@ Timer tmSerial
//entity name //entity name
spstr strCommand.txt,entn.txt,"~",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tIcon.txt,"~",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"~",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
@@ -552,9 +550,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"~",8 spstr strCommand.txt,tPlayPause.txt,"~",8
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"~",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")

View File

@@ -704,12 +704,9 @@ Timer tmSerial
vis bt7,0 vis bt7,0
vis bt8,0 vis bt8,0
//bt0 //bt0
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,bt0.txt,"~",10
if(tTmp.txt!="") if(bt0.txt!="")
{ {
// set icon
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bt0.txt,sys0,1
// set text color on active state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,bt0.pco2,0,0 covx tTmp.txt,bt0.pco2,0,0
@@ -720,232 +717,216 @@ Timer tmSerial
spstr strCommand.txt,va0.txt,"~",13 spstr strCommand.txt,va0.txt,"~",13
//enable //enable
vis bt0,1 vis bt0,1
} //bt1 }
spstr strCommand.txt,tTmp.txt,"~",14 //bt1
if(tTmp.txt!="") spstr strCommand.txt,bt1.txt,"~",14
{ if(bt1.txt!="")
// set icon {
covx tTmp.txt,sys0,0,0 // set text color on active state
substr pageIcons.tIcons.txt,bt1.txt,sys0,1 spstr strCommand.txt,tTmp.txt,"~",15
// set text color on active state covx tTmp.txt,bt1.pco2,0,0
spstr strCommand.txt,tTmp.txt,"~",15 // set state
covx tTmp.txt,bt1.pco2,0,0 spstr strCommand.txt,tTmp.txt,"~",16
// set state covx tTmp.txt,bt1.val,0,0
spstr strCommand.txt,tTmp.txt,"~",16 // save action
covx tTmp.txt,bt1.val,0,0 spstr strCommand.txt,va1.txt,"~",17
// save action //enable
spstr strCommand.txt,va1.txt,"~",17 vis bt1,1
//enable }
vis bt1,1 //bt2
} //bt2 spstr strCommand.txt,bt2.txt,"~",18
spstr strCommand.txt,tTmp.txt,"~",18 if(bt2.txt!="")
if(tTmp.txt!="") {
{ // set text color on active state
// set icon spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,sys0,0,0 covx tTmp.txt,bt2.pco2,0,0
substr pageIcons.tIcons.txt,bt2.txt,sys0,1 // set state
// set text color on active state spstr strCommand.txt,tTmp.txt,"~",20
spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,bt2.val,0,0
covx tTmp.txt,bt2.pco2,0,0 // save action
// set state spstr strCommand.txt,va2.txt,"~",21
spstr strCommand.txt,tTmp.txt,"~",20 //enable
covx tTmp.txt,bt2.val,0,0 vis bt2,1
// save action }
spstr strCommand.txt,va2.txt,"~",21 //bt3
//enable spstr strCommand.txt,bt3.txt,"~",22
vis bt2,1 if(bt3.txt!="")
} //bt3 {
spstr strCommand.txt,tTmp.txt,"~",22 // set text color on active state
if(tTmp.txt!="") spstr strCommand.txt,tTmp.txt,"~",23
{ covx tTmp.txt,bt3.pco2,0,0
// set icon // set state
covx tTmp.txt,sys0,0,0 spstr strCommand.txt,tTmp.txt,"~",24
substr pageIcons.tIcons.txt,bt3.txt,sys0,1 covx tTmp.txt,bt3.val,0,0
// set text color on active state // save action
spstr strCommand.txt,tTmp.txt,"~",23 spstr strCommand.txt,va3.txt,"~",25
covx tTmp.txt,bt3.pco2,0,0 //enable
// set state vis bt3,1
spstr strCommand.txt,tTmp.txt,"~",24 }
covx tTmp.txt,bt3.val,0,0 //bt4
// save action spstr strCommand.txt,bt4.txt,"~",26
spstr strCommand.txt,va3.txt,"~",25 if(bt4.txt!="")
//enable {
vis bt3,1 // set text color on active state
} //bt4 spstr strCommand.txt,tTmp.txt,"~",27
spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,bt4.pco2,0,0
if(tTmp.txt!="") // set state
{ spstr strCommand.txt,tTmp.txt,"~",28
// set icon covx tTmp.txt,bt4.val,0,0
covx tTmp.txt,sys0,0,0 // save action
substr pageIcons.tIcons.txt,bt4.txt,sys0,1 spstr strCommand.txt,va4.txt,"~",29
// set text color on active state //enable
spstr strCommand.txt,tTmp.txt,"~",27 vis bt4,1
covx tTmp.txt,bt4.pco2,0,0 }
// set state //bt5
spstr strCommand.txt,tTmp.txt,"~",28 spstr strCommand.txt,bt5.txt,"~",30
covx tTmp.txt,bt4.val,0,0 if(bt5.txt!="")
// save action {
spstr strCommand.txt,va4.txt,"~",29 // set text color on active state
//enable spstr strCommand.txt,tTmp.txt,"~",31
vis bt4,1 covx tTmp.txt,bt5.pco2,0,0
} //bt5 // set state
spstr strCommand.txt,tTmp.txt,"~",30 spstr strCommand.txt,tTmp.txt,"~",32
if(tTmp.txt!="") covx tTmp.txt,bt5.val,0,0
{ // save action
// set icon spstr strCommand.txt,va5.txt,"~",33
covx tTmp.txt,sys0,0,0 //enable
substr pageIcons.tIcons.txt,bt5.txt,sys0,1 vis bt5,1
// set text color on active state }
spstr strCommand.txt,tTmp.txt,"~",31 //bt6
covx tTmp.txt,bt5.pco2,0,0 spstr strCommand.txt,bt6.txt,"~",34
// set state if(bt6.txt!="")
spstr strCommand.txt,tTmp.txt,"~",32 {
covx tTmp.txt,bt5.val,0,0 // set text color on active state
// save action spstr strCommand.txt,tTmp.txt,"~",35
spstr strCommand.txt,va5.txt,"~",33 covx tTmp.txt,bt6.pco2,0,0
//enable // set state
vis bt5,1 spstr strCommand.txt,tTmp.txt,"~",36
} //bt6 covx tTmp.txt,bt6.val,0,0
spstr strCommand.txt,tTmp.txt,"~",34 // save action
if(tTmp.txt!="") spstr strCommand.txt,va6.txt,"~",37
{ //enable
// set icon vis bt6,1
covx tTmp.txt,sys0,0,0 }
substr pageIcons.tIcons.txt,bt6.txt,sys0,1 //bt7
// set text color on active state spstr strCommand.txt,bt7.txt,"~",38
spstr strCommand.txt,tTmp.txt,"~",35 if(bt7.txt!="")
covx tTmp.txt,bt6.pco2,0,0 {
// set state // set text color on active state
spstr strCommand.txt,tTmp.txt,"~",36 spstr strCommand.txt,tTmp.txt,"~",39
covx tTmp.txt,bt6.val,0,0 covx tTmp.txt,bt7.pco2,0,0
// save action // set state
spstr strCommand.txt,va6.txt,"~",37 spstr strCommand.txt,tTmp.txt,"~",40
//enable covx tTmp.txt,bt7.val,0,0
vis bt6,1 // save action
} //bt7 spstr strCommand.txt,va7.txt,"~",41
spstr strCommand.txt,tTmp.txt,"~",38 //enable
if(tTmp.txt!="") vis bt7,1
{ }
// set icon //bt8
covx tTmp.txt,sys0,0,0 spstr strCommand.txt,bt8.txt,"~",42
substr pageIcons.tIcons.txt,bt7.txt,sys0,1 if(bt8.txt!="")
// set text color on active state {
spstr strCommand.txt,tTmp.txt,"~",39 // set text color on active state
covx tTmp.txt,bt7.pco2,0,0 spstr strCommand.txt,tTmp.txt,"~",43
// set state covx tTmp.txt,bt8.pco2,0,0
spstr strCommand.txt,tTmp.txt,"~",40 // set state
covx tTmp.txt,bt7.val,0,0 spstr strCommand.txt,tTmp.txt,"~",44
// save action covx tTmp.txt,bt8.val,0,0
spstr strCommand.txt,va7.txt,"~",41 // save action
//enable spstr strCommand.txt,va8.txt,"~",45
vis bt7,1 //enable
} //bt8 vis bt8,1
spstr strCommand.txt,tTmp.txt,"~",42 }
if(tTmp.txt!="") }
{ if(tInstruction.txt=="pageType")
// set icon {
covx tTmp.txt,sys0,0,0 //command format pageType,specialPageName
substr pageIcons.tIcons.txt,bt8.txt,sys0,1 //write name of speical page to tId
// set text color on active state spstr strCommand.txt,tId.txt,"~",1
spstr strCommand.txt,tTmp.txt,"~",43 //save second arg if there's one
covx tTmp.txt,bt8.pco2,0,0 spstr strCommand.txt,tTmp.txt,"~",2
// set state //save third arg if there's one
spstr strCommand.txt,tTmp.txt,"~",44 spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
covx tTmp.txt,bt8.val,0,0 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
// save action udelete payloadLength-1
spstr strCommand.txt,va8.txt,"~",45 bufferPos=0
//enable if(tId.txt=="pageStartup")
vis bt8,1 {
} page pageStartup
} }
if(tInstruction.txt=="pageType") if(tId.txt=="screensaver")
{ {
//command format pageType,specialPageName page screensaver
//write name of speical page to tId }
spstr strCommand.txt,tId.txt,"~",1 if(tId.txt=="cardEntities")
//save second arg if there's one {
spstr strCommand.txt,tTmp.txt,"~",2 page cardEntities
//save third arg if there's one }
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 if(tId.txt=="cardGrid")
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... {
udelete payloadLength-1 page cardGrid
bufferPos=0 }
if(tId.txt=="pageStartup") if(tId.txt=="popupLight")
{ {
page pageStartup pageIcons.tTmp1.txt=tTmp.txt
} page popupLight
if(tId.txt=="screensaver") }
{ if(tId.txt=="popupShutter")
page screensaver {
} pageIcons.tTmp1.txt=tTmp.txt
if(tId.txt=="cardEntities") page popupShutter
{ }
page cardEntities if(tId.txt=="popupNotify")
} {
if(tId.txt=="cardGrid") page popupNotify
{ }
page cardGrid if(tId.txt=="cardThermo")
} {
if(tId.txt=="popupLight") page cardThermo
{ }
pageIcons.tTmp1.txt=tTmp.txt if(tId.txt=="cardMedia")
page popupLight {
} page cardMedia
if(tId.txt=="popupShutter") }
{ if(tId.txt=="cardAlarm")
pageIcons.tTmp1.txt=tTmp.txt {
page popupShutter page cardAlarm
} }
if(tId.txt=="popupNotify") }
{ if(tInstruction.txt=="time")
page popupNotify {
} // get set time to global variable
if(tId.txt=="cardThermo") spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
{ }
page cardThermo if(tInstruction.txt=="date")
} {
if(tId.txt=="cardMedia") // get set date to global variable
{ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
page cardMedia }
} if(tInstruction.txt=="dimmode")
if(tId.txt=="cardAlarm") {
{ // get value
page cardAlarm spstr strCommand.txt,tTmp.txt,"~",1
} covx tTmp.txt,dimValue,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="timeout")
{ {
// get set time to global variable //set timeout to global var
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
} covx tTmp.txt,sleepTimeout,0,0
if(tInstruction.txt=="date") }
{ // end of user code
// get set date to global variable udelete payloadLength-1
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 bufferPos=0
} }
if(tInstruction.txt=="dimmode") }
{ }
// get value }
spstr strCommand.txt,tTmp.txt,"~",1 // next character
covx tTmp.txt,dimValue,0,0 bufferPos++
} }
if(tInstruction.txt=="timeout") }
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep Timer tmSleep
Attributes Attributes

View File

@@ -22,16 +22,6 @@ Variable (string) vaDate
Text : Text :
Max. Text Size: 35 Max. Text Size: 35
Text tIcons
Attributes
Scope : global
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 185
Text tTmp1 Text tTmp1
Attributes Attributes
Scope : global Scope : global

View File

@@ -1,207 +0,0 @@
Page pageSerialTest
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Events
Preinitialize Event
//vis p0,0
//recmod=1
//bauds=115200
Number nCrcRecv
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Number nCrcCalc
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Number nIt
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Number nLength
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Text tStatus
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : newtxt
Max. Text Size : 100
Text tCmd
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : newtxt
Max. Text Size : 500
Text tBuffer
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : newtxt
Max. Text Size : 100
Text tDesc
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : CRC Recv:\r\nCRC Calc:\r\n\r\nStatus\r\n\r\nCommand
Max. Text Size : 60
Picture p0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Button b0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : bck
Max. Text Size : 10
Events
Touch Press Event
recmod=0
page pageTest
Button b1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : ON
Max. Text Size : 10
Events
Touch Press Event
recmod=1
bauds=115200
Timer tmSerial
Attributes
Scope : local
Period (ms): 400
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
tStatus.txt="init command detected"
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
//payloadLength=u[2]
ucopy payloadLength,2,2,0
nLength.val=payloadLength
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
tStatus.txt="reached"
// calculate crc
crcrest 1,0xFFFF
// payload length -1 to exclude crc
crcputu 0,payloadLength-1 //u[2]+3
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
nCrcRecv.val=recvCrc
// compare crc with recived value
if(crcval==recvCrc)
{
tStatus.txt="crc ok"
nIt.val=nIt.val+1
ucopy tCmd.txt,4,payloadLength-5,0
udelete payloadLength-1
bufferPos=0
// here is the location where acual code should be
}
// copy calculated crc and recived crc to nCrcRecv and nCrcCalc, for debugging
nCrcRecv.val=recvCrc
nCrcCalc.val=crcval
//ucopy nCrcCalc.val,u[2]+3,3,0
}
}
}
// next character
bufferPos++
}
if(bufferPos==usize)
{
// copy whole buffer to tCmd.txt, for debugging
//ucopy tBuffer.txt,0,usize,0
// ucopy nIt.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
}

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 29 Text : 30
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

View File

@@ -35,20 +35,6 @@ Button b0
Touch Press Event Touch Press Event
page cardEntities page cardEntities
Button b1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : serial
Max. Text Size : 10
Events
Touch Press Event
page pageSerialTest
Button b3 Button b3
Attributes Attributes
Scope : local Scope : local
@@ -176,3 +162,17 @@ Button b11
Touch Press Event Touch Press Event
page cardGrid page cardGrid
Button b1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : bauds=115200
Max. Text Size : 20
Events
Touch Press Event
bauds=115200

View File

@@ -442,9 +442,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpdateDetail") if(tInstruction.txt=="entityUpdateDetail")
{ {
// change icon // change icon
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tIcon1.txt,"~",1
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1 vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",2 spstr strCommand.txt,tTmp.txt,"~",2

View File

@@ -400,9 +400,7 @@ Timer tmSerial
vis tMRIcon,0 vis tMRIcon,0
vis tMR,0 vis tMR,0
//tMainIcon //tMainIcon
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tMainIcon.txt,"~",1
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
tMainIconAlt.txt=tMainIcon.txt tMainIconAlt.txt=tMainIcon.txt
//tMainText //tMainText
spstr strCommand.txt,tMainText.txt,"~",2 spstr strCommand.txt,tMainText.txt,"~",2
@@ -410,41 +408,31 @@ Timer tmSerial
//tForecast1 //tForecast1
spstr strCommand.txt,tForecast1.txt,"~",3 spstr strCommand.txt,tForecast1.txt,"~",3
//tF1Icon //tF1Icon
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tF1Icon.txt,"~",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
//tForecast1Val //tForecast1Val
spstr strCommand.txt,tForecast1Val.txt,"~",5 spstr strCommand.txt,tForecast1Val.txt,"~",5
//tForecast2 //tForecast2
spstr strCommand.txt,tForecast2.txt,"~",6 spstr strCommand.txt,tForecast2.txt,"~",6
//tF2Icon //tF2Icon
spstr strCommand.txt,tTmp.txt,"~",7 spstr strCommand.txt,tF2Icon.txt,"~",7
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
//tForecast2Val //tForecast2Val
spstr strCommand.txt,tForecast2Val.txt,"~",8 spstr strCommand.txt,tForecast2Val.txt,"~",8
//tForecast3 //tForecast3
spstr strCommand.txt,tForecast3.txt,"~",9 spstr strCommand.txt,tForecast3.txt,"~",9
//tF3Icon //tF3Icon
spstr strCommand.txt,tTmp.txt,"~",10 spstr strCommand.txt,tF3Icon.txt,"~",10
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
//tForecast3Val //tForecast3Val
spstr strCommand.txt,tForecast3Val.txt,"~",11 spstr strCommand.txt,tForecast3Val.txt,"~",11
//tForecast4 //tForecast4
spstr strCommand.txt,tForecast4.txt,"~",12 spstr strCommand.txt,tForecast4.txt,"~",12
//tF4Icon //tF4Icon
spstr strCommand.txt,tTmp.txt,"~",13 spstr strCommand.txt,tF4Icon.txt,"~",13
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
//tForecast4Val //tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"~",14 spstr strCommand.txt,tForecast4Val.txt,"~",14
//alternative layout //alternative layout
//tMRIcon //tMRIcon
spstr strCommand.txt,tTmp.txt,"~",15 spstr strCommand.txt,tMRIcon.txt,"~",15
covx tTmp.txt,sys0,0,0 if(tMRIcon.txt!="")
substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
if(tTmp.txt!="")
{ {
//value for tMRIcon, activate alternative layout //value for tMRIcon, activate alternative layout
vis tMainIcon,0 vis tMainIcon,0