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

stability improvements

Browse Source
This commit is contained in:
Sebastien
2019-10-29 19:02:40 -04:00
parent 2f042d25a8
commit 113e7be398
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/wifi-manager/code.js
View File

@@ -572,7 +572,7 @@ function checkStatus(){
//update wait screen //update wait screen
$( "#loading" ).hide(); $( "#loading" ).hide();
$( "#connect-success" ).text("<p>Your IP address now is: " + data["ip"] + "</p>"); $( "#connect-success" ).text("Your IP address now is: " + data["ip"] );
$( "#connect-success" ).show(); $( "#connect-success" ).show();
$( "#connect-fail" ).hide(); $( "#connect-fail" ).hide();

34
components/wifi-manager/wifi_manager.c
View File

@@ -191,6 +191,29 @@ void wifi_manager_start(){
else { else {
free(release_url); free(release_url);
} }
char * value = get_nvs_value_alloc_default(NVS_TYPE_STR, "ap_ssid", CONFIG_DEFAULT_AP_SSID, 0);
if(value!=NULL){
memcpy(wifi_settings.ap_ssid, value, sizeof(wifi_settings.ap_ssid)-1);
free(value);
}
value = get_nvs_value_alloc_default(NVS_TYPE_STR, "ap_pwd", DEFAULT_AP_PASSWORD, 0);
if(value!=NULL){
memcpy(wifi_settings.ap_pwd, value, sizeof(wifi_settings.ap_pwd)-1);
free(value);
}
value = get_nvs_value_alloc_default(NVS_TYPE_STR, "ap_channel", CONFIG_DEFAULT_AP_CHANNEL, 0);
if(value!=NULL){
wifi_settings.ap_channel=atoi(value);
free(value);
}
/* Fetch configuration from nvs */
wifi_manager_fetch_wifi_sta_config();
/* start wifi manager task */ /* start wifi manager task */
xTaskCreate(&wifi_manager, "wifi_manager", 4096, NULL, WIFI_MANAGER_TASK_PRIORITY, &task_wifi_manager); xTaskCreate(&wifi_manager, "wifi_manager", 4096, NULL, WIFI_MANAGER_TASK_PRIORITY, &task_wifi_manager);
@@ -250,7 +273,7 @@ bool wifi_manager_fetch_wifi_sta_config(){
} }
memset(wifi_manager_config_sta, 0x00, sizeof(wifi_config_t)); memset(wifi_manager_config_sta, 0x00, sizeof(wifi_config_t));
//memset(&wifi_settings, 0x00, sizeof(struct wifi_settings_t)); memset(&wifi_settings, 0x00, sizeof(struct wifi_settings_t));
/* allocate buffer */ /* allocate buffer */
size_t sz = sizeof(wifi_settings); size_t sz = sizeof(wifi_settings);
@@ -343,6 +366,9 @@ cJSON * wifi_manager_get_basic_info(cJSON **old){
cJSON_AddNumberToObject(root,"ota_pct", ota_get_pct_complete() ); cJSON_AddNumberToObject(root,"ota_pct", ota_get_pct_complete() );
cJSON_AddItemToObject(root, "Jack", cJSON_CreateString(JACK_LEVEL)); cJSON_AddItemToObject(root, "Jack", cJSON_CreateString(JACK_LEVEL));
cJSON_AddNumberToObject(root,"Voltage", adc1_get_raw(ADC1_CHANNEL_7) / 4095. * (10+174)/10. * 1.1); cJSON_AddNumberToObject(root,"Voltage", adc1_get_raw(ADC1_CHANNEL_7) / 4095. * (10+174)/10. * 1.1);
cJSON_AddNumberToObject(root,"disconnect_count", num_disconnect );
cJSON_AddNumberToObject(root,"avg_conn_time", num_disconnect>0?(total_connected_time/num_disconnect):0 );
ESP_LOGD(TAG,"wifi_manager_get_basic_info done"); ESP_LOGD(TAG,"wifi_manager_get_basic_info done");
return root; return root;
} }
@@ -726,14 +752,11 @@ void wifi_manager( void * pvParameters ){
.show_hidden = true .show_hidden = true
}; };
/* default wifi config */ /* default wifi config */
wifi_init_config_t wifi_init_config = WIFI_INIT_CONFIG_DEFAULT(); wifi_init_config_t wifi_init_config = WIFI_INIT_CONFIG_DEFAULT();
ESP_ERROR_CHECK(esp_wifi_init(&wifi_init_config)); ESP_ERROR_CHECK(esp_wifi_init(&wifi_init_config));
ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM)); ESP_ERROR_CHECK(esp_wifi_set_storage(WIFI_STORAGE_RAM));
/* SoftAP - Wifi Access Point configuration setup */ /* SoftAP - Wifi Access Point configuration setup */
tcpip_adapter_ip_info_t info; tcpip_adapter_ip_info_t info;
memset(&info, 0x00, sizeof(info)); memset(&info, 0x00, sizeof(info));
@@ -747,6 +770,7 @@ void wifi_manager( void * pvParameters ){
.beacon_interval = DEFAULT_AP_BEACON_INTERVAL, .beacon_interval = DEFAULT_AP_BEACON_INTERVAL,
}, },
}; };
memcpy(ap_config.ap.ssid, wifi_settings.ap_ssid , sizeof(wifi_settings.ap_ssid)); memcpy(ap_config.ap.ssid, wifi_settings.ap_ssid , sizeof(wifi_settings.ap_ssid));
memcpy(ap_config.ap.password, wifi_settings.ap_pwd, sizeof(wifi_settings.ap_pwd)); memcpy(ap_config.ap.password, wifi_settings.ap_pwd, sizeof(wifi_settings.ap_pwd));
@@ -790,7 +814,7 @@ void wifi_manager( void * pvParameters ){
/* start http server */ /* start http server */
http_server_start(); http_server_start();
/* enqueue first event: load previous config */ /* enqueue first event: load previous config and start AP or STA mode */
wifi_manager_send_message(ORDER_LOAD_AND_RESTORE_STA, NULL); wifi_manager_send_message(ORDER_LOAD_AND_RESTORE_STA, NULL);