This commit is contained in:
Johannes
2022-09-18 19:32:43 +02:00
4 changed files with 51 additions and 497 deletions

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-09-18 15:58:47.706858635 +0000 +++ /dev/fd/62 2022-09-18 17:04:58.368670000 +0000
+rdAlarm.txt +rdAlarm.txt
+18 +833,14 @@ +18 +833,14 @@
+ { + {

View File

@@ -32,8 +32,6 @@ Page cardPower
tsw h1,0 tsw h1,0
tsw h2,0 tsw h2,0
tsw h3,0 tsw h3,0
tsw h4,0
tsw h5,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -72,37 +70,37 @@ Variable (string) tInstruction
Variable (int32) t0Speed Variable (int32) t0Speed
Attributes Attributes
ID : 42 ID : 34
Scope: local Scope: local
Value: 0 Value: 0
Variable (int32) t1Speed Variable (int32) t1Speed
Attributes Attributes
ID : 43 ID : 35
Scope: local Scope: local
Value: 0 Value: 0
Variable (int32) t3Speed Variable (int32) t3Speed
Attributes Attributes
ID : 44 ID : 36
Scope: local Scope: local
Value: 0 Value: 0
Variable (int32) t4Speed Variable (int32) t4Speed
Attributes Attributes
ID : 45 ID : 37
Scope: local Scope: local
Value: 0 Value: 0
Variable (int32) t5Speed Variable (int32) t5Speed
Attributes Attributes
ID : 46 ID : 38
Scope: local Scope: local
Value: 0 Value: 0
Variable (int32) t2Speed Variable (int32) t2Speed
Attributes Attributes
ID : 47 ID : 39
Scope: local Scope: local
Value: 0 Value: 0
@@ -136,7 +134,7 @@ Text tHeading
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text t4Icon Text t0Icon
Attributes Attributes
ID : 16 ID : 16
Scope : local Scope : local
@@ -144,72 +142,8 @@ Text t4Icon
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 : 378
y coordinate : 156
Width : 60
Height : 60
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Associated Keyboard : none
Border Color : 17299
Border Width : 2
Font ID : 3
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : î´½
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t5Icon
Attributes
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 378
y coordinate : 232
Width : 60
Height : 60
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Associated Keyboard : none
Border Color : 17299
Border Width : 2
Font ID : 3
Back. Color : 6371
Font Color : 17299
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 5
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t0Icon
Attributes
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 18 x coordinate : 18
y coordinate : 80 y coordinate : 102
Width : 60 Width : 60
Height : 60 Height : 60
Effect : load Effect : load
@@ -234,14 +168,14 @@ Text t0Icon
Text t2Icon Text t2Icon
Attributes Attributes
ID : 19 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 18 x coordinate : 377
y coordinate : 232 y coordinate : 102
Width : 60 Width : 60
Height : 60 Height : 60
Effect : load Effect : load
@@ -266,14 +200,14 @@ Text t2Icon
Text t1Icon Text t1Icon
Attributes Attributes
ID : 21 ID : 19
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 18 x coordinate : 18
y coordinate : 156 y coordinate : 205
Width : 60 Width : 60
Height : 60 Height : 60
Effect : load Effect : load
@@ -298,7 +232,7 @@ Text t1Icon
Text t1 Text t1
Attributes Attributes
ID : 23 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -330,14 +264,14 @@ Text t1
Text t3Icon Text t3Icon
Attributes Attributes
ID : 26 ID : 23
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 378 x coordinate : 378
y coordinate : 80 y coordinate : 205
Width : 60 Width : 60
Height : 60 Height : 60
Effect : load Effect : load
@@ -362,14 +296,14 @@ Text t3Icon
Text t0u Text t0u
Attributes Attributes
ID : 30 ID : 26
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 82 x coordinate : 82
y coordinate : 117 y coordinate : 154
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -392,14 +326,14 @@ Text t0u
Text t0o Text t0o
Attributes Attributes
ID : 31 ID : 27
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 82 x coordinate : 82
y coordinate : 70 y coordinate : 80
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -422,14 +356,14 @@ Text t0o
Text t1u Text t1u
Attributes Attributes
ID : 32 ID : 28
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 82 x coordinate : 82
y coordinate : 194 y coordinate : 258
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -452,14 +386,14 @@ Text t1u
Text t1o Text t1o
Attributes Attributes
ID : 33 ID : 29
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 82 x coordinate : 82
y coordinate : 147 y coordinate : 184
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -482,14 +416,14 @@ Text t1o
Text t2o Text t2o
Attributes Attributes
ID : 34 ID : 30
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 82 x coordinate : 261
y coordinate : 224 y coordinate : 80
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -512,134 +446,14 @@ Text t2o
Text t2u Text t2u
Attributes Attributes
ID : 35 ID : 31
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 82 x coordinate : 261
y coordinate : 271 y coordinate : 154
Width : 108
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t5u
Attributes
ID : 36
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 271
Width : 108
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t5o
Attributes
ID : 37
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 224
Width : 108
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4u
Attributes
ID : 38
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 194
Width : 108
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4o
Attributes
ID : 39
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 147
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -662,14 +476,14 @@ Text t4o
Text t3u Text t3u
Attributes Attributes
ID : 40 ID : 32
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 262 x coordinate : 262
y coordinate : 117 y coordinate : 258
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -692,14 +506,14 @@ Text t3u
Text t3o Text t3o
Attributes Attributes
ID : 41 ID : 33
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 262 x coordinate : 262
y coordinate : 70 y coordinate : 184
Width : 108 Width : 108
Height : 30 Height : 30
Effect : load Effect : load
@@ -739,39 +553,14 @@ Picture p0
Slider h1 Slider h1
Attributes Attributes
ID : 20 ID : 18
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 78 x coordinate : 78
y coordinate : 165 y coordinate : 214
Width : 120
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Lower range limit : 0
Slider h4
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 258
y coordinate : 165
Width : 120 Width : 120
Height : 44 Height : 44
Effect : load Effect : load
@@ -789,14 +578,14 @@ Slider h4
Slider h0 Slider h0
Attributes Attributes
ID : 25 ID : 22
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 78 x coordinate : 78
y coordinate : 88 y coordinate : 110
Width : 120 Width : 120
Height : 44 Height : 44
Effect : load Effect : load
@@ -814,39 +603,14 @@ Slider h0
Slider h2 Slider h2
Attributes Attributes
ID : 27 ID : 24
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 78 x coordinate : 257
y coordinate : 241 y coordinate : 110
Width : 120
Height : 44
Effect : load
Effect Priority : 0
Effect Time : 300
Direction : horizontal
Fill : image
Cursor width : auto
Cursor height : 255
Back. Picture ID : 18
Slided Back. Picture ID : 18
Position : 50
Upper range limit : 100
Lower range limit : 0
Slider h5
Attributes
ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 258
y coordinate : 241
Width : 120 Width : 120
Height : 44 Height : 44
Effect : load Effect : load
@@ -864,14 +628,14 @@ Slider h5
Slider h3 Slider h3
Attributes Attributes
ID : 29 ID : 25
Scope : local Scope : local
Dragging : 0 Dragging : 0
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 : 258 x coordinate : 258
y coordinate : 88 y coordinate : 214
Width : 120 Width : 120
Height : 44 Height : 44
Effect : load Effect : load
@@ -1244,56 +1008,6 @@ Timer tmSerial
vis t3u,0 vis t3u,0
vis h3,0 vis h3,0
} }
// iconColor
spstr strCommand.txt,tTmp.txt,"~",25
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",26
// speed
spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,t4Speed.val,0,0
// upper text
spstr strCommand.txt,t4o.txt,"~",28
// lower text
spstr strCommand.txt,t4u.txt,"~",29
if(t4Icon.txt!="")
{
vis t4Icon,1
vis t4o,1
vis t4u,1
vis h4,1
}else
{
vis t4Icon,0
vis t4o,0
vis t4u,0
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",30
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",31
// speed
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,t5Speed.val,0,0
// upper text
spstr strCommand.txt,t5o.txt,"~",33
// lower text
spstr strCommand.txt,t5u.txt,"~",34
if(t5Icon.txt!="")
{
vis t5Icon,1
vis t5o,1
vis t5u,1
vis h5,1
}else
{
vis t5Icon,0
vis t5o,0
vis t5u,0
vis h5,0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
@@ -1442,7 +1156,7 @@ Timer tmSleep
Timer tm0 Timer tm0
Attributes Attributes
ID : 24 ID : 21
Scope : local Scope : local
Period (ms): 100 Period (ms): 100
Enabled : yes Enabled : yes
@@ -1453,8 +1167,6 @@ Timer tm0
h1.val+=t1Speed.val h1.val+=t1Speed.val
h2.val+=t2Speed.val h2.val+=t2Speed.val
h3.val+=t3Speed.val h3.val+=t3Speed.val
h4.val+=t4Speed.val
h5.val+=t5Speed.val
if(h0.val>=100&&h0.val<=150) if(h0.val>=100&&h0.val<=150)
{ {
h0.val=0 h0.val=0
@@ -1471,14 +1183,6 @@ Timer tm0
{ {
h3.val=0 h3.val=0
} }
if(h4.val>=100&&h4.val<=150)
{
h4.val=0
}
if(h5.val>=100&&h5.val<=150)
{
h5.val=0
}
ref t0o ref t0o
ref t0u ref t0u
ref t1o ref t1o
@@ -1487,10 +1191,6 @@ Timer tm0
ref t2u ref t2u
ref t3o ref t3o
ref t3u ref t3u
ref t4o
ref t4u
ref t5o
ref t5u
TouchCap tc0 TouchCap tc0
Attributes Attributes

View File

@@ -27,9 +27,9 @@ screensaver
345 Line(s) of event code 345 Line(s) of event code
265 Unique line(s) of event code 265 Unique line(s) of event code
cardPower cardPower
48 Component(s) 40 Component(s)
391 Line(s) of event code 335 Line(s) of event code
281 Unique line(s) of event code 237 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
346 Line(s) of event code 346 Line(s) of event code
@@ -65,6 +65,6 @@ cardEntities
Total Total
15 Page(s) 15 Page(s)
493 Component(s) 485 Component(s)
5760 Line(s) of event code 5704 Line(s) of event code
1558 Unique line(s) of event code 1514 Unique line(s) of event code

View File

@@ -24,8 +24,6 @@ Page cardPower
tsw h1,0 tsw h1,0
tsw h2,0 tsw h2,0
tsw h3,0 tsw h3,0
tsw h4,0
tsw h5,0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
@@ -97,26 +95,6 @@ Text tHeading
Text : Text :
Max. Text Size : 40 Max. Text Size : 40
Text t4Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î´½
Max. Text Size : 5
Text t5Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t0Icon Text t0Icon
Attributes Attributes
Scope : local Scope : local
@@ -227,46 +205,6 @@ Text t2u
Text : Text :
Max. Text Size : 20 Max. Text Size : 20
Text t5u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t5o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t4u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t4o
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t3u Text t3u
Attributes Attributes
Scope : local Scope : local
@@ -304,16 +242,6 @@ Slider h1
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0
Slider h4
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Lower range limit : 0
Slider h0 Slider h0
Attributes Attributes
Scope : local Scope : local
@@ -334,16 +262,6 @@ Slider h2
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0
Slider h5
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Position : 50
Upper range limit : 100
Lower range limit : 0
Slider h3 Slider h3
Attributes Attributes
Scope : local Scope : local
@@ -639,56 +557,6 @@ Timer tmSerial
vis t3u,0 vis t3u,0
vis h3,0 vis h3,0
} }
// iconColor
spstr strCommand.txt,tTmp.txt,"~",25
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",26
// speed
spstr strCommand.txt,tTmp.txt,"~",27
covx tTmp.txt,t4Speed.val,0,0
// upper text
spstr strCommand.txt,t4o.txt,"~",28
// lower text
spstr strCommand.txt,t4u.txt,"~",29
if(t4Icon.txt!="")
{
vis t4Icon,1
vis t4o,1
vis t4u,1
vis h4,1
}else
{
vis t4Icon,0
vis t4o,0
vis t4u,0
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",30
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",31
// speed
spstr strCommand.txt,tTmp.txt,"~",32
covx tTmp.txt,t5Speed.val,0,0
// upper text
spstr strCommand.txt,t5o.txt,"~",33
// lower text
spstr strCommand.txt,t5u.txt,"~",34
if(t5Icon.txt!="")
{
vis t5Icon,1
vis t5o,1
vis t5u,1
vis h5,1
}else
{
vis t5Icon,0
vis t5o,0
vis t5u,0
vis h5,0
}
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
@@ -846,8 +714,6 @@ Timer tm0
h1.val+=t1Speed.val h1.val+=t1Speed.val
h2.val+=t2Speed.val h2.val+=t2Speed.val
h3.val+=t3Speed.val h3.val+=t3Speed.val
h4.val+=t4Speed.val
h5.val+=t5Speed.val
if(h0.val>=100&&h0.val<=150) if(h0.val>=100&&h0.val<=150)
{ {
h0.val=0 h0.val=0
@@ -864,14 +730,6 @@ Timer tm0
{ {
h3.val=0 h3.val=0
} }
if(h4.val>=100&&h4.val<=150)
{
h4.val=0
}
if(h5.val>=100&&h5.val<=150)
{
h5.val=0
}
ref t0o ref t0o
ref t0u ref t0u
ref t1o ref t1o
@@ -880,10 +738,6 @@ Timer tm0
ref t2u ref t2u
ref t3o ref t3o
ref t3u ref t3u
ref t4o
ref t4u
ref t5o
ref t5u
TouchCap tc0 TouchCap tc0
Attributes Attributes