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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui into joBr99-main

Browse Source
This commit is contained in:
illuzn
2022-06-01 00:18:00 +09:30
parent b11018aad2 debd9e181a
commit 3792b9bbbb
81 changed files with 978 additions and 2516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/nextion2text.yml vendored
View File

@@ -75,6 +75,7 @@ jobs:
continue-on-error: true continue-on-error: true
run: | run: |
find -name "**.txt" find -name "**.txt"
rm Nextion2Text.py*
- uses: stefanzweifel/git-auto-commit-action@v4 - uses: stefanzweifel/git-auto-commit-action@v4
with: with:

6
HMI/README.md
View File

@@ -37,11 +37,11 @@ wake screen:
`wake` `wake`
set brightness of screensaver: set brightness of screensaver and active-brightness:
`dimmode~0 - (screen off)` `dimmode~0~100 - (screen off)`
`dimmode~100 - (screen on with full brightness)` `dimmode~100~100 - (screen on with full brightness)`
set current time: set current time:

73
HMI/US/landscape/diff-eu-version.txt
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-29 21:20:55.128409486 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-29 21:20:55.900415426 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 20:13:57.965045854 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,25 +8,10 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.904415457 +0000
@@ -683,10 +683,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 20:13:57.969045903 +0000
@@ -1924,10 +1924,6 @@ @@ -1925,10 +1925,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -38,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 20:13:57.965045854 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,9 +37,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 20:13:57.965045854 +0000
@@ -635,10 +635,7 @@ @@ -636,10 +636,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -67,9 +52,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 20:13:57.965045854 +0000
@@ -581,10 +581,7 @@ @@ -582,10 +582,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -82,9 +67,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 20:13:57.969045903 +0000
@@ -1169,10 +1169,6 @@ @@ -1170,10 +1170,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -96,8 +81,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-29 21:20:55.128409486 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-29 21:20:55.900415426 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 20:13:57.965045854 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -119,9 +104,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 20:13:57.965045854 +0000
@@ -560,10 +560,6 @@ @@ -561,10 +561,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -133,9 +118,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/popupNotify.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-29 21:20:55.900415426 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 20:13:57.965045854 +0000
@@ -310,10 +310,6 @@ @@ -311,10 +311,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -147,9 +132,9 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 20:13:57.969045903 +0000
@@ -405,10 +405,6 @@ @@ -406,10 +406,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
@@ -161,8 +146,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-29 21:20:55.904415457 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 20:13:57.969045903 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0

230
HMI/US/landscape/n2t-out-visual/cardAlarm.txt
View File

@@ -20,6 +20,7 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -40,6 +41,7 @@ Page cardAlarm
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -93,6 +95,13 @@ Variable (string) va4
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) vaAddBtn
Attributes
ID : 39
Scope : local
Text :
Max. Text Size: 20
Text tTmp Text tTmp
Attributes Attributes
ID : 2 ID : 2
@@ -111,7 +120,7 @@ Text tTmp
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 0 Font ID : 6
Back. Color : 65535 Back. Color : 65535
Font Color : 0 Font Color : 0
Horizontal Alignment : center Horizontal Alignment : center
@@ -141,7 +150,7 @@ Text tInstruction
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 0 Font ID : 6
Back. Color : 65535 Back. Color : 65535
Font Color : 0 Font Color : 0
Horizontal Alignment : center Horizontal Alignment : center
@@ -171,7 +180,7 @@ Text tId
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 0 Font ID : 6
Back. Color : 65535 Back. Color : 65535
Font Color : 0 Font Color : 0
Horizontal Alignment : center Horizontal Alignment : center
@@ -191,7 +200,7 @@ Text tCode
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 : 107 x coordinate : 108
y coordinate : 16 y coordinate : 16
Width : 192 Width : 192
Height : 49 Height : 49
@@ -201,7 +210,7 @@ Text tCode
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 2 Font ID : 1
Back. Color : 10565 Back. Color : 10565
Font Color : 40179 Font Color : 40179
Horizontal Alignment : center Horizontal Alignment : center
@@ -221,7 +230,7 @@ Text tIcon
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 : 315 x coordinate : 316
y coordinate : 16 y coordinate : 16
Width : 64 Width : 64
Height : 49 Height : 49
@@ -253,8 +262,8 @@ Picture p0
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 0
y coordinate : 0 y coordinate : 0
Width : 480 Width : 479
Height : 320 Height : 319
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -268,7 +277,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 : 406 x coordinate : 407
y coordinate : 16 y coordinate : 16
Width : 50 Width : 50
Height : 50 Height : 50
@@ -315,7 +324,7 @@ Button bPrev
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 : 24 x coordinate : 25
y coordinate : 16 y coordinate : 16
Width : 50 Width : 50
Height : 50 Height : 50
@@ -369,7 +378,7 @@ Button b0
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 : 40 x coordinate : 41
y coordinate : 94 y coordinate : 94
Width : 75 Width : 75
Height : 50 Height : 50
@@ -380,7 +389,7 @@ Button b0
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -407,7 +416,7 @@ Button b1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 132 x coordinate : 133
y coordinate : 94 y coordinate : 94
Width : 75 Width : 75
Height : 50 Height : 50
@@ -418,7 +427,7 @@ Button b1
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -445,7 +454,7 @@ Button b2
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 : 225
y coordinate : 93 y coordinate : 93
Width : 75 Width : 75
Height : 50 Height : 50
@@ -456,7 +465,7 @@ Button b2
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -483,7 +492,7 @@ Button b3
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 : 40 x coordinate : 41
y coordinate : 152 y coordinate : 152
Width : 75 Width : 75
Height : 50 Height : 50
@@ -494,7 +503,7 @@ Button b3
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -521,7 +530,7 @@ Button b4
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 : 132 x coordinate : 133
y coordinate : 152 y coordinate : 152
Width : 75 Width : 75
Height : 50 Height : 50
@@ -532,7 +541,7 @@ Button b4
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -559,7 +568,7 @@ Button b5
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 : 225
y coordinate : 152 y coordinate : 152
Width : 75 Width : 75
Height : 50 Height : 50
@@ -570,7 +579,7 @@ Button b5
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -597,7 +606,7 @@ Button b6
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 : 40 x coordinate : 41
y coordinate : 210 y coordinate : 210
Width : 75 Width : 75
Height : 50 Height : 50
@@ -608,7 +617,7 @@ Button b6
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -635,7 +644,7 @@ Button b7
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 : 132 x coordinate : 133
y coordinate : 210 y coordinate : 210
Width : 75 Width : 75
Height : 50 Height : 50
@@ -646,7 +655,7 @@ Button b7
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -673,7 +682,7 @@ Button b8
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 : 225
y coordinate : 210 y coordinate : 210
Width : 75 Width : 75
Height : 50 Height : 50
@@ -684,7 +693,7 @@ Button b8
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -711,7 +720,7 @@ Button b9
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 : 131 x coordinate : 41
y coordinate : 266 y coordinate : 266
Width : 75 Width : 75
Height : 50 Height : 50
@@ -722,7 +731,60 @@ Button b9
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 2 Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
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
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.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
tCode.txt=""
Button b10
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 134
y coordinate : 266
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 1
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -741,44 +803,6 @@ Button b9
Touch Press Event Touch Press Event
tCode.txt=tCode.txt+"0" tCode.txt=tCode.txt+"0"
Button b10
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 224
y coordinate : 266
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 2
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : CLR
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tCode.txt=""
Button arm1 Button arm1
Attributes Attributes
ID : 24 ID : 24
@@ -787,7 +811,7 @@ Button arm1
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 : 315 x coordinate : 316
y coordinate : 91 y coordinate : 91
Width : 141 Width : 141
Height : 50 Height : 50
@@ -798,7 +822,7 @@ Button arm1
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 0 Font ID : 6
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -841,7 +865,7 @@ Button arm3
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 : 315 x coordinate : 316
y coordinate : 210 y coordinate : 210
Width : 140 Width : 140
Height : 50 Height : 50
@@ -852,7 +876,7 @@ Button arm3
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 0 Font ID : 6
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -895,7 +919,7 @@ Button arm2
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 : 315 x coordinate : 316
y coordinate : 152 y coordinate : 152
Width : 141 Width : 141
Height : 50 Height : 50
@@ -906,7 +930,7 @@ Button arm2
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 0 Font ID : 6
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -949,7 +973,7 @@ Button arm4
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 : 315 x coordinate : 316
y coordinate : 266 y coordinate : 266
Width : 141 Width : 141
Height : 50 Height : 50
@@ -960,7 +984,7 @@ Button arm4
Style : border Style : border
Border Color : 6371 Border Color : 6371
Border Width : 2 Border Width : 2
Font ID : 0 Font ID : 6
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 65535 Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823 Back. Color (Pressed) : 14823
@@ -995,6 +1019,44 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Button b11
Attributes
ID : 38
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 225
y coordinate : 266
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : CLR
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tCode.txt=""
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 35 ID : 35
@@ -1025,7 +1087,7 @@ Hotspot mSwipeUp
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 0 y coordinate : 0
Width : 450 Width : 426
Height : 9 Height : 9
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -1224,6 +1286,15 @@ Timer tmSerial
{ {
tmFlash.en=0 tmFlash.en=0
} }
// extra button
spstr strCommand.txt,b9.txt,"~",15
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -1240,7 +1311,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

