Skip to content

Update to ESP-IDF 5.0 #8411

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

Merged
merged 29 commits into from
Sep 22, 2023
Merged

Update to ESP-IDF 5.0 #8411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a18e015
update idf to v5.0
microdev1 Jan 6, 2023
931ed7c
conditionally include `esp_psram` and fix sdkconfig
microdev1 Jan 6, 2023
7b9c87e
update espressif ble sdkconfig
microdev1 Mar 2, 2023
242a720
fix psram crash
microdev1 Mar 2, 2023
c38972b
update ulp implementation
microdev1 Mar 2, 2023
02da5ca
update espressif ci
microdev1 Mar 2, 2023
8feb3ba
refactor board config files
microdev1 Mar 2, 2023
3d2cfa1
enable `paralleldisplay` on `esp32` and `esp32s3`
microdev1 Mar 11, 2023
ba22633
temporarily disable `rgbmatrix` on `espressif`
microdev1 Mar 11, 2023
7a7f1e6
fix arch switch statement in ulp
microdev1 Mar 21, 2023
e90c07e
More esp fixing
tannewt Aug 12, 2023
feabf7b
Use kconfiglib in sdkconfig update script
tannewt Aug 16, 2023
6043874
Split out ram dependent configs
tannewt Aug 24, 2023
73e04e8
Split out flash and psram settings from sdkconfig
tannewt Aug 29, 2023
1ab083f
Support target specific kconfig source
tannewt Sep 8, 2023
4b29862
Clean up more s2 sdkconfig
tannewt Sep 8, 2023
2a45d95
Use correct flash defaults
tannewt Sep 8, 2023
5937f4c
Hopefully finish updating kconfig
tannewt Sep 11, 2023
cb6b4d0
Fix esp-camera. 32 was dropped so the path doesn't have esp32 in it.
tannewt Sep 11, 2023
0a9ae1f
Code size optimizations
tannewt Sep 11, 2023
18fd004
More kconfig updates
tannewt Sep 11, 2023
99726e2
Switch to newlib nano
tannewt Sep 12, 2023
f357f4a
Size optimize 3 more boards
tannewt Sep 12, 2023
a3d3712
Fix PSRAM address
tannewt Sep 13, 2023
952118f
Update new boards. Reduce memory use in S2
tannewt Sep 14, 2023
4087960
Fix MDNS. C3 works
tannewt Sep 14, 2023
0547ef6
Update dotclock for IDF 5.0
tannewt Sep 15, 2023
c86b3ae
Update to merged idf changes
tannewt Sep 18, 2023
d400002
Fix board def mistakes and cast
tannewt Sep 20, 2023
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
fix psram crash
  • Loading branch information
@microdev1 @tannewt
microdev1 authored and tannewt committed Sep 13, 2023
commit 242a720593285aad911ca504a07bbfd2500f16e3
10 changes: 1 addition & 9 deletions ports/espressif/common-hal/espidf/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#else
#define esp_himem_reserved_area_size() (0)
#endif
bool ok_to_reserve_psram = true;
size_t reserved_psram = DEFAULT_RESERVED_PSRAM;
#endif

Expand All @@ -63,9 +62,6 @@ bool common_hal_espidf_set_reserved_psram(size_t amount) {
if (!esp_psram_is_initialized()) {
return false;
}
if (!ok_to_reserve_psram) {
return false;
}
if (amount > psram_size_usable()) {
return false;
}
Expand Down Expand Up @@ -113,11 +109,7 @@ size_t common_hal_espidf_get_total_psram(void) {
intptr_t common_hal_espidf_get_psram_start(void) {
#ifdef CONFIG_SPIRAM
if (esp_psram_is_initialized()) {
#ifdef CONFIG_IDF_TARGET_ESP32
return SOC_EXTRAM_DATA_LOW;
#else
return SOC_EXTRAM_DATA_HIGH - psram_size_usable();
#endif
}
#endif
return 0;
Expand All @@ -126,7 +118,7 @@ intptr_t common_hal_espidf_get_psram_start(void) {
intptr_t common_hal_espidf_get_psram_end(void) {
#ifdef CONFIG_SPIRAM
if (esp_psram_is_initialized()) {
return common_hal_espidf_get_psram_start() + psram_size_usable();
return SOC_EXTRAM_DATA_LOW + psram_size_usable();
}
#endif
return 0;
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/esp-idf-config/sdkconfig-debug.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
# Hardware Abstraction Layer (HAL) and Low Level (LL)
#
# CONFIG_HAL_ASSERTION_DISABLE is not set
# CONFIG_HAL_ASSERTION_SILIENT is not set
# CONFIG_HAL_ASSERTION_SILENT is not set
# CONFIG_HAL_ASSERTION_ENABLE is not set
CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/esp-idf-config/sdkconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
CONFIG_ESP_IPC_TASK_STACK_SIZE=1536
CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384

CONFIG_ESP_TASK_WDT=n
CONFIG_ESP_TASK_WDT_INIT=n

CONFIG_ESP_TLS_SERVER=y

Expand Down