Skip to content

Commit 9233db8

Browse files
committed
Fix PIO builds and change coex policy
1 parent 1db376c commit 9233db8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+9
-9
lines changed

tools/platformio-build.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
],
9797

9898
CPPPATH=[
99-
join(FRAMEWORK_DIR, "tools", "sdk", "include", "config"),
99+
join(FRAMEWORK_DIR, "tools", "sdk", "include", "config"),
100100
join(FRAMEWORK_DIR, "tools", "sdk", "include", "app_trace"),
101101
join(FRAMEWORK_DIR, "tools", "sdk", "include", "app_update"),
102102
join(FRAMEWORK_DIR, "tools", "sdk", "include", "asio"),
@@ -153,14 +153,14 @@
153153
join(FRAMEWORK_DIR, "tools", "sdk", "include", "xtensa-debug-module"),
154154
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
155155
],
156-
156+
157157
LIBPATH=[
158158
join(FRAMEWORK_DIR, "tools", "sdk", "lib"),
159159
join(FRAMEWORK_DIR, "tools", "sdk", "ld")
160160
],
161-
161+
162162
LIBS=[
163-
"gcc", "openssl", "btdm_app", "fatfs", "wps", "coexist", "wear_levelling", "esp_http_client", "protobuf-c", "hal", "newlib", "driver", "bootloader_support", "pp", "freemodbus", "mesh", "smartconfig", "jsmn", "wpa", "ethernet", "phy", "app_trace", "console", "ulp", "wpa_supplicant", "freertos", "bt", "micro-ecc", "cxx", "xtensa-debug-module", "tcp_transport", "mdns", "vfs", "esp_ringbuf", "soc", "core", "sdmmc", "libsodium", "coap", "tcpip_adapter", "protocomm", "esp_event", "c_nano", "esp-tls", "asio", "rtc", "spi_flash", "wpa2", "wifi_provisioning", "esp32", "app_update", "nghttp", "spiffs", "unity", "esp_https_server", "espnow", "nvs_flash", "esp_adc_cal", "log", "smartconfig_ack", "expat", "m", "mqtt", "c", "heap", "mbedtls", "lwip", "net80211", "esp_http_server", "pthread", "json", "esp_https_ota", "stdc++"
163+
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lesp_ringbuf", "-lsoc", "-lcore", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lapp_update", "-lnghttp", "-lspiffs", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-lsmartconfig_ack", "-lexpat", "-lm", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lstdc++"
164164
],
165165

166166
LIBSOURCE_DIRS=[

tools/sdk/bin/bootloader_qout_40m.bin

0 Bytes
Binary file not shown.

tools/sdk/include/config/sdkconfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164
#define CONFIG_BTDM_LPCLK_SEL_MAIN_XTAL 1
165165
#define CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED 1
166166
#define CONFIG_LIBSODIUM_USE_MBEDTLS_SHA 1
167+
#define CONFIG_SW_COEXIST_PREFERENCE_WIFI 1
167168
#define CONFIG_DMA_RX_BUF_NUM 10
168169
#define CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED 1
169170
#define CONFIG_TCP_SYNMAXRTX 6
@@ -195,7 +196,7 @@
195196
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN 2
196197
#define CONFIG_EMAC_TASK_STACK_SIZE 3072
197198
#define CONFIG_MB_QUEUE_LENGTH 20
198-
#define CONFIG_SW_COEXIST_PREFERENCE_VALUE 2
199+
#define CONFIG_SW_COEXIST_PREFERENCE_VALUE 0
199200
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA 1
200201
#define CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER 1
201202
#define CONFIG_PPP_SUPPORT 1
@@ -265,7 +266,6 @@
265266
#define CONFIG_MBEDTLS_TLS_CLIENT 1
266267
#define CONFIG_BTDM_CONTROLLER_HCI_MODE_VHCI 1
267268
#define CONFIG_BT_ENABLED 1
268-
#define CONFIG_SW_COEXIST_PREFERENCE_BALANCE 1
269269
#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
270270
#define CONFIG_MONITOR_BAUD 115200
271271
#define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1

tools/sdk/lib/libapp_trace.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libasio.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libbootloader_support.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libbt.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libcoap.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libconsole.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libcxx.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libdriver.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp-tls.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp32.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_adc_cal.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_event.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_http_client.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_http_server.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_https_ota.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_https_server.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libesp_ringbuf.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libethernet.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libexpat.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfatfs.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfreemodbus.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libfreertos.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libheap.a

0 Bytes
Binary file not shown.

tools/sdk/lib/liblibsodium.a

0 Bytes
Binary file not shown.

tools/sdk/lib/liblog.a

0 Bytes
Binary file not shown.

tools/sdk/lib/liblwip.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmbedtls.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmdns.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libmqtt.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libnewlib.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libnghttp.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libnvs_flash.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libopenssl.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libprotobuf-c.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libprotocomm.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libpthread.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libsdmmc.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libsmartconfig_ack.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libsoc.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libspi_flash.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libspiffs.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libtcp_transport.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libtcpip_adapter.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libulp.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libunity.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libvfs.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libwear_levelling.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libwifi_provisioning.a

0 Bytes
Binary file not shown.

tools/sdk/lib/libwpa_supplicant.a

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

tools/sdk/sdkconfig

+3-3
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,10 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
344344
# Wi-Fi
345345
#
346346
CONFIG_SW_COEXIST_ENABLE=y
347-
CONFIG_SW_COEXIST_PREFERENCE_WIFI=
347+
CONFIG_SW_COEXIST_PREFERENCE_WIFI=y
348348
CONFIG_SW_COEXIST_PREFERENCE_BT=
349-
CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y
350-
CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
349+
CONFIG_SW_COEXIST_PREFERENCE_BALANCE=
350+
CONFIG_SW_COEXIST_PREFERENCE_VALUE=0
351351
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
352352
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=10
353353
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=

0 commit comments

Comments
 (0)