diff --git a/HMI/README.md b/HMI/README.md index 2587c86b..2821cdf7 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -77,10 +77,6 @@ change the page type: `weatherUpdate,? tMainIcon? tMainText? tMRIcon? tMR? tForecast1? tF1Icon? tForecast1Val? tForecast2? tF2Icon? tForecast2Val?tForecast3? tF3Icon? tForecast3Val?tForecast4? tF4Icon? tForecast4Val` -`weatherUpdate,?0?2,3 C?0?0 mm?Mi?0?9,3 C?Do?0?11,5 C` - -`page,0` - ### cardEntities Page The following message can be used to update the content on the cardEntities Page diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index d2e6a9bd..8a32547b 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -533,6 +533,106 @@ Picture p0 Effect Time : 300 Picture ID : 0 +Slider hSlider1 + Attributes + ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 275 + y coordinate : 77 + Width : 150 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider2 + Attributes + ID : 55 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 276 + y coordinate : 133 + Width : 150 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider3 + Attributes + ID : 56 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 276 + y coordinate : 187 + Width : 150 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hSlider4 + Attributes + ID : 57 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 275 + y coordinate : 243 + Width : 150 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID : 4 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + Button bDown1 Attributes ID : 11 @@ -1809,6 +1909,7 @@ Timer tmSerial vis tEntity1,0 vis tIcon1,0 vis bText1,0 + vis hSlider1,0 }else { // change icon @@ -1831,6 +1932,7 @@ Timer tmSerial vis bDown1,1 vis btOnOff1,0 vis bText1,0 + vis hSlider1,0 } if(type1.txt=="light") { @@ -1839,6 +1941,7 @@ Timer tmSerial vis bDown1,0 vis btOnOff1,1 vis bText1,0 + vis hSlider1,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 @@ -1851,6 +1954,7 @@ Timer tmSerial vis bDown1,0 vis btOnOff1,1 vis bText1,0 + vis hSlider1,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 @@ -1864,6 +1968,7 @@ Timer tmSerial vis btOnOff1,0 vis bText1,1 tsw bText1,0 + vis hSlider1,0 bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) @@ -1877,11 +1982,24 @@ Timer tmSerial vis btOnOff1,0 vis bText1,1 tsw bText1,1 + vis hSlider1,0 bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) spstr strCommand.txt,bText1.txt,",",6 } + if(type1.txt=="number") + { + vis bUp1,0 + vis bStop1,0 + vis bDown1,0 + vis btOnOff1,0 + vis bText1,0 + tsw bText1,0 + vis hSlider1,1 + // get Text (optional Value) + spstr strCommand.txt,bText1.txt,",",6 + } // id2 // get Type spstr strCommand.txt,type2.txt,",",7 @@ -1896,6 +2014,7 @@ Timer tmSerial vis tEntity2,0 vis tIcon2,0 vis bText2,0 + vis hSlider2,0 }else { //change icon @@ -1918,6 +2037,7 @@ Timer tmSerial vis bDown2,1 vis btOnOff2,0 vis bText2,0 + vis hSlider2,0 } if(type2.txt=="light") { @@ -1926,6 +2046,7 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,1 vis bText2,0 + vis hSlider2,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 @@ -1938,6 +2059,7 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,1 vis bText2,0 + vis hSlider2,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 @@ -1951,6 +2073,7 @@ Timer tmSerial vis btOnOff2,0 vis bText2,1 tsw bText2,0 + vis hSlider2,0 bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) @@ -1963,6 +2086,7 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,0 vis bText2,1 + vis hSlider2,0 tsw bText2,1 bText2.pco=1374 bText2.pco2=1374 @@ -1983,6 +2107,7 @@ Timer tmSerial vis tEntity3,0 vis tIcon3,0 vis bText3,0 + vis hSlider3,0 }else { //change icon @@ -2005,6 +2130,7 @@ Timer tmSerial vis bDown3,1 vis btOnOff3,0 vis bText3,0 + vis hSlider3,0 } if(type3.txt=="light") { @@ -2013,6 +2139,7 @@ Timer tmSerial vis bDown3,0 vis bText3,0 vis btOnOff3,1 + vis hSlider3,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 @@ -2025,6 +2152,7 @@ Timer tmSerial vis bDown3,0 vis bText3,0 vis btOnOff3,1 + vis hSlider3,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 @@ -2038,6 +2166,7 @@ Timer tmSerial vis btOnOff3,0 vis bText3,1 tsw bText3,0 + vis hSlider3,0 bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) @@ -2051,6 +2180,7 @@ Timer tmSerial vis btOnOff3,0 vis bText3,1 tsw bText3,1 + vis hSlider3,0 bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) @@ -2070,6 +2200,7 @@ Timer tmSerial vis tEntity4,0 vis tIcon4,0 vis bText4,0 + vis hSlider4,0 }else { //change icon @@ -2092,6 +2223,7 @@ Timer tmSerial vis bDown4,1 vis btOnOff4,0 vis bText4,0 + vis hSlider4,0 } if(type4.txt=="light") { @@ -2100,6 +2232,7 @@ Timer tmSerial vis bDown4,0 vis bText4,0 vis btOnOff4,1 + vis hSlider4,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 @@ -2112,6 +2245,7 @@ Timer tmSerial vis bDown4,0 vis bText4,0 vis btOnOff4,1 + vis hSlider4,0 // get Button State (optional Value) spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 @@ -2124,6 +2258,7 @@ Timer tmSerial vis bDown4,0 vis btOnOff4,0 vis bText4,1 + vis hSlider4,0 tsw bText4,0 bText4.pco=65535 bText4.pco2=65535 @@ -2138,6 +2273,7 @@ Timer tmSerial vis btOnOff4,0 vis bText4,1 tsw bText4,1 + vis hSlider4,0 bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index c76a676d..96d52696 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -51,12 +51,12 @@ screensaver 183 Line(s) of event code 133 Unique line(s) of event code cardEntities - 54 Component(s) - 752 Line(s) of event code - 330 Unique line(s) of event code + 58 Component(s) + 787 Line(s) of event code + 336 Unique line(s) of event code Total 13 Page(s) - 344 Component(s) - 3130 Line(s) of event code - 838 Unique line(s) of event code + 348 Component(s) + 3165 Line(s) of event code + 844 Unique line(s) of event code diff --git a/README.md b/README.md index a7e81559..6d11ce63 100644 --- a/README.md +++ b/README.md @@ -375,13 +375,9 @@ HACS will show you that there is an update avalible and ask you to update. ### Update Display Firmware -Use the following command to update or use your own webserver. FlashNextionFast will use Nextion Upload Protocol 1.2 and try to skip unchanged parts of the firmware. +Use the following command to update or use your own webserver. -`FlashNextionFast http://nspanel.pky.eu/lui.tft` - -In case this Update failes, reboot tasmota and use the following command: - -`FlashNextion http://nspanel.pky.eu/lui.tft` +`FlashNextion http://nspanel.pky.eu/lui-release.tft` ### Update Tasmota Berry Driver