Commit Graph

13724 Commits

Author SHA1 Message Date
Stephan Hadinger 1aa017a095 Roll back from #13435 2021-10-23 17:46:52 +02:00
s-hadinger f9eee02265
Merge pull request #13448 from s-hadinger/openhasp_roboto
LVGL add roboto condensed
2021-10-23 16:47:02 +02:00
Stephan Hadinger e047260158 LVGL add roboto condensed 2021-10-23 16:13:00 +02:00
s-hadinger 8ad20cb4a3
Merge pull request #13444 from s-hadinger/openhasp_alpha2
LVGL OpenHASP alpha2
2021-10-23 15:34:09 +02:00
Stephan Hadinger 6fa5aec939 LVGL OpenHASP alpha2 2021-10-23 15:08:33 +02:00
Theo Arends 498cd2d6d0 Merge branch 'development' of https://github.com/arendst/Tasmota into development 2021-10-23 14:41:03 +02:00
Theo Arends afee240717 Update changelog 2021-10-23 14:40:49 +02:00
Theo Arends 36e51ff4bb
Merge pull request #13441 from gemu2015/sml_fix
fix sml compile error SML_MAX_VARS missing
2021-10-23 14:36:01 +02:00
Theo Arends e4570cd45f
Merge pull request #13442 from hallard/fix_mqtt_tls_webui
Fixed Checkbox "MQTT TLS" are not saved through webinterface
2021-10-23 14:25:00 +02:00
Charles 5c7e1657ed use setOption103 2021-10-23 14:08:40 +02:00
gemu2015 41639d46c2 fix sml compile error SML_MAX_VARS missing 2021-10-23 08:07:51 +02:00
Jason2866 746682cd5b
Merge pull request #13437 from Jason2866/ESP32_core201rc1
ESP32 Core 2.0.1 rc1
2021-10-22 13:08:52 +02:00
Jason2866 6237867894 ESP32 Core 2.0.1 rc1 2021-10-22 13:06:05 +02:00
Theo Arends e6cc6dfcd1
Merge pull request #13435 from Leo-PL/fix_bearssl_connect_esp32
BearSSL: support connect() without timeout on ESP32
2021-10-22 09:33:49 +02:00
Lech Perczak b5730a9be9 BearSSL: support connect() without timeout on ESP32
Arduino-ESP32 supports both versions of 'connect' method, with and
without timeout argument. Since most users of
WiFiClientSecure_light class use version without this argument -
for example - Telegram, export both on ESP32 to fix build failure
with USE_TELEGRAM enabled on ESP32.

