Commit Graph

331 Commits

Author SHA1 Message Date
joBr99
1f6e2a08f6 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 15:43:33 +00:00
Johannes
180e338453 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 17:43:07 +02:00
Johannes
c46cd3cb34 fix overlap 2022-05-07 17:42:55 +02:00
joBr99
3e8b5d1f27 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 15:37:53 +00:00
Johannes
88744e5f49 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 17:37:12 +02:00
Johannes
d76965c2ac extend length 2022-05-07 17:37:06 +02:00
joBr99
e66923ae64 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 15:22:56 +00:00
Johannes
c1802042b0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 17:22:27 +02:00
Johannes
c4fab76907 fix localization 2022-05-07 17:21:02 +02:00
joBr99
2f12dbd3cc implemented localization for popup pages (add nextion2text) 2022-05-07 15:04:38 +00:00
Johannes
6ab5c666ac implemented localization for popup pages 2022-05-07 17:04:10 +02:00
joBr99
76492f4211 fixed model in us-l (add nextion2text) 2022-05-07 09:49:51 +00:00
Johannes
83fda3eae9 fixed model in us-l 2022-05-07 11:49:25 +02:00
joBr99
dcfdab4ba9 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-07 08:40:24 +00:00
Johannes
e80ae8af43 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-07 10:39:50 +02:00
Johannes
3193cd089c bumped version to 33 2022-05-07 10:39:39 +02:00
joBr99
b19bbe0427 fix number in US-P Firmware #175 (add nextion2text) 2022-05-07 08:29:47 +00:00
Johannes
843828eeb7 fix number in US-P Firmware #175 2022-05-07 10:29:24 +02:00
Johannes
5f8b6f3212 updated known good 2022-05-06 21:36:24 +02:00
joBr99
c42dbd6a48 fix crc (add nextion2text) 2022-05-06 19:28:29 +00:00
Johannes
8c7bdf7eba fix crc 2022-05-06 21:28:03 +02:00
joBr99
0b660e96b1 sync (add nextion2text) 2022-05-06 16:25:27 +00:00
Johannes
57f25cada2 sync 2022-05-06 18:25:02 +02:00
joBr99
4cef55e560 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:21:35 +00:00
Johannes
8f82f470f0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:21:13 +02:00
Johannes
600c447136 sync 2022-05-06 18:20:27 +02:00
joBr99
7bb069d1e2 sync (add nextion2text) 2022-05-06 16:15:47 +00:00
Johannes
d734adefce sync 2022-05-06 18:15:23 +02:00
Johannes
a633a8e286 sync 2022-05-06 18:13:34 +02:00
joBr99
6f2e6498c0 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:09:55 +00:00
Johannes
55c7d6c67f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:09:31 +02:00
Johannes
b3964e8b0d sync media page 2022-05-06 18:09:23 +02:00
joBr99
c7255e0b5e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:05:12 +00:00
Johannes
b309881487 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-05-06 18:04:47 +02:00
Johannes
2542a1e40f sync cardAlarm 2022-05-06 18:04:41 +02:00
joBr99
12114e560a Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 16:01:54 +00:00
joBr99
eb1f4779f2 Merge pull request #179 from jmbinette/main (add nextion2text) 2022-05-06 15:56:24 +00:00
Johannes
319a2a429c Merge branch 'main' into pr/179 2022-05-06 17:55:39 +02:00
joBr99
e0ed65ea50 Merge branch 'main' into pr/179 (add nextion2text) 2022-05-06 15:52:05 +00:00
Johannes
57a3984de3 Merge branch 'main' into pr/179 2022-05-06 17:51:23 +02:00
joBr99
cff204b38e merge cardThermo into PR (add nextion2text) 2022-05-06 15:50:20 +00:00
Johannes
f3948d86c2 merge cardThermo into PR 2022-05-06 17:49:51 +02:00
joBr99
ac23ed80ea Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-05-06 15:41:34 +00:00
joBr99
ee47d331f1 syned cardThermo (add nextion2text) 2022-05-06 15:23:54 +00:00
Johannes
25c67de9d2 syned cardThermo 2022-05-06 17:23:28 +02:00
joBr99
e0b66e606e synced popupShutter, popupLight and pageIcons (add nextion2text) 2022-05-06 15:18:25 +00:00
Johannes
b932cf5e69 synced popupShutter, popupLight and pageIcons 2022-05-06 17:17:54 +02:00
joBr99
cf5afe3ede synced popup shutter (add nextion2text) 2022-05-06 15:15:13 +00:00
Johannes
fa0e68e68e synced popup shutter 2022-05-06 17:14:46 +02:00
joBr99
cbb875cc1b Synced US-P (#178) (add nextion2text) 2022-05-06 15:00:34 +00:00