Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 04:27:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sync up (#16)

Browse Source 
* Update CMakeLists.txt

* sink name corrections
This commit is contained in:
sle118
2019-09-08 22:24:29 -04:00
committed by GitHub
parent 7fee96ec63
commit 6cf0acfc4c
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/driver_bt/bt_app_sink.c
View File

@@ -39,8 +39,8 @@
#define BT_RC_TG_TAG "RCTG" #define BT_RC_TG_TAG "RCTG"
#define BT_RC_CT_TAG "RCCT" #define BT_RC_CT_TAG "RCCT"
#ifndef CONFIG_BT_SINK_NAME #ifndef CONFIG_BT_NAME
#define CONFIG_BT_SINK_NAME "default" #define CONFIG_BT_NAME "ESP32-BT"
#endif #endif
extern char current_namespace[]; 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: { case BT_APP_EVT_STACK_UP: {
/* set up device name */ /* set up device name */
nvs_handle nvs; 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) { if (nvs_open(current_namespace, NVS_READONLY, &nvs) == ESP_OK) {
size_t len = 31; 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); nvs_close(nvs);
} }

4
components/raop/raop_sink.c
View File

@@ -19,7 +19,7 @@
#include "trace.h" #include "trace.h"
#ifndef CONFIG_AIRPLAY_NAME #ifndef CONFIG_AIRPLAY_NAME
#define CONFIG_AIRPLAY_NAME "disabled" #define CONFIG_AIRPLAY_NAME "ESP32-AirPlay"
#endif #endif
static const char * TAG = "platform"; 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) { if (nvs_open(current_namespace, NVS_READONLY, &nvs) == ESP_OK) {
size_t len = sizeof(sink_name) - 1; 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); nvs_close(nvs);
} }

7
main/CMakeLists.txt
View File

@@ -1,7 +1,8 @@
set(COMPONENT_ADD_INCLUDEDIRS . ) set(COMPONENT_ADD_INCLUDEDIRS . )
set(COMPONENT_SRCS "esp_app_main.c" "cmd_wifi.c" "console.c" "nvs_utilities.c" "cmd_squeezelite.c" ) 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 esp_common)
set(REQUIRES_COMPONENTS freertos squeezelite nvs_flash esp32 spi_flash newlib log console wifi-manager ) set(REQUIRES_COMPONENTS freertos squeezelite nvs_flash esp32 spi_flash newlib log console )
register_component() register_component()

2
main/Kconfig.projbuild
View File

@@ -160,7 +160,7 @@ menu "Squeezelite-ESP32"
default y default y
help help
Enable bluetooth sink (Note that you obviously can't at the same time be a Bluetooth receiver and transmitter) 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 depends on BT_SINK
string "Name of Bluetooth A2DP device" string "Name of Bluetooth A2DP device"
default "ESP32-BT" default "ESP32-BT"