1
HMI/US/landscape/n2t-out-visual/cardEntities.txt
View File

@@ -20,6 +20,7 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0

2
HMI/US/landscape/n2t-out-visual/cardGrid.txt
View File

@@ -20,7 +20,7 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
//wup=cardEntities dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
recmod=1 recmod=1

1
HMI/US/landscape/n2t-out-visual/cardMedia.txt
View File

@@ -20,6 +20,7 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/US/landscape/n2t-out-visual/cardQR.txt
View File

@@ -20,6 +20,7 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/US/landscape/n2t-out-visual/cardThermo.txt
View File

@@ -20,6 +20,7 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

66
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -12,51 +12,51 @@ pageTest
14 Unique line(s) of event code 14 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
200 Line(s) of event code 201 Line(s) of event code
125 Unique line(s) of event code 126 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
115 Unique line(s) of event code 115 Unique line(s) of event code
cardThermo
56 Component(s)
542 Line(s) of event code
292 Unique line(s) of event code
popupShutter
20 Component(s)
244 Line(s) of event code
138 Unique line(s) of event code
cardQR
30 Component(s)
359 Line(s) of event code
209 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
348 Line(s) of event code 349 Line(s) of event code
188 Unique line(s) of event code 189 Unique line(s) of event code
cardGrid
42 Component(s)
435 Line(s) of event code
256 Unique line(s) of event code
cardAlarm
38 Component(s)
360 Line(s) of event code
226 Unique line(s) of event code
cardMedia cardMedia
33 Component(s) 33 Component(s)
346 Line(s) of event code 347 Line(s) of event code
181 Unique line(s) of event code 182 Unique line(s) of event code
cardQR
30 Component(s)
360 Line(s) of event code
210 Unique line(s) of event code
cardGrid
42 Component(s)
436 Line(s) of event code
257 Unique line(s) of event code
popupShutter
20 Component(s)
245 Line(s) of event code
139 Unique line(s) of event code
cardThermo
56 Component(s)
543 Line(s) of event code
293 Unique line(s) of event code
cardAlarm
40 Component(s)
385 Line(s) of event code
235 Unique line(s) of event code
cardEntities
65 Component(s)
1130 Line(s) of event code
494 Unique line(s) of event code
screensaver screensaver
37 Component(s) 37 Component(s)
305 Line(s) of event code 305 Line(s) of event code
244 Unique line(s) of event code 244 Unique line(s) of event code
cardEntities
65 Component(s)
1129 Line(s) of event code
493 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
404 Component(s) 406 Component(s)
4446 Line(s) of event code 4479 Line(s) of event code
1177 Unique line(s) of event code 1185 Unique line(s) of event code

