Compare commits

..

32 Commits

Author SHA1 Message Date
Johannes
ffcd872f4a fixes #802 2023-10-25 21:16:34 +02:00
Marek
d34a835363 small update to sk.json for preset mode (#1000) 2023-10-24 20:12:02 +02:00
Armilar
40d17f9641 v 4.3.1.7 - Merge pull request #998 from tt-tom17/main
v 4.3.1.7
2023-10-22 16:29:03 +02:00
Thomas
9eb543467b v 4.3.1.7
Fix CreateEntity (navigate) role 'light' and 'socket' and 'temperature'
2023-10-22 15:24:47 +02:00
Armilar
86594de18d v4.3.1.6 - Update NsPanelTs.ts
- Add more Alias Device-Types to Navigation (createEntity) 
- Minor Fixes
2023-10-19 10:58:31 +02:00
joBr99
14efa10683 fixes #983 (add nextion2text) 2023-10-14 14:36:49 +00:00
joBr99
7f38c6b346 fixes #983 2023-10-14 16:32:37 +02:00
Armilar
17cf7d40c5 Merge pull request #989 from tt-tom17/main
v4.3.1.5
2023-10-12 15:40:09 +02:00
Thomas
9ff8506035 v4.3.1.5
Fix Datapoint for Role timetable -> Attention use new script from TT-Tom https://github.com/tt-tom17/MyScripts/blob/main/Sonoff_NSPanel/Fahrplan_to_NSPanel.ts
2023-10-12 15:22:25 +02:00
Johannes
757ffcd129 Update README.md 2023-10-06 21:56:02 +02:00
Armilar
ac96ff595a v4.3.1.4 - Move Examples 2 Wiki
https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Page-%E2%80%90-Typen_How-2_Beispiele
2023-10-03 13:48:01 +02:00
Armilar
7c1fe558f9 Delete ioBroker/NsPanelTs_without_Examples.ts 2023-10-03 13:26:49 +02:00
Armilar
98ec0aca45 v4.3.1.4 - Remove Examples
- Moving the examples from the NSPanelTs.ts --> https://github.com/joBr99/nspanel-lovelace-ui/wiki/NSPanel-Page-%E2%80%90-Typen_How-2_Beispiele
- Delete NsPanelTs_without_Examples.ts
2023-10-03 13:24:31 +02:00
Armilar
df105a2233 v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:13:52 +02:00
Armilar
a33c58941c v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:13:44 +02:00
Armilar
33c0c4402f v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:09:03 +02:00
Armilar
1529115fb5 v4.3.1.3 - Update BerryDriver / Service Menu Fix
v4.3.1.2  Upgrade BerryDriver v9
v4.3.1.3  Fix - Change ServivceMenu from Fake-SSId to real Tasmota-SSIdParam
 
Todo:
v4.4.0    Change the bottomScreensaverEntity (rolling) if more than 6 entries are defined
2023-09-23 21:08:27 +02:00
Armilar
210b90ff8f v4.3.1.2 Upgrade BerryDriver v9
- 23.09.2023 - v4.3.1.2  Upgrade BerryDriver v9
2023-09-23 13:46:58 +02:00
Armilar
e9a69651d7 v4.3.1.2 Upgrade BerryDriver v9
- 23.09.2023 - v4.3.1.2  Upgrade BerryDriver v9
2023-09-23 13:46:52 +02:00
Johannes
e576af72b7 Update prepare_nspanel.md 2023-09-18 22:55:54 +02:00
joBr99
e5e88e3a5e Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-09-18 18:07:36 +02:00
joBr99
957cde8384 Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-09-18 18:07:16 +02:00
joBr99
ddc8818aae Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui 2023-09-18 18:03:15 +02:00
joBr99
252339d36c update tasmota driver #972 2023-09-18 18:02:59 +02:00
Armilar
0803dd5214 v4.3.1.1
v4.2.1.6  Fix ServicePage Dimmode 'next' -> 'home'
v4.2.1.6  Fix Log '.USERICON' to Debug.log
v4.2.1.6  Fix Link PowerIcon to Alias (Thermocard)
v4.3.1    Upgrade TFT 53 / 4.3.1
v4.3.1.1  Add Parameter fontSize (0-4) to cardGrid (with useValue)
2023-09-17 13:36:34 +02:00
Armilar
586af0aac3 v4.3.1.1
v4.2.1.6  Fix ServicePage Dimmode 'next' -> 'home'
v4.2.1.6  Fix Log '.USERICON' to Debug.log
v4.2.1.6  Fix Link PowerIcon to Alias (Thermocard)
v4.3.1    Upgrade TFT 53 / 4.3.1
v4.3.1.1  Add Parameter fontSize (0-4) to cardGrid (with useValue)
2023-09-17 13:36:28 +02:00
Armilar
65032dc3a0 Merge branch 'main' into main 2023-09-17 13:25:26 +02:00
Armilar
a6c617fc44 Merge pull request #976 from tt-tom17/main
v4.2.1.6
2023-09-17 10:22:59 +02:00
Thomas
f0a3a04edb v4.2.1.6
- Fix ServicePage Dimmode 'next' -> 'home'
- Fix Log '.USERICON' to Debug.log
- Fix Link PowerIcon to Alias (Thermocard)
2023-09-15 19:20:53 +02:00
Armilar
df8e913831 Merge branch 'joBr99:main' into main 2023-09-14 23:35:36 +02:00
Armilar
d78a6c4ed7 Merge branch 'joBr99:main' into main 2023-08-27 21:35:48 +02:00
Armilar
cb542f1e77 v4.2.1.2 - New pageItem-Parameter fontSize (add nextion2text) 2023-08-25 12:36:47 +00:00
36 changed files with 354 additions and 8823 deletions

View File

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

View File

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

View File

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

View File

@@ -72,20 +72,20 @@ cardThermo
319 Unique line(s) of event code 319 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
579 Line(s) of event code 583 Line(s) of event code
330 Unique line(s) of event code 332 Unique line(s) of event code
cardMedia cardGrid2
59 Component(s) 52 Component(s)
699 Line(s) of event code 693 Line(s) of event code
354 Unique line(s) of event code 384 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
227 Unique line(s) of event code 227 Unique line(s) of event code
cardGrid2 cardMedia
52 Component(s) 59 Component(s)
689 Line(s) of event code 703 Line(s) of event code
382 Unique line(s) of event code 356 Unique line(s) of event code
cardEntities cardEntities
67 Component(s) 67 Component(s)
1194 Line(s) of event code 1194 Line(s) of event code
@@ -98,5 +98,5 @@ screensaver2
Total Total
23 Page(s) 23 Page(s)
875 Component(s) 875 Component(s)
10556 Line(s) of event code 10568 Line(s) of event code
2450 Unique line(s) of event code 2450 Unique line(s) of event code

View File

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

View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-09-16 10:55:16.569411880 +0000 +++ /dev/fd/62 2023-10-14 14:36:40.102098093 +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 @@

View File

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

View File

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

View File

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

View File

@@ -38,10 +38,10 @@ cardChart
33 Component(s) 33 Component(s)
437 Line(s) of event code 437 Line(s) of event code
296 Unique line(s) of event code 296 Unique line(s) of event code
cardGrid cardGrid2
44 Component(s) 56 Component(s)
579 Line(s) of event code 748 Line(s) of event code
330 Unique line(s) of event code 410 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
@@ -62,14 +62,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
cardGrid
44 Component(s)
583 Line(s) of event code
332 Unique line(s) of event code
cardAlarm cardAlarm
43 Component(s) 43 Component(s)
500 Line(s) of event code 500 Line(s) of event code
273 Unique line(s) of event code 273 Unique line(s) of event code
cardMedia
59 Component(s)
699 Line(s) of event code
354 Unique line(s) of event code
cardThermo cardThermo
57 Component(s) 57 Component(s)
540 Line(s) of event code 540 Line(s) of event code
@@ -90,13 +90,13 @@ cardEntities
91 Component(s) 91 Component(s)
1666 Line(s) of event code 1666 Line(s) of event code
711 Unique line(s) of event code 711 Unique line(s) of event code
cardGrid2 cardMedia
56 Component(s) 59 Component(s)
744 Line(s) of event code 703 Line(s) of event code
408 Unique line(s) of event code 356 Unique line(s) of event code
Total Total
23 Page(s) 23 Page(s)
890 Component(s) 890 Component(s)
11017 Line(s) of event code 11029 Line(s) of event code
2600 Unique line(s) of event code 2600 Unique line(s) of event code

View File

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

View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

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

View File

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

View File

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

View File

@@ -36,8 +36,8 @@ popupNotify
172 Unique line(s) of event code 172 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
579 Line(s) of event code 583 Line(s) of event code
330 Unique line(s) of event code 332 Unique line(s) of event code
cardQR cardQR
34 Component(s) 34 Component(s)
410 Line(s) of event code 410 Line(s) of event code
@@ -62,14 +62,10 @@ cardThermo
57 Component(s) 57 Component(s)
540 Line(s) of event code 540 Line(s) of event code
319 Unique line(s) of event code 319 Unique line(s) of event code
cardGrid2
52 Component(s)
689 Line(s) of event code
382 Unique line(s) of event code
cardMedia cardMedia
59 Component(s) 59 Component(s)
699 Line(s) of event code 703 Line(s) of event code
354 Unique line(s) of event code 356 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
621 Line(s) of event code 621 Line(s) of event code
@@ -90,6 +86,10 @@ popupThermo
44 Component(s) 44 Component(s)
523 Line(s) of event code 523 Line(s) of event code
276 Unique line(s) of event code 276 Unique line(s) of event code
cardGrid2
52 Component(s)
693 Line(s) of event code
384 Unique line(s) of event code
cardEntities cardEntities
67 Component(s) 67 Component(s)
1194 Line(s) of event code 1194 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
878 Component(s) 878 Component(s)
10576 Line(s) of event code 10588 Line(s) of event code
2459 Unique line(s) of event code 2459 Unique line(s) of event code

View File

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

View File

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

View File

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

Binary file not shown.

Binary file not shown.

View File

@@ -64,3 +64,4 @@ SmartHomeNG: https://github.com/sisamiwe/shng-nspanel-plugin
OpenHAB: https://github.com/donoo/o2n2l OpenHAB: https://github.com/donoo/o2n2l
NodeRed: https://github.com/laluz742/node-red-contrib-nspanel-lui

View File

@@ -418,7 +418,7 @@ class LuiPagesGen(object):
font = 3 font = 3
elif isinstance(item.font, int): elif isinstance(item.font, int):
font = item.font font = item.font
icon_id += f'{icon_id}¬{font}' icon_id = f'{icon_id}¬{font}'
return f"~{entityTypePanel}~{entityId}~{icon_id}~{color}~{name}~{value}" return f"~{entityTypePanel}~{entityId}~{icon_id}~{color}~{name}~{value}"
def generate_entities_page(self, navigation, heading, items, cardType, tempUnit): def generate_entities_page(self, navigation, heading, items, cardType, tempUnit):

View File

@@ -57,8 +57,8 @@
"comfort": "Komfort", "comfort": "Komfort",
"eco": "Eko", "eco": "Eko",
"home": "Doma", "home": "Doma",
"none": "Žiadny", "none": "Žiadna",
"sleep": "Pohotovostný režim" "sleep": "Spánok"
} }
}, },
"humidifier": { "humidifier": {
@@ -3951,4 +3951,4 @@
"sidebar_toggle": "Prepínač bočného panela" "sidebar_toggle": "Prepínač bočného panela"
} }
} }
} }

