mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-11 05:57:05 +03:00
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
This commit is contained in:
@@ -166,13 +166,7 @@ CONFIG_BT_A2DP_SOURCE_TASK_STACK_SIZE=2048
|
||||
|
||||
|
||||
CONFIG_BT_SSP_ENABLED=y
|
||||
CONFIG_BT_BLE_ENABLED=y
|
||||
CONFIG_BT_GATTS_ENABLE=y
|
||||
|
||||
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y
|
||||
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0
|
||||
CONFIG_BT_GATTC_ENABLE=y
|
||||
|
||||
CONFIG_BT_BLE_ENABLED=n
|
||||
CONFIG_BT_BLE_SMP_ENABLE=y
|
||||
|
||||
|
||||
@@ -497,6 +491,8 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=40
|
||||
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER=y
|
||||
CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=0
|
||||
CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=12
|
||||
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n
|
||||
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n
|
||||
|
||||
|
||||
|
||||
@@ -613,7 +609,7 @@ CONFIG_LWIP_MAX_SOCKETS=16
|
||||
|
||||
CONFIG_LWIP_SO_REUSE=y
|
||||
CONFIG_LWIP_SO_REUSE_RXTOALL=y
|
||||
|
||||
CONFIG_LWIP_IP_REASSEMBLY=y
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user