Fix 3.3 build

me-no-dev · me-no-dev · commit 8828e1abb445 · 2020-04-07T00:46:42.000+03:00
Currently there is an issue with ESP-FACE which will break the build
diff --git a/sdkconfig b/sdkconfig
@@ -212,6 +212,7 @@ CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=
 CONFIG_SCAN_DUPLICATE_TYPE=0
 CONFIG_DUPLICATE_SCAN_CACHE_SIZE=20
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=
+CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
 CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
 CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
 CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
@@ -250,6 +251,7 @@ CONFIG_SMP_ENABLE=y
 CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY=
 CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
 CONFIG_BT_RESERVE_DRAM=0xdb5c
+CONFIG_BLE_MESH=
 
 #
 # Driver configurations
@@ -425,10 +427,6 @@ CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 # Wi-Fi
 #
 CONFIG_SW_COEXIST_ENABLE=y
-CONFIG_SW_COEXIST_PREFERENCE_WIFI=
-CONFIG_SW_COEXIST_PREFERENCE_BT=
-CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y
-CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
 CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=
@@ -468,7 +466,10 @@ CONFIG_PM_ENABLE=
 CONFIG_OV2640_SUPPORT=y
 CONFIG_OV7725_SUPPORT=y
 CONFIG_OV3660_SUPPORT=y
+CONFIG_OV5640_SUPPORT=y
 CONFIG_SCCB_HARDWARE_I2C=y
+CONFIG_SCCB_HARDWARE_I2C_PORT0=
+CONFIG_SCCB_HARDWARE_I2C_PORT1=y
 CONFIG_CAMERA_CORE0=
 CONFIG_CAMERA_CORE1=y
 CONFIG_CAMERA_NO_AFFINITY=
@@ -641,6 +642,7 @@ CONFIG_LOG_COLORS=
 # LWIP
 #
 CONFIG_L2_TO_L3_COPY=
+CONFIG_ETHARP_SUPPORT_VLAN=
 CONFIG_LWIP_IRAM_OPTIMIZATION=
 CONFIG_LWIP_MAX_SOCKETS=10
 CONFIG_LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS=y
@@ -664,6 +666,7 @@ CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 CONFIG_LWIP_AUTOIP=
+CONFIG_LWIP_IPV6_AUTOCONFIG=
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 
@@ -719,6 +722,7 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
 #
 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
 # mbedTLS
diff --git a/tools/build-libs.sh b/tools/build-libs.sh
@@ -15,5 +15,6 @@ $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_240/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_240=
 $SED -i '/CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ/c\CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240' ./sdkconfig
 
 # make the example
+make defconfig
 make -j8 #fixes make issue where build fails in arduino core subfolder
 make -j8 idf-libs || exit 1