View File

@@ -27,11 +27,14 @@ After a reboot of tasmota your screen will light up with the stock display firmw
Go to `Consoles` > `Console` in Tasmota and execute the following command: Go to `Consoles` > `Console` in Tasmota and execute the following command:
``` ```
Backlog UrlFetch https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1 Backlog UrlFetch https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; SetOption151 0;Restart 1
``` ```
This will download the autoexec.be file from the repository and restart tasmota. This will download the autoexec.be file from the repository and restart tasmota.
Note: The command is also disabling matter to free up memory, as it's most likely not used by any homeassistant users anyway.
(Matter could cause memory issues during flashing of the Nextion Screen, but you can still enable it if you need to.)
## Flash Firmware to Nextion Screen ## Flash Firmware to Nextion Screen
Due the limitations of Berry, it's not possible to download the tft file directly from github, so I'm also renting a small server where you can download the file via HTTP. Due the limitations of Berry, it's not possible to download the tft file directly from github, so I'm also renting a small server where you can download the file via HTTP.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -109,7 +109,7 @@ class Nextion : Driver
log("FLH: Read block",3) log("FLH: Read block",3)
while size(self.flash_buff)<self.flash_block_size && self.tcp.connected() while size(self.flash_buff)<self.flash_block_size && self.tcp.connected()
if self.tcp.available()>0 if self.tcp.available()>0
self.flash_buff += self.tcp.readbytes() self.flash_buff += self.tcp.readbytes(4096)
else else
tasmota.delay(50) tasmota.delay(50)
log("FLH: Wait for available...",3) log("FLH: Wait for available...",3)
@@ -321,7 +321,7 @@ tasmota.add_driver(nextion)
def get_current_version(cmd, idx, payload, payload_json) def get_current_version(cmd, idx, payload, payload_json)
import string import string
var version_of_this_script = 8 var version_of_this_script = 9
var jm = string.format("{\"nlui_driver_version\":\"%s\"}", version_of_this_script) var jm = string.format("{\"nlui_driver_version\":\"%s\"}", version_of_this_script)
tasmota.publish_result(jm, "RESULT") tasmota.publish_result(jm, "RESULT")
end end

Binary file not shown.