Commit Graph

1161 Commits

Author SHA1 Message Date
Johannes
92ee3a18b8 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 20:57:02 +02:00
Johannes
b13287754f fix cardalarm 2022-03-31 20:56:53 +02:00
joBr99
0d0c9edced Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-03-31 18:53:37 +00:00
Johannes
c17b95dca7 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 20:53:14 +02:00
Johannes
979c2587bb sync some changes 2022-03-31 20:53:07 +02:00
joBr99
b24405e579 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-03-31 18:39:22 +00:00
Johannes
7c3b0da36e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 20:38:57 +02:00
Johannes
b27f3bd078 implemented bUp 2022-03-31 20:38:49 +02:00
joBr99
8c0f5db6ec Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-03-31 18:35:25 +00:00
Johannes
9b42681588 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 20:35:03 +02:00
Johannes
324b2f2165 fix dstTemp 2022-03-31 20:34:50 +02:00
joBr99
26bacb26c1 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-03-31 18:31:21 +00:00
Johannes
d151c58057 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 20:30:55 +02:00
Johannes
71dcebf6d2 hide num on alarm page on disable 2022-03-31 20:30:49 +02:00
joBr99
708e5515d1 add navigation on alarm and thermo page (add nextion2text) 2022-03-31 18:20:57 +00:00
Johannes
d74ccfcd64 add navigation on alarm and thermo page 2022-03-31 20:20:27 +02:00
joBr99
067bad12e3 implemented navigation on cardEntities Grid and Thermo (add nextion2text) 2022-03-31 14:19:07 +00:00
Johannes
5ea5c76b57 implemented navigation on cardEntities Grid and Thermo 2022-03-31 16:18:44 +02:00
Johannes
4f4d12759b upd code gen 2022-03-31 14:22:27 +02:00
Johannes
393bcc243b Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui v2.3.0 2022-03-31 12:58:52 +02:00
Johannes
d0d690e748 bump vers 2022-03-31 12:58:45 +02:00
joBr99
7bd3c263cf Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-03-31 10:58:09 +00:00
Johannes
22563d1cb4 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 12:57:42 +02:00
Johannes
52364e05a7 add us-l 2022-03-31 12:57:37 +02:00
Johannes
ab51c44c32 sync diff 2022-03-31 12:50:34 +02:00
joBr99
d908cb7d96 fixed screensaver pagetype (add nextion2text) 2022-03-31 10:46:03 +00:00
Johannes
39c1aa6773 fixed screensaver pagetype 2022-03-31 12:45:35 +02:00
Johannes
037fc104df Update pages.py 2022-03-31 09:48:30 +02:00
Johannes
06464404c4 Update controller.py 2022-03-31 09:39:02 +02:00
joBr99
f3933ab0e2 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-03-31 07:32:24 +00:00
Johannes
210efd1384 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-03-31 09:31:55 +02:00
Johannes
13073d2b70 bump to 24 for next release 2022-03-31 09:31:46 +02:00
joBr99
2f43430b2f . (add nextion2text) 2022-03-31 07:13:42 +00:00
Johannes
7ba6fcbbc9 . 2022-03-31 09:13:19 +02:00
joBr99
9ca1e2f717 Update cardEntities.txt (add nextion2text) 2022-03-31 06:59:06 +00:00
Johannes
da7e3c39c7 Update cardEntities.txt 2022-03-31 08:58:49 +02:00
joBr99
37a7a8db4f Update nextion2text.yml (add nextion2text) 2022-03-31 06:52:56 +00:00
Johannes
7773eedd45 Update nextion2text.yml 2022-03-31 08:52:39 +02:00
Johannes
9d82d849c5 Update cardEntities.txt 2022-03-31 08:49:28 +02:00
joBr99
9fdf8635a6 Update nextion2text.yml (add nextion2text) 2022-03-31 06:42:30 +00:00
Johannes
cddc3cf7a0 Update nextion2text.yml 2022-03-31 08:42:11 +02:00
joBr99
2ce12d0c71 ignore parts of cardEntities in diff (add nextion2text) 2022-03-31 06:34:28 +00:00
Johannes
aac014bb09 ignore parts of cardEntities in diff 2022-03-31 08:34:05 +02:00
joBr99
b3cc89f12a Merge pull request #103 from jmbinette/main (add nextion2text) 2022-03-31 06:31:08 +00:00
Johannes
cbf49483eb Merge pull request #103 from jmbinette/main
Updated HMI and TFT following EU mod (Daily update)
2022-03-31 08:30:50 +02:00
Johannes
4c6b3d2dda remove __pycache__ 2022-03-31 08:29:46 +02:00
jmbinette
24e8d6a597 bDown5 and bDown6 typo in Entities (add nextion2text) 2022-03-31 03:33:55 +00:00
jmbinette
c7a3965db4 bDown5 and bDown6 typo in Entities 2022-03-30 23:33:33 -04:00
jmbinette
8e53463d57 Commit (add nextion2text) 2022-03-31 03:13:55 +00:00
jmbinette
6acbe3b088 Commit 2022-03-30 23:13:30 -04:00