Compare commits

...

20 Commits

Author SHA1 Message Date
Johannes
c647c42095 Fixed localization 2022-05-13 22:17:28 +02:00
Johannes
792da24c61 Update README.md 2022-05-13 19:02:31 +02:00
Johannes
0e3aa59867 set tft to latest rel 2022-05-08 23:23:17 +02:00
joBr99
3bfc0c86f2 redesign thermostat page (add nextion2text) 2022-05-07 23:31:13 +00:00
Johannes
f042ff662e redesign thermostat page 2022-05-08 01:30:45 +02:00
Johannes
922baa41b4 Update detail Page update commands 2022-05-08 00:51:04 +02:00
Johannes
4ba40f0458 Update README.md 2022-05-08 00:44:48 +02:00
Johannes
c2ee0d30f1 Add position info #145 2022-05-07 22:11:28 +02:00
joBr99
1f6e2a08f6 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 15:43:33 +00:00
Johannes
180e338453 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 17:43:07 +02:00
Johannes
c46cd3cb34 fix overlap 2022-05-07 17:42:55 +02:00
Johannes
a6594e0f4a Update nspanel-lovelace-ui.py 2022-05-07 17:37:58 +02:00
joBr99
3e8b5d1f27 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 15:37:53 +00:00
Johannes
88744e5f49 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 17:37:12 +02:00
Johannes
d76965c2ac extend length 2022-05-07 17:37:06 +02:00
joBr99
e66923ae64 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 15:22:56 +00:00
Johannes
c1802042b0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 17:22:27 +02:00
Johannes
c4fab76907 fix localization 2022-05-07 17:21:02 +02:00
joBr99
2f12dbd3cc implemented localization for popup pages (add nextion2text) 2022-05-07 15:04:38 +00:00
Johannes
6ab5c666ac implemented localization for popup pages 2022-05-07 17:04:10 +02:00
36 changed files with 1516 additions and 721 deletions

View File

@@ -103,7 +103,7 @@ The following message can be used to update the content on the cardEntities Page
### popupLight Page ### popupLight Page
`entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*` `entityUpdateDetail~*iconId*~*iconColor*~*buttonState*~*sliderBrightnessPos*~*sliderColorTempPos*~*colorMode*~*color_translation*~*color_temp_translation*~*brightness_translation*`
`entityUpdateDetail~1~17299~1~100~78~enable` `entityUpdateDetail~1~17299~1~100~78~enable`
@@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page
### popupShutter Page ### popupShutter Page
`entityUpdateDetail~*ignored*~*sliderPos*` `entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition`
`entityUpdateDetail~1~77` `entityUpdateDetail~1~77`

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-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 09:49:50.284371694 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 23:31:12.408706139 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,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-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 23:31:12.412706142 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

View File

@@ -51,116 +51,86 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 21 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
ID : 32 ID : 30
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va1 Variable (string) va1
Attributes Attributes
ID : 33 ID : 31
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va2 Variable (string) va2
Attributes Attributes
ID : 34 ID : 32
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va3 Variable (string) va3
Attributes Attributes
ID : 35 ID : 33
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va4 Variable (string) va4
Attributes Attributes
ID : 36 ID : 34
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va5 Variable (string) va5
Attributes Attributes
ID : 37 ID : 35
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va6 Variable (string) va6
Attributes Attributes
ID : 38 ID : 36
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va7 Variable (string) va7
Attributes Attributes
ID : 39 ID : 37
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va8 Variable (string) va8
Attributes Attributes
ID : 40 ID : 38
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
XFloat xTempCurr XFloat xTempCurr
Attributes Attributes
ID : 13 ID : 11
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 : 171 x coordinate : 148
y coordinate : 79 y coordinate : 70
Width : 130 Width : 90
Height : 70 Height : 35
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest
Attributes
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 216
y coordinate : 156
Width : 50
Height : 22
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -179,17 +149,47 @@ XFloat xTempDest
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
XFloat xTempMin XFloat xTempDest
Attributes Attributes
ID : 16 ID : 13
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 : 25 x coordinate : 301
y coordinate : 30 y coordinate : 97
Width : 100 Width : 120
Height : 60
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempMin
Attributes
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 269
y coordinate : 0
Width : 51
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -211,15 +211,15 @@ XFloat xTempMin
XFloat xTempMax XFloat xTempMax
Attributes Attributes
ID : 17 ID : 15
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 : 23 x coordinate : 320
y coordinate : 62 y coordinate : 0
Width : 100 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -241,15 +241,15 @@ XFloat xTempMax
XFloat xTempStep XFloat xTempStep
Attributes Attributes
ID : 18 ID : 16
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 : 22 x coordinate : 366
y coordinate : 91 y coordinate : 0
Width : 100 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -397,9 +397,9 @@ Text tHeading
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 : 127 x coordinate : 5
y coordinate : 265 y coordinate : 257
Width : 228 Width : 227
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -427,9 +427,9 @@ Text tStatus
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 : 196 x coordinate : 148
y coordinate : 178 y coordinate : 115
Width : 88 Width : 86
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -451,14 +451,14 @@ Text tStatus
Text t2 Text t2
Attributes Attributes
ID : 14 ID : 12
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 : 298 x coordinate : 422
y coordinate : 74 y coordinate : 115
Width : 25 Width : 25
Height : 30 Height : 30
Effect : load Effect : load
@@ -543,117 +543,9 @@ Button bNext
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Button bDown
Attributes
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 83
y coordinate : 124
Width : 64
Height : 64
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 7
Back. Picture ID (Pressed) : 7
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bUp
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 331
y coordinate : 124
Width : 64
Height : 64
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 9
Back. Picture ID (Pressed) : 9
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bPrev Button bPrev
Attributes Attributes
ID : 22 ID : 20
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -707,16 +599,16 @@ Button bPrev
Dual-state Button bt0 Dual-state Button bt0
Attributes Attributes
ID : 23 ID : 21
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 : 130 x coordinate : 8
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -756,16 +648,16 @@ Dual-state Button bt0
Dual-state Button bt1 Dual-state Button bt1
Attributes Attributes
ID : 24 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 : 177 x coordinate : 55
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -805,16 +697,16 @@ Dual-state Button bt1
Dual-state Button bt2 Dual-state Button bt2
Attributes Attributes
ID : 25 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 : 224 x coordinate : 102
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -854,16 +746,16 @@ Dual-state Button bt2
Dual-state Button bt3 Dual-state Button bt3
Attributes Attributes
ID : 26 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 : 271 x coordinate : 149
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -903,16 +795,16 @@ Dual-state Button bt3
Dual-state Button bt4 Dual-state Button bt4
Attributes Attributes
ID : 27 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 : 318 x coordinate : 196
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -952,16 +844,16 @@ Dual-state Button bt4
Dual-state Button bt5 Dual-state Button bt5
Attributes Attributes
ID : 28 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 : 151 x coordinate : 29
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1001,16 +893,16 @@ Dual-state Button bt5
Dual-state Button bt6 Dual-state Button bt6
Attributes Attributes
ID : 29 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 : 198 x coordinate : 76
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1050,16 +942,16 @@ Dual-state Button bt6
Dual-state Button bt7 Dual-state Button bt7
Attributes Attributes
ID : 30 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 : 245 x coordinate : 123
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1099,16 +991,16 @@ Dual-state Button bt7
Dual-state Button bt8 Dual-state Button bt8
Attributes Attributes
ID : 31 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 : 292 x coordinate : 170
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1146,6 +1038,122 @@ Dual-state Button bt8
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Dual-state Button btUp1
Attributes
ID : 39
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 337
y coordinate : 46
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Dual-state Button btDown1
Attributes
ID : 40
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 337
y coordinate : 158
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmSerial Timer tmSerial
Attributes Attributes
ID : 5 ID : 5
@@ -1485,7 +1493,7 @@ Timer tmSerial
Timer tmSleep Timer tmSleep
Attributes Attributes
ID : 19 ID : 17
Scope : local Scope : local
Period (ms): 1000 Period (ms): 1000
Enabled : yes Enabled : yes
@@ -1516,7 +1524,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 20 ID : 18
Scope: local Scope: local
Value: 0 Value: 0

