Skip to content

Commit 8828e1a

Browse files
me-no-devme-no-dev
committed
Fix 3.3 build
Currently there is an issue with ESP-FACE which will break the build
1 parent ad0586a commit 8828e1a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

‎sdkconfig

+8-4
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=
212212
CONFIG_SCAN_DUPLICATE_TYPE=0
213213
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=20
214214
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=
215+
CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
215216
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
216217
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
217218
CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
@@ -250,6 +251,7 @@ CONFIG_SMP_ENABLE=y
250251
CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY=
251252
CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
252253
CONFIG_BT_RESERVE_DRAM=0xdb5c
254+
CONFIG_BLE_MESH=
253255

254256
#
255257
# Driver configurations
@@ -425,10 +427,6 @@ CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
425427
# Wi-Fi
426428
#
427429
CONFIG_SW_COEXIST_ENABLE=y
428-
CONFIG_SW_COEXIST_PREFERENCE_WIFI=
429-
CONFIG_SW_COEXIST_PREFERENCE_BT=
430-
CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y
431-
CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
432430
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
433431
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
434432
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
@@ -468,7 +466,10 @@ CONFIG_PM_ENABLE=
468466
CONFIG_OV2640_SUPPORT=y
469467
CONFIG_OV7725_SUPPORT=y
470468
CONFIG_OV3660_SUPPORT=y
469+
CONFIG_OV5640_SUPPORT=y
471470
CONFIG_SCCB_HARDWARE_I2C=y
471+
CONFIG_SCCB_HARDWARE_I2C_PORT0=
472+
CONFIG_SCCB_HARDWARE_I2C_PORT1=y
472473
CONFIG_CAMERA_CORE0=
473474
CONFIG_CAMERA_CORE1=y
474475
CONFIG_CAMERA_NO_AFFINITY=
@@ -641,6 +642,7 @@ CONFIG_LOG_COLORS=
641642
# LWIP
642643
#
643644
CONFIG_L2_TO_L3_COPY=
645+
CONFIG_ETHARP_SUPPORT_VLAN=
644646
CONFIG_LWIP_IRAM_OPTIMIZATION=
645647
CONFIG_LWIP_MAX_SOCKETS=10
646648
CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y
@@ -664,6 +666,7 @@ CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
664666
CONFIG_LWIP_DHCPS_LEASE_UNIT=60
665667
CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
666668
CONFIG_LWIP_AUTOIP=
669+
CONFIG_LWIP_IPV6_AUTOCONFIG=
667670
CONFIG_LWIP_NETIF_LOOPBACK=y
668671
CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
669672

@@ -719,6 +722,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
719722
#
720723
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
721724
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
725+
CONFIG_LWIP_ESP_LWIP_ASSERT=y
722726

723727
#
724728
# mbedTLS

‎tools/build-libs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_240/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_240=
1515
$SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240' ./sdkconfig
1616

1717
# make the example
18+
make defconfig
1819
make -j8 #fixes make issue where build fails in arduino core subfolder
1920
make -j8 idf-libs || exit 1

0 commit comments

Comments
 (0)