1
HMI/US/landscape/n2t-out-visual/popupLight.txt
View File

@@ -20,6 +20,7 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

1
HMI/US/landscape/n2t-out-visual/popupNotify.txt
View File

@@ -20,6 +20,7 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/US/landscape/n2t-out-visual/popupShutter.txt
View File

@@ -20,6 +20,7 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

59
HMI/US/landscape/n2t-out/cardAlarm.txt
View File

@@ -12,6 +12,7 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -32,6 +33,7 @@ Page cardAlarm
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -78,6 +80,12 @@ Variable (string) va4
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) vaAddBtn
Attributes
Scope : local
Text :
Max. Text Size: 20
Text tTmp Text tTmp
Attributes Attributes
Scope : local Scope : local
@@ -325,12 +333,27 @@ Button b9
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : 0 Text :
Max. Text Size : 10 Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
tCode.txt=tCode.txt+"0" // event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.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
tCode.txt=""
Button b10 Button b10
Attributes Attributes
@@ -339,12 +362,12 @@ Button b10
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : CLR Text : 0
Max. Text Size : 10 Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
tCode.txt="" tCode.txt=tCode.txt+"0"
Button arm1 Button arm1
Attributes Attributes
@@ -466,6 +489,20 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Button b11
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : CLR
Max. Text Size : 10
Events
Touch Press Event
tCode.txt=""
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -667,6 +704,15 @@ Timer tmSerial
{ {
tmFlash.en=0 tmFlash.en=0
} }
// extra button
spstr strCommand.txt,b9.txt,"~",15
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -683,7 +729,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

1
HMI/US/landscape/n2t-out/cardEntities.txt
View File

@@ -12,6 +12,7 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0

2
HMI/US/landscape/n2t-out/cardGrid.txt
View File

@@ -12,7 +12,7 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
//wup=cardEntities dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
recmod=1 recmod=1

1
HMI/US/landscape/n2t-out/cardMedia.txt
View File

@@ -12,6 +12,7 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/US/landscape/n2t-out/cardQR.txt
View File

@@ -12,6 +12,7 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/US/landscape/n2t-out/cardThermo.txt
View File

@@ -12,6 +12,7 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/US/landscape/n2t-out/popupLight.txt
View File

@@ -12,6 +12,7 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

1
HMI/US/landscape/n2t-out/popupNotify.txt
View File

@@ -12,6 +12,7 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/US/landscape/n2t-out/popupShutter.txt
View File

@@ -12,6 +12,7 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

BIN
HMI/US/landscape/nspanel_US_L.HMI
View File

Binary file not shown.

BIN
HMI/US/landscape/nspanel_US_L.tft
View File

Binary file not shown.