View File

@@ -14,6 +14,10 @@ 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
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
193 Line(s) of event code 193 Line(s) of event code
@@ -22,14 +26,6 @@ popupLight
27 Component(s) 27 Component(s)
341 Line(s) of event code 341 Line(s) of event code
185 Unique line(s) of event code 185 Unique line(s) of event code
popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
331 Line(s) of event code 331 Line(s) of event code
@@ -50,6 +46,10 @@ cardEntities
62 Component(s) 62 Component(s)
966 Line(s) of event code 966 Line(s) of event code
412 Unique line(s) of event code 412 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)

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 : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -647,7 +647,7 @@ Timer tmSpinner
Events Events
Timer Event Timer Event
xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820) if(frame_ptr.val==1820)

View File

@@ -154,7 +154,7 @@ Text t1
Opacity : 127 Opacity : 127
x coordinate : 25 x coordinate : 25
y coordinate : 226 y coordinate : 226
Width : 100 Width : 208
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -165,11 +165,11 @@ Text t1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -244,7 +244,7 @@ Text t4
Opacity : 127 Opacity : 127
x coordinate : 24 x coordinate : 24
y coordinate : 143 y coordinate : 143
Width : 116 Width : 229
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -255,11 +255,11 @@ Text t4
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -405,11 +405,11 @@ Text t0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -537,8 +537,8 @@ Slider hTempSlider
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
Back. Picture ID : 8 Back. Picture ID : 7
Slided Back. Picture ID : 10 Slided Back. Picture ID : 8
Position : 50 Position : 50
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0
@@ -618,7 +618,7 @@ Button bColor
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 : 104 x coordinate : 108
y coordinate : 68 y coordinate : 68
Width : 50 Width : 50
Height : 50 Height : 50
@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -310,7 +310,7 @@ Button b2
Style : flat Style : flat
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 9 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -359,7 +359,7 @@ Button b1
Style : flat Style : flat
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 9 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535

View File

@@ -247,78 +247,6 @@ Button bNext
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Button bDown
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bPrev Button bPrev
Attributes Attributes
Scope : local Scope : local
@@ -594,6 +522,78 @@ Dual-state Button bt8
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Dual-state Button btUp1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Dual-state Button btDown1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local

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 : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0
@@ -351,7 +351,7 @@ Timer tmSpinner
Events Events
Timer Event Timer Event
xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820) if(frame_ptr.val==1820)

View File

@@ -100,7 +100,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Text t2 Text t2
Attributes Attributes
@@ -130,7 +130,7 @@ Text t4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Text tSend Text tSend
Attributes Attributes
@@ -180,7 +180,7 @@ Text t0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Picture p0 Picture p0
Attributes Attributes
@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

Binary file not shown.

Binary file not shown.

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-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +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/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-05-07 09:49:49.316383378 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -426,9 +426,330 @@ 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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000
@@ -247,26 +247,30 @@
prints tSend.txt,0
prints crcval,2
-Button bPrev
+Button bDown
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : 
+ Text :
Max. Text Size : 10
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }else
+ if(xTempDest.val>xTempMin.val)
{
- tSend.txt+="bPrev"
+ xTempDest.val=xTempDest.val-xTempStep.val
}
+ // event,buttonPress2,entn,tempUpd,X
+ //craft command
+ tSend.txt="event,buttonPress2,"
+ tSend.txt+=entn.txt+","
+ tSend.txt+="tempUpd,"
+ //convert temperature
+ covx xTempDest.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -279,21 +283,30 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt0
+Button bUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : 
+ Text :
Max. Text Size : 10
Events
Touch Press Event
+ if(xTempDest.val<xTempMax.val)
+ {
+ xTempDest.val=xTempDest.val+xTempStep.val
+ }
+ // event,buttonPress2,entn,tempUpd,X
//craft command
- tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va0.txt
+ tSend.txt="event,buttonPress2,"
+ tSend.txt+=entn.txt+","
+ tSend.txt+="tempUpd,"
+ //convert temperature
+ covx xTempDest.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -306,21 +319,26 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt1
+Button bPrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : 
+ Text : 
Max. Text Size : 10
Events
Touch Press Event
- //craft command
- tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va1.txt
+ tSend.txt="event,buttonPress2,cardThermo,"
+ if(bPrev.txt=="")
+ {
+ tSend.txt+="bUp"
+ }else
+ {
+ tSend.txt+="bPrev"
+ }
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -333,7 +351,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt2
+Dual-state Button bt0
Attributes
Scope : local
Dragging : 0
@@ -347,7 +365,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va2.txt
+ tSend.txt+=",hvac_action,"+va0.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -360,7 +378,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt3
+Dual-state Button bt1
Attributes
Scope : local
Dragging : 0
@@ -374,7 +392,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va3.txt
+ tSend.txt+=",hvac_action,"+va1.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -387,7 +405,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt4
+Dual-state Button bt2
Attributes
Scope : local
Dragging : 0
@@ -401,7 +419,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va4.txt
+ tSend.txt+=",hvac_action,"+va2.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -414,13 +432,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt5
+Dual-state Button bt3
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : pressed
+ State : unpressed
Text : 
Max. Text Size : 10
@@ -428,7 +446,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va5.txt
+ tSend.txt+=",hvac_action,"+va3.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -441,13 +459,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt6
+Dual-state Button bt4
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : pressed
+ State : unpressed
Text : 
Max. Text Size : 10
@@ -455,7 +473,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va6.txt
+ tSend.txt+=",hvac_action,"+va4.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -468,7 +486,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt7
+Dual-state Button bt5
Attributes
Scope : local
Dragging : 0
@@ -482,7 +500,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va7.txt
+ tSend.txt+=",hvac_action,"+va5.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -495,7 +513,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt8
+Dual-state Button bt6
Attributes
Scope : local
Dragging : 0
@@ -509,7 +527,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va8.txt
+ tSend.txt+=",hvac_action,"+va6.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -522,30 +540,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button btUp1
+Dual-state Button bt7
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : unpressed
- Text : 
+ State : pressed
+ Text : 
Max. Text Size : 10
Events
Touch Press Event
- if(xTempDest.val<xTempMax.val)
- {
- xTempDest.val=xTempDest.val+xTempStep.val
- }
- // event,buttonPress2,entn,tempUpd,X
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
+ tSend.txt="event,buttonPress2,"+entn.txt
+ tSend.txt+=",hvac_action,"+va7.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -558,30 +567,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button btDown1
+Dual-state Button bt8
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : unpressed
- Text : 
+ State : pressed
+ Text : 
Max. Text Size : 10
Events
Touch Press Event
- if(xTempDest.val>xTempMin.val)
- {
- xTempDest.val=xTempDest.val-xTempStep.val
- }
- // event,buttonPress2,entn,tempUpd,X
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
+ tSend.txt="event,buttonPress2,"+entn.txt
+ tSend.txt+=",hvac_action,"+va8.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
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-05-07 09:49:49.312383427 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +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
@@ -447,3 +768,12 @@ 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
@@ -351,7 +351,7 @@
Events
Timer Event
- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
+ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820)

