Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-31 06:40:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

@daduke special build for OTA - release

Browse Source
This commit is contained in:
Sebastien
2019-11-18 12:49:50 -05:00
parent e02987f8df
commit 98de501e71
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,9 @@
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. CONDITIONS OF ANY KIND, either express or implied.
*/ */
#ifndef LOG_LOCAL_LEVEL
#define LOG_LOCAL_LEVEL ESP_LOG_DEBUG #define LOG_LOCAL_LEVEL ESP_LOG_DEBUG
#endif
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"
#include "esp_system.h" #include "esp_system.h"
@@ -284,6 +286,7 @@ esp_err_t _erase_last_boot_app_partition(void)
void ota_task(void *pvParameter) void ota_task(void *pvParameter)
{ {
char * passedURL=(char *)pvParameter; char * passedURL=(char *)pvParameter;
esp_err_t err = ESP_OK;
ota_status.bInitialized = true; ota_status.bInitialized = true;
ESP_LOGD(TAG, "HTTP ota Thread started"); ESP_LOGD(TAG, "HTTP ota Thread started");
@@ -299,16 +302,16 @@ void ota_task(void *pvParameter)
ota_status.current_url= strdup(passedURL); ota_status.current_url= strdup(passedURL);
FREE_RESET(pvParameter); FREE_RESET(pvParameter);
ESP_LOGW(TAG,"**************** Expecting WATCHDOG errors below during flash erase. This is OK and not to worry about **************** "); // ESP_LOGW(TAG,"**************** Expecting WATCHDOG errors below during flash erase. This is OK and not to worry about **************** ");
triggerStatusJsonRefresh(true,"Erasing OTA partition"); // triggerStatusJsonRefresh(true,"Erasing OTA partition");
esp_err_t err=_erase_last_boot_app_partition(); // esp_err_t err=_erase_last_boot_app_partition();
if(err!=ESP_OK){ // if(err!=ESP_OK){
ESP_LOGE(TAG,"Unable to erase last APP partition. Error: %s",esp_err_to_name(err)); // ESP_LOGE(TAG,"Unable to erase last APP partition. Error: %s",esp_err_to_name(err));
FREE_RESET(ota_status.current_url); // FREE_RESET(ota_status.current_url);
FREE_RESET(ota_status.redirected_url); // FREE_RESET(ota_status.redirected_url);
//
vTaskDelete(NULL); // vTaskDelete(NULL);
} // }
ESP_LOGI(TAG,"Calling esp_https_ota"); ESP_LOGI(TAG,"Calling esp_https_ota");
init_config(&ota_config,ota_status.bRedirectFound?ota_status.redirected_url:ota_status.current_url); init_config(&ota_config,ota_status.bRedirectFound?ota_status.redirected_url:ota_status.current_url);

18
main/esp_app_main.c
View File

@@ -113,6 +113,20 @@ char * process_ota_url(){
return fwurl; return fwurl;
} }
esp_log_level_t get_log_level_from_char(char * level){
if(!strcasecmp(level, "NONE" )) { return ESP_LOG_NONE ;}
if(!strcasecmp(level, "ERROR" )) { return ESP_LOG_ERROR ;}
if(!strcasecmp(level, "WARN" )) { return ESP_LOG_WARN ;}
if(!strcasecmp(level, "INFO" )) { return ESP_LOG_INFO ;}
if(!strcasecmp(level, "DEBUG" )) { return ESP_LOG_DEBUG ;}
if(!strcasecmp(level, "VERBOSE" )) { return ESP_LOG_VERBOSE;}
return ESP_LOG_WARN;
}
void set_log_level(char * tag, char * level){
esp_log_level_set(tag, get_log_level_from_char(level));
}
//CONFIG_SDIF_NUM=0 //CONFIG_SDIF_NUM=0
//CONFIG_SPDIF_BCK_IO=26 //CONFIG_SPDIF_BCK_IO=26
//CONFIG_SPDIF_WS_IO=25 //CONFIG_SPDIF_WS_IO=25
@@ -193,6 +207,10 @@ void register_default_nvs(){
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bypass_wm", "0"); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "bypass_wm", "0");
config_set_default(NVS_TYPE_STR, "bypass_wm", "0", 0); config_set_default(NVS_TYPE_STR, "bypass_wm", "0", 0);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "test_num", "0");
config_set_default(NVS_TYPE_U16, "test_num", (uint16_t)2, 0);
char number_buffer[101] = {}; char number_buffer[101] = {};
snprintf(number_buffer,sizeof(number_buffer)-1,"%u",OTA_FLASH_ERASE_BLOCK); snprintf(number_buffer,sizeof(number_buffer)-1,"%u",OTA_FLASH_ERASE_BLOCK);
ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ota_erase_blk", number_buffer); ESP_LOGD(TAG,"Registering default value for key %s, value %s", "ota_erase_blk", number_buffer);