195
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 21:20:55.500412348 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,24 +11,20 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.500412348 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000
@@ -683,10 +683,7 @@ @@ -33,7 +33,6 @@
// get value vis b8,0
spstr strCommand.txt,tTmp.txt,"~",1 vis b9,0
covx tTmp.txt,dimValue,0,0 vis b10,0
- // get value normal - vis b11,0
- spstr strCommand.txt,tTmp.txt,"~",2 vis tCode,0
- covx tTmp.txt,dimValueNormal,0,0 vis bPrev,0
- dim=dimValueNormal vis bNext,0
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
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-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 21:20:55.500412348 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000
@@ -62,6 +62,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
vis nNum4,0 vis nNum4,0
@@ -45,7 +41,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -119,6 +129,18 @@ @@ -120,6 +130,18 @@
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
@@ -64,7 +60,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1 Number nNum1
Attributes Attributes
Scope : local Scope : local
@@ -155,6 +177,15 @@ @@ -156,6 +178,15 @@
Associated Keyboard : none Associated Keyboard : none
Value : 0 Value : 0
@@ -80,7 +76,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading Text tHeading
Attributes Attributes
Scope : local Scope : local
@@ -285,6 +316,26 @@ @@ -286,6 +317,26 @@
Text : Text :
Max. Text Size : 50 Max. Text Size : 50
@@ -107,7 +103,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0 Picture p0
Attributes Attributes
Scope : local Scope : local
@@ -404,6 +455,34 @@ @@ -405,6 +456,34 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -142,7 +138,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -861,6 +940,106 @@ @@ -862,6 +941,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -249,7 +245,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
Scope : local Scope : local
@@ -969,6 +1148,33 @@ @@ -970,6 +1149,33 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -283,7 +279,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
Scope : local Scope : local
@@ -1074,6 +1280,28 @@ @@ -1075,6 +1281,28 @@
page popupLight page popupLight
} }
@@ -312,7 +308,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -1849,6 +2077,169 @@ @@ -1850,6 +2078,169 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -482,50 +478,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
@@ -1924,10 +2315,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 21:20:55.500412348 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-29 21:20:55.500412348 +0000
@@ -635,10 +635,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 21:20:55.500412348 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000
@@ -34,7 +34,7 @@ @@ -35,7 +35,7 @@
Attributes Attributes
Scope : local Scope : local
Text : Text :
@@ -534,35 +490,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -581,10 +581,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 21:20:55.500412348 +0000
@@ -1169,10 +1169,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
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-29 21:20:55.128409486 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 21:20:55.500412348 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +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
@@ -581,73 +511,10 @@ 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
@@ -273,10 +273,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-29 21:20:55.500412348 +0000
@@ -560,10 +560,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-29 21:20:55.500412348 +0000
@@ -310,10 +310,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-29 21:20:55.500412348 +0000
@@ -405,10 +405,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 21:20:55.500412348 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000
@@ -397,9 +397,6 @@ @@ -474,22 +474,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
}
if(tInstruction.txt=="time")
{
@@ -474,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1
vis tMR,1 vis tMR,1

188
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,157 +1,33 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-29 21:20:55.512412440 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 20:13:57.437039326 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-29 21:20:55.128409486 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-29 21:20:55.500412348 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.128409486 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-29 21:20:55.500412348 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000
+@@ -683,10 +683,7 @@ +@@ -33,7 +33,6 @@
+ // get value + vis b8,0
+ spstr strCommand.txt,tTmp.txt,"~",1 + vis b9,0
+ covx tTmp.txt,dimValue,0,0 + vis b10,0
+- // get value normal +- vis b11,0
+- spstr strCommand.txt,tTmp.txt,"~",2 + vis tCode,0
+- covx tTmp.txt,dimValueNormal,0,0 + vis bPrev,0
+- dim=dimValueNormal + vis bNext,0
++ dim=dimValue +--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000
+ } ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000
+ if(tInstruction.txt=="timeout") +@@ -63,6 +63,16 @@
+ { +@@ -120,6 +130,18 @@
+--- HMI/n2t-out/cardEntities.txt 2022-05-29 21:20:55.128409486 +0000 +@@ -156,6 +178,15 @@
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-29 21:20:55.500412348 +0000 +@@ -286,6 +317,26 @@
+@@ -1849,6 +2077,169 @@ +@@ -405,6 +456,34 @@
+@@ -1924,10 +2315,6 @@ +@@ -862,6 +941,106 @@
+ // get value +@@ -970,6 +1149,33 @@
+ spstr strCommand.txt,tTmp.txt,"~",1 +@@ -1075,6 +1281,28 @@
+ covx tTmp.txt,dimValue,0,0 +@@ -1850,6 +2078,169 @@
+- // get value normal +--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000
+- spstr strCommand.txt,tTmp.txt,"~",2 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000
+- covx tTmp.txt,dimValueNormal,0,0 +@@ -35,7 +35,7 @@
+- dim=dimValueNormal +--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000
+ } ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000
+ if(tInstruction.txt=="timeout") +--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000
+ { ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +@@ -474,22 +474,6 @@
+--- HMI/n2t-out/cardGrid.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -846,10 +846,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -635,10 +635,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
++ dim=dimValue
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardQR.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -581,10 +581,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
++ dim=dimValue
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -1169,10 +1169,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -273,10 +273,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -560,10 +560,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -310,10 +310,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -405,10 +405,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/screensaver.txt 2022-05-29 21:20:55.128409486 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-29 21:20:55.500412348 +0000
+@@ -397,9 +397,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+ dim=dimValue
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+ }
+ if(tInstruction.txt=="time")
+ {
+@@ -474,22 +471,6 @@

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

@@ -20,6 +20,7 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -93,6 +94,13 @@ Variable (string) va4
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) vaAddBtn
Attributes
ID : 39
Scope : local
Text :
Max. Text Size: 20
Text tTmp Text tTmp
Attributes Attributes
ID : 2 ID : 2
@@ -711,7 +719,60 @@ Button b9
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 : 116 x coordinate : 24
y coordinate : 424
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
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
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.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
tCode.txt=""
Button b10
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 117
y coordinate : 424 y coordinate : 424
Width : 75 Width : 75
Height : 50 Height : 50
@@ -741,44 +802,6 @@ Button b9
Touch Press Event Touch Press Event
tCode.txt=tCode.txt+"0" tCode.txt=tCode.txt+"0"
Button b10
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 209
y coordinate : 424
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : CLR
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tCode.txt=""
Button arm1 Button arm1
Attributes Attributes
ID : 24 ID : 24
@@ -995,6 +1018,44 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Button b11
Attributes
ID : 38
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 209
y coordinate : 424
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 0
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : CLR
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tCode.txt=""
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 35 ID : 35
@@ -1224,6 +1285,15 @@ Timer tmSerial
{ {
tmFlash.en=0 tmFlash.en=0
} }
// extra button
spstr strCommand.txt,b9.txt,"~",15
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -1240,7 +1310,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -20,6 +20,7 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
@@ -3480,6 +3481,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

6
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -20,7 +20,7 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
//wup=cardEntities dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
recmod=1 recmod=1
@@ -1310,6 +1310,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

6
HMI/US/portrait/n2t-out-visual/cardMedia.txt
View File

@@ -20,6 +20,7 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -1084,7 +1085,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

6
HMI/US/portrait/n2t-out-visual/cardQR.txt
View File

@@ -20,6 +20,7 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -871,7 +872,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/cardThermo.txt
View File

@@ -20,6 +20,7 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -1950,6 +1951,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -2,10 +2,10 @@ Program.s
0 Component(s) 0 Component(s)
10 Line(s) of event code 10 Line(s) of event code
10 Unique line(s) of event code 10 Unique line(s) of event code
cardAlarm cardQR
38 Component(s) 30 Component(s)
360 Line(s) of event code 362 Line(s) of event code
226 Unique line(s) of event code 211 Unique line(s) of event code
pageIcons pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
@@ -14,49 +14,49 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
popupNotify
17 Component(s)
200 Line(s) of event code
125 Unique line(s) of event code
cardGrid
42 Component(s)
435 Line(s) of event code
256 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
348 Line(s) of event code 352 Line(s) of event code
188 Unique line(s) of event code 191 Unique line(s) of event code
cardQR
30 Component(s)
359 Line(s) of event code
209 Unique line(s) of event code
cardMedia
33 Component(s)
346 Line(s) of event code
181 Unique line(s) of event code
cardThermo
56 Component(s)
542 Line(s) of event code
292 Unique line(s) of event code
pageStartup
19 Component(s)
154 Line(s) of event code
115 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 248 Line(s) of event code
138 Unique line(s) of event code 141 Unique line(s) of event code
screensaver popupNotify
37 Component(s) 17 Component(s)
290 Line(s) of event code 204 Line(s) of event code
229 Unique line(s) of event code 128 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
295 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1359 Line(s) of event code 1363 Line(s) of event code
578 Unique line(s) of event code 581 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
259 Unique line(s) of event code
cardMedia
33 Component(s)
349 Line(s) of event code
183 Unique line(s) of event code
cardAlarm
40 Component(s)
384 Line(s) of event code
234 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
screensaver
37 Component(s)
292 Line(s) of event code
230 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 418 Component(s)
4661 Line(s) of event code 4720 Line(s) of event code
1234 Unique line(s) of event code 1241 Unique line(s) of event code