View File

@@ -1,7 +1,337 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 23:31:11.916705803 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000
+@@ -247,26 +247,30 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Button bPrev
++Button bDown
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text : 
++ Text :
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+- tSend.txt="event,buttonPress2,cardThermo,"
+- if(bPrev.txt=="")
+- {
+- tSend.txt+="bUp"
+- }else
++ if(xTempDest.val>xTempMin.val)
+ {
+- tSend.txt+="bPrev"
++ xTempDest.val=xTempDest.val-xTempStep.val
+ }
++ // event,buttonPress2,entn,tempUpd,X
++ //craft command
++ tSend.txt="event,buttonPress2,"
++ tSend.txt+=entn.txt+","
++ tSend.txt+="tempUpd,"
++ //convert temperature
++ covx xTempDest.val,tTmp.txt,0,0
++ tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -279,21 +283,30 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt0
++Button bUp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text : 
++ Text :
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
++ if(xTempDest.val<xTempMax.val)
++ {
++ xTempDest.val=xTempDest.val+xTempStep.val
++ }
++ // event,buttonPress2,entn,tempUpd,X
+ //craft command
+- tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va0.txt
++ tSend.txt="event,buttonPress2,"
++ tSend.txt+=entn.txt+","
++ tSend.txt+="tempUpd,"
++ //convert temperature
++ covx xTempDest.val,tTmp.txt,0,0
++ tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -306,21 +319,26 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt1
++Button bPrev
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+- Text : 
++ Text : 
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+- //craft command
+- tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va1.txt
++ tSend.txt="event,buttonPress2,cardThermo,"
++ if(bPrev.txt=="")
++ {
++ tSend.txt+="bUp"
++ }else
++ {
++ tSend.txt+="bPrev"
++ }
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -333,7 +351,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt2
++Dual-state Button bt0
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -347,7 +365,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va2.txt
++ tSend.txt+=",hvac_action,"+va0.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -360,7 +378,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt3
++Dual-state Button bt1
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -374,7 +392,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va3.txt
++ tSend.txt+=",hvac_action,"+va1.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -387,7 +405,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt4
++Dual-state Button bt2
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -401,7 +419,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va4.txt
++ tSend.txt+=",hvac_action,"+va2.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -414,13 +432,13 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt5
++Dual-state Button bt3
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- State : pressed
++ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+@@ -428,7 +446,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va5.txt
++ tSend.txt+=",hvac_action,"+va3.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -441,13 +459,13 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt6
++Dual-state Button bt4
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- State : pressed
++ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+@@ -455,7 +473,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va6.txt
++ tSend.txt+=",hvac_action,"+va4.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -468,7 +486,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt7
++Dual-state Button bt5
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -482,7 +500,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va7.txt
++ tSend.txt+=",hvac_action,"+va5.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -495,7 +513,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt8
++Dual-state Button bt6
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -509,7 +527,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va8.txt
++ tSend.txt+=",hvac_action,"+va6.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -522,30 +540,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button btUp1
++Dual-state Button bt7
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- State : unpressed
+- Text : 
++ State : pressed
++ Text : 
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+- if(xTempDest.val<xTempMax.val)
+- {
+- xTempDest.val=xTempDest.val+xTempStep.val
+- }
+- // event,buttonPress2,entn,tempUpd,X
+ //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd,"
+- //convert temperature
+- covx xTempDest.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
++ tSend.txt="event,buttonPress2,"+entn.txt
++ tSend.txt+=",hvac_action,"+va7.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -558,30 +567,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button btDown1
++Dual-state Button bt8
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- State : unpressed
+- Text : 
++ State : pressed
++ Text : 
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+- if(xTempDest.val>xTempMin.val)
+- {
+- xTempDest.val=xTempDest.val-xTempStep.val
+- }
+- // event,buttonPress2,entn,tempUpd,X
+ //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd,"
+- //convert temperature
+- covx xTempDest.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
++ tSend.txt="event,buttonPress2,"+entn.txt
++ tSend.txt+=",hvac_action,"+va8.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000
+@@ -351,7 +351,7 @@
+
+ Events
+ Timer Event
+- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
++ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
+ frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
+ doevents // finish drawing before next timer event triggers
+ if(frame_ptr.val==1820)

View File

