Fix 4.0 builds

Author: me-no-dev

sdkconfig

@@ -141,6 +141,8 @@ CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=0
 # CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_HCI is not set
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_PCM=y
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=1
+# CONFIG_BTDM_CTRL_AUTO_LATENCY is not set
+# CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF is not set
 CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF=3
 CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF=2
 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -162,6 +164,7 @@ CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE=y
 CONFIG_BTDM_SCAN_DUPL_TYPE=0
 CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE=20
 # CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN is not set
+CONFIG_BTDM_CTRL_FULL_SCAN_SUPPORTED=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
 CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
 CONFIG_BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
@@ -306,7 +309,10 @@ CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 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 is not set
+CONFIG_SCCB_HARDWARE_I2C_PORT1=y
 # CONFIG_CAMERA_CORE0 is not set
 CONFIG_CAMERA_CORE1=y
 # CONFIG_CAMERA_NO_AFFINITY is not set
@@ -357,10 +363,6 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_OTA_ALLOW_HTTP is not set
 # CONFIG_ESP_HTTPS_SERVER_ENABLE is not set
 CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
-# CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_WIFI is not set
-# CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BT is not set
-CONFIG_ESP32_WIFI_SW_COEXIST_PREFERENCE_BALANCE=y
-CONFIG_ESP32_WIFI_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 is not set
@@ -504,6 +506,7 @@ CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y
 CONFIG_LWIP_DHCPS_LEASE_UNIT=60
 CONFIG_LWIP_DHCPS_MAX_STATION_NUM=8
 # CONFIG_LWIP_AUTOIP is not set
+# CONFIG_LWIP_IPV6_AUTOCONFIG is not set
 CONFIG_LWIP_NETIF_LOOPBACK=y
 CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
@@ -682,6 +685,7 @@ CONFIG_SEMIHOSTFS_HOST_PATH_MAX_LEN=128
 CONFIG_WL_SECTOR_SIZE_4096=y
 CONFIG_WL_SECTOR_SIZE=4096
 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
+CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
 CONFIG_WPA_MBEDTLS_CRYPTO=y
 # CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set
 
@@ -745,6 +749,7 @@ CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR=y
 CONFIG_SCAN_DUPLICATE_TYPE=0
 CONFIG_DUPLICATE_SCAN_CACHE_SIZE=20
 # CONFIG_BLE_MESH_SCAN_DUPLICATE_EN is not set
+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
@@ -823,10 +828,6 @@ CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
 CONFIG_SW_COEXIST_ENABLE=y
-# CONFIG_SW_COEXIST_PREFERENCE_WIFI is not set
-# CONFIG_SW_COEXIST_PREFERENCE_BT is not set
-CONFIG_SW_COEXIST_PREFERENCE_BALANCE=y
-CONFIG_SW_COEXIST_PREFERENCE_VALUE=2
 CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150
 CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
 CONFIG_MB_QUEUE_LENGTH=20

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

tools/copy-to-arduino.sh

@@ -1,17 +1,21 @@
 #!/bin/bash
 source ./tools/config.sh
 
-if [[ "$AR_OS" == "macos" ]]; then
-	ESP32_ARDUINO="$HOME/Documents/Arduino/hardware/espressif/esp32"
-else
-	ESP32_ARDUINO="$HOME/Arduino/hardware/espressif/esp32"
+if [ -z $ESP32_ARDUINO ]; then
+    if [[ "$AR_OS" == "macos" ]]; then
+    	ESP32_ARDUINO="$HOME/Documents/Arduino/hardware/espressif/esp32"
+    else
+    	ESP32_ARDUINO="$HOME/Arduino/hardware/espressif/esp32"
+    fi
 fi
 
 if ! [ -d "$ESP32_ARDUINO" ]; then
 	echo "ERROR: Target arduino folder does not exist!"
 	exit 1
 fi
 
+echo "Installing new libraries to $ESP32_ARDUINO"
+
 rm -rf $ESP32_ARDUINO/tools/sdk
 cp -Rf $AR_SDK $ESP32_ARDUINO/tools/sdk
 cp -f $AR_ESPTOOL_PY $ESP32_ARDUINO/tools/esptool.py