From 291102971a751da6d4d061b987a37d9a16f8d1ee Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 20 Aug 2023 12:42:36 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 237 ------------------ .../landscape/n2t-out-visual/cardEntities.txt | 36 ++- HMI/US/landscape/n2t-out-visual/cardGrid.txt | 8 +- HMI/US/landscape/n2t-out-visual/cardGrid2.txt | 8 +- HMI/US/landscape/n2t-out-visual/cardPower.txt | 4 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 46 ++-- .../landscape/n2t-out-visual/popupLight.txt | 6 +- .../landscape/n2t-out-visual/screensaver2.txt | 4 + HMI/US/landscape/n2t-out/cardEntities.txt | 36 ++- HMI/US/landscape/n2t-out/cardGrid.txt | 8 +- HMI/US/landscape/n2t-out/cardGrid2.txt | 8 +- HMI/US/landscape/n2t-out/cardPower.txt | 4 + HMI/US/landscape/n2t-out/popupLight.txt | 6 +- HMI/US/landscape/n2t-out/screensaver2.txt | 4 + HMI/US/portrait/diff-eu-version.txt | 42 +--- HMI/US/portrait/diff-filtered.txt | 42 +--- HMI/n2t-out-visual/nspanel_Stats.txt | 12 +- HMI/n2t-out-visual/popupLight.txt | 4 +- HMI/n2t-out-visual/screensaver.txt | 15 -- HMI/n2t-out/popupLight.txt | 4 +- HMI/n2t-out/screensaver.txt | 15 -- 21 files changed, 155 insertions(+), 394 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 00fa1ae0..46a0f8ed 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -14,175 +14,6 @@ │ + //lcd_dev fffb 0002 0000 0020 │ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ 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/US/landscape/n2t-out/pageStartup.txt │ @@ -164,15 +164,15 @@ @@ -223,25 +54,6 @@ │ spstr strCommand.txt,tTmp.txt,"~",1 │ 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/US/landscape/n2t-out/popupNotify.txt │ @@ -295,19 +295,14 @@ @@ -319,36 +131,6 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ 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/US/landscape/n2t-out/screensaver2.txt │ @@ -28,17 +28,14 @@ @@ -420,22 +202,3 @@ │ if(tAMPM.txt=="") │ { │ 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 -│ } diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index ef7933da..e63880a6 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -1856,8 +1856,13 @@ Hotspot m0 } if(type1.txt=="light") { - //popupLight.tEntity.txt=tEntity1.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type1.txt=="fan") { @@ -1899,8 +1904,13 @@ Hotspot m1 } if(type2.txt=="light") { - //popupLight.tEntity.txt=tEntity2.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type2.txt=="fan") { @@ -1942,8 +1952,13 @@ Hotspot m2 } if(type3.txt=="light") { - //popupLight.tEntity.txt=tEntity3.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type3.txt=="fan") { @@ -1985,8 +2000,13 @@ Hotspot m3 } if(type4.txt=="light") { - //popupLight.tEntity.txt=tEntity4.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type4.txt=="fan") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 7a37e3aa..311c1168 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1052,7 +1052,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid2.txt b/HMI/US/landscape/n2t-out-visual/cardGrid2.txt index 7039d771..2c936965 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid2.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid2.txt @@ -1274,7 +1274,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/landscape/n2t-out-visual/cardPower.txt b/HMI/US/landscape/n2t-out-visual/cardPower.txt index ad6a9866..1cfd808d 100644 --- a/HMI/US/landscape/n2t-out-visual/cardPower.txt +++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt @@ -1652,6 +1652,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index ce3c24e4..2467eb10 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -58,10 +58,10 @@ screensaver 46 Component(s) 435 Line(s) of event code 309 Unique line(s) of event code -cardGrid2 - 52 Component(s) - 611 Line(s) of event code - 335 Unique line(s) of event code +cardPower + 54 Component(s) + 531 Line(s) of event code + 349 Unique line(s) of event code cardLChart 33 Component(s) 402 Line(s) of event code @@ -74,29 +74,29 @@ cardMedia 59 Component(s) 649 Line(s) of event code 322 Unique line(s) of event code -screensaver2 - 58 Component(s) - 348 Line(s) of event code - 245 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 +cardGrid2 + 52 Component(s) + 617 Line(s) of event code + 338 Unique line(s) of event code popupLight 28 Component(s) 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 23 Page(s) 875 Component(s) - 10335 Line(s) of event code - 2403 Unique line(s) of event code + 10379 Line(s) of event code + 2406 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 0c516441..c13b0a12 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -75,8 +75,8 @@ Page popupLight } if(defaultBcoColor==0) { - hBrightness.pic=14 - hBrightness.pic1=13 + hBrightness.pic=24 + hBrightness.pic1=25 hBrightness.pic2=15 hTempSlider.pic=16 hTempSlider.pic1=17 @@ -984,7 +984,7 @@ Timer tmSerial } if(tId.txt=="cardGrid2") { - page cardGrid + page cardGrid2 } if(tId.txt=="popupLight") { diff --git a/HMI/US/landscape/n2t-out-visual/screensaver2.txt b/HMI/US/landscape/n2t-out-visual/screensaver2.txt index 8a8d4478..da2595c9 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver2.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver2.txt @@ -1617,6 +1617,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index ee3b8c6c..5bc7d912 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -965,8 +965,13 @@ Hotspot m0 } if(type1.txt=="light") { - //popupLight.tEntity.txt=tEntity1.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type1.txt=="fan") { @@ -999,8 +1004,13 @@ Hotspot m1 } if(type2.txt=="light") { - //popupLight.tEntity.txt=tEntity2.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type2.txt=="fan") { @@ -1033,8 +1043,13 @@ Hotspot m2 } if(type3.txt=="light") { - //popupLight.tEntity.txt=tEntity3.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type3.txt=="fan") { @@ -1067,8 +1082,13 @@ Hotspot m3 } if(type4.txt=="light") { - //popupLight.tEntity.txt=tEntity4.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type4.txt=="fan") { diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index baafe618..6d8abda1 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -605,7 +605,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/landscape/n2t-out/cardGrid2.txt b/HMI/US/landscape/n2t-out/cardGrid2.txt index 3d594abf..0f5a64e7 100644 --- a/HMI/US/landscape/n2t-out/cardGrid2.txt +++ b/HMI/US/landscape/n2t-out/cardGrid2.txt @@ -739,7 +739,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/landscape/n2t-out/cardPower.txt b/HMI/US/landscape/n2t-out/cardPower.txt index 8ca6ea76..a4bd1ad0 100644 --- a/HMI/US/landscape/n2t-out/cardPower.txt +++ b/HMI/US/landscape/n2t-out/cardPower.txt @@ -964,6 +964,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index cfd46ad5..98f66dfc 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -67,8 +67,8 @@ Page popupLight } if(defaultBcoColor==0) { - hBrightness.pic=14 - hBrightness.pic1=13 + hBrightness.pic=24 + hBrightness.pic1=25 hBrightness.pic2=15 hTempSlider.pic=16 hTempSlider.pic1=17 @@ -635,7 +635,7 @@ Timer tmSerial } if(tId.txt=="cardGrid2") { - page cardGrid + page cardGrid2 } if(tId.txt=="popupLight") { diff --git a/HMI/US/landscape/n2t-out/screensaver2.txt b/HMI/US/landscape/n2t-out/screensaver2.txt index d0667b7c..ebd42395 100644 --- a/HMI/US/landscape/n2t-out/screensaver2.txt +++ b/HMI/US/landscape/n2t-out/screensaver2.txt @@ -804,6 +804,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b36338f9..e7d3ef48 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1728,7 +1728,7 @@ │ } │ --- HMI/n2t-out/popupLight.txt ├── +++ HMI/US/portrait/n2t-out/popupLight.txt -│ @@ -48,15 +48,15 @@ +│ @@ -48,33 +48,33 @@ │ vis hTempSlider,0 │ //disable color wheel components by default │ vis bColor,0 @@ -1745,13 +1745,17 @@ │ b[sys0].pco=defaultFontColor │ } │ if(b[sys0].type==53&&defaultBcoColor==0) -│ @@ -66,15 +66,15 @@ +│ { +│ b[sys0].pic=10 +│ b[sys0].pic2=11 │ } │ } │ if(defaultBcoColor==0) │ { -│ hBrightness.pic=14 -│ hBrightness.pic1=13 +│ - hBrightness.pic=24 +│ - hBrightness.pic1=25 +│ + hBrightness.pic=14 +│ + hBrightness.pic1=13 │ hBrightness.pic2=15 │ - hTempSlider.pic=16 │ + hTempSlider.pic=23 @@ -1877,36 +1881,6 @@ │ spstr strCommand.txt,tTmp.txt,"~",1 │ covx tTmp.txt,tTime.bco,0,0 │ 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/US/portrait/n2t-out/screensaver2.txt │ @@ -28,17 +28,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 8a850c2a..fe9ca108 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -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 ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -59,13 +59,13 @@ +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 38 + +e (string) nent2 +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 38 +14 +185,26 @@ +e (string) type6 @@ -1270,7 +1270,7 @@ + } +I/n2t-out/popupLight.txt ++ HMI/US/portrait/n2t-out/popupLight.txt -+5 +48,15 @@ ++3 +48,33 @@ + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 @@ -1287,11 +1287,15 @@ + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) -+5 +66,15 @@ ++ { ++ b[sys0].pic=10 ++ b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { ++ hBrightness.pic=24 ++ hBrightness.pic1=25 + hBrightness.pic=14 + hBrightness.pic1=13 + hBrightness.pic2=15 @@ -1419,36 +1423,6 @@ + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,tTime.bco,0,0 + 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 ++ HMI/US/portrait/n2t-out/screensaver2.txt +7 +28,14 @@ diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 8162306e..7d8b457d 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -74,14 +74,14 @@ popupInSel 34 Component(s) 621 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 54 Component(s) 531 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 42 Component(s) 516 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 878 Component(s) - 10421 Line(s) of event code - 2421 Unique line(s) of event code + 10408 Line(s) of event code + 2418 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 47df5328..c13b0a12 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -75,8 +75,8 @@ Page popupLight } if(defaultBcoColor==0) { - hBrightness.pic=14 - hBrightness.pic1=13 + hBrightness.pic=24 + hBrightness.pic1=25 hBrightness.pic2=15 hTempSlider.pic=16 hTempSlider.pic1=17 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 8f3685ee..eb8a1b86 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1299,21 +1299,6 @@ Timer tmSerial 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 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 21b19052..98f66dfc 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -67,8 +67,8 @@ Page popupLight } if(defaultBcoColor==0) { - hBrightness.pic=14 - hBrightness.pic1=13 + hBrightness.pic=24 + hBrightness.pic1=25 hBrightness.pic2=15 hTempSlider.pic=16 hTempSlider.pic1=17 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 16bc1e34..30e471fc 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -706,21 +706,6 @@ Timer tmSerial 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