@@ -14,10 +14,6 @@ popupNotify
17 Component(s) 17 Component(s)
196 Line(s) of event code 196 Line(s) of event code
123 Unique line(s) of event code 123 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
193 Line(s) of event code 193 Line(s) of event code
@@ -26,6 +22,10 @@ cardGrid
39 Component(s) 39 Component(s)
420 Line(s) of event code 420 Line(s) of event code
246 Unique line(s) of event code 246 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
screensaver screensaver
35 Component(s) 35 Component(s)
292 Line(s) of event code 292 Line(s) of event code

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 : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -154,7 +154,7 @@ Text t1
Opacity : 127 Opacity : 127
x coordinate : 10 x coordinate : 10
y coordinate : 319 y coordinate : 319
Width : 100 Width : 240
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -165,11 +165,11 @@ Text t1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -244,7 +244,7 @@ Text t4
Opacity : 127 Opacity : 127
x coordinate : 9 x coordinate : 9
y coordinate : 234 y coordinate : 234
Width : 116 Width : 242
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -255,11 +255,11 @@ Text t4
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -394,7 +394,7 @@ Text t0
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 57 y coordinate : 57
Width : 64 Width : 141
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -405,11 +405,11 @@ Text t0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -618,8 +618,8 @@ Button bColor
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 : 83 x coordinate : 12
y coordinate : 57 y coordinate : 89
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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 : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

View File

@@ -100,7 +100,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Text t2 Text t2
Attributes Attributes
@@ -130,7 +130,7 @@ Text t4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Text tSend Text tSend
Attributes Attributes
@@ -180,7 +180,7 @@ Text t0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Picture p0 Picture p0
Attributes Attributes
@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -51,116 +51,86 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 21 ID : 19
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (string) va0 Variable (string) va0
Attributes Attributes
ID : 32 ID : 30
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va1 Variable (string) va1
Attributes Attributes
ID : 33 ID : 31
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va2 Variable (string) va2
Attributes Attributes
ID : 34 ID : 32
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va3 Variable (string) va3
Attributes Attributes
ID : 35 ID : 33
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va4 Variable (string) va4
Attributes Attributes
ID : 36 ID : 34
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va5 Variable (string) va5
Attributes Attributes
ID : 37 ID : 35
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va6 Variable (string) va6
Attributes Attributes
ID : 38 ID : 36
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va7 Variable (string) va7
Attributes Attributes
ID : 39 ID : 37
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) va8 Variable (string) va8
Attributes Attributes
ID : 40 ID : 38
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
XFloat xTempCurr XFloat xTempCurr
Attributes Attributes
ID : 13 ID : 11
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 : 156 x coordinate : 148
y coordinate : 79 y coordinate : 70
Width : 130 Width : 90
Height : 70 Height : 35
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest
Attributes
ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 201
y coordinate : 156
Width : 50
Height : 22
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -179,17 +149,47 @@ XFloat xTempDest
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
XFloat xTempMin XFloat xTempDest
Attributes Attributes
ID : 16 ID : 13
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 : 10 x coordinate : 301
y coordinate : 30 y coordinate : 97
Width : 100 Width : 120
Height : 60
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempMin
Attributes
ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 269
y coordinate : 0
Width : 51
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -211,15 +211,15 @@ XFloat xTempMin
XFloat xTempMax XFloat xTempMax
Attributes Attributes
ID : 17 ID : 15
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 : 8 x coordinate : 320
y coordinate : 62 y coordinate : 0
Width : 100 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -241,15 +241,15 @@ XFloat xTempMax
XFloat xTempStep XFloat xTempStep
Attributes Attributes
ID : 18 ID : 16
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 : 7 x coordinate : 366
y coordinate : 91 y coordinate : 0
Width : 100 Width : 45
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -277,7 +277,7 @@ Text tSend
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 : 0 x coordinate : 15
y coordinate : 0 y coordinate : 0
Width : 230 Width : 230
Height : 23 Height : 23
@@ -307,7 +307,7 @@ Text tTmp
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 : 406 x coordinate : 421
y coordinate : 277 y coordinate : 277
Width : 34 Width : 34
Height : 30 Height : 30
@@ -337,7 +337,7 @@ Text tInstruction
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 : 0 x coordinate : 15
y coordinate : 290 y coordinate : 290
Width : 100 Width : 100
Height : 30 Height : 30
@@ -367,7 +367,7 @@ Text tId
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 : 99 x coordinate : 114
y coordinate : 290 y coordinate : 290
Width : 39 Width : 39
Height : 30 Height : 30
@@ -397,9 +397,9 @@ Text tHeading
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 : 112 x coordinate : 5
y coordinate : 265 y coordinate : 257
Width : 228 Width : 227
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -427,9 +427,9 @@ Text tStatus
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 : 181 x coordinate : 148
y coordinate : 178 y coordinate : 115
Width : 88 Width : 86
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -451,14 +451,14 @@ Text tStatus
Text t2 Text t2
Attributes Attributes
ID : 14 ID : 12
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 : 283 x coordinate : 422
y coordinate : 74 y coordinate : 115
Width : 25 Width : 25
Height : 30 Height : 30
Effect : load Effect : load
@@ -504,7 +504,7 @@ Button bNext
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 : 396 x coordinate : 411
y coordinate : 16 y coordinate : 16
Width : 50 Width : 50
Height : 50 Height : 50
@@ -543,123 +543,15 @@ Button bNext
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Button bDown
Attributes
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 68
y coordinate : 124
Width : 64
Height : 64
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 7
Back. Picture ID (Pressed) : 7
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bUp
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 316
y coordinate : 124
Width : 64
Height : 64
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : image
Font ID : 0
Background Picture ID (Unpressed) : 9
Back. Picture ID (Pressed) : 9
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bPrev Button bPrev
Attributes Attributes
ID : 22 ID : 20
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 : 9 x coordinate : 24
y coordinate : 16 y coordinate : 16
Width : 50 Width : 50
Height : 50 Height : 50
@@ -707,16 +599,16 @@ Button bPrev
Dual-state Button bt0 Dual-state Button bt0
Attributes Attributes
ID : 23 ID : 21
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 : 115 x coordinate : 8
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -756,16 +648,16 @@ Dual-state Button bt0
Dual-state Button bt1 Dual-state Button bt1
Attributes Attributes
ID : 24 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 : 162 x coordinate : 55
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -805,16 +697,16 @@ Dual-state Button bt1
Dual-state Button bt2 Dual-state Button bt2
Attributes Attributes
ID : 25 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 : 209 x coordinate : 102
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -854,16 +746,16 @@ Dual-state Button bt2
Dual-state Button bt3 Dual-state Button bt3
Attributes Attributes
ID : 26 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 : 256 x coordinate : 149
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -903,16 +795,16 @@ Dual-state Button bt3
Dual-state Button bt4 Dual-state Button bt4
Attributes Attributes
ID : 27 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 : 303 x coordinate : 196
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -952,16 +844,16 @@ Dual-state Button bt4
Dual-state Button bt5 Dual-state Button bt5
Attributes Attributes
ID : 28 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 : 136 x coordinate : 29
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1001,16 +893,16 @@ Dual-state Button bt5
Dual-state Button bt6 Dual-state Button bt6
Attributes Attributes
ID : 29 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 : 183 x coordinate : 76
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1050,16 +942,16 @@ Dual-state Button bt6
Dual-state Button bt7 Dual-state Button bt7
Attributes Attributes
ID : 30 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 : 230 x coordinate : 123
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1099,16 +991,16 @@ Dual-state Button bt7
Dual-state Button bt8 Dual-state Button bt8
Attributes Attributes
ID : 31 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 : 277 x coordinate : 170
y coordinate : 223 y coordinate : 215
Width : 31 Width : 30
Height : 31 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -1146,6 +1038,122 @@ Dual-state Button bt8
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Dual-state Button btUp1
Attributes
ID : 39
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 337
y coordinate : 46
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Dual-state Button btDown1
Attributes
ID : 40
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 337
y coordinate : 158
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmSerial Timer tmSerial
Attributes Attributes
ID : 5 ID : 5
@@ -1485,7 +1493,7 @@ Timer tmSerial
Timer tmSleep Timer tmSleep
Attributes Attributes
ID : 19 ID : 17
Scope : local Scope : local
Period (ms): 1000 Period (ms): 1000
Enabled : yes Enabled : yes
@@ -1516,7 +1524,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 20 ID : 18
Scope: local Scope: local
Value: 0 Value: 0

