diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0bddb9d2..c695f890 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,12 +1,14 @@
name: docs-ci
on:
+ workflow_dispatch:
push:
branches:
- main
paths:
- docs/*
- .github/workflows/docs.yml
+ - mkdocs.yml
jobs:
deploy:
@@ -17,4 +19,4 @@ jobs:
with:
python-version: 3.x
- run: pip install mkdocs-material mkdocs-video markdown-include
- - run: mkdocs gh-deploy --force
\ No newline at end of file
+ - run: mkdocs gh-deploy --force
diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt
index 37e880ee..87f0e9ba 100644
--- a/HMI/US/landscape/diff-eu-version.txt
+++ b/HMI/US/landscape/diff-eu-version.txt
@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt 2022-07-12 19:48:18.749451287 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-12 19:48:19.897452968 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-13 16:57:07.448403502 +0000
@@ -11,9 +11,4 @@
// dim value
int dimValue=40
@@ -12,12 +12,12 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
---- HMI/n2t-out/cardAlarm.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,25 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-13 16:57:07.452403499 +0000
+@@ -37,25 +37,6 @@
+ vis tCode,0
+ vis bPrev,0
+ vis bNext,0
- cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
@@ -37,18 +37,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
- tCode.bco=10565
- tCode.pco=40179
- }
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
-@@ -142,7 +123,7 @@
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
-- Text : xxxxxxx
-+ Text :
- Max. Text Size : 10
-
- Text tIcon
+
+ Variable (string) strCommand
+ Attributes
@@ -759,18 +740,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -69,12 +60,12 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,26 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-13 16:57:07.448403502 +0000
+@@ -65,26 +65,6 @@
+ vis nNum4,0
+ vis bPrev,0
+ vis bNext,0
- cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++)
- {
@@ -95,9 +86,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
- b[sys0].pic2=15
- }
- }
- dim=dimValueNormal
- //wup=cardEntities
- //remove background & activate reparse mode
+
+ Variable (string) strCommand
+ Attributes
@@ -1028,10 +1008,6 @@
//popupLight.tEntity.txt=tEntity3.txt
page popupLight
@@ -162,12 +153,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
---- HMI/n2t-out/cardGrid.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,15 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-13 16:57:07.448403502 +0000
+@@ -36,15 +36,6 @@
+ vis tEntity6,0
+ vis bPrev,0
+ vis bNext,0
- cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++)
- {
@@ -177,9 +168,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
- b[sys0].pco=defaultFontColor
- }
- }
- dim=dimValueNormal
- //remove background & activate reparse mode
- vis p0,0
+
+ Variable (string) strCommand
+ Attributes
@@ -859,18 +850,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -211,12 +202,12 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
---- HMI/n2t-out/cardMedia.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-12 19:48:19.897452968 +0000
-@@ -12,21 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-13 16:57:07.448403502 +0000
+@@ -21,21 +21,6 @@
+ vis t5,0
+ vis bPrev,0
+ vis bNext,0
- cardMedia.bco=defaultBcoColor
- for(sys0=0;sys0<34;sys0++)
- {
@@ -232,9 +223,9 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
- hVolume.pic1=13
- hVolume.pic2=15
- }
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
+
+ Variable (string) strCommand
+ Attributes
@@ -681,18 +666,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -255,12 +246,12 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
---- HMI/n2t-out/cardQR.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,25 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-13 16:57:07.448403502 +0000
+@@ -32,25 +32,6 @@
+ vis bText2,0
+ tsw m0,0
+ tsw m1,0
- cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++)
- {
@@ -280,9 +271,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
- b[sys0].pic2=11
- }
- }
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
+
+ Variable (string) strCommand
+ Attributes
@@ -628,18 +609,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -303,12 +294,12 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,21 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-13 16:57:07.452403499 +0000
+@@ -41,21 +41,6 @@
+ vis xTempDest1,0
+ vis bPrev,0
+ vis bNext,0
- cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++)
- {
@@ -324,9 +315,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- b[sys0].pco=defaultFontColor
- }
- }
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
+
+ Variable (string) strCommand
+ Attributes
@@ -1171,18 +1156,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -347,8 +338,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt 2022-07-12 19:48:18.749451287 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-12 19:48:19.901452974 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-13 16:57:07.448403502 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -378,8 +369,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
---- HMI/n2t-out/pageTest.txt 2022-07-12 19:48:18.749451287 +0000
-+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-12 19:48:19.897452968 +0000
+--- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-07-13 16:57:07.448403502 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -429,12 +420,12 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
---- HMI/n2t-out/popupLight.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,29 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-13 16:57:07.448403502 +0000
+@@ -50,29 +50,6 @@
+ vis t0,0
+ vis pColorWheel,0
+ //vis t0,0
- popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++)
- {
@@ -458,9 +449,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
- hTempSlider.pic1=17
- hTempSlider.pic2=15
- }
- dim=dimValueNormal
- //get entitiy name
- tEntity.txt=pageIcons.tTmp1.txt
+
+ Variable (string) strCommand
+ Attributes
@@ -589,18 +566,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
@@ -481,8 +472,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
---- HMI/n2t-out/popupNotify.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-12 19:48:19.901452974 +0000
+--- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-13 16:57:07.448403502 +0000
@@ -12,24 +12,12 @@
Events
@@ -528,12 +519,12 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
---- HMI/n2t-out/popupShutter.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-12 19:48:19.901452974 +0000
-@@ -12,40 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-13 16:57:07.448403502 +0000
+@@ -40,40 +40,6 @@
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
- popupShutter.bco=defaultBcoColor
- b0.bco=defaultBcoColor
- tIcon1.bco=defaultBcoColor
@@ -568,9 +559,9 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
- hPosition.pic1=13
- hPosition.pic2=15
- }
- dim=dimValueNormal
- //get entitiy name
- tEntity.txt=pageIcons.tTmp1.txt
+
+ Variable (string) strCommand
+ Attributes
@@ -143,7 +109,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -697,8 +688,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
---- HMI/n2t-out/screensaver.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-12 19:48:19.901452974 +0000
+--- HMI/n2t-out/screensaver.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-13 16:57:07.452403499 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -722,4 +713,4 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
- }
}
if(tInstruction.txt=="time")
- {
+ {
\ No newline at end of file
diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt
index 2443e0cb..b1e5ca93 100644
--- a/HMI/US/portrait/diff-eu-version.txt
+++ b/HMI/US/portrait/diff-eu-version.txt
@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt 2022-07-12 19:48:18.749451287 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-12 19:48:19.285452072 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-13 16:57:06.972403853 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -11,56 +11,106 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
---- HMI/n2t-out/cardAlarm.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.285452072 +0000
-@@ -12,15 +12,11 @@
+--- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,6 +12,21 @@
Events
Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ }
++ if(defaultBcoColor==0)
++ {
++ tCode.bco=6371
++ tCode.pco=40179
++ }
++ if(defaultBcoColor==6371)
++ {
++ tCode.bco=10565
++ tCode.pco=40179
++ }
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+@@ -37,25 +52,6 @@
+ vis tCode,0
+ vis bPrev,0
+ vis bNext,0
- cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
+- for(sys0=0;sys0<40;sys0++)
+- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
- }
- if(defaultBcoColor==0)
- {
- tCode.bco=6371
-@@ -142,7 +138,7 @@
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
-- Text : xxxxxxx
-+ Text :
- Max. Text Size : 10
-
- Text tIcon
+- if(defaultBcoColor==0)
+- {
+- tCode.bco=6371
+- tCode.pco=40179
+- }
+- if(defaultBcoColor==6371)
+- {
+- tCode.bco=10565
+- tCode.pco=40179
+- }
+
+ Variable (string) strCommand
+ Attributes
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-12 19:48:19.289452078 +0000
-@@ -12,14 +12,10 @@
+--- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-13 16:57:06.976403850 +0000
+@@ -12,6 +12,22 @@
Events
Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ if(b[sys0].type==53&&defaultBcoColor==0)
++ {
++ b[sys0].pic=10
++ b[sys0].pic2=11
++ }
++ if(b[sys0].type==1&&defaultBcoColor==0)
++ {
++ b[sys0].pic=14
++ b[sys0].pic1=13
++ b[sys0].pic2=15
++ }
++ }
+ dim=dimValueNormal
+ //wup=cardEntities
+ //remove background & activate reparse mode
+@@ -65,26 +81,18 @@
+ vis nNum4,0
+ vis bPrev,0
+ vis bNext,0
- cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
-+ for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
-@@ -85,6 +81,18 @@
- vis nNum4,0
- vis bPrev,0
- vis bNext,0
+- if(b[sys0].type==53&&defaultBcoColor==0)
+- {
+- b[sys0].pic=10
+- b[sys0].pic2=11
+- }
+- if(b[sys0].type==1&&defaultBcoColor==0)
+- {
+- b[sys0].pic=14
+- b[sys0].pic1=13
+- b[sys0].pic2=15
+- }
+- }
+ //ui e5
+ vis btOnOff5,0
+ vis bUp5,0
@@ -378,25 +428,36 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
---- HMI/n2t-out/cardGrid.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-12 19:48:19.289452078 +0000
-@@ -12,15 +12,11 @@
+--- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,6 +12,11 @@
Events
Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ }
+ dim=dimValueNormal
+ //remove background & activate reparse mode
+ vis p0,0
+@@ -36,15 +41,6 @@
+ vis tEntity6,0
+ vis bPrev,0
+ vis bNext,0
- cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
-+ for(sys0=0;sys0<40;sys0++)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
- }
- dim=dimValueNormal
- //remove background & activate reparse mode
- vis p0,0
+
+ Variable (string) strCommand
+ Attributes
@@ -932,10 +928,6 @@
{
page popupLight
@@ -409,12 +470,21 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
---- HMI/n2t-out/cardMedia.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-12 19:48:19.289452078 +0000
-@@ -12,15 +12,11 @@
+--- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,30 +12,26 @@
Events
Preinitialize Event
+- dim=dimValueNormal
+- vis p0,0
+- vis tSend,0
+- vis tInstruction,0
+- vis tTmp,0
+- vis tId,0
+- vis t5,0
+- vis bPrev,0
+- vis bNext,0
- cardMedia.bco=defaultBcoColor
- for(sys0=0;sys0<34;sys0++)
- {
@@ -428,13 +498,28 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(defaultBcoColor==0)
{
hVolume.pic=14
+ hVolume.pic1=13
+ hVolume.pic2=15
+ }
++ dim=dimValueNormal
++ vis p0,0
++ vis tSend,0
++ vis tInstruction,0
++ vis tTmp,0
++ vis tId,0
++ vis t5,0
++ vis bPrev,0
++ vis bNext,0
+
+ Variable (string) strCommand
+ Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
---- HMI/n2t-out/cardQR.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-12 19:48:19.285452072 +0000
-@@ -12,25 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -32,25 +32,6 @@
+ vis bText2,0
+ tsw m0,0
+ tsw m1,0
- cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++)
- {
@@ -454,16 +539,16 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
- b[sys0].pic2=11
- }
- }
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
+
+ Variable (string) strCommand
+ Attributes
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
---- HMI/n2t-out/cardThermo.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-12 19:48:19.289452078 +0000
-@@ -12,21 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -41,21 +41,6 @@
+ vis xTempDest1,0
+ vis bPrev,0
+ vis bNext,0
- cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++)
- {
@@ -479,12 +564,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- b[sys0].pco=defaultFontColor
- }
- }
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
+
+ Variable (string) strCommand
+ Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt 2022-07-12 19:48:18.749451287 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-12 19:48:19.289452078 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-13 16:57:06.972403853 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -504,8 +589,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
---- HMI/n2t-out/pageTest.txt 2022-07-12 19:48:18.749451287 +0000
-+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-12 19:48:19.285452072 +0000
+--- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-13 16:57:06.972403853 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -555,67 +640,27 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Attributes
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
---- HMI/n2t-out/popupLight.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-12 19:48:19.285452072 +0000
-@@ -12,29 +12,6 @@
-
- Events
- Preinitialize Event
+--- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -50,14 +50,10 @@
+ vis t0,0
+ vis pColorWheel,0
+ //vis t0,0
- popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
-- {
-- b[sys0].bco=defaultBcoColor
-- b[sys0].pco=defaultFontColor
-- }
-- if(b[sys0].type==53&&defaultBcoColor==0)
-- {
-- b[sys0].pic=10
-- b[sys0].pic2=11
-- }
-- }
-- if(defaultBcoColor==0)
-- {
-- hBrightness.pic=14
-- hBrightness.pic1=13
-- hBrightness.pic2=15
-- hTempSlider.pic=16
-- hTempSlider.pic1=17
-- hTempSlider.pic2=15
-- }
- dim=dimValueNormal
- //get entitiy name
- tEntity.txt=pageIcons.tTmp1.txt
-@@ -73,6 +50,25 @@
- vis t0,0
- vis pColorWheel,0
- //vis t0,0
+ for(sys0=0;sys0<40;sys0++)
-+ {
-+ b[sys0].bco=defaultBcoColor
-+ b[sys0].pco=defaultFontColor
-+ if(b[sys0].type==53&&defaultBcoColor==0)
-+ {
-+ b[sys0].pic=10
-+ b[sys0].pic2=11
-+ }
-+ }
-+ if(defaultBcoColor==0)
-+ {
-+ hBrightness.pic=14
-+ hBrightness.pic1=13
-+ hBrightness.pic2=15
-+ hTempSlider.pic=16
-+ hTempSlider.pic1=17
-+ hTempSlider.pic2=15
-+ }
-
- Variable (string) strCommand
- Attributes
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+- }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
---- HMI/n2t-out/popupNotify.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-12 19:48:19.285452072 +0000
+--- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-13 16:57:06.972403853 +0000
@@ -12,24 +12,12 @@
Events
@@ -642,8 +687,78 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
Variable (string) strCommand
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
---- HMI/n2t-out/popupShutter.txt 2022-07-12 19:48:18.753451293 +0000
-+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-12 19:48:19.285452072 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,34 +12,6 @@
+
+ Events
+ Preinitialize Event
+- dim=dimValueNormal
+- //get entitiy name
+- tEntity.txt=pageIcons.tTmp1.txt
+- //get entity id
+- entn.txt=pageIcons.tTmp2.txt
+- vis p0,0
+- vis tSend,0
+- vis tPosHeading,0
+- vis hPosition,0
+- vis hTilt,0
+- vis bTLeft,0
+- vis bTStop,0
+- vis bTRight,0
+- //page open event
+- // event,pageOpenDetail,typeOfPage,tEntityName
+- // craft command
+- tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
+ popupShutter.bco=defaultBcoColor
+ b0.bco=defaultBcoColor
+ tIcon1.bco=defaultBcoColor
+@@ -74,6 +46,34 @@
+ hPosition.pic1=13
+ hPosition.pic2=15
+ }
++ dim=dimValueNormal
++ //get entitiy name
++ tEntity.txt=pageIcons.tTmp1.txt
++ //get entity id
++ entn.txt=pageIcons.tTmp2.txt
++ vis p0,0
++ vis tSend,0
++ vis tPosHeading,0
++ vis hPosition,0
++ vis hTilt,0
++ vis bTLeft,0
++ vis bTStop,0
++ vis bTRight,0
++ //page open event
++ // event,pageOpenDetail,typeOfPage,tEntityName
++ // craft command
++ tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
+
+ Variable (string) strCommand
+ Attributes
@@ -143,7 +143,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -661,4 +776,4 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+ Max. Text Size : 15
Picture p0
- Attributes
+ Attributes
\ No newline at end of file
diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt
index 39bab6ab..a51e745b 100644
--- a/HMI/US/portrait/diff-filtered.txt
+++ b/HMI/US/portrait/diff-filtered.txt
@@ -1,59 +1,109 @@
-+++ HMI/US/portrait/diff-eu-version.txt 2022-07-12 19:48:19.341452154 +0000
-+--- HMI/n2t-out/Program.s.txt 2022-07-12 19:48:18.749451287 +0000
-++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-12 19:48:19.285452072 +0000
++++ HMI/US/portrait/diff-eu-version.txt 2022-07-13 16:57:07.016403820 +0000
++--- HMI/n2t-out/Program.s.txt 2022-07-13 16:57:06.544404168 +0000
+++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
-+--- HMI/n2t-out/cardAlarm.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-12 19:48:19.285452072 +0000
-+@@ -12,15 +12,11 @@
++--- HMI/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.548404165 +0000
+++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -12,6 +12,21 @@
+
+ Events
+ Preinitialize Event
+++ for(sys0=0;sys0<40;sys0++)
+++ {
+++ b[sys0].bco=defaultBcoColor
+++ b[sys0].pco=defaultFontColor
+++ }
+++ if(defaultBcoColor==0)
+++ {
+++ tCode.bco=6371
+++ tCode.pco=40179
+++ }
+++ if(defaultBcoColor==6371)
+++ {
+++ tCode.bco=10565
+++ tCode.pco=40179
+++ }
++ dim=dimValueNormal
++ vis p0,0
++ vis tSend,0
++@@ -37,25 +52,6 @@
++ vis tCode,0
++ vis bPrev,0
++ vis bNext,0
+- cardAlarm.bco=defaultBcoColor
-+ for(sys0=0;sys0<40;sys0++)
-+ {
++- for(sys0=0;sys0<40;sys0++)
++- {
+- if(b[sys0].type==98||b[sys0].type==116)
+- {
-+ b[sys0].bco=defaultBcoColor
-+ b[sys0].pco=defaultFontColor
-+ }
++- b[sys0].bco=defaultBcoColor
++- b[sys0].pco=defaultFontColor
++- }
+- }
-+ if(defaultBcoColor==0)
-+ {
-+ tCode.bco=6371
-+@@ -142,7 +138,7 @@
-+ Disable release event after dragging: 0
-+ Send Component ID : disabled
-+ Associated Keyboard : none
-+- Text : xxxxxxx
-++ Text :
-+ Max. Text Size : 10
-+
-+ Text tIcon
-+--- HMI/n2t-out/cardEntities.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-12 19:48:19.289452078 +0000
-+@@ -12,14 +12,10 @@
++- if(defaultBcoColor==0)
++- {
++- tCode.bco=6371
++- tCode.pco=40179
++- }
++- if(defaultBcoColor==6371)
++- {
++- tCode.bco=10565
++- tCode.pco=40179
++- }
++
++ Variable (string) strCommand
++ Attributes
++--- HMI/n2t-out/cardEntities.txt 2022-07-13 16:57:06.548404165 +0000
+++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-13 16:57:06.976403850 +0000
++@@ -12,6 +12,22 @@
+
+ Events
+ Preinitialize Event
+++ for(sys0=0;sys0<40;sys0++)
+++ {
+++ b[sys0].bco=defaultBcoColor
+++ b[sys0].pco=defaultFontColor
+++ if(b[sys0].type==53&&defaultBcoColor==0)
+++ {
+++ b[sys0].pic=10
+++ b[sys0].pic2=11
+++ }
+++ if(b[sys0].type==1&&defaultBcoColor==0)
+++ {
+++ b[sys0].pic=14
+++ b[sys0].pic1=13
+++ b[sys0].pic2=15
+++ }
+++ }
++ dim=dimValueNormal
++ //wup=cardEntities
++ //remove background & activate reparse mode
++@@ -65,26 +81,18 @@
++ vis bPrev,0
++ vis bNext,0
+- cardEntities.bco=defaultBcoColor
+- for(sys0=0;sys0<65;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
-++ for(sys0=0;sys0<40;sys0++)
-+ {
-+ b[sys0].bco=defaultBcoColor
-+ b[sys0].pco=defaultFontColor
++- {
++- b[sys0].bco=defaultBcoColor
++- b[sys0].pco=defaultFontColor
+- }
-+ if(b[sys0].type==53&&defaultBcoColor==0)
-+ {
-+ b[sys0].pic=10
-+@@ -85,6 +81,18 @@
-+ vis bPrev,0
-+ vis bNext,0
++- if(b[sys0].type==53&&defaultBcoColor==0)
++- {
++- b[sys0].pic=10
++- b[sys0].pic2=11
++- }
++- if(b[sys0].type==1&&defaultBcoColor==0)
++- {
++- b[sys0].pic=14
++- b[sys0].pic1=13
++- b[sys0].pic2=15
++- }
++- }
++ vis bPrev,0
++ vis bNext,0
+ Variable (string) strCommand
@@ -68,13 +118,10 @@
+@@ -990,6 +1167,33 @@
+@@ -1028,10 +1232,6 @@
+ //popupLight.tEntity.txt=tEntity3.txt
-+ page popupLight
-+ }
+- if(type3.txt=="fan")
+- {
+- page popupFan
+- }
-+
+ Hotspot m1
+ Attributes
+@@ -1054,10 +1254,6 @@
@@ -90,10 +137,13 @@
+ Attributes
+@@ -1080,10 +1276,6 @@
+ //popupLight.tEntity.txt=tEntity1.txt
++ page popupLight
++ }
+- if(type1.txt=="fan")
+- {
+- page popupFan
+- }
++
+ Hotspot m3
+ Attributes
+@@ -1106,9 +1298,27 @@
@@ -107,25 +157,35 @@
+ }
+
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
-+--- HMI/n2t-out/cardGrid.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-12 19:48:19.289452078 +0000
-+@@ -12,15 +12,11 @@
++--- HMI/n2t-out/cardGrid.txt 2022-07-13 16:57:06.548404165 +0000
+++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -12,6 +12,11 @@
+
+ Events
+ Preinitialize Event
+++ for(sys0=0;sys0<40;sys0++)
+++ {
+++ b[sys0].bco=defaultBcoColor
+++ b[sys0].pco=defaultFontColor
+++ }
++ dim=dimValueNormal
++ //remove background & activate reparse mode
++ vis p0,0
++@@ -36,15 +41,6 @@
++ vis tEntity6,0
++ vis bPrev,0
++ vis bNext,0
+- cardGrid.bco=defaultBcoColor
+- for(sys0=0;sys0<42;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
-++ for(sys0=0;sys0<40;sys0++)
-+ {
-+ b[sys0].bco=defaultBcoColor
-+ b[sys0].pco=defaultFontColor
-+ }
++- {
++- b[sys0].bco=defaultBcoColor
++- b[sys0].pco=defaultFontColor
++- }
+- }
-+ dim=dimValueNormal
-+ //remove background & activate reparse mode
-+ vis p0,0
++
++ Variable (string) strCommand
+@@ -932,10 +928,6 @@
+ {
+ page popupLight
@@ -137,12 +197,20 @@
+
+ TouchCap tc0
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
-+--- HMI/n2t-out/cardMedia.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-12 19:48:19.289452078 +0000
-+@@ -12,15 +12,11 @@
-+
++--- HMI/n2t-out/cardMedia.txt 2022-07-13 16:57:06.548404165 +0000
+++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -12,30 +12,26 @@
+ Events
+ Preinitialize Event
++- dim=dimValueNormal
++- vis p0,0
++- vis tSend,0
++- vis tInstruction,0
++- vis tTmp,0
++- vis tId,0
++- vis t5,0
++- vis bPrev,0
++- vis bNext,0
+- cardMedia.bco=defaultBcoColor
+- for(sys0=0;sys0<34;sys0++)
+- {
@@ -156,11 +224,28 @@
+ if(defaultBcoColor==0)
+ {
+ hVolume.pic=14
-+--- HMI/n2t-out/cardQR.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-12 19:48:19.285452072 +0000
-+@@ -12,25 +12,6 @@
-+ Events
-+ Preinitialize Event
++ hVolume.pic1=13
++ hVolume.pic2=15
++ }
+++ dim=dimValueNormal
+++ vis p0,0
+++ vis tSend,0
+++ vis tInstruction,0
+++ vis tTmp,0
+++ vis tId,0
+++ vis t5,0
+++ vis bPrev,0
+++ vis bNext,0
++
++ Variable (string) strCommand
++ Attributes
++diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
++--- HMI/n2t-out/cardQR.txt 2022-07-13 16:57:06.548404165 +0000
+++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -32,25 +32,6 @@
++ vis bText2,0
++ tsw m0,0
++ tsw m1,0
+- cardQR.bco=defaultBcoColor
+- for(sys0=0;sys0<32;sys0++)
+- {
@@ -180,16 +265,16 @@
+- b[sys0].pic2=11
+- }
+- }
-+ dim=dimValueNormal
-+ vis p0,0
-+ vis tSend,0
++
++ Variable (string) strCommand
++ Attributes
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
-+--- HMI/n2t-out/cardThermo.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-12 19:48:19.289452078 +0000
-+@@ -12,21 +12,6 @@
-+
-+ Events
-+ Preinitialize Event
++--- HMI/n2t-out/cardThermo.txt 2022-07-13 16:57:06.548404165 +0000
+++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -41,21 +41,6 @@
++ vis xTempDest1,0
++ vis bPrev,0
++ vis bNext,0
+- cardThermo.bco=defaultBcoColor
+- for(sys0=0;sys0<53;sys0++)
+- {
@@ -205,14 +290,13 @@
+- b[sys0].pco=defaultFontColor
+- }
+- }
-+ dim=dimValueNormal
-+ vis p0,0
-+ vis tSend,0
-+--- HMI/n2t-out/pageStartup.txt 2022-07-12 19:48:18.749451287 +0000
-++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-12 19:48:19.289452078 +0000
++
++ Variable (string) strCommand
++--- HMI/n2t-out/pageStartup.txt 2022-07-13 16:57:06.544404168 +0000
+++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-13 16:57:06.972403853 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
-+--- HMI/n2t-out/pageTest.txt 2022-07-12 19:48:18.749451287 +0000
-++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-12 19:48:19.285452072 +0000
++--- HMI/n2t-out/pageTest.txt 2022-07-13 16:57:06.544404168 +0000
+++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -13,46 +13,6 @@
+ Events
+ Preinitialize Event
@@ -262,67 +346,27 @@
+ Attributes
+Only in HMI/n2t-out: popupFan.txt
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
-+--- HMI/n2t-out/popupLight.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-12 19:48:19.285452072 +0000
-+@@ -12,29 +12,6 @@
-+
-+ Events
-+ Preinitialize Event
++--- HMI/n2t-out/popupLight.txt 2022-07-13 16:57:06.544404168 +0000
+++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -50,14 +50,10 @@
++ vis t0,0
++ vis pColorWheel,0
++ //vis t0,0
+- popupLight.bco=defaultBcoColor
+- for(sys0=0;sys0<27;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
-+- {
-+- b[sys0].bco=defaultBcoColor
-+- b[sys0].pco=defaultFontColor
-+- }
-+- if(b[sys0].type==53&&defaultBcoColor==0)
-+- {
-+- b[sys0].pic=10
-+- b[sys0].pic2=11
-+- }
-+- }
-+- if(defaultBcoColor==0)
-+- {
-+- hBrightness.pic=14
-+- hBrightness.pic1=13
-+- hBrightness.pic2=15
-+- hTempSlider.pic=16
-+- hTempSlider.pic1=17
-+- hTempSlider.pic2=15
-+- }
-+ dim=dimValueNormal
-+ //get entitiy name
-+ tEntity.txt=pageIcons.tTmp1.txt
-+@@ -73,6 +50,25 @@
-+ vis t0,0
-+ vis pColorWheel,0
-+ //vis t0,0
++ for(sys0=0;sys0<40;sys0++)
-++ {
-++ b[sys0].bco=defaultBcoColor
-++ b[sys0].pco=defaultFontColor
-++ if(b[sys0].type==53&&defaultBcoColor==0)
-++ {
-++ b[sys0].pic=10
-++ b[sys0].pic2=11
-++ }
-++ }
-++ if(defaultBcoColor==0)
-++ {
-++ hBrightness.pic=14
-++ hBrightness.pic1=13
-++ hBrightness.pic2=15
-++ hTempSlider.pic=16
-++ hTempSlider.pic1=17
-++ hTempSlider.pic2=15
-++ }
-+
-+ Variable (string) strCommand
-+ Attributes
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++- }
++ if(b[sys0].type==53&&defaultBcoColor==0)
++ {
++ b[sys0].pic=10
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
-+--- HMI/n2t-out/popupNotify.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-12 19:48:19.285452072 +0000
++--- HMI/n2t-out/popupNotify.txt 2022-07-13 16:57:06.544404168 +0000
+++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-07-13 16:57:06.972403853 +0000
+@@ -12,24 +12,12 @@
+
+ Events
@@ -349,8 +393,78 @@
+ Variable (string) strCommand
+ Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
-+--- HMI/n2t-out/popupShutter.txt 2022-07-12 19:48:18.753451293 +0000
-++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-12 19:48:19.285452072 +0000
++--- HMI/n2t-out/popupShutter.txt 2022-07-13 16:57:06.544404168 +0000
+++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-13 16:57:06.972403853 +0000
++@@ -12,34 +12,6 @@
++
++ Events
++ Preinitialize Event
++- dim=dimValueNormal
++- //get entitiy name
++- tEntity.txt=pageIcons.tTmp1.txt
++- //get entity id
++- entn.txt=pageIcons.tTmp2.txt
++- vis p0,0
++- vis tSend,0
++- vis tPosHeading,0
++- vis hPosition,0
++- vis hTilt,0
++- vis bTLeft,0
++- vis bTStop,0
++- vis bTRight,0
++- //page open event
++- // event,pageOpenDetail,typeOfPage,tEntityName
++- // craft command
++- tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
++ popupShutter.bco=defaultBcoColor
++ b0.bco=defaultBcoColor
++ tIcon1.bco=defaultBcoColor
++@@ -74,6 +46,34 @@
++ hPosition.pic1=13
++ hPosition.pic2=15
++ }
+++ dim=dimValueNormal
+++ //get entitiy name
+++ tEntity.txt=pageIcons.tTmp1.txt
+++ //get entity id
+++ entn.txt=pageIcons.tTmp2.txt
+++ vis p0,0
+++ vis tSend,0
+++ vis tPosHeading,0
+++ vis hPosition,0
+++ vis hTilt,0
+++ vis bTLeft,0
+++ vis bTStop,0
+++ vis bTRight,0
+++ //page open event
+++ // event,pageOpenDetail,typeOfPage,tEntityName
+++ // craft command
+++ tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
++
++ Variable (string) strCommand
++ Attributes
+@@ -143,7 +143,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -368,4 +482,4 @@
++ Max. Text Size : 15
+
+ Picture p0
-+ Attributes
++ Attributes
\ No newline at end of file
diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt
index 36ded3ce..96c94fc6 100644
--- a/HMI/n2t-out-visual/cardAlarm.txt
+++ b/HMI/n2t-out-visual/cardAlarm.txt
@@ -20,25 +20,6 @@ Page cardAlarm
Events
Preinitialize Event
- cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
- if(defaultBcoColor==0)
- {
- tCode.bco=6371
- tCode.pco=40179
- }
- if(defaultBcoColor==6371)
- {
- tCode.bco=10565
- tCode.pco=40179
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -64,6 +45,25 @@ Page cardAlarm
vis tCode,0
vis bPrev,0
vis bNext,0
+ cardAlarm.bco=defaultBcoColor
+ for(sys0=0;sys0<40;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ tCode.bco=6371
+ tCode.pco=40179
+ }
+ if(defaultBcoColor==6371)
+ {
+ tCode.bco=10565
+ tCode.pco=40179
+ }
Variable (string) strCommand
Attributes
@@ -235,7 +235,7 @@ Text tCode
Horizontal Alignment : center
Vertical Alignment : center
Input Type : password
- Text : xxxxxxx
+ Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt
index 37358fc4..7bccd9f5 100644
--- a/HMI/n2t-out-visual/cardEntities.txt
+++ b/HMI/n2t-out-visual/cardEntities.txt
@@ -20,26 +20,6 @@ Page cardEntities
Events
Preinitialize Event
- cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- if(b[sys0].type==1&&defaultBcoColor==0)
- {
- b[sys0].pic=14
- b[sys0].pic1=13
- b[sys0].pic2=15
- }
- }
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -93,6 +73,26 @@ Page cardEntities
vis nNum4,0
vis bPrev,0
vis bNext,0
+ cardEntities.bco=defaultBcoColor
+ for(sys0=0;sys0<65;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ if(b[sys0].type==1&&defaultBcoColor==0)
+ {
+ b[sys0].pic=14
+ b[sys0].pic1=13
+ b[sys0].pic2=15
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt
index a0977a00..96ef28b1 100644
--- a/HMI/n2t-out-visual/cardGrid.txt
+++ b/HMI/n2t-out-visual/cardGrid.txt
@@ -20,15 +20,6 @@ Page cardGrid
Events
Preinitialize Event
- cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -53,6 +44,15 @@ Page cardGrid
vis tEntity6,0
vis bPrev,0
vis bNext,0
+ cardGrid.bco=defaultBcoColor
+ for(sys0=0;sys0<42;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt
index 2ec4cc20..cb66a40b 100644
--- a/HMI/n2t-out-visual/cardMedia.txt
+++ b/HMI/n2t-out-visual/cardMedia.txt
@@ -20,6 +20,15 @@ Page cardMedia
Events
Preinitialize Event
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis t5,0
+ vis bPrev,0
+ vis bNext,0
cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++)
{
@@ -35,15 +44,6 @@ Page cardMedia
hVolume.pic1=13
hVolume.pic2=15
}
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
- vis tInstruction,0
- vis tTmp,0
- vis tId,0
- vis t5,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt
index 02601aac..472b2c98 100644
--- a/HMI/n2t-out-visual/cardQR.txt
+++ b/HMI/n2t-out-visual/cardQR.txt
@@ -20,25 +20,6 @@ Page cardQR
Events
Preinitialize Event
- cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==6371)
- {
- b[sys0].pic=1
- b[sys0].pic2=2
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -59,6 +40,25 @@ Page cardQR
vis bText2,0
tsw m0,0
tsw m1,0
+ cardQR.bco=defaultBcoColor
+ for(sys0=0;sys0<32;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==6371)
+ {
+ b[sys0].pic=1
+ b[sys0].pic2=2
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt
index e054f48c..91265578 100644
--- a/HMI/n2t-out-visual/cardThermo.txt
+++ b/HMI/n2t-out-visual/cardThermo.txt
@@ -20,21 +20,6 @@ Page cardThermo
Events
Preinitialize Event
- cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].bco2=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -64,6 +49,21 @@ Page cardThermo
vis xTempDest1,0
vis bPrev,0
vis bNext,0
+ cardThermo.bco=defaultBcoColor
+ for(sys0=0;sys0<53;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].bco2=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt
index 95b6f55c..c5caa32a 100644
--- a/HMI/n2t-out-visual/nspanel_Stats.txt
+++ b/HMI/n2t-out-visual/nspanel_Stats.txt
@@ -14,10 +14,14 @@ pageStartup
19 Component(s)
167 Line(s) of event code
122 Unique line(s) of event code
-popupLight
- 27 Component(s)
- 386 Line(s) of event code
+popupShutter
+ 25 Component(s)
+ 388 Line(s) of event code
211 Unique line(s) of event code
+popupFan
+ 20 Component(s)
+ 234 Line(s) of event code
+ 148 Unique line(s) of event code
screensaver
38 Component(s)
332 Line(s) of event code
@@ -26,18 +30,10 @@ popupNotify
17 Component(s)
226 Line(s) of event code
143 Unique line(s) of event code
-popupFan
- 20 Component(s)
- 234 Line(s) of event code
- 148 Unique line(s) of event code
-popupShutter
- 25 Component(s)
- 388 Line(s) of event code
+popupLight
+ 27 Component(s)
+ 386 Line(s) of event code
211 Unique line(s) of event code
-cardQR
- 32 Component(s)
- 403 Line(s) of event code
- 234 Unique line(s) of event code
cardMedia
34 Component(s)
388 Line(s) of event code
@@ -46,14 +42,18 @@ cardGrid
42 Component(s)
462 Line(s) of event code
271 Unique line(s) of event code
-cardThermo
- 53 Component(s)
- 580 Line(s) of event code
- 303 Unique line(s) of event code
+cardQR
+ 32 Component(s)
+ 403 Line(s) of event code
+ 234 Unique line(s) of event code
cardAlarm
40 Component(s)
421 Line(s) of event code
254 Unique line(s) of event code
+cardThermo
+ 53 Component(s)
+ 580 Line(s) of event code
+ 303 Unique line(s) of event code
cardEntities
65 Component(s)
1179 Line(s) of event code
diff --git a/HMI/n2t-out-visual/popupFan.txt b/HMI/n2t-out-visual/popupFan.txt
index 2f0eea47..5ae5d4f2 100644
--- a/HMI/n2t-out-visual/popupFan.txt
+++ b/HMI/n2t-out-visual/popupFan.txt
@@ -20,26 +20,6 @@ Page popupFan
Events
Preinitialize Event
- popupFan.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
- if(defaultBcoColor==0)
- {
- hSpeed.pic=14
- hSpeed.pic1=13
- hSpeed.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -66,6 +46,26 @@ Page popupFan
prints tSend.txt,0
prints crcval,2
vis hSpeed,0
+ popupFan.bco=defaultBcoColor
+ for(sys0=0;sys0<40;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hSpeed.pic=14
+ hSpeed.pic1=13
+ hSpeed.pic2=15
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt
index 4953d697..35290e65 100644
--- a/HMI/n2t-out-visual/popupLight.txt
+++ b/HMI/n2t-out-visual/popupLight.txt
@@ -20,29 +20,6 @@ Page popupLight
Events
Preinitialize Event
- popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
- if(defaultBcoColor==0)
- {
- hBrightness.pic=14
- hBrightness.pic1=13
- hBrightness.pic2=15
- hTempSlider.pic=16
- hTempSlider.pic1=17
- hTempSlider.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -81,6 +58,29 @@ Page popupLight
vis t0,0
vis pColorWheel,0
//vis t0,0
+ popupLight.bco=defaultBcoColor
+ for(sys0=0;sys0<27;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hBrightness.pic=14
+ hBrightness.pic1=13
+ hBrightness.pic2=15
+ hTempSlider.pic=16
+ hTempSlider.pic1=17
+ hTempSlider.pic2=15
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt
index 0d2aba83..e1960332 100644
--- a/HMI/n2t-out-visual/popupShutter.txt
+++ b/HMI/n2t-out-visual/popupShutter.txt
@@ -20,6 +20,34 @@ Page popupShutter
Events
Preinitialize Event
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+ //get entity id
+ entn.txt=pageIcons.tTmp2.txt
+ vis p0,0
+ vis tSend,0
+ vis tPosHeading,0
+ vis hPosition,0
+ vis hTilt,0
+ vis bTLeft,0
+ vis bTStop,0
+ vis bTRight,0
+ //page open event
+ // event,pageOpenDetail,typeOfPage,tEntityName
+ // craft command
+ tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor
@@ -54,34 +82,6 @@ Page popupShutter
hPosition.pic1=13
hPosition.pic2=15
}
- dim=dimValueNormal
- //get entitiy name
- tEntity.txt=pageIcons.tTmp1.txt
- //get entity id
- entn.txt=pageIcons.tTmp2.txt
- vis p0,0
- vis tSend,0
- vis tPosHeading,0
- vis hPosition,0
- vis hTilt,0
- vis bTLeft,0
- vis bTStop,0
- vis bTRight,0
- //page open event
- // event,pageOpenDetail,typeOfPage,tEntityName
- // craft command
- tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt
index 6ca40476..4018e695 100644
--- a/HMI/n2t-out/cardAlarm.txt
+++ b/HMI/n2t-out/cardAlarm.txt
@@ -12,25 +12,6 @@ Page cardAlarm
Events
Preinitialize Event
- cardAlarm.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
- if(defaultBcoColor==0)
- {
- tCode.bco=6371
- tCode.pco=40179
- }
- if(defaultBcoColor==6371)
- {
- tCode.bco=10565
- tCode.pco=40179
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -56,6 +37,25 @@ Page cardAlarm
vis tCode,0
vis bPrev,0
vis bNext,0
+ cardAlarm.bco=defaultBcoColor
+ for(sys0=0;sys0<40;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ tCode.bco=6371
+ tCode.pco=40179
+ }
+ if(defaultBcoColor==6371)
+ {
+ tCode.bco=10565
+ tCode.pco=40179
+ }
Variable (string) strCommand
Attributes
@@ -142,7 +142,7 @@ Text tCode
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : xxxxxxx
+ Text :
Max. Text Size : 10
Text tIcon
diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt
index 768577c1..b39b9143 100644
--- a/HMI/n2t-out/cardEntities.txt
+++ b/HMI/n2t-out/cardEntities.txt
@@ -12,26 +12,6 @@ Page cardEntities
Events
Preinitialize Event
- cardEntities.bco=defaultBcoColor
- for(sys0=0;sys0<65;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- if(b[sys0].type==1&&defaultBcoColor==0)
- {
- b[sys0].pic=14
- b[sys0].pic1=13
- b[sys0].pic2=15
- }
- }
dim=dimValueNormal
//wup=cardEntities
//remove background & activate reparse mode
@@ -85,6 +65,26 @@ Page cardEntities
vis nNum4,0
vis bPrev,0
vis bNext,0
+ cardEntities.bco=defaultBcoColor
+ for(sys0=0;sys0<65;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ if(b[sys0].type==1&&defaultBcoColor==0)
+ {
+ b[sys0].pic=14
+ b[sys0].pic1=13
+ b[sys0].pic2=15
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt
index 9a56a4ef..cb8a8847 100644
--- a/HMI/n2t-out/cardGrid.txt
+++ b/HMI/n2t-out/cardGrid.txt
@@ -12,15 +12,6 @@ Page cardGrid
Events
Preinitialize Event
- cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -45,6 +36,15 @@ Page cardGrid
vis tEntity6,0
vis bPrev,0
vis bNext,0
+ cardGrid.bco=defaultBcoColor
+ for(sys0=0;sys0<42;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt
index 9c406e35..c1e67e37 100644
--- a/HMI/n2t-out/cardMedia.txt
+++ b/HMI/n2t-out/cardMedia.txt
@@ -12,6 +12,15 @@ Page cardMedia
Events
Preinitialize Event
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis t5,0
+ vis bPrev,0
+ vis bNext,0
cardMedia.bco=defaultBcoColor
for(sys0=0;sys0<34;sys0++)
{
@@ -27,15 +36,6 @@ Page cardMedia
hVolume.pic1=13
hVolume.pic2=15
}
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
- vis tInstruction,0
- vis tTmp,0
- vis tId,0
- vis t5,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt
index ef65b734..62ad8746 100644
--- a/HMI/n2t-out/cardQR.txt
+++ b/HMI/n2t-out/cardQR.txt
@@ -12,25 +12,6 @@ Page cardQR
Events
Preinitialize Event
- cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==6371)
- {
- b[sys0].pic=1
- b[sys0].pic2=2
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -51,6 +32,25 @@ Page cardQR
vis bText2,0
tsw m0,0
tsw m1,0
+ cardQR.bco=defaultBcoColor
+ for(sys0=0;sys0<32;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==6371)
+ {
+ b[sys0].pic=1
+ b[sys0].pic2=2
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt
index 0f990088..bac9c333 100644
--- a/HMI/n2t-out/cardThermo.txt
+++ b/HMI/n2t-out/cardThermo.txt
@@ -12,21 +12,6 @@ Page cardThermo
Events
Preinitialize Event
- cardThermo.bco=defaultBcoColor
- for(sys0=0;sys0<53;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].bco2=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
dim=dimValueNormal
vis p0,0
vis tSend,0
@@ -56,6 +41,21 @@ Page cardThermo
vis xTempDest1,0
vis bPrev,0
vis bNext,0
+ cardThermo.bco=defaultBcoColor
+ for(sys0=0;sys0<53;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==59)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].bco2=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/popupFan.txt b/HMI/n2t-out/popupFan.txt
index af90ee28..c8f47c64 100644
--- a/HMI/n2t-out/popupFan.txt
+++ b/HMI/n2t-out/popupFan.txt
@@ -12,26 +12,6 @@ Page popupFan
Events
Preinitialize Event
- popupFan.bco=defaultBcoColor
- for(sys0=0;sys0<40;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
- if(defaultBcoColor==0)
- {
- hSpeed.pic=14
- hSpeed.pic1=13
- hSpeed.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -58,6 +38,26 @@ Page popupFan
prints tSend.txt,0
prints crcval,2
vis hSpeed,0
+ popupFan.bco=defaultBcoColor
+ for(sys0=0;sys0<40;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hSpeed.pic=14
+ hSpeed.pic1=13
+ hSpeed.pic2=15
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt
index 69c84d9d..cb0959db 100644
--- a/HMI/n2t-out/popupLight.txt
+++ b/HMI/n2t-out/popupLight.txt
@@ -12,29 +12,6 @@ Page popupLight
Events
Preinitialize Event
- popupLight.bco=defaultBcoColor
- for(sys0=0;sys0<27;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
- if(defaultBcoColor==0)
- {
- hBrightness.pic=14
- hBrightness.pic1=13
- hBrightness.pic2=15
- hTempSlider.pic=16
- hTempSlider.pic1=17
- hTempSlider.pic2=15
- }
dim=dimValueNormal
//get entitiy name
tEntity.txt=pageIcons.tTmp1.txt
@@ -73,6 +50,29 @@ Page popupLight
vis t0,0
vis pColorWheel,0
//vis t0,0
+ popupLight.bco=defaultBcoColor
+ for(sys0=0;sys0<27;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
+ if(b[sys0].type==53&&defaultBcoColor==0)
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hBrightness.pic=14
+ hBrightness.pic1=13
+ hBrightness.pic2=15
+ hTempSlider.pic=16
+ hTempSlider.pic1=17
+ hTempSlider.pic2=15
+ }
Variable (string) strCommand
Attributes
diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt
index e1e20a81..12468be5 100644
--- a/HMI/n2t-out/popupShutter.txt
+++ b/HMI/n2t-out/popupShutter.txt
@@ -12,6 +12,34 @@ Page popupShutter
Events
Preinitialize Event
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+ //get entity id
+ entn.txt=pageIcons.tTmp2.txt
+ vis p0,0
+ vis tSend,0
+ vis tPosHeading,0
+ vis hPosition,0
+ vis hTilt,0
+ vis bTLeft,0
+ vis bTStop,0
+ vis bTRight,0
+ //page open event
+ // event,pageOpenDetail,typeOfPage,tEntityName
+ // craft command
+ tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
popupShutter.bco=defaultBcoColor
b0.bco=defaultBcoColor
tIcon1.bco=defaultBcoColor
@@ -46,34 +74,6 @@ Page popupShutter
hPosition.pic1=13
hPosition.pic2=15
}
- dim=dimValueNormal
- //get entitiy name
- tEntity.txt=pageIcons.tTmp1.txt
- //get entity id
- entn.txt=pageIcons.tTmp2.txt
- vis p0,0
- vis tSend,0
- vis tPosHeading,0
- vis hPosition,0
- vis hTilt,0
- vis bTLeft,0
- vis bTStop,0
- vis bTRight,0
- //page open event
- // event,pageOpenDetail,typeOfPage,tEntityName
- // craft command
- tSend.txt="event,pageOpenDetail,popupShutter,"+entn.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
Variable (string) strCommand
Attributes
diff --git a/docs/notifications.md b/docs/notifications.md
index e4eaf1c8..c75304af 100644
--- a/docs/notifications.md
+++ b/docs/notifications.md
@@ -2,21 +2,19 @@
There are two notification types, that can be triggered by sending a command over mqtt to the panel here are examples for homeassistant scripts:
-
-Seperate Page
-
+## Seperate Page
- This is the notification used by the backend for updates, opening it requires to the following commands to the CustomSend Topic:
+This is the notification used by the backend for updates, opening it requires to the following commands to the CustomSend Topic:
- `pageType popupNotify`
+`pageType popupNotify`
- `entityUpdateDetail~internalName~heading~headingColor~button1text~button1color~button2text~tB2Color~notificationText~textColor~sleepTimeout`
+`entityUpdateDetail~internalName~heading~headingColor~button1text~button1color~button2text~tB2Color~notificationText~textColor~sleepTimeout`
- It is possible to exit from the page by sending `exitPopup`
+It is possible to exit from the page by sending `exitPopup`
Send Message to the Panel combined with a buzzer sound:
- ```yaml
+ ```
nspanel_popup_notification:
alias: Popup Notification
sequence:
@@ -31,7 +29,7 @@ nspanel_popup_notification:
Send Message to the Panel:
- ```yaml
+ ```
nspanel_popup_notification:
alias: Popup Notification
sequence:
@@ -43,19 +41,16 @@ nspanel_popup_notification:
mode: single
icon: mdi:message-badge
```
-
-
-Notification on screensaver
-
+## Notification on screensaver
- The screensaver can display Notifications by sending this command to the CustomSend topic: `notify~heading~text`
+The screensaver can display Notifications by sending this command to the CustomSend topic: `notify~heading~text`
Send Message to the Screensaver combined with a buzzer sound:
- ```yaml
+ ```
nspanel_screensaver_notification:
alias: Screensaver Notification
sequence:
@@ -69,7 +64,7 @@ nspanel_screensaver_notification:
Send Message to the Screensaver:
- ```yaml
+ ```
nspanel_screensaver_notification:
alias: Screensaver Notification
sequence:
@@ -80,6 +75,4 @@ nspanel_screensaver_notification:
mode: single
icon: mdi:message-badge
```
-
-
diff --git a/mkdocs.yml b/mkdocs.yml
index 9adc7de4..efac9dd2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -55,8 +55,8 @@ markdown_extensions:
permalink: true
- codehilite:
guess_lang: false
- - markdown_include.include:
- base_path: docs
+# - markdown_include.include:
+# base_path: docs
plugins:
- search:
@@ -86,8 +86,6 @@ nav:
- "Notifications": notifications.md
- "Physical Buttons": phys-btn.md
-
-
- "Getting started (ioBroker)":
- "Prepare NsPanel": prepare_nspanel2.md
- - "Prepare ioBroker": iobroker-install.md
\ No newline at end of file
+ - "Prepare ioBroker": iobroker-install.md