8000 Tasmota changes by Jason2866 · Pull Request #636 · tasmota/arduino-esp32 · GitHub
[go: up one dir, main page]
Skip to content

Tasmota changes #636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8000
Merged
merged 9 commits into from
May 19, 2025
Merged

Tasmota changes #636

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
102fb3b
Tasmota changes
Jason2866 May 7, 2025
d19bbdb
Merge branch 'espressif:release/v3.3.x' into release/v3.3.x
Jason2866 May 13, 2025
356a7a0
Merge branch 'espressif:release/v3.3.x' into release/v3.3.x
Jason2866 May 15, 2025
a4012fc
Update esp32-hal.h
Jason2866 May 18, 2025
0128dc9
Update esp32-hal-bt.c
Jason2866 May 18, 2025
1fca957
Update esp32-hal-bt.h
Jason2866 May 18, 2025
48dc945
Update esp32-hal-misc.c
Jason2866 May 18, 2025
246618c
Update CMakeLists.txt
Jason2866 May 18, 2025
d006156
Merge branch 'release/v3.3.x' into merge33
Jason2866 May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update esp32-hal-misc.c
  • Loading branch information
@Jason2866
Jason2866 authored May 18, 2025
commit 48dc945e018ee172eaf9f50da80f3fb6e4993d1c
21 changes: 21 additions & 0 deletions cores/esp32/esp32-hal-misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include "esp_ota_ops.h"
#endif //CONFIG_APP_ROLLBACK_ENABLE
#include "esp_private/startup_internal.h"
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
#include "esp_bt.h"
#endif //CONFIG_BT_BLUEDROID_ENABLED
#include <sys/time.h>
#include "soc/rtc.h"
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4) && !defined(CONFIG_IDF_TARGET_ESP32C5)
Expand Down Expand Up @@ -242,6 +245,19 @@ bool verifyRollbackLater() {
}
#endif

#ifdef CONFIG_BT_BLUEDROID_ENABLED
#if CONFIG_IDF_TARGET_ESP32
//overwritten in esp32-hal-bt.c
bool btInUse() __attribute__((weak));
bool btInUse() {
return false;
}
#else
//from esp32-hal-bt.c
extern bool btInUse();
#endif
#endif

#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
ESP_SYSTEM_INIT_FN(init_psram_new, CORE, BIT(0), 99) {
psramInit();
Expand Down Expand Up @@ -291,6 +307,11 @@ void initArduino() {
if (err) {
log_e("Failed to initialize NVS! Error: %u", err);
}
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
if (!btInUse()) {
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
}
#endif
init();
initVariant();
}
Expand Down
0