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

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

Browse Source
This commit is contained in:
joBr99
2023-08-20 12:42:36 +00:00
committed by github-actions[bot]
parent a1104b8f81
commit 291102971a
21 changed files with 155 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
HMI/US/landscape/diff-eu-version.txt
View File

@@ -14,175 +14,6 @@
│ + //lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup │ page pageStartup
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -961,21 +961,16 @@
│ if(type1.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity1.txt
│ page popupShutter
│ }
│ if(type1.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity1.txt
│ + page popupLight
│ }
│ if(type1.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type1.txt=="input_sel")
│ {
│ @@ -1000,21 +995,16 @@
│ if(type2.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity2.txt
│ page popupShutter
│ }
│ if(type2.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity2.txt
│ + page popupLight
│ }
│ if(type2.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type2.txt=="input_sel")
│ {
│ @@ -1039,21 +1029,16 @@
│ if(type3.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity3.txt
│ page popupShutter
│ }
│ if(type3.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity3.txt
│ + page popupLight
│ }
│ if(type3.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type3.txt=="input_sel")
│ {
│ @@ -1078,21 +1063,16 @@
│ if(type4.txt=="shutter")
│ {
│ //popupShutter.tHeading.txt=tEntity4.txt
│ page popupShutter
│ }
│ if(type4.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + //popupLight.tEntity.txt=tEntity4.txt
│ + page popupLight
│ }
│ if(type4.txt=="fan")
│ {
│ page popupFan
│ }
│ if(type4.txt=="input_sel")
│ {
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -601,21 +601,15 @@
│ Period (ms): 500
│ Enabled : no
│
│ Events
│ Timer Event
│ if(tTmp.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + page popupLight
│ }
│ if(tTmp.txt=="fan")
│ {
│ page popupFan
│ }
│
│ Timer tmSerial
│ --- HMI/n2t-out/cardGrid2.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid2.txt
│ @@ -735,21 +735,15 @@
│ Period (ms): 500
│ Enabled : no
│
│ Events
│ Timer Event
│ if(tTmp.txt=="light")
│ {
│ - if(featNewSliders==1)
│ - {
│ - page popupLightNew
│ - }else
│ - {
│ - page popupLight
│ - }
│ + page popupLight
│ }
│ if(tTmp.txt=="fan")
│ {
│ page popupFan
│ }
│
│ Timer tmSerial
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -960,18 +960,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -164,15 +164,15 @@ │ @@ -164,15 +164,15 @@
@@ -223,25 +54,6 @@
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0 │ covx tTmp.txt,sleepTimeout,0,0
│ } │ }
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/landscape/n2t-out/popupLight.txt
│ @@ -631,15 +631,15 @@
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ if(tId.txt=="cardGrid2")
│ {
│ - page cardGrid2
│ + page cardGrid
│ }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ --- HMI/n2t-out/popupNotify.txt │ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt ├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@ │ @@ -295,19 +295,14 @@
@@ -319,36 +131,6 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard: none │ Associated Keyboard: none
│ Text : | │ Text : |
│ @@ -702,29 +679,14 @@
│ }
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,tNotifyText.pco,0,0
│ }
│ }
│ - if(tInstruction.txt=="getBrightness")
│ - {
│ - tSend.txt="event,getBrightnessResponse,"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs dim,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - }
│ if(tInstruction.txt=="pageType")
│ {
│ dim=100
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ --- HMI/n2t-out/screensaver2.txt │ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt ├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@
@@ -420,22 +202,3 @@
│ if(tAMPM.txt=="") │ if(tAMPM.txt=="")
│ { │ {
│ vis tAMPM,0 │ vis tAMPM,0
│ @@ -824,18 +800,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="timeout")
│ {
│ //set timeout to global var
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }

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

@@ -1856,8 +1856,13 @@ Hotspot m0
} }
if(type1.txt=="light") if(type1.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity1.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type1.txt=="fan") if(type1.txt=="fan")
{ {
@@ -1899,8 +1904,13 @@ Hotspot m1
} }
if(type2.txt=="light") if(type2.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity2.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type2.txt=="fan") if(type2.txt=="fan")
{ {
@@ -1942,8 +1952,13 @@ Hotspot m2
} }
if(type3.txt=="light") if(type3.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity3.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type3.txt=="fan") if(type3.txt=="fan")
{ {
@@ -1985,8 +2000,13 @@ Hotspot m3
} }
if(type4.txt=="light") if(type4.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity4.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type4.txt=="fan") if(type4.txt=="fan")
{ {

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

@@ -1052,7 +1052,13 @@ Timer tmLP
Timer Event Timer Event
if(tTmp.txt=="light") if(tTmp.txt=="light")
{ {
page popupLight if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
} }
if(tTmp.txt=="fan") if(tTmp.txt=="fan")
{ {

8
HMI/US/landscape/n2t-out-visual/cardGrid2.txt
View File

@@ -1274,7 +1274,13 @@ Timer tmLP
Timer Event Timer Event
if(tTmp.txt=="light") if(tTmp.txt=="light")
{ {
page popupLight if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
} }
if(tTmp.txt=="fan") if(tTmp.txt=="fan")
{ {

4
HMI/US/landscape/n2t-out-visual/cardPower.txt
View File

@@ -1652,6 +1652,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -58,10 +58,10 @@ screensaver
46 Component(s) 46 Component(s)
435 Line(s) of event code 435 Line(s) of event code
309 Unique line(s) of event code 309 Unique line(s) of event code
cardGrid2 cardPower
52 Component(s) 54 Component(s)
611 Line(s) of event code 531 Line(s) of event code
335 Unique line(s) of event code 349 Unique line(s) of event code
cardLChart cardLChart
33 Component(s) 33 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -74,29 +74,29 @@ cardMedia
59 Component(s) 59 Component(s)
649 Line(s) of event code 649 Line(s) of event code
322 Unique line(s) of event code 322 Unique line(s) of event code
screensaver2 cardGrid2
58 Component(s) 52 Component(s)
348 Line(s) of event code 617 Line(s) of event code
245 Unique line(s) of event code 338 Unique line(s) of event code
cardGrid
44 Component(s)
523 Line(s) of event code
295 Unique line(s) of event code
cardPower
54 Component(s)
527 Line(s) of event code
347 Unique line(s) of event code
cardEntities
67 Component(s)
1170 Line(s) of event code
532 Unique line(s) of event code
popupLight popupLight
28 Component(s) 28 Component(s)
412 Line(s) of event code 412 Line(s) of event code
226 Unique line(s) of event code 227 Unique line(s) of event code
cardGrid
44 Component(s)
529 Line(s) of event code
298 Unique line(s) of event code
cardEntities
67 Component(s)
1194 Line(s) of event code
535 Unique line(s) of event code
screensaver2
58 Component(s)
352 Line(s) of event code
247 Unique line(s) of event code
Total Total
23 Page(s) 23 Page(s)
875 Component(s) 875 Component(s)
10335 Line(s) of event code 10379 Line(s) of event code
2403 Unique line(s) of event code 2406 Unique line(s) of event code

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

@@ -75,8 +75,8 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14 hBrightness.pic=24
hBrightness.pic1=13 hBrightness.pic1=25
hBrightness.pic2=15 hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=17
@@ -984,7 +984,7 @@ Timer tmSerial
} }
if(tId.txt=="cardGrid2") if(tId.txt=="cardGrid2")
{ {
page cardGrid page cardGrid2
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {

4
HMI/US/landscape/n2t-out-visual/screensaver2.txt
View File

@@ -1617,6 +1617,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -965,8 +965,13 @@ Hotspot m0
} }
if(type1.txt=="light") if(type1.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity1.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type1.txt=="fan") if(type1.txt=="fan")
{ {
@@ -999,8 +1004,13 @@ Hotspot m1
} }
if(type2.txt=="light") if(type2.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity2.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type2.txt=="fan") if(type2.txt=="fan")
{ {
@@ -1033,8 +1043,13 @@ Hotspot m2
} }
if(type3.txt=="light") if(type3.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity3.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type3.txt=="fan") if(type3.txt=="fan")
{ {
@@ -1067,8 +1082,13 @@ Hotspot m3
} }
if(type4.txt=="light") if(type4.txt=="light")
{ {
//popupLight.tEntity.txt=tEntity4.txt if(featNewSliders==1)
page popupLight {
page popupLightNew
}else
{
page popupLight
}
} }
if(type4.txt=="fan") if(type4.txt=="fan")
{ {

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

@@ -605,7 +605,13 @@ Timer tmLP
Timer Event Timer Event
if(tTmp.txt=="light") if(tTmp.txt=="light")
{ {
page popupLight if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
} }
if(tTmp.txt=="fan") if(tTmp.txt=="fan")
{ {

8
HMI/US/landscape/n2t-out/cardGrid2.txt
View File

@@ -739,7 +739,13 @@ Timer tmLP
Timer Event Timer Event
if(tTmp.txt=="light") if(tTmp.txt=="light")
{ {
page popupLight if(featNewSliders==1)
{
page popupLightNew
}else
{
page popupLight
}
} }
if(tTmp.txt=="fan") if(tTmp.txt=="fan")
{ {

4
HMI/US/landscape/n2t-out/cardPower.txt
View File

@@ -964,6 +964,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -67,8 +67,8 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14 hBrightness.pic=24
hBrightness.pic1=13 hBrightness.pic1=25
hBrightness.pic2=15 hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=17
@@ -635,7 +635,7 @@ Timer tmSerial
} }
if(tId.txt=="cardGrid2") if(tId.txt=="cardGrid2")
{ {
page cardGrid page cardGrid2
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {

4
HMI/US/landscape/n2t-out/screensaver2.txt
View File

@@ -804,6 +804,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -1728,7 +1728,7 @@
│ } │ }
│ --- HMI/n2t-out/popupLight.txt │ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt ├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -48,15 +48,15 @@ │ @@ -48,33 +48,33 @@
│ vis hTempSlider,0 │ vis hTempSlider,0
│ //disable color wheel components by default │ //disable color wheel components by default
│ vis bColor,0 │ vis bColor,0
@@ -1745,13 +1745,17 @@
│ b[sys0].pco=defaultFontColor │ b[sys0].pco=defaultFontColor
│ } │ }
│ if(b[sys0].type==53&&defaultBcoColor==0) │ if(b[sys0].type==53&&defaultBcoColor==0)
│ @@ -66,15 +66,15 @@ │ {
│ b[sys0].pic=10
│ b[sys0].pic2=11
│ } │ }
│ } │ }
│ if(defaultBcoColor==0) │ if(defaultBcoColor==0)
│ { │ {
│ hBrightness.pic=14 │ - hBrightness.pic=24
│ hBrightness.pic1=13 │ - hBrightness.pic1=25
│ + hBrightness.pic=14
│ + hBrightness.pic1=13
│ hBrightness.pic2=15 │ hBrightness.pic2=15
│ - hTempSlider.pic=16 │ - hTempSlider.pic=16
│ + hTempSlider.pic=23 │ + hTempSlider.pic=23
@@ -1877,36 +1881,6 @@
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0 │ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco) │ if(tTime.bco!=screensaver.bco)
│ @@ -702,29 +673,14 @@
│ }
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,tNotifyText.pco,0,0
│ }
│ }
│ - if(tInstruction.txt=="getBrightness")
│ - {
│ - tSend.txt="event,getBrightnessResponse,"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs dim,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - }
│ if(tInstruction.txt=="pageType")
│ {
│ dim=100
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ --- HMI/n2t-out/screensaver2.txt │ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-08-20 12:32:07.109670758 +0000 +++ /dev/fd/62 2023-08-20 12:42:27.830750069 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@ +1 +12,11 @@
@@ -59,13 +59,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 38 + Max. Text Size: 38
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 38 + Max. Text Size: 38
+14 +185,26 @@ +14 +185,26 @@
+e (string) type6 +e (string) type6
@@ -1270,7 +1270,7 @@
+ } + }
+I/n2t-out/popupLight.txt +I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt ++ HMI/US/portrait/n2t-out/popupLight.txt
+5 +48,15 @@ +3 +48,33 @@
+ vis hTempSlider,0 + vis hTempSlider,0
+ //disable color wheel components by default + //disable color wheel components by default
+ vis bColor,0 + vis bColor,0
@@ -1287,11 +1287,15 @@
+ b[sys0].pco=defaultFontColor + b[sys0].pco=defaultFontColor
+ } + }
+ if(b[sys0].type==53&&defaultBcoColor==0) + if(b[sys0].type==53&&defaultBcoColor==0)
+5 +66,15 @@ + {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ } + }
+ } + }
+ if(defaultBcoColor==0) + if(defaultBcoColor==0)
+ { + {
+ hBrightness.pic=24
+ hBrightness.pic1=25
+ hBrightness.pic=14 + hBrightness.pic=14
+ hBrightness.pic1=13 + hBrightness.pic1=13
+ hBrightness.pic2=15 + hBrightness.pic2=15
@@ -1419,36 +1423,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0 + covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco) + if(tTime.bco!=screensaver.bco)
+29 +673,14 @@
+ }
+ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,tNotifyText.pco,0,0
+ }
+ }
+ if(tInstruction.txt=="getBrightness")
+ {
+ tSend.txt="event,getBrightnessResponse,"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs dim,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+ //save second arg if there's one
+I/n2t-out/screensaver2.txt +I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt
+7 +28,14 @@ +7 +28,14 @@

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

@@ -74,14 +74,14 @@ popupInSel
34 Component(s) 34 Component(s)
621 Line(s) of event code 621 Line(s) of event code
297 Unique line(s) of event code 297 Unique line(s) of event code
screensaver
47 Component(s)
457 Line(s) of event code
327 Unique line(s) of event code
cardPower cardPower
54 Component(s) 54 Component(s)
531 Line(s) of event code 531 Line(s) of event code
349 Unique line(s) of event code 349 Unique line(s) of event code
screensaver
47 Component(s)
444 Line(s) of event code
316 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
516 Line(s) of event code 516 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
878 Component(s) 878 Component(s)
10421 Line(s) of event code 10408 Line(s) of event code
2421 Unique line(s) of event code 2418 Unique line(s) of event code

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

@@ -75,8 +75,8 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14 hBrightness.pic=24
hBrightness.pic1=13 hBrightness.pic1=25
hBrightness.pic2=15 hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=17

15
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1299,21 +1299,6 @@ Timer tmSerial
covx tTmp.txt,tNotifyText.pco,0,0 covx tTmp.txt,tNotifyText.pco,0,0
} }
} }
if(tInstruction.txt=="getBrightness")
{
tSend.txt="event,getBrightnessResponse,"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs dim,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100

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

@@ -67,8 +67,8 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14 hBrightness.pic=24
hBrightness.pic1=13 hBrightness.pic1=25
hBrightness.pic2=15 hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=17

15
HMI/n2t-out/screensaver.txt
View File

@@ -706,21 +706,6 @@ Timer tmSerial
covx tTmp.txt,tNotifyText.pco,0,0 covx tTmp.txt,tNotifyText.pco,0,0
} }
} }
if(tInstruction.txt=="getBrightness")
{
tSend.txt="event,getBrightnessResponse,"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs dim,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100