Merge branch 'Over_The_Air_Update' of

https://github.com/sle118/squeezelite-esp32.git into Over_The_Air_Update

Conflicts:
	components/wifi-manager/wifi_manager.c
This commit is contained in:
Sebastien
2019-09-23 00:21:37 -04:00
13 changed files with 282 additions and 61 deletions

View File

@@ -8,5 +8,6 @@
#
CFLAGS += -I$(COMPONENT_PATH)/../tools
#CFLAGS += -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
COMPONENT_ADD_INCLUDEDIRS := .
COMPONENT_ADD_INCLUDEDIRS += $(COMPONENT_PATH)/../tools