4
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -568,6 +568,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -20,6 +20,7 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
@@ -906,6 +907,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/popupNotify.txt
View File

@@ -20,6 +20,7 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0
@@ -519,6 +520,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -20,6 +20,7 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
@@ -690,6 +691,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

3
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -942,6 +942,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -12,6 +12,7 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -78,6 +79,12 @@ Variable (string) va4
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) vaAddBtn
Attributes
Scope : local
Text :
Max. Text Size: 20
Text tTmp Text tTmp
Attributes Attributes
Scope : local Scope : local
@@ -325,12 +332,27 @@ Button b9
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : 0 Text :
Max. Text Size : 10 Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
tCode.txt=tCode.txt+"0" // event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.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
tCode.txt=""
Button b10 Button b10
Attributes Attributes
@@ -339,12 +361,12 @@ Button b10
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : CLR Text : 0
Max. Text Size : 10 Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
tCode.txt="" tCode.txt=tCode.txt+"0"
Button arm1 Button arm1
Attributes Attributes
@@ -466,6 +488,20 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Button b11
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : CLR
Max. Text Size : 10
Events
Touch Press Event
tCode.txt=""
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -667,6 +703,15 @@ Timer tmSerial
{ {
tmFlash.en=0 tmFlash.en=0
} }
// extra button
spstr strCommand.txt,b9.txt,"~",15
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -683,7 +728,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/cardEntities.txt
View File

@@ -12,6 +12,7 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
@@ -2315,6 +2316,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

6
HMI/US/portrait/n2t-out/cardGrid.txt
View File

@@ -12,7 +12,7 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
//wup=cardEntities dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
recmod=1 recmod=1
@@ -846,6 +846,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

6
HMI/US/portrait/n2t-out/cardMedia.txt
View File

@@ -12,6 +12,7 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -635,7 +636,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

6
HMI/US/portrait/n2t-out/cardQR.txt
View File

@@ -12,6 +12,7 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -581,7 +582,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/cardThermo.txt
View File

@@ -12,6 +12,7 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -1169,6 +1170,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -273,6 +273,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -12,6 +12,7 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
@@ -560,6 +561,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/popupNotify.txt
View File

@@ -12,6 +12,7 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0
@@ -310,6 +311,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -12,6 +12,7 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
@@ -405,6 +406,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

3
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -397,6 +397,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

BIN
HMI/US/portrait/nspanel.tft
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.HMI
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.tft
View File

Binary file not shown.

BIN
HMI/fonts/SPECIAL HMI NotoSans-Regular 24 (UTF_8).zi Normal file
View File

Binary file not shown.

BIN
HMI/fonts/SPECIAL HMI NotoSans-Regular 32 (UTF_8).zi Normal file
View File

Binary file not shown.

149
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -20,6 +20,7 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -40,6 +41,7 @@ Page cardAlarm
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -93,6 +95,13 @@ Variable (string) va4
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) vaAddBtn
Attributes
ID : 39
Scope : local
Text :
Max. Text Size: 20
Text tTmp Text tTmp
Attributes Attributes
ID : 2 ID : 2
@@ -711,7 +720,60 @@ Button b9
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 : 116 x coordinate : 25
y coordinate : 266
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
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
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.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
tCode.txt=""
Button b10
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 118
y coordinate : 266 y coordinate : 266
Width : 75 Width : 75
Height : 50 Height : 50
@@ -741,44 +803,6 @@ Button b9
Touch Press Event Touch Press Event
tCode.txt=tCode.txt+"0" tCode.txt=tCode.txt+"0"
Button b10
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 209
y coordinate : 266
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 2
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : CLR
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tCode.txt=""
Button arm1 Button arm1
Attributes Attributes
ID : 24 ID : 24
@@ -995,6 +1019,44 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Button b11
Attributes
ID : 38
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 209
y coordinate : 266
Width : 75
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : border
Border Color : 6371
Border Width : 2
Font ID : 2
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 1374
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : CLR
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tCode.txt=""
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
ID : 35 ID : 35
@@ -1224,6 +1286,15 @@ Timer tmSerial
{ {
tmFlash.en=0 tmFlash.en=0
} }
// extra button
spstr strCommand.txt,b9.txt,"~",15
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

1
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -20,6 +20,7 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0

2
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -20,7 +20,7 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
//wup=cardEntities dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
recmod=1 recmod=1

1
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -20,6 +20,7 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/n2t-out-visual/cardQR.txt
View File

@@ -20,6 +20,7 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -20,6 +20,7 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

66
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -10,53 +10,53 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
cardQR
30 Component(s)
362 Line(s) of event code
211 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
203 Line(s) of event code 204 Line(s) of event code
127 Unique line(s) of event code 128 Unique line(s) of event code
cardAlarm
38 Component(s)
362 Line(s) of event code
227 Unique line(s) of event code
popupShutter
20 Component(s)
247 Line(s) of event code
140 Unique line(s) of event code
cardGrid
42 Component(s)
438 Line(s) of event code
258 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
351 Line(s) of event code 352 Line(s) of event code
190 Unique line(s) of event code 191 Unique line(s) of event code
popupShutter
20 Component(s)
248 Line(s) of event code
141 Unique line(s) of event code
cardAlarm
40 Component(s)
385 Line(s) of event code
235 Unique line(s) of event code
cardMedia cardMedia
33 Component(s) 33 Component(s)
348 Line(s) of event code 349 Line(s) of event code
182 Unique line(s) of event code 183 Unique line(s) of event code
screensaver
37 Component(s)
307 Line(s) of event code
245 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
157 Line(s) of event code 157 Line(s) of event code
117 Unique line(s) of event code 117 Unique line(s) of event code
cardGrid
42 Component(s)
439 Line(s) of event code
259 Unique line(s) of event code
cardThermo cardThermo
56 Component(s) 56 Component(s)
545 Line(s) of event code 546 Line(s) of event code
294 Unique line(s) of event code 295 Unique line(s) of event code
screensaver
37 Component(s)
307 Line(s) of event code
245 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1132 Line(s) of event code 1133 Line(s) of event code
495 Unique line(s) of event code 496 Unique line(s) of event code
cardQR
30 Component(s)
361 Line(s) of event code
210 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
404 Component(s) 406 Component(s)
4476 Line(s) of event code 4507 Line(s) of event code
1180 Unique line(s) of event code 1186 Unique line(s) of event code

