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

Continue searching for STA in AP mode when SSID has been set

Browse Source
This commit is contained in:
Philippe G
2021-10-05 12:22:46 -07:00
parent 449ef32a4e
commit 13294ddd0c
1 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,6 @@ SemaphoreHandle_t wifi_manager_json_mutex = NULL;
SemaphoreHandle_t wifi_manager_sta_ip_mutex = NULL; SemaphoreHandle_t wifi_manager_sta_ip_mutex = NULL;
char *wifi_manager_sta_ip = NULL; char *wifi_manager_sta_ip = NULL;
#define STA_IP_LEN sizeof(char) * IP4ADDR_STRLEN_MAX #define STA_IP_LEN sizeof(char) * IP4ADDR_STRLEN_MAX
bool bHasConnected=false;
uint16_t ap_num = MAX_AP_NUM; uint16_t ap_num = MAX_AP_NUM;
wifi_ap_record_t *accessp_records=NULL; wifi_ap_record_t *accessp_records=NULL;
cJSON * accessp_cjson=NULL; cJSON * accessp_cjson=NULL;
@@ -108,6 +107,9 @@ static const char TAG[] = "wifi_manager";
/* @brief task handle for the main wifi_manager task */ /* @brief task handle for the main wifi_manager task */
static TaskHandle_t task_wifi_manager = NULL; static TaskHandle_t task_wifi_manager = NULL;
#define STA_POLLING_MIN (15*1000)
#define STA_POLLING_MAX (10*60*1000)
/** /**
* The actual WiFi settings in use * The actual WiFi settings in use
*/ */
@@ -266,7 +268,6 @@ void wifi_manager_init_wifi(){
/* event handler and event group for the wifi driver */ /* event handler and event group for the wifi driver */
ESP_LOGD(TAG, "Initializing wifi. Creating event group"); ESP_LOGD(TAG, "Initializing wifi. Creating event group");
wifi_manager_event_group = xEventGroupCreate(); wifi_manager_event_group = xEventGroupCreate();
bHasConnected=false;
// Now Initialize the Wifi Stack // Now Initialize the Wifi Stack
ESP_LOGD(TAG, "Initializing wifi. Initializing tcp_ip adapter"); ESP_LOGD(TAG, "Initializing wifi. Initializing tcp_ip adapter");
tcpip_adapter_init(); tcpip_adapter_init();
@@ -303,6 +304,9 @@ static void connect_notify(in_addr_t ip, u16_t hport, u16_t cport) {
wifi_manager_update_status(); wifi_manager_update_status();
} }
static void polling_STA(void* timer_id) {
wifi_manager_send_message(ORDER_CONNECT_STA, (void*)CONNECTION_REQUEST_AUTO_RECONNECT);
}
void wifi_manager_start(){ void wifi_manager_start(){
@@ -1215,6 +1219,11 @@ void wifi_manager( void * pvParameters ){
EventBits_t uxBits; EventBits_t uxBits;
uint8_t retries = 0; uint8_t retries = 0;
esp_err_t err=ESP_OK; esp_err_t err=ESP_OK;
TimerHandle_t STA_timer;
uint32_t STA_duration = STA_POLLING_MIN;
/* create timer for background STA connection */
STA_timer = xTimerCreate("background STA", pdMS_TO_TICKS(STA_duration), pdFALSE, NULL, polling_STA);
/* start http server */ /* start http server */
http_server_start(); http_server_start();
@@ -1520,23 +1529,38 @@ void wifi_manager( void * pvParameters ){
if(retries < WIFI_MANAGER_MAX_RETRY){ if(retries < WIFI_MANAGER_MAX_RETRY){
ESP_LOGD(TAG, "Issuing ORDER_CONNECT_STA to retry connection."); ESP_LOGD(TAG, "Issuing ORDER_CONNECT_STA to retry connection.");
if(!bHasConnected) retries++; retries++;
wifi_manager_send_message(ORDER_CONNECT_STA, (void*)CONNECTION_REQUEST_AUTO_RECONNECT); wifi_manager_send_message(ORDER_CONNECT_STA, (void*)CONNECTION_REQUEST_AUTO_RECONNECT);
} }
else{ else{
/* In this scenario the connection was lost beyond repair: kick start the AP! */ /* In this scenario the connection was lost beyond repair: kick start the AP! */
retries = 0; retries = 0;
wifi_mode_t mode;
ESP_LOGW(TAG, "All connect retry attempts failed."); ESP_LOGW(TAG, "All connect retry attempts failed.");
/* put us in softAP mode first */
esp_wifi_get_mode(&mode);
/* if it was a restore attempt connection, we clear the bit */ /* if it was a restore attempt connection, we clear the bit */
xEventGroupClearBits(wifi_manager_event_group, WIFI_MANAGER_REQUEST_RESTORE_STA_BIT); xEventGroupClearBits(wifi_manager_event_group, WIFI_MANAGER_REQUEST_RESTORE_STA_BIT);
ESP_LOGD(TAG, "Issuing ORDER_START_AP to trigger AP start."); if(WIFI_MODE_APSTA != mode){
/* start SoftAP */ /* call directly config_ap because we don't want to scan so the message has no benefit */
wifi_manager_send_message(ORDER_START_AP, NULL); ESP_LOGD(TAG, "Starting AP directly.");
wifi_manager_config_ap();
STA_duration = STA_POLLING_MIN;
/* manual callback if needed */
if(cb_ptr_arr[ORDER_START_AP]) (*cb_ptr_arr[ORDER_START_AP])(NULL);
}
else if(STA_duration < STA_POLLING_MAX) {
STA_duration *= 1.25;
}
xTimerChangePeriod(STA_timer, pdMS_TO_TICKS(STA_duration), portMAX_DELAY);
xTimerStart(STA_timer, portMAX_DELAY);
ESP_LOGD(TAG, "STA search slow polling of %d", STA_duration);
} }
} }
/* callback */ /* callback */
if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL); if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL);
} }
@@ -1588,7 +1612,9 @@ void wifi_manager( void * pvParameters ){
/* bring down DNS hijack */ /* bring down DNS hijack */
ESP_LOGD(TAG, "Stopping dns server."); ESP_LOGD(TAG, "Stopping dns server.");
dns_server_stop(); dns_server_stop();
bHasConnected=true;
/* stop AP mode */
esp_wifi_set_mode(WIFI_MODE_STA);
/* callback */ /* callback */
if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL); if(cb_ptr_arr[msg.code]) (*cb_ptr_arr[msg.code])(NULL);