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

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

Browse Source 
Conflicts:
	components/wifi-manager/http_server.c
This commit is contained in:
sebastien
2020-02-04 22:44:34 -05:00
parent acbc661efb 5f84dc3cb0
commit e6bad26ef0
63 changed files with 2408 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
main/esp_app_main.c
View File

@@ -46,6 +46,7 @@
#include <math.h>
#include "config.h"
#include "audio_controls.h"
#include "telnet.h"
static const char certs_namespace[] = "certificates";
static const char certs_key[] = "blob";
@@ -305,29 +306,43 @@ void register_default_nvs(){
ESP_LOGD(TAG,"Registering default value for key %s", "i2c_config");
config_set_default(NVS_TYPE_STR, "i2c_config", "", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "Vcc_GPIO");
config_set_default(NVS_TYPE_STR, "Vcc_GPIO", "", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "set_GPIO");
config_set_default(NVS_TYPE_STR, "set_GPIO", "", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "metadata_config");
config_set_default(NVS_TYPE_STR, "metadata_config", "", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "telnet_enable");
config_set_default(NVS_TYPE_STR, "telnet_enable", "", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "telnet_buffer");
config_set_default(NVS_TYPE_STR, "telnet_buffer", "40000", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "telnet_block");
config_set_default(NVS_TYPE_STR, "telnet_block", "500", 0);
ESP_LOGD(TAG,"Registering default value for key %s", "stats");
config_set_default(NVS_TYPE_STR, "stats", "n", 0);
ESP_LOGD(TAG,"Done setting default values in nvs.");
}
void app_main()
{
char * fwurl = NULL;
esp_err_t update_certificates();
ESP_LOGI(TAG,"Starting app_main");
initialize_nvs();
ESP_LOGI(TAG,"Setting up telnet.");
init_telnet(); // align on 32 bits boundaries
ESP_LOGI(TAG,"Setting up config subsystem.");
config_init();
ESP_LOGD(TAG,"Creating event group for wifi");
wifi_event_group = xEventGroupCreate();
ESP_LOGD(TAG,"Clearing CONNECTED_BIT from wifi group");
xEventGroupClearBits(wifi_event_group, CONNECTED_BIT);
ESP_LOGI(TAG,"Starting app_main");
initialize_nvs();
ESP_LOGI(TAG,"Setting up config subsystem.");
config_init();
ESP_LOGI(TAG,"Registering default values");
register_default_nvs();
@@ -381,6 +396,10 @@ void app_main()
wifi_manager_start();
wifi_manager_set_callback(EVENT_STA_GOT_IP, &cb_connection_got_ip);
wifi_manager_set_callback(EVENT_STA_DISCONNECTED, &cb_connection_sta_disconnected);
/* Start the telnet service after we are certain that the network stack has been properly initialized.
* This can be either after we're started the AP mode, or after we've started the STA mode */
wifi_manager_set_callback(ORDER_START_AP, &start_telnet);
wifi_manager_set_callback(ORDER_CONNECT_STA, &start_telnet);
}
console_start();
if(fwurl && strlen(fwurl)>0){