View File

@@ -14,6 +14,10 @@ cardMedia
30 Component(s) 30 Component(s)
331 Line(s) of event code 331 Line(s) of event code
171 Unique line(s) of event code 171 Unique line(s) of event code
popupNotify
17 Component(s)
196 Line(s) of event code
123 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
@@ -26,10 +30,6 @@ cardGrid
39 Component(s) 39 Component(s)
420 Line(s) of event code 420 Line(s) of event code
246 Unique line(s) of event code 246 Unique line(s) of event code
popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
193 Line(s) of event code 193 Line(s) of event code
@@ -38,6 +38,10 @@ popupLight
27 Component(s) 27 Component(s)
341 Line(s) of event code 341 Line(s) of event code
185 Unique line(s) of event code 185 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
cardAlarm cardAlarm
35 Component(s) 35 Component(s)
345 Line(s) of event code 345 Line(s) of event code
@@ -46,10 +50,6 @@ cardEntities
62 Component(s) 62 Component(s)
966 Line(s) of event code 966 Line(s) of event code
412 Unique line(s) of event code 412 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)

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 : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
@@ -647,7 +647,7 @@ Timer tmSpinner
Events Events
Timer Event Timer Event
xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820) if(frame_ptr.val==1820)

View File

@@ -154,7 +154,7 @@ Text t1
Opacity : 127 Opacity : 127
x coordinate : 10 x coordinate : 10
y coordinate : 226 y coordinate : 226
Width : 100 Width : 211
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -165,11 +165,11 @@ Text t1
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -244,7 +244,7 @@ Text t4
Opacity : 127 Opacity : 127
x coordinate : 9 x coordinate : 9
y coordinate : 143 y coordinate : 143
Width : 116 Width : 242
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -255,11 +255,11 @@ Text t4
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -405,11 +405,11 @@ Text t0
Font ID : 0 Font ID : 0
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment : center Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -537,8 +537,8 @@ Slider hTempSlider
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
Back. Picture ID : 8 Back. Picture ID : 7
Slided Back. Picture ID : 10 Slided Back. Picture ID : 8
Position : 50 Position : 50
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0
@@ -618,7 +618,7 @@ Button bColor
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 : 89 x coordinate : 93
y coordinate : 68 y coordinate : 68
Width : 50 Width : 50
Height : 50 Height : 50
@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

View File

@@ -310,7 +310,7 @@ Button b2
Style : flat Style : flat
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 9 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -359,7 +359,7 @@ Button b1
Style : flat Style : flat
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 9 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535

View File