1
HMI/n2t-out-visual/popupLight.txt
View File

@@ -20,6 +20,7 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

1
HMI/n2t-out-visual/popupNotify.txt
View File

@@ -20,6 +20,7 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/n2t-out-visual/popupShutter.txt
View File

@@ -20,6 +20,7 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

54
HMI/n2t-out/cardAlarm.txt
View File

@@ -12,6 +12,7 @@ Page cardAlarm
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0
@@ -32,6 +33,7 @@ Page cardAlarm
vis b8,0 vis b8,0
vis b9,0 vis b9,0
vis b10,0 vis b10,0
vis b11,0
vis tCode,0 vis tCode,0
vis bPrev,0 vis bPrev,0
vis bNext,0 vis bNext,0
@@ -78,6 +80,12 @@ Variable (string) va4
Text : Text :
Max. Text Size: 20 Max. Text Size: 20
Variable (string) vaAddBtn
Attributes
Scope : local
Text :
Max. Text Size: 20
Text tTmp Text tTmp
Attributes Attributes
Scope : local Scope : local
@@ -325,12 +333,27 @@ Button b9
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : 0 Text :
Max. Text Size : 10 Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
tCode.txt=tCode.txt+"0" // event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.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
tCode.txt=""
Button b10 Button b10
Attributes Attributes
@@ -339,12 +362,12 @@ Button b10
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
State : unpressed State : unpressed
Text : CLR Text : 0
Max. Text Size : 10 Max. Text Size : 10
Events Events
Touch Press Event Touch Press Event
tCode.txt="" tCode.txt=tCode.txt+"0"
Button arm1 Button arm1
Attributes Attributes
@@ -466,6 +489,20 @@ Button arm4
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
Button b11
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : CLR
Max. Text Size : 10
Events
Touch Press Event
tCode.txt=""
Hotspot mSwipeNext Hotspot mSwipeNext
Attributes Attributes
Scope : local Scope : local
@@ -667,6 +704,15 @@ Timer tmSerial
{ {
tmFlash.en=0 tmFlash.en=0
} }
// extra button
spstr strCommand.txt,b9.txt,"~",15
if(b9.txt!="")
{
vis b9,1
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,b9.pco,0,0
spstr strCommand.txt,vaAddBtn.txt,"~",17
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

1
HMI/n2t-out/cardEntities.txt
View File

@@ -12,6 +12,7 @@ Page cardEntities
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//wup=cardEntities //wup=cardEntities
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0

2
HMI/n2t-out/cardGrid.txt
View File

@@ -12,7 +12,7 @@ Page cardGrid
Events Events
Preinitialize Event Preinitialize Event
//wup=cardEntities dim=dimValueNormal
//remove background & activate reparse mode //remove background & activate reparse mode
vis p0,0 vis p0,0
recmod=1 recmod=1

1
HMI/n2t-out/cardMedia.txt
View File

@@ -12,6 +12,7 @@ Page cardMedia
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/n2t-out/cardQR.txt
View File

@@ -12,6 +12,7 @@ Page cardQR
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/n2t-out/cardThermo.txt
View File

@@ -12,6 +12,7 @@ Page cardThermo
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tInstruction,0 vis tInstruction,0

1
HMI/n2t-out/popupLight.txt
View File

@@ -12,6 +12,7 @@ Page popupLight
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

1
HMI/n2t-out/popupNotify.txt
View File

@@ -12,6 +12,7 @@ Page popupNotify
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
vis p0,0 vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0

1
HMI/n2t-out/popupShutter.txt
View File

@@ -12,6 +12,7 @@ Page popupShutter
Events Events
Preinitialize Event Preinitialize Event
dim=dimValueNormal
//get entitiy name //get entitiy name
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id

BIN
HMI/nspanel.HMI
View File

Binary file not shown.

BIN
HMI/nspanel.tft
View File

Binary file not shown.

1842
Nextion2Text.py
View File

File diff suppressed because it is too large Load Diff

3
README.md
View File

@@ -377,7 +377,8 @@ key | optional | type | default | description
`updateMode` | True | string | `auto-notify` | Update Mode; Possible values: "auto", "auto-notify", "manual" `updateMode` | True | string | `auto-notify` | Update Mode; Possible values: "auto", "auto-notify", "manual"
`model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p" `model` | True | string | `eu` | Model; Possible values: "eu", "us-l" and "us-p"
`sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0 `sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0
`sleepBrightness` | True | integer/complex | `20` | Brightness for the screen to enter screensaver, see example below for complex/scheduled config. `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen on the screensaver, see example below for complex/scheduled config.
`screenBrightness` | True | integer/complex | `100` | Brightness for the screen during usage, config format is the same as sleepBrightness.
`sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity. `sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity.
`sleepOverride` | True | complex | None | Allows overriding of the sleepBrightness if entity state is on, true or home. Overrides sleepBrightness but sleepTracking takes precedence. `sleepOverride` | True | complex | None | Allows overriding of the sleepBrightness if entity state is on, true or home. Overrides sleepBrightness but sleepTracking takes precedence.
`locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization. `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization.

1
apps/nspanel-lovelace-ui/luibackend/config.py
View File

@@ -67,6 +67,7 @@ class LuiBackendConfig(object):
'model': "eu", 'model': "eu",
'sleepTimeout': 20, 'sleepTimeout': 20,
'sleepBrightness': 20, 'sleepBrightness': 20,
'screenBrightness': 100,
'sleepTracking': None, 'sleepTracking': None,
'sleepOverride': None, 'sleepOverride': None,
'locale': "en_US", 'locale': "en_US",

47
apps/nspanel-lovelace-ui/luibackend/controller.py
View File

@@ -36,9 +36,10 @@ class LuiController(object):
self._ha_api.run_daily(self.update_screensaver_brightness, timeset["time"], value=timeset["value"]) self._ha_api.run_daily(self.update_screensaver_brightness, timeset["time"], value=timeset["value"])
# calculate current brightness # calculate current brightness
self.current_screensaver_brightness = self.calc_current_screensaver_brightness() self.current_screensaver_brightness = self.calc_current_brightness(self._config.get("sleepBrightness"))
self.current_screen_brightness = self.calc_current_brightness(self._config.get("screenBrightness"))
# call update_screensaver_brightness on changes of entity configured in brightnessScreensaverTracking # call update_screensaver_brightness on changes of entity configured in sleepTracking
bst = self._config.get("sleepTracking") bst = self._config.get("sleepTracking")
if bst is not None and self._ha_api.entity_exists(bst): if bst is not None and self._ha_api.entity_exists(bst):
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst) self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst)
@@ -49,10 +50,14 @@ class LuiController(object):
self._ha_api.log(f"Configuring Sleep Override. Config is {sleepOverride}") self._ha_api.log(f"Configuring Sleep Override. Config is {sleepOverride}")
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleepOverride["entity"]) self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleepOverride["entity"])
# register callback for state changes on tracked value # register callback for state changes on tracked value (for input_number) - sleepBrightness
sleep_brightness_config = self._config.get("sleepBrightness") sleep_brightness_config = self._config.get("sleepBrightness")
if type(sleep_brightness_config) == str and self._ha_api.entity_exists(sleep_brightness_config): if type(sleep_brightness_config) == str and self._ha_api.entity_exists(sleep_brightness_config):
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleep_brightness_config) self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleep_brightness_config)
# register callback for state changes on tracked value (for input_number) - screenBrightness
screen_brightness_config = self._config.get("screenBrightness")
if type(screen_brightness_config) == str and self._ha_api.entity_exists(screen_brightness_config):
self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=screen_brightness_config)
def startup(self): def startup(self):
self._ha_api.log(f"Startup Event") self._ha_api.log(f"Startup Event")
@@ -65,7 +70,7 @@ class LuiController(object):
self._send_mqtt_msg(f"timeout~{timeout}") self._send_mqtt_msg(f"timeout~{timeout}")
# set current screensaver brightness # set current screensaver brightness
self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness}) self.update_screensaver_brightness(kwargs={"ssbr": self.current_screensaver_brightness, "sbr": self.current_screen_brightness})
# send panel to screensaver # send panel to screensaver
self._pages_gen.render_card(self._current_card) self._pages_gen.render_card(self._current_card)
@@ -73,8 +78,9 @@ class LuiController(object):
def update_screensaver_brightness_state_callback(self, entity, attribute, old, new, kwargs): def update_screensaver_brightness_state_callback(self, entity, attribute, old, new, kwargs):
if type(self._config.get("sleepBrightness")) == str: if type(self._config.get("sleepBrightness")) == str:
self.current_screensaver_brightness = self.calc_current_screensaver_brightness() self.current_screensaver_brightness = self.calc_current_brightness(self._config.get("sleepBrightness"))
self.update_screensaver_brightness(kwargs={"value": self.current_screensaver_brightness}) self.current_screen_brightness = self.calc_current_brightness(self._config.get("screenBrightness"))
self.update_screensaver_brightness(kwargs={"ssbr": self.current_screensaver_brightness, "sbr": self.current_screen_brightness})
def update_screensaver_brightness(self, kwargs): def update_screensaver_brightness(self, kwargs):
bst = self._config.get("sleepTracking") bst = self._config.get("sleepTracking")
@@ -83,24 +89,29 @@ class LuiController(object):
sOEntity = sleepOverride["entity"] sOEntity = sleepOverride["entity"]
sOBrightness = sleepOverride["brightness"] sOBrightness = sleepOverride["brightness"]
brightness = 0 sleepBrightness = 0
if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]: if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]:
self._ha_api.log(f"sleepTracking setting brightness to 0") self._ha_api.log(f"sleepTracking setting brightness to 0")
brightness = 0 sleepBrightness = 0
elif sOEntity is not None and sOBrightness is not None and self._ha_api.entity_exists(sOEntity) and self._ha_api.get_entity(sOEntity).state in ["on", "true", "home"]: elif sOEntity is not None and sOBrightness is not None and self._ha_api.entity_exists(sOEntity) and self._ha_api.get_entity(sOEntity).state in ["on", "true", "home"]:
self._ha_api.log(f"sleepOverride setting brightness to {sOBrightness}") self._ha_api.log(f"sleepOverride setting brightness to {sOBrightness}")
brightness = sOBrightness sleepBrightness = sOBrightness
else: else:
self.current_screensaver_brightness = kwargs['value'] self.current_screensaver_brightness = kwargs['ssbr']
brightness = kwargs['value'] sleepBrightness = self.current_screensaver_brightness
self._send_mqtt_msg(f"dimmode~{brightness}") self.current_screen_brightness = kwargs['sbr']
brightness = self.current_screen_brightness
# same value for both values will break sleep timer of the firmware
if sleepBrightness==brightness:
sleepBrightness = sleepBrightness-1
self._send_mqtt_msg(f"dimmode~{sleepBrightness}~{brightness}")
def calc_current_screensaver_brightness(self): def calc_current_brightness(self, sleep_brightness_config):
current_screensaver_brightness = 20 current_screensaver_brightness = 20
sleep_brightness_config = self._config.get("sleepBrightness") #sleep_brightness_config = self._config.get("sleepBrightness")
# set brightness of screensaver # set brightness of screensaver
if type(sleep_brightness_config) == int: if type(sleep_brightness_config) == int:
current_screensaver_brightness = sleep_brightness_config current_screensaver_brightness = sleep_brightness_config
@@ -290,3 +301,11 @@ class LuiController(object):
# for alarm page # for alarm page
if button_type in ["disarm", "arm_home", "arm_away", "arm_night", "arm_vacation"]: if button_type in ["disarm", "arm_home", "arm_away", "arm_night", "arm_vacation"]:
self._ha_api.get_entity(entity_id).call_service(f"alarm_{button_type}", code=value) self._ha_api.get_entity(entity_id).call_service(f"alarm_{button_type}", code=value)
if button_type == "opnSensorNotify":
msg = ""
entity = self._ha_api.get_entity(entity_id)
if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
for e in entity.attributes.open_sensors:
msg += f"- {self._ha_api.get_entity(e).attributes.friendly_name}\n"
self._pages_gen.send_message_page("opnSensorNotifyRes", "", msg, "", "")