Fixes: 3d5c68b850 ("Berry class ``webclient`` for HTTP/HTTPS requests")
Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
2021-10-21 23:29:47 +02:00
mikep1998 bc2919d360
Merge pull request #1 from arendst/development
test
2021-10-21 13:22:44 -07:00
mikep1998 207298271a Revert "Update tasmota_lv_conf.h"
This reverts commit b30d559c4d.
2021-10-21 13:20:43 -07:00
s-hadinger 1360d68540
Merge pull request #13434 from s-hadinger/berry_json_dump
Berry json dump for subclasses
2021-10-21 22:02:08 +02:00
Stephan Hadinger 0a5bccc8d9 Berry json dump for subclasses 2021-10-21 21:41:20 +02:00
Theo Arends 2d4e5a86c9 Merge branch 'development' of https://github.com/arendst/Tasmota into development 2021-10-21 18:35:28 +02:00
Theo Arends b65e0fb21e Fix compile error 2021-10-21 18:35:25 +02:00
Theo Arends af85cbedb1
Merge pull request #13411 from s-hadinger/twdt_to_tasmota
Move TWDT watchdog from esp-idf to Tasmota
2021-10-21 16:59:39 +02:00
Theo Arends cf380f8a90 Update changelog 2021-10-21 16:38:23 +02:00
Theo Arends 28ed5e7960 Merge branch 'development' of https://github.com/arendst/Tasmota into development 2021-10-21 16:24:58 +02:00
Theo Arends 071971edaa Fix initial reset RTC memory based variables
Fix initial reset RTC memory based variables like EnergyToday and EnergyTotal
2021-10-21 16:24:41 +02:00
Theo Arends fcfc3a05c1
Merge pull request #13408 from mbezuidenhout/feature/os-compat
Updated paths to work on windows and unix
2021-10-21 16:03:12 +02:00
Theo Arends 9e612dcb8b
Merge branch 'development' into twdt_to_tasmota 2021-10-21 15:59:54 +02:00
Theo Arends 1be20cf5a0
Merge pull request #13418 from arendst/Solo1_core1075
Core 1.0.7.5 for solo1
2021-10-21 15:58:47 +02:00
Theo Arends b3748d6f5f
Merge pull request #13417 from Jason2866/Core_1075
ESP32 Tasmota Core 1.0.7.5
2021-10-21 15:58:32 +02:00
Theo Arends 11371e3da1 Update changelogs 2021-10-21 15:57:04 +02:00
Adrian Scillato 5647fbdc04
Merge pull request #13427 from barbudor/file_editor_nowrap
file editor no-wrap
2021-10-20 18:50:46 -03:00
s-hadinger 8c8933f8f1
Merge pull request #13428 from s-hadinger/berry_python_compat2
Berry python compat for ranges
2021-10-20 23:24:57 +02:00
Stephan Hadinger 85a0ba4b6d Change limit 2021-10-20 23:06:29 +02:00
Stephan Hadinger 13e8287554 Berry python compat for ranges 2021-10-20 22:59:16 +02:00
Barbudor 38c9942c2c file editor no-wrap 2021-10-20 22:49:50 +02:00
s-hadinger 2dc7047177
Merge pull request #13424 from s-hadinger/bump_10_0_0_1
Bump to version 10.0.0.1
2021-10-20 20:59:32 +02:00
Stephan Hadinger 06b4dba98a Bump to version 10.0.0.1 2021-10-20 20:40:26 +02:00
s-hadinger 9b8f4e2a16
Merge pull request #13423 from s-hadinger/berry_python_compat
Berry add module ``python_compat`` to be closer to Python syntax
2021-10-20 19:26:27 +02:00
Stephan Hadinger 9f7a52633a Berry add module ``python_compat`` to be closer to Python syntax 2021-10-20 19:04:18 +02:00
Jason2866 a2c68f501d
Core 1.0.7.5 for solo1 2021-10-20 13:32:40 +02:00
Jason2866 79a07fcbbf
PR Template Core 1.0.7.5 2021-10-20 12:12:33 +02:00
Jason2866 35e375798e
Stable Tasmota ESP32 2021-10-20 12:11:36 +02:00
Jason2866 4c19930ef3
Tasmota ESP32 Core 1.0.7.5 2021-10-20 12:10:41 +02:00
s-hadinger ab118b5b1c
Merge pull request #13413 from s-hadinger/berry_tele
Berry support for tele rules
2021-10-19 22:48:31 +02:00
Stephan Hadinger 3d3d634070 Berry support for tele rules 2021-10-19 22:38:54 +02:00
s-hadinger 78933490aa
Merge pull request #13412 from s-hadinger/berry_global_sleep
Berry global sleep
2021-10-19 22:05:49 +02:00
Stephan Hadinger 24afc50375 Berry add access to Settings 2021-10-19 21:47:48 +02:00
Stephan Hadinger b8b1e0ca5f Berry sleep global 2021-10-19 21:13:52 +02:00
Stephan Hadinger f4dc0090b0 Move TWDT watchdog from esp-idf to Tasmota 2021-10-19 21:00:48 +02:00
s-hadinger e7159c8c8c
Merge pull request #13410 from s-hadinger/berry_set_solidified_fix
Berry prevent crash when setting static variable for solidified class
2021-10-19 20:56:09 +02:00