h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-03 21:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-07-13 16:57:11 +00:00
committed by github-actions[bot]
parent a46e9f5eb0
commit d84f869adf
22 changed files with 916 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

373
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
--- 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

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

@@ -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