Merge remote-tracking branch 'origin/master' into master-cmake

Conflicts:
	README.md
	build-scripts/ESP32-A1S-sdkconfig.defaults
	build-scripts/I2S-4MFlash-sdkconfig.defaults
	build-scripts/NonOTA-I2S-4MFlash-sdkconfig.defaults
	build-scripts/NonOTA-SqueezeAmp-sdkconfig.defaults
	build-scripts/SqueezeAmp4MBFlash-sdkconfig.defaults
	build-scripts/SqueezeAmp8MBFlash-sdkconfig.defaults

build-scripts/ESP32-A1S-sdkconfig.defaults

@@ -171,8 +171,183 @@ CONFIG_BT_A2DP_ENABLE=y
 # CONFIG_BT_SPP_ENABLED is not set
 # CONFIG_BT_HFP_ENABLE is not set
 CONFIG_BT_SSP_ENABLED=y
+<<<<<<< HEAD
 # CONFIG_BT_BLE_ENABLED is not set
 CONFIG_BT_STACK_NO_LOG=y
+=======
+CONFIG_BT_BLE_ENABLED=n
+CONFIG_BT_BLE_SMP_ENABLE=y
+
+
+
+
+CONFIG_BT_LOG_HCI_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_HCI_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_BTM_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_BTM_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_L2CAP_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_SDP_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_SDP_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_GAP_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_GAP_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_BNEP_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_BNEP_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_PAN_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_PAN_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_A2D_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_A2D_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_AVDT_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_AVDT_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_AVCT_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_AVCT_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_AVRC_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_AVRC_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_MCA_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_MCA_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_HID_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_HID_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_APPL_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_APPL_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_GATT_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_GATT_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_SMP_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_SMP_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_BTIF_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_BTIF_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_BTC_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_BTC_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_OSI_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_OSI_TRACE_LEVEL=2
+
+
+CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_WARNING=y
+
+
+
+
+CONFIG_BT_LOG_BLUFI_TRACE_LEVEL=2
+>>>>>>> refs/remotes/origin/master
 CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
@@ -446,11 +621,19 @@ CONFIG_LWIP_MAX_SOCKETS=16
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
+<<<<<<< HEAD
 # CONFIG_LWIP_SO_RCVBUF is not set
 # CONFIG_LWIP_IP_REASSEMBLY is not set
 # CONFIG_LWIP_IP_FRAG is not set
 # CONFIG_LWIP_STATS is not set
 # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
+=======
+CONFIG_LWIP_IP_REASSEMBLY=y
+
+
+
+
+>>>>>>> refs/remotes/origin/master
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32