@@ -247,78 +247,6 @@ Button bNext
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Button bDown
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bPrev Button bPrev
Attributes Attributes
Scope : local Scope : local
@@ -594,6 +522,78 @@ Dual-state Button bt8
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
Dual-state Button btUp1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val<xTempMax.val)
{
xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Dual-state Button btDown1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
if(xTempDest.val>xTempMin.val)
{
xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local

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 : 33 Text : 34
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0
@@ -351,7 +351,7 @@ Timer tmSpinner
Events Events
Timer Event Timer Event
xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820) if(frame_ptr.val==1820)

View File

@@ -100,7 +100,7 @@ Text t1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Brightness Text : Brightness
Max. Text Size : 15 Max. Text Size : 50
Text t2 Text t2
Attributes Attributes
@@ -130,7 +130,7 @@ Text t4
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Temperature Text : Temperature
Max. Text Size : 15 Max. Text Size : 50
Text tSend Text tSend
Attributes Attributes
@@ -180,7 +180,7 @@ Text t0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Color Text : Color
Max. Text Size : 15 Max. Text Size : 50
Picture p0 Picture p0
Attributes Attributes
@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

Binary file not shown.

Binary file not shown.

View File

@@ -581,4 +581,5 @@ Click download.
Development happens in the EU version, so it is possible that the US Version isn't up to date with the current development version of the EU firmware, the lastet US versions are still downloadable with the following links: Development happens in the EU version, so it is possible that the US Version isn't up to date with the current development version of the EU firmware, the lastet US versions are still downloadable with the following links:
`FlashNextion http://nspanel.pky.eu/lui-us-l.tft` `FlashNextion http://nspanel.pky.eu/lui-us-l.tft`
`FlashNextion http://nspanel.pky.eu/lui-us-p.tft` `FlashNextion http://nspanel.pky.eu/lui-us-p.tft`

View File

@@ -17,6 +17,9 @@ translations = {
'run': "Hardloop", 'run': "Hardloop",
'lock': "Sluit toe", 'lock': "Sluit toe",
'unlock': "Sluit oop", 'unlock': "Sluit oop",
'brightness': "Helderheid",
'color_temperature': "Kleur temperatuur",
'position': "Posisie",
}, },
'ar': { 'ar': {
'ACTIVATE': "تفعيل", 'ACTIVATE': "تفعيل",
@@ -36,6 +39,9 @@ translations = {
'run': "تشغيل", 'run': "تشغيل",
'lock': "قفل", 'lock': "قفل",
'unlock': "فتح", 'unlock': "فتح",
'brightness': "السطوع",
'color_temperature': "درجة حرارة اللون",
'position': "موضع",
}, },
'bg': { 'bg': {
'ACTIVATE': "Активирай", 'ACTIVATE': "Активирай",
@@ -56,6 +62,9 @@ translations = {
'run': "Изпълни", 'run': "Изпълни",
'lock': "Заключване", 'lock': "Заключване",
'unlock': "Отключване", 'unlock': "Отключване",
'brightness': "Яркост",
'color_temperature': "Цветова температура",
'position': "Позиция",
}, },
'ca': { 'ca': {
'PRESS': "Prem", 'PRESS': "Prem",
@@ -77,6 +86,9 @@ translations = {
'run': "Executa", 'run': "Executa",
'lock': "Bloquejar", 'lock': "Bloquejar",
'unlock': "Desbloquejar", 'unlock': "Desbloquejar",
'brightness': "Brillantor",
'color_temperature': "Temperatura de color",
'position': "Posició",
}, },
'cs': { 'cs': {
'PRESS': "Stisknutí", 'PRESS': "Stisknutí",
@@ -98,6 +110,9 @@ translations = {
'run': "Spustit", 'run': "Spustit",
'lock': "Zamknout", 'lock': "Zamknout",
'unlock': "Odemknout", 'unlock': "Odemknout",
'brightness': "Jas",
'color_temperature': "Teplota barvy",
'position': "Pozice",
}, },
'da': { 'da': {
'PRESS': "Tryk", 'PRESS': "Tryk",
@@ -119,6 +134,9 @@ translations = {
'run': "Kør", 'run': "Kør",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås op", 'unlock': "Lås op",
'brightness': "Lysstyrke",
'color_temperature': "Farvetemperatur",
'position': "Position",
}, },
'de': { 'de': {
'PRESS': "Drücken", 'PRESS': "Drücken",
@@ -140,6 +158,9 @@ translations = {
'run': "Ausführen", 'run': "Ausführen",
'lock': "Verriegeln", 'lock': "Verriegeln",
'unlock': "Entriegeln", 'unlock': "Entriegeln",
'brightness': "Helligkeit",
'color_temperature': "Farbtemperatur",
'position': "Position",
}, },
'el': { 'el': {
'PRESS': "Πατήστε", 'PRESS': "Πατήστε",
@@ -161,6 +182,9 @@ translations = {
'run': "Εκτέλεση", 'run': "Εκτέλεση",
'lock': "Κλείδωμα", 'lock': "Κλείδωμα",
'unlock': "Ξεκλείδωμα", 'unlock': "Ξεκλείδωμα",
'brightness': "Φωτεινότητα",
'color_temperature': "Θερμοκρασία χρώματος",
'position': "Θέση",
}, },
'en': { 'en': {
'PRESS': "Press", 'PRESS': "Press",
@@ -182,6 +206,9 @@ translations = {
'run': "Run", 'run': "Run",
'lock': "Lock", 'lock': "Lock",
'unlock': "Unlock", 'unlock': "Unlock",
'brightness': "Brightness",
'color_temperature': "Color temperature",
'position': "Position",
}, },
'es': { 'es': {
'PRESS': "Pulsa", 'PRESS': "Pulsa",
@@ -203,6 +230,9 @@ translations = {
'run': "Ejecutar", 'run': "Ejecutar",
'lock': "Bloquear", 'lock': "Bloquear",
'unlock': "Desbloquear", 'unlock': "Desbloquear",
'brightness': "Brillo",
'color_temperature': "Temperatura del color",
'position': "Posición",
}, },
'et': { 'et': {
'PRESS': "Vajuta nuppu", 'PRESS': "Vajuta nuppu",
@@ -224,6 +254,9 @@ translations = {
'run': "Käivita", 'run': "Käivita",
'lock': "Lukusta", 'lock': "Lukusta",
'unlock': "Ava", 'unlock': "Ava",
'brightness': "Heledus",
'color_temperature': "Värvustemperatuur",
'position': "Asend",
}, },
'fa': { 'fa': {
'ACTIVATE': "فعال سازی", 'ACTIVATE': "فعال سازی",
@@ -243,6 +276,9 @@ translations = {
'run': "اجرا", 'run': "اجرا",
'lock': "قفل", 'lock': "قفل",
'unlock': "باز کردن", 'unlock': "باز کردن",
'brightness': "روشنایی",
'color_temperature': "دمای رنگ",
'position': "موقعیت",
}, },
'fi': { 'fi': {
'PRESS': "Paina", 'PRESS': "Paina",
@@ -264,6 +300,9 @@ translations = {
'run': "Suorita", 'run': "Suorita",
'lock': "Lukitse", 'lock': "Lukitse",
'unlock': "Avaa lukitus", 'unlock': "Avaa lukitus",
'brightness': "Kirkkaus",
'color_temperature': "Värilämpötila",
'position': "Sijainti",
}, },
'fr': { 'fr': {
'PRESS': "Appui", 'PRESS': "Appui",
@@ -285,6 +324,9 @@ translations = {
'run': "Exécuter", 'run': "Exécuter",
'lock': "Verrouiller", 'lock': "Verrouiller",
'unlock': "Déverrouiller", 'unlock': "Déverrouiller",
'brightness': "Luminosité",
'color_temperature': "Température de couleur",
'position': "Position",
}, },
'he': { 'he': {
'PRESS': "לחיצה", 'PRESS': "לחיצה",
@@ -306,6 +348,9 @@ translations = {
'run': "רוץ", 'run': "רוץ",
'lock': "נעילה", 'lock': "נעילה",
'unlock': "ביטול נעילה", 'unlock': "ביטול נעילה",
'brightness': "בהירות",
'color_temperature': "טמפרטורת הצבע",
'position': "מיקום",
}, },
'hr': { 'hr': {
'ACTIVATE': "Aktivirati", 'ACTIVATE': "Aktivirati",
@@ -325,6 +370,9 @@ translations = {
'run': "Pokreni", 'run': "Pokreni",
'lock': "zaključati", 'lock': "zaključati",
'unlock': "Otključati", 'unlock': "Otključati",
'brightness': "Svjetlina",
'color_temperature': "Temperatura boje",
'position': "Pozicija",
}, },
'hu': { 'hu': {
'PRESS': "Gombnyomás", 'PRESS': "Gombnyomás",
@@ -346,6 +394,9 @@ translations = {
'run': "Futtatás", 'run': "Futtatás",
'lock': "Bezár", 'lock': "Bezár",
'unlock': "Kinyit", 'unlock': "Kinyit",
'brightness': "Fényerő",
'color_temperature': "Színhőmérséklet",
'position': "Pozíció",
}, },
'hy': { 'hy': {
'ACTIVATE': "Ակտիվացնել", 'ACTIVATE': "Ակտիվացնել",
@@ -364,6 +415,9 @@ translations = {
'disarm': "Զինաթափել", 'disarm': "Զինաթափել",
'lock': "Կողպեք", 'lock': "Կողպեք",
'unlock': "Բացել", 'unlock': "Բացել",
'brightness': "Պայծառություն",
'color_temperature': "Գունային ջերմաստիճան",
'position': "Դիրք",
}, },
'id': { 'id': {
'PRESS': "Tekan", 'PRESS': "Tekan",
@@ -385,6 +439,9 @@ translations = {
'run': "Jalankan", 'run': "Jalankan",
'lock': "Kunci", 'lock': "Kunci",
'unlock': "Buka", 'unlock': "Buka",
'brightness': "Kecerahan",
'color_temperature': "Temperatur warna",
'position': "Posisi",
}, },
'is': { 'is': {
'PRESS': "Ýttu á", 'PRESS': "Ýttu á",
@@ -405,6 +462,9 @@ translations = {
'run': "Keyra", 'run': "Keyra",
'lock': "Læsa", 'lock': "Læsa",
'unlock': "Aflæsa", 'unlock': "Aflæsa",
'brightness': "Birtustig",
'color_temperature': "Litastig",
'position': "Staðsetning",
}, },
'it': { 'it': {
'PRESS': "Premi", 'PRESS': "Premi",
@@ -426,6 +486,9 @@ translations = {
'run': "Esegui", 'run': "Esegui",
'lock': "Blocca", 'lock': "Blocca",
'unlock': "Sblocca", 'unlock': "Sblocca",
'brightness': "Luminosità",
'color_temperature': "Temperatura colore",
'position': "Apertura",
}, },
'lb': { 'lb': {
'ACTIVATE': "Aktivéieren", 'ACTIVATE': "Aktivéieren",
@@ -445,6 +508,9 @@ translations = {
'run': "Ausféieren", 'run': "Ausféieren",
'lock': "Spären", 'lock': "Spären",
'unlock': "Entspären", 'unlock': "Entspären",
'brightness': "Hellegkeet",
'color_temperature': "Faarf Temperatur",
'position': "Positioun",
}, },
'lt': { 'lt': {
'ACTIVATE': "Suaktyvinti", 'ACTIVATE': "Suaktyvinti",
@@ -463,6 +529,9 @@ translations = {
'run': "Paleisti", 'run': "Paleisti",
'lock': "Užrakinti", 'lock': "Užrakinti",
'unlock': "Atrakinti", 'unlock': "Atrakinti",
'brightness': "Ryškumas",
'color_temperature': "Spalvos temperatūra",
'position': "Padėtis",
}, },
'lv': { 'lv': {
'ACTIVATE': "Aktivizēt", 'ACTIVATE': "Aktivizēt",
@@ -481,6 +550,9 @@ translations = {
'disarm': "Atslēgt", 'disarm': "Atslēgt",
'lock': "Aizslēgt", 'lock': "Aizslēgt",
'unlock': "Atslēgt", 'unlock': "Atslēgt",
'brightness': "Spilgtums",
'color_temperature': "Krāsu temperatūra",
'position': "Pozīcija",
}, },
'nb': { 'nb': {
'PRESS': "trykk", 'PRESS': "trykk",
@@ -502,6 +574,9 @@ translations = {
'run': "Kjør", 'run': "Kjør",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås opp", 'unlock': "Lås opp",
'brightness': "Lysstyrke",
'color_temperature': "Fargetemperatur",
'position': "Posisjon",
}, },
'nl': { 'nl': {
'PRESS': "Klik", 'PRESS': "Klik",
@@ -523,6 +598,9 @@ translations = {
'run': "Uitvoeren", 'run': "Uitvoeren",
'lock': "Vergrendelen", 'lock': "Vergrendelen",
'unlock': "Ontgrendelen", 'unlock': "Ontgrendelen",
'brightness': "Helderheid",
'color_temperature': "Kleurtemperatuur",
'position': "Positie",
}, },
'nn': { 'nn': {
'ACTIVATE': "Aktiver", 'ACTIVATE': "Aktiver",
@@ -543,6 +621,9 @@ translations = {
'run': "Køyr", 'run': "Køyr",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås opp", 'unlock': "Lås opp",
'brightness': "Lysstyrke",
'color_temperature': "Fargetemperatur",
'position': "Posisjon",
}, },
'pl': { 'pl': {
'PRESS': "Naciśnij", 'PRESS': "Naciśnij",
@@ -564,6 +645,9 @@ translations = {
'run': "Uruchom", 'run': "Uruchom",
'lock': "Zablokuj", 'lock': "Zablokuj",
'unlock': "Odblokuj", 'unlock': "Odblokuj",
'brightness': "Jasność",
'color_temperature': "Temperatura barwy",
'position': "Pozycja",
}, },
'pt': { 'pt': {
'PRESS': "Pressione", 'PRESS': "Pressione",
@@ -584,6 +668,9 @@ translations = {
'run': "Executar", 'run': "Executar",
'lock': "Bloquear", 'lock': "Bloquear",
'unlock': "Desbloquear", 'unlock': "Desbloquear",
'brightness': "Brilho",
'color_temperature': "Temperatura de cor",
'position': "Posição",
}, },
'ro': { 'ro': {
'ACTIVATE': "Activați", 'ACTIVATE': "Activați",
@@ -604,6 +691,9 @@ translations = {
'run': "Rulați", 'run': "Rulați",
'lock': "Blocat", 'lock': "Blocat",
'unlock': "Deblocare", 'unlock': "Deblocare",
'brightness': "Luminozitate",
'color_temperature': "Temperatură de culoare",
'position': "Poziţie",
}, },
'ru': { 'ru': {
'PRESS': "Нажать", 'PRESS': "Нажать",
@@ -625,6 +715,9 @@ translations = {
'run': "Запустить", 'run': "Запустить",
'lock': "Закрыть", 'lock': "Закрыть",
'unlock': "Открыть", 'unlock': "Открыть",
'brightness': "Яркость",
'color_temperature': "Цветовая температура",
'position': "Положение",
}, },
'sk': { 'sk': {
'ACTIVATE': "Aktivovať", 'ACTIVATE': "Aktivovať",
@@ -645,6 +738,9 @@ translations = {
'run': "Spustiť", 'run': "Spustiť",
'lock': "Zamknúť", 'lock': "Zamknúť",
'unlock': "Odomknúť", 'unlock': "Odomknúť",
'brightness': "Jas",
'color_temperature': "Teplota farby",
'position': "Poloha",
}, },
'sl': { 'sl': {
'PRESS': "Pritisnite", 'PRESS': "Pritisnite",
@@ -665,6 +761,9 @@ translations = {
'run': "Poženi", 'run': "Poženi",
'lock': "Zakleni", 'lock': "Zakleni",
'unlock': "Odkleni", 'unlock': "Odkleni",
'brightness': "Svetlost",
'color_temperature': "Temperatura barve",
'position': "Položaj",
}, },
'sv': { 'sv': {
'PRESS': "Tryck", 'PRESS': "Tryck",
@@ -686,6 +785,9 @@ translations = {
'run': "Kör", 'run': "Kör",
'lock': "Lås", 'lock': "Lås",
'unlock': "Lås upp", 'unlock': "Lås upp",
'brightness': "Ljusstyrka",
'color_temperature': "Färgtemperatur",
'position': "Position",
}, },
'th': { 'th': {
'PRESS': "กด", 'PRESS': "กด",
@@ -705,6 +807,9 @@ translations = {
'disarm': "ปิดระบบสัญญาณกันขโมย", 'disarm': "ปิดระบบสัญญาณกันขโมย",
'lock': "ล็อค", 'lock': "ล็อค",
'unlock': "ปลดล็อค", 'unlock': "ปลดล็อค",
'brightness': "ความสว่าง",
'color_temperature': "อุณหภูมิสี",
'position': "ตำแหน่ง",
}, },
'tr': { 'tr': {
'PRESS': "Basınız", 'PRESS': "Basınız",
@@ -726,6 +831,9 @@ translations = {
'run': "Çalıştır", 'run': "Çalıştır",
'lock': "Kilitle", 'lock': "Kilitle",
'unlock': "Kilidi aç", 'unlock': "Kilidi aç",
'brightness': "Parlaklık",
'color_temperature': "Renk sıcaklığı",
'position': "Pozisyon",
}, },
'uk': { 'uk': {
'PRESS': "Натисніть", 'PRESS': "Натисніть",
@@ -746,6 +854,9 @@ translations = {
'run': "Запустити", 'run': "Запустити",
'lock': "Блокувати", 'lock': "Блокувати",
'unlock': "Розблокувати", 'unlock': "Розблокувати",
'brightness': "Яскравість",
'color_temperature': "Кольорова температура",
'position': "Положення",
}, },
'vi': { 'vi': {
'ACTIVATE': "Kích hoạt", 'ACTIVATE': "Kích hoạt",
@@ -765,13 +876,16 @@ translations = {
'run': "Chạy", 'run': "Chạy",
'lock': "Khóa", 'lock': "Khóa",
'unlock': "Mở khóa", 'unlock': "Mở khóa",
'brightness': "Độ sáng",
'color_temperature': "Nhiệt độ màu",
'position': "Vị trí",
}, },
} }
def get_translation(locale, input): def get_translation(locale, input):
locale = locale.split("_")[0]
en_fallback_res = translations.get("en").get(input, input) en_fallback_res = translations.get("en").get(input, input)
if locale in translations: if locale in translations:
return translations.get(locale).get(input, en_fallback_res) return translations.get(locale).get(input, en_fallback_res)
else: else:
return en_fallback_res return en_fallback_res

View File

@@ -402,12 +402,16 @@ class LuiPagesGen(object):
color = "enable" color = "enable"
else: else:
color = "disable" color = "disable"
self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}") color_translation = "Color"
brightness_translation = get_translation(self._locale, "brightness")
color_temp_translation = get_translation(self._locale, "color_temperature")
self._send_mqtt_msg(f"entityUpdateDetail~{get_icon_id('lightbulb')}~{icon_color}~{switch_val}~{brightness}~{color_temp}~{color}~{color_translation}~{color_temp_translation}~{brightness_translation}")
def generate_shutter_detail_page(self, entity): def generate_shutter_detail_page(self, entity):
entity = self._ha_api.get_entity(entity) entity = self._ha_api.get_entity(entity)
pos = int(entity.attributes.get("current_position", 50)) pos = int(entity.attributes.get("current_position", 50))
self._send_mqtt_msg(f"entityUpdateDetail~{pos}") pos_translation = get_translation(self._locale, "position")
self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos}~{pos_translation}")
def send_message_page(self, id, heading, msg, b1, b2): def send_message_page(self, id, heading, msg, b1, b2):
self._send_mqtt_msg(f"pageType~popupNotify") self._send_mqtt_msg(f"pageType~popupNotify")

View File

@@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
controller = LuiController(self, cfg, send_mqtt_msg) controller = LuiController(self, cfg, send_mqtt_msg)
desired_display_firmware_version = 33 desired_display_firmware_version = 34
version = "v2.8.0" version = "v2.8.1"
model = cfg.get("model") model = cfg.get("model")
if model == "us-l": if model == "us-l":

View File

@@ -1119,7 +1119,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
iconColor = GetIconColor(pageItem, true, false); iconColor = GetIconColor(pageItem, true, false);
} }
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + + iconColor + "~" + switchVal + ",disable,disable,disable" }) out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + + iconColor + "~" + switchVal + ",disable,disable,disable" + "~Color~Temperature~Brightness" })
} }
//Dimmer //Dimmer
@@ -1160,7 +1160,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
let colorTemp = "disable" let colorTemp = "disable"
let colorMode = "disable" let colorMode = "disable"
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode }) out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
} }
//HUE-Licht //HUE-Licht
if (o.common.role == "hue") { if (o.common.role == "hue") {
@@ -1213,7 +1213,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode }) out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
} }
//RGB-Licht //RGB-Licht
@@ -1266,7 +1266,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode }) out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
} }
//RGB-Licht-einzeln (HEX) //RGB-Licht-einzeln (HEX)
@@ -1323,7 +1323,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode }) out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
} }
//Farbtemperatur //Farbtemperatur
@@ -1368,7 +1368,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read"); console.warn("Alias-Datenpunkt: " + id + ".TEMPERATURE could not be read");
} }
out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode }) out_msgs.push({ payload: "entityUpdateDetail~" + icon + "~" + iconColor + "~" + switchVal + "~" + brightness + "~" + colorTemp + "~" + colorMode + "~Color~Temperature~Brightness" })
} }
} }
@@ -1381,7 +1381,7 @@ function GenerateDetailPage(type: string, pageItem: PageItem): Payload[] {
val = getState(id + ".SET").val; val = getState(id + ".SET").val;
RegisterDetailEntityWatcher(id + ".SET", pageItem, type); RegisterDetailEntityWatcher(id + ".SET", pageItem, type);
} }
out_msgs.push({ payload: "entityUpdateDetail~" + val }) out_msgs.push({ payload: "entityUpdateDetail~" + val + "~~Position" })
} }
} }
return out_msgs return out_msgs