From 26c23720d6dc238dc3b7ae87ab194f7c242a4766 Mon Sep 17 00:00:00 2001 From: sle118 Date: Wed, 4 Sep 2019 14:29:49 -0400 Subject: [PATCH 1/3] Update CMakeLists.txt --- main/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 44152c3c..5616af06 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -2,6 +2,6 @@ set(COMPONENT_ADD_INCLUDEDIRS . ) set(COMPONENT_SRCS "esp_app_main.c" "platform_esp32.c" "cmd_wifi.c" "console.c" "nvs_utilities.c" "cmd_squeezelite.c") set(REQUIRES esp_common) -set(REQUIRES_COMPONENTS freertos nvs_flash esp32 spi_flash newlib log console ) +set(REQUIRES_COMPONENTS freertos squeezelite nvs_flash esp32 spi_flash newlib log console ) register_component() From ac66339947181edd560a63c2136102aeb6b5adff Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sat, 7 Sep 2019 19:09:35 -0700 Subject: [PATCH 2/3] sink name corrections --- components/driver_bt/bt_app_sink.c | 8 ++++---- components/raop/raop_sink.c | 4 ++-- main/Kconfig.projbuild | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/driver_bt/bt_app_sink.c b/components/driver_bt/bt_app_sink.c index e9bb86ae..d0088501 100644 --- a/components/driver_bt/bt_app_sink.c +++ b/components/driver_bt/bt_app_sink.c @@ -39,8 +39,8 @@ #define BT_RC_TG_TAG "RCTG" #define BT_RC_CT_TAG "RCCT" -#ifndef CONFIG_BT_SINK_NAME -#define CONFIG_BT_SINK_NAME "default" +#ifndef CONFIG_BT_NAME +#define CONFIG_BT_NAME "ESP32-BT" #endif extern char current_namespace[]; @@ -468,11 +468,11 @@ static void bt_av_hdl_stack_evt(uint16_t event, void *p_param) case BT_APP_EVT_STACK_UP: { /* set up device name */ nvs_handle nvs; - char dev_name[32] = CONFIG_BT_SINK_NAME; + char dev_name[32] = CONFIG_BT_NAME; if (nvs_open(current_namespace, NVS_READONLY, &nvs) == ESP_OK) { size_t len = 31; - nvs_get_str(nvs, "bt_sink_name", dev_name, &len); + nvs_get_str(nvs, "bt_name", dev_name, &len); nvs_close(nvs); } diff --git a/components/raop/raop_sink.c b/components/raop/raop_sink.c index 092f1b57..623c45d1 100644 --- a/components/raop/raop_sink.c +++ b/components/raop/raop_sink.c @@ -19,7 +19,7 @@ #include "trace.h" #ifndef CONFIG_AIRPLAY_NAME -#define CONFIG_AIRPLAY_NAME "disabled" +#define CONFIG_AIRPLAY_NAME "ESP32-AirPlay" #endif static const char * TAG = "platform"; @@ -60,7 +60,7 @@ void raop_sink_init(raop_cmd_cb_t cmd_cb, raop_data_cb_t data_cb) { if (nvs_open(current_namespace, NVS_READONLY, &nvs) == ESP_OK) { size_t len = sizeof(sink_name) - 1; - nvs_get_str(nvs, "airplay_sink_name", sink_name, &len); + nvs_get_str(nvs, "airplay_name", sink_name, &len); nvs_close(nvs); } diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index e6c29b69..eb4e4ebd 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -226,7 +226,7 @@ menu "Squeezelite-ESP32" default y help Enable bluetooth sink (Note that you obviously can't at the same time be a Bluetooth receiver and transmitter) - config BT_SINK_NAME + config BT_NAME depends on BT_SINK string "Name of Bluetooth A2DP device" default "ESP32-BT" From b1f787a3a5fdef5b03effa76dd4beb0213f55412 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Sun, 8 Sep 2019 22:21:48 -0700 Subject: [PATCH 3/3] update UDP recvmbox --- sdkconfig.defaults | 1 + 1 file changed, 1 insertion(+) diff --git a/sdkconfig.defaults b/sdkconfig.defaults index 1c8de298..c9794f97 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -116,6 +116,7 @@ CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 CONFIG_FREERTOS_HZ=100 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 +CONFIG_LWIP_UDP_RECVMBOX_SIZE=32 CONFIG_LWIP_NETIF_LOOPBACK=y CONFIG_LWIP_TCP_MSL=60000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=8192