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

Conflicts:
	README.md
	components/config/config.c
	components/driver_bt/bt_app_sink.c
	components/raop/raop.c
	components/services/audio_controls.c
	main/platform_esp32.h
This commit is contained in:
Sebastien
2020-05-18 10:13:32 -04:00
60 changed files with 1944 additions and 860 deletions

View File

@@ -19,7 +19,7 @@
#include "platform_config.h"
#include "trace.h"
static const char * TAG = "platform";
static const char * TAG = "bt_app_source";
extern int32_t output_bt_data(uint8_t *data, int32_t len);
extern void output_bt_tick(void);