Skip to content

Commit

Permalink
Merge pull request #2293 from MaBecker/esp32-v3.3.6
Browse files Browse the repository at this point in the history
update esp-idf to v3.3.6
  • Loading branch information
gfwilliams authored Nov 23, 2022
2 parents 750b7d6 + 24ec262 commit 11d2ca3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Bangle.js: When reading file info from a filename table, do it in blocks of 8 (20% faster file search)
Bangle.js2: Increase flash buffer size from 16->32 bytes (5% performance increase)
ESP32: update esp-idf to v3.3.6

2v16 : JIT functions now execute in their own function scope (allows arguments)
Move older 'HY' boards to use `g` for the built-in graphics, not `LCD` (and change docs)
Expand Down
4 changes: 2 additions & 2 deletions libs/network/esp32/jswrap_esp32_network.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#include "tcpip_adapter.h"
#include "mdns/include/mdns.h"

#include "lwip/apps/ping/ping.h"
#include "lwip/apps/ping/esp_ping.h"
#include "lwip/include/apps/ping/ping.h"
#include "lwip/include/apps/esp_ping.h"
#include "apps/sntp/sntp.h"
#include "lwip/dns.h"

Expand Down
19 changes: 13 additions & 6 deletions make/family/ESP32.make
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ INCLUDE+=\
-I$(ESP_IDF_PATH)/components/esp32/include \
-I$(ESP_IDF_PATH)/components/freertos/include \
-I$(ESP_IDF_PATH)/components/heap/include \
-I$(ESP_IDF_PATH)/components/json/include \
-I$(ESP_IDF_PATH)/components/log/include \
-I$(ESP_IDF_PATH)/components/lwip/include/lwip \
-I$(ESP_IDF_PATH)/components/lwip/include/lwip/port \
-I$(ESP_IDF_PATH)/components/lwip/include/lwip/posix \
-I$(ESP_IDF_PATH)/components/lwip/lwip/src/include/posix \
-I$(ESP_IDF_PATH)/components/lwip/lwip/src/include \
-I$(ESP_IDF_PATH)/components/lwip/port/esp32/include \
-I$(ESP_IDF_PATH)/components/lwip/include_compat \
-I$(ESP_IDF_PATH)/components/newlib/include \
-I$(ESP_IDF_PATH)/components/newlib/platform_include \
-I$(ESP_IDF_PATH)/components/nvs_flash/include \
Expand All @@ -77,10 +77,14 @@ INCLUDE+=\
-I$(ESP_IDF_PATH)/components/soc/esp32/include \
-I$(ESP_IDF_PATH)/components/soc/esp32/include/soc \
-I$(ESP_IDF_PATH)/components/vfs/include \
-Itargets/esp32/include
-I$(ESP_IDF_PATH)/components/esp_ringbuf/include \
-I$(ESP_IDF_PATH)/components/lwip/include/apps/sntp \
-I$(ESP_IDF_PATH)/components/esp_event/include \
-I$(ESP_IDF_PATH)/components/lwip/include/apps

LDFLAGS+=-nostdlib -u call_user_start_cpu0 -u ld_include_panic_highint_hdl -Wl,--gc-sections -Wl,-static -Wl,-EL
LIBS+=-T esp32_out.ld \
-T$(ESP_IDF_PATH)/components/esp32/ld/esp32.common.ld \
-T esp32.project.ld \
-T$(ESP_IDF_PATH)/components/esp32/ld/esp32.rom.ld \
-T$(ESP_IDF_PATH)/components/esp32/ld/esp32.peripherals.ld \
$(ESP_IDF_PATH)/components/esp32/lib/librtc.a \
Expand All @@ -92,6 +96,9 @@ $(ESP_IDF_PATH)/components/esp32/lib/libwps.a \
$(ESP_IDF_PATH)/components/newlib/lib/libc-psram-workaround.a \
$(ESP_IDF_PATH)/components/newlib/lib/libm-psram-workaround.a \
$(ESP_IDF_PATH)/components/esp32/lib/libcore.a \
$(ESP_APP_TEMPLATE_PATH)/build/esp_ringbuf/libesp_ringbuf.a \
$(ESP_APP_TEMPLATE_PATH)/build/bootloader_support/libbootloader_support.a \
$(ESP_APP_TEMPLATE_PATH)/build/bootloader/efuse/libefuse.a \
-lbt \
-lbtdm_app \
-ldriver \
Expand Down

0 comments on commit 11d2ca3

Please sign in to comment.