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

Merge branch 'Over_The_Air_Update' of

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

Conflicts:
	components/squeezelite-ota/squeezelite-ota.c
This commit is contained in:
Sebastien
2019-09-29 08:30:17 -04:00
parent da610effc9 7c3b9ed089
commit 8cbfc71946
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/squeezelite-ota/squeezelite-ota.c
View File

@@ -277,9 +277,13 @@ void start_ota(const char * bin_url)
nvs_close(nvs); nvs_close(nvs);
} }
ESP_LOGI(TAG, "Waiting for other processes to start"); ESP_LOGI(TAG, "Waiting for other processes to start");
<<<<<<< HEAD
for(int i=0;i<10;i++){ for(int i=0;i<10;i++){
vTaskDelay(1000/ portTICK_RATE_MS); vTaskDelay(1000/ portTICK_RATE_MS);
} }
=======
vTaskDelay(5000/ portTICK_RATE_MS);
>>>>>>> branch 'Over_The_Air_Update' of https://github.com/sle118/squeezelite-esp32.git
#ifdef CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1 #ifdef CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1
#define OTA_CORE 0 #define OTA_CORE 0
#warning "Wifi running on core 1" #warning "Wifi running on core 1"