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

Merge remote-tracking branch 'origin/master' into httpd

Browse Source 
Conflicts:
	components/services/monitor.c
	components/telnet/telnet.c
This commit is contained in:
sebastien
2020-02-05 21:05:09 -05:00
parent dd594245f6 07b0d0cb6c
commit 58a2d0bea7
22 changed files with 2005 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/esp_app_main.c
View File

@@ -280,6 +280,9 @@ void register_default_nvs(){
ESP_LOGD(TAG,"Registering default Audio control board type %s, value ","actrls_config");
config_set_default(NVS_TYPE_STR, "actrls_config", "", 0);
ESP_LOGD(TAG,"Registering default Audio control board type %s, value ","rotary_config");
config_set_default(NVS_TYPE_STR, "rotary_config", "", 0);
char number_buffer[101] = {};
snprintf(number_buffer,sizeof(number_buffer)-1,"%u",OTA_FLASH_ERASE_BLOCK);
@@ -324,6 +327,12 @@ void register_default_nvs(){
ESP_LOGD(TAG,"Registering default value for key %s", "stats");
config_set_default(NVS_TYPE_STR, "stats", "n", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "spdif_config");
config_set_default(NVS_TYPE_STR, "spdif_config", "", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "dac_config");
config_set_default(NVS_TYPE_STR, "dac_config", "", 0);
ESP_LOGD(TAG,"Done setting default values in nvs.");
}
@@ -374,15 +383,12 @@ void app_main()
ESP_LOGD(TAG,"Getting audio control mapping ");
char *actrls_config = config_alloc_get_default(NVS_TYPE_STR, "actrls_config", NULL, 0);
if (actrls_config) {
if(actrls_config[0] !='\0'){
ESP_LOGD(TAG,"Initializing audio control buttons type %s", actrls_config);
actrls_init_json(actrls_config, true);
}
free(actrls_config);
if (actrls_init_json(actrls_config, true) == ESP_OK) {
ESP_LOGD(TAG,"Initializing audio control buttons type %s", actrls_config);
} else {
ESP_LOGD(TAG,"No audio control buttons");
}
if (actrls_config) free(actrls_config);
/* start the wifi manager */
ESP_LOGD(TAG,"Blinking led");