Commit Graph

13101 Commits

Author SHA1 Message Date
Theo Arends
0643c2bafb Revert latest BL09xx changes as it fails BL0940 2021-10-03 13:28:06 +02:00
Theo Arends
ec412c9b5d
Merge pull request #13259 from barbudor/bl0942_pr
Add support for BL0942 to xnrg_14_bl09xx.ino
2021-10-03 13:17:35 +02:00
s-hadinger
fe32c4f294
Merge pull request #13265 from s-hadinger/fix_lvgl_freetype
Fix compilation
2021-10-03 12:47:13 +02:00
Stephan Hadinger
1d5b9fb8ed Fix compilation 2021-10-03 12:24:31 +02:00
s-hadinger
6878bf9fbf
Berry add module `import persist` (#13264)
* Berry add module ``import persist``

* Call `persist.save()` before restart
2021-10-03 11:54:29 +02:00
s-hadinger
54359e5aa7
Merge pull request #13263 from s-hadinger/berry_dac_fix
Berry fix DAC
2021-10-03 10:42:14 +02:00
Stephan Hadinger
d833418802 Berry fix DAC 2021-10-03 10:08:21 +02:00
Barbudor
df7810a6f8 add support for BL0942 to xnrg_14_bl09xx.ino 2021-10-02 20:00:18 +02:00
Theo Arends
5d6bf997f5
Merge pull request #13258 from barbudor/trim_rule_trigger
Trim pre/post spaces on rule trigger
2021-10-02 18:51:08 +02:00
Theo Arends
c4bb190e82 Add split total energy 2021-10-02 18:29:05 +02:00
Theo Arends
de75cd4c40 Merge branch 'development' into dev-energy-split 2021-10-02 18:20:42 +02:00
Theo Arends
9002830d7c Fixes 2021-10-02 18:19:39 +02:00
Barbudor
26916f62de Trim pre/pst spaces on rule trigger 2021-10-02 15:46:51 +02:00
Theo Arends
1232933337 Update changelog 2021-10-02 15:36:01 +02:00
Theo Arends
3b5172a5c0 Merge branch 'development' into dev-energy-split 2021-10-02 15:30:05 +02:00
Theo Arends
b82f098383 Remove interfering debug information 2021-10-02 14:49:50 +02:00
Theo Arends
5803407209 Revert "Chk if this fixes memory leak (#13251)"
This reverts commit 789c3acf38.
2021-10-02 14:05:52 +02:00
Theo Arends
811152a630 Merge branch 'development' of https://github.com/arendst/Tasmota into development 2021-10-02 14:04:36 +02:00
Theo Arends
21c0200bd7 Fix ESP32 restart hang when USE_EMERGENCY_RESET is enabled 2021-10-02 14:04:32 +02:00
s-hadinger
6ee08a1bf0
Merge pull request #13257 from s-hadinger/lvgl_fix_init
LVGL fix init display desctriptor
2021-10-02 11:00:40 +02:00
Stephan Hadinger
4eee590a04 LVGL fix init display desctriptor 2021-10-02 10:59:41 +02:00
s-hadinger
bb2fedd553
Merge pull request #13256 from s-hadinger/lvgl8_clean1
Lvgl8 minor cleaning
2021-10-02 10:32:45 +02:00
Stephan Hadinger
319b6e664a Lvgl8 minor cleaning 2021-10-02 10:31:38 +02:00
s-hadinger
d82bf5fa59
Merge pull request #13255 from s-hadinger/lvgl8
LVGL updated to v8.0.2 **breaking changes**
2021-10-02 10:10:19 +02:00
Stephan Hadinger
98acc6fe2d LVGL updated to v8.0.2 **breaking changes** 2021-10-02 09:33:59 +02:00
Theo Arends
960291729c
Merge pull request #13254 from barbudor/opentherm_conflicting_symbols
Fix OpenTherm conflicting symbols
2021-10-01 21:35:55 +02:00
Barbudor
6783f91566 prepend OPTH_ to conflicting symbols 2021-10-01 17:57:02 +00:00
Theo Arends
789c3acf38 Chk if this fixes memory leak (#13251) 2021-10-01 17:15:28 +02:00
Theo Arends
a45c2ca66b Fix unwanted pre-init functionality toggling non-display relays. 2021-10-01 16:19:23 +02:00
Theo Arends
63f526972c
Merge pull request #13252 from gemu2015/multi_display
fix multi display issues
2021-10-01 16:12:57 +02:00
s-hadinger
e1c0942811
Merge pull request #13253 from s-hadinger/berry_tasmota_global
Berry add `tasmota.global`
2021-09-30 20:25:19 +02:00
Stephan Hadinger
a21e4a58fc Berry add tasmota.global 2021-09-30 19:51:40 +02:00
gemu2015
7e38e75116 fix multi display issues 2021-09-30 19:09:38 +02:00
Adrian Scillato
86e72bbedd
Merge pull request #13235 from ascillato/Allow-KNX-and-Zigbee
Fix Optional Compilation of ZigBee with KNX
2021-09-29 17:11:33 -03:00
Theo Arends
0b944fddba Fix unwanted display interactions
Fix unwanted display interactions when no display is configured
2021-09-29 16:36:33 +02:00
Theo Arends
b47e91c8ab Add energy total spilt 2021-09-29 15:33:58 +02:00
Theo Arends
9b35c54ed1 Revert "Add support for split energy totals"
This reverts commit d3fc03d398.
2021-09-29 14:53:23 +02:00
Theo Arends
d3fc03d398 Add support for split energy totals
Add command ``SetOption129 1`` to enable split total energy results (#13030)
2021-09-29 12:08:03 +02:00
s-hadinger
7ced37fdd6
Merge pull request #13239 from s-hadinger/berry_nan
Berry support for NAN
2021-09-28 23:21:14 +02:00
Stephan Hadinger
b5c58d0273 Berry support for NAN 2021-09-28 22:47:40 +02:00
s-hadinger
42d4fe9bb1
Merge pull request #13238 from s-hadinger/berry_save_bytecode
Berry smart compile to bytecode
2021-09-28 22:33:56 +02:00
Stephan Hadinger
2f494feb80 Berry smart compile to bytecode 2021-09-28 22:17:11 +02:00
Adrian Scillato
b107725620
Allow KNX and Zigbee to be compiled together 2021-09-28 15:56:39 -03:00
Adrian Scillato
e49dfa7296
KNX: Fix Energy Driver dependency 2021-09-28 15:55:38 -03:00
Adrian Scillato
e28a3342cb
Allow KNX and Zigbee 2021-09-28 15:53:14 -03:00
s-hadinger
b2a96298ba
Merge pull request #13234 from s-hadinger/fix_energy_berry_mapping
Berry fix Energy mapping
2021-09-28 20:21:42 +02:00
Stephan Hadinger
27dbe91a1c Berry fix Energy mapping 2021-09-28 20:03:24 +02:00
Theo Arends
2e06937b6f Bump version 9.5.0.9 2021-09-27 14:36:19 +02:00
Theo Arends
2455d4bfec Prep energy total by phase 2021-09-27 14:31:16 +02:00
s-hadinger
bd49586715
Merge pull request #13227 from s-hadinger/berry_stacktrace
Berry print stack trace when exception, more detailed with line numbers if `#define USE_BERRY_DEBUG`
2021-09-27 14:03:48 +02:00