mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-07 20:17:04 +03:00
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:
@@ -25,6 +25,7 @@
|
||||
#include "esp_pthread.h"
|
||||
#include "cmd_decl.h"
|
||||
#include "console.h"
|
||||
#include "wifi_manager.h"
|
||||
|
||||
#include "cmd_squeezelite.h"
|
||||
#include "nvs_utilities.h"
|
||||
@@ -33,7 +34,7 @@ static void * console_thread();
|
||||
void console_start();
|
||||
static const char * TAG = "console";
|
||||
|
||||
#if (RECOVERY_APPLICATION )
|
||||
#if RECOVERY_APPLICATION ==1
|
||||
extern void start_ota(const char * bin_url);
|
||||
#endif
|
||||
|
||||
@@ -240,12 +241,14 @@ void console_start() {
|
||||
esp_console_register_help_command();
|
||||
register_system();
|
||||
register_nvs();
|
||||
#if ! RECOVERY_APPLICATION
|
||||
#warning "compiling for squeezelite"
|
||||
#if RECOVERY_APPLICATION!=1
|
||||
#warning "compiling for squeezelite"
|
||||
register_squeezelite();
|
||||
#else
|
||||
#elif RECOVERY_APPLICATION==1
|
||||
#warning "compiling for recovery"
|
||||
register_ota_cmd();
|
||||
#else
|
||||
#error "Unknown build configuration"
|
||||
#endif
|
||||
register_i2ctools();
|
||||
printf("\n"
|
||||
|
||||
Reference in New Issue
Block a user