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 291 additions and 53 deletions

View File

@@ -29,9 +29,3 @@ extern void console_start();
extern pthread_cond_t wifi_connect_suspend_cond;
extern pthread_t wifi_connect_suspend_mutex;
#ifndef RECOVERY_APPLICATION
#define RECOVERY_APPLICATION 0
#else
#undef RECOVERY_APPLICATION
#define RECOVERY_APPLICATION 1
#endif