72
apps/nspanel-lovelace-ui/luibackend/localization.py
View File

@@ -264,6 +264,12 @@ translations = {
'fan_mode': "Fan mode", 'fan_mode': "Fan mode",
'heating': "Heating", 'heating': "Heating",
}, },
'eo': {
'cooling': "malvarmigo",
'code': "Kodo",
'state': "Stato",
'heating': "hejtado",
},
'es': { 'es': {
'PRESS': "Pulsa", 'PRESS': "Pulsa",
'ACTIVATE': "Activar", 'ACTIVATE': "Activar",
@@ -1108,10 +1114,76 @@ translations = {
'fan_mode': "Chế độ quạt", 'fan_mode': "Chế độ quạt",
'heating': "Làm ấm", 'heating': "Làm ấm",
}, },
'zh-Hans': {
'PRESS': "按下",
'ACTIVATE': "激活",
'aux_heat': "辅热",
'away_mode': "离开模式",
'cooling': "制冷",
'drying': "除湿",
'fan': "送风",
'idle': "空闲",
'off': "关",
'arm_away': "离家警戒",
'arm_custom_bypass': "自定义略过条件",
'arm_home': "在家警戒",
'arm_night': "夜间警戒",
'arm_vacation': "度假警戒",
'clear_code': "清除",
'code': "密码",
'disarm': "解除警戒",
'run': "运行",
'lock': "锁定",
'unlock': "解锁",
'brightness': "亮度",
'color_temperature': "色温",
'position': "位置",
'state': "状态",
'currently': "当前",
'operation': "运行模式",
'fan_mode': "风速",
'heating': "制热",
},
'zh-Hant': {
'PRESS': "按下",
'ACTIVATE': "啟用",
'aux_heat': "輔助暖氣",
'away_mode': "外出模式",
'cooling': "冷氣",
'drying': "除濕",
'fan': "風速",
'idle': "閒置",
'off': "關閉",
'arm_away': "離家警戒",
'arm_custom_bypass': "警戒模式狀態",
'arm_home': "在家警戒",
'arm_night': "夜間警戒",
'arm_vacation': "度假警戒",
'clear_code': "清除",
'code': "密碼",
'disarm': "解除警戒",
'run': "執行",
'lock': "上鎖",
'unlock': "解鎖",
'brightness': "亮度",
'color_temperature': "色溫",
'position': "位置",
'state': "狀態判斷",
'currently': "目前狀態",
'operation': "運轉模式",
'fan_mode': "風速模式",
'heating': "暖氣",
},
} }
def lookup(locale, inputstr): def lookup(locale, inputstr):
if locale in ["zh_CN", "zh_Hans_CN", "zh_Hans"]:
locale = "zh-Hans"
elif locale in ["zh_TW", "zh_Hant_TW", "zh_Hant"]:
locale = "zh-Hant"
else:
locale = locale.split("_")[0] locale = locale.split("_")[0]
en_fallback_res = translations.get("en").get(inputstr, inputstr) en_fallback_res = translations.get("en").get(inputstr, inputstr)
if locale in translations: if locale in translations:
return translations.get(locale).get(inputstr, en_fallback_res) return translations.get(locale).get(inputstr, en_fallback_res)

11
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -413,13 +413,18 @@ class LuiPagesGen(object):
icon = get_icon_id("bell-ring") icon = get_icon_id("bell-ring")
flashing = "enable" flashing = "enable"
#add button to show sensor state
add_btn = ""
if "open_sensors" in entity.attributes and entity.attributes.open_sensors is not None:
add_btn=f"{get_icon_id('progress-alert')}~{rgb_dec565([243,179,0])}~opnSensorNotify"
# add padding to arm buttons # add padding to arm buttons
arm_buttons = "" arm_buttons = ""
for b in supported_modes: for b in supported_modes:
arm_buttons += f"~{get_translation(self._locale, b)}~{b}" arm_buttons += f"~{get_translation(self._locale, b)}~{b}"
if len(supported_modes) < 4: if len(supported_modes) < 4:
arm_buttons += "~"*((4-len(supported_modes))*2) arm_buttons += "~"*((4-len(supported_modes))*2)
command = f"entityUpd~{item}~{navigation}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}" command = f"entityUpd~{item}~{navigation}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}~{add_btn}"
self._send_mqtt_msg(command) self._send_mqtt_msg(command)
@@ -529,6 +534,6 @@ class LuiPagesGen(object):
pos_translation = get_translation(self._locale, "position") pos_translation = get_translation(self._locale, "position")
self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}~{icon_up_status}~{icon_stop_status}~{icon_down_status}") self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}~{icon_up_status}~{icon_stop_status}~{icon_down_status}")
def send_message_page(self, id, heading, msg, b1, b2): def send_message_page(self, ident, heading, msg, b1, b2):
self._send_mqtt_msg(f"pageType~popupNotify") self._send_mqtt_msg(f"pageType~popupNotify")
self._send_mqtt_msg(f"entityUpdateDetail~{id}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0") self._send_mqtt_msg(f"entityUpdateDetail~{ident}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")