Skip to content

Commit

Permalink
Improved wifi: run mDNS in both AP and STA modes. Don't turn mDNS off…
Browse files Browse the repository at this point in the history 
… if both are disconnected. Added mDNS device info. Improve reconnection logic. Reduced timeout periods. Stop STA hunting if there is an AP connection. Stop power save mode to allow mDNS to multicast.
  • Loading branch information
Brian Mathews authored and Brian Mathews committed Nov 28, 2024
1 parent 69e0630 commit 42209e9
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 62 deletions.
2 changes: 1 addition & 1 deletion firmware/webtools/manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SOTACAT for Elecraft KX2 and KX3",
"version": "2024-11-25_18:51-Release",
"version": "2024-11-28_10:55-Release",
"builds": [
{
"chipFamily": "ESP32-C3",
Expand Down
2 changes: 1 addition & 1 deletion include/build_info.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define BUILD_DATE_TIME "241125:1851"
#define BUILD_DATE_TIME "241128:1055"
160 changes: 100 additions & 60 deletions src/wifi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <string.h>

#include "globals.h"
#include "hardware_specific.h"
#include "settings.h"
#include "wifi.h"

Expand All @@ -19,6 +20,7 @@
#include <esp_log.h>

// Add at top with other includes
#include "build_info.h"
#include "lwip/netdb.h"
#include "lwip/sockets.h"
#include "lwip/tcp.h"
Expand All @@ -37,13 +39,15 @@ static int retry_count = 0;
static esp_netif_t * sta_netif;
static esp_netif_t * ap_netif;
// Add this line:
static bool mdns_started = false;
static bool mdns_started = false;

// Add these at the top of wifi.cpp
#define WIFI_CONNECT_TIMEOUT_MS 10000
#define WIFI_STATE_TRANSITION_TIMEOUT_MS 5000
#define WIFI_RECONNECT_BACKOFF_BASE_MS 1000
#define WIFI_MAX_BACKOFF_MS 32000
#define WIFI_CONNECT_TIMEOUT_MS 5000
#define WIFI_STATE_TRANSITION_TIMEOUT_MS 3000
#define WIFI_RECONNECT_BACKOFF_BASE_MS 500
#define WIFI_MAX_BACKOFF_MS 8000
#define RECONNECT_TIMEOUT_MS 2000
#define MDNS_SERVICE_NAME "SOTAcat SOTAmat Service"

// Function to handle Wi-Fi events
static void wifi_event_handler (void * arg, esp_event_base_t event_base, int32_t event_id, void * event_data) {
Expand All @@ -68,29 +72,12 @@ static void wifi_event_handler (void * arg, esp_event_base_t event_base, int32_t
case WIFI_EVENT_STA_DISCONNECTED:
ESP_LOGI (TAG8, "WIFI_EVENT_STA_DISCONNECTED");
s_sta_connected = false;
wifi_connected = false;

if (retry_count < MAX_RETRY_WIFI_STATION_CONNECT) {
ESP_LOGI (TAG8, "Retrying connection to SSID...");
esp_err_t err = esp_wifi_connect();
if (err != ESP_OK) {
ESP_LOGE (TAG8, "Failed to initiate STA connection: %s", esp_err_to_name (err));
// Delay a short time before retrying
vTaskDelay (pdMS_TO_TICKS (150));
}
retry_count++;
}
else {
ESP_LOGI (TAG8, "Maximum retry attempts reached. Switching SSID or resetting state.");
retry_count = 0;
// Optionally switch SSID or reset state to trigger alternate logic
}
wifi_connected = s_ap_client_connected;

// Add these lines
if (mdns_started) {
if (!s_sta_connected && !s_ap_client_connected && mdns_started) {
mdns_free();
mdns_started = false;
ESP_LOGI (TAG8, "mDNS stopped due to disconnection");
ESP_LOGI (TAG8, "mDNS stopped due to all connections lost");
}
break;

Expand All @@ -109,6 +96,13 @@ static void wifi_event_handler (void * arg, esp_event_base_t event_base, int32_t
s_ap_client_connected = true;
wifi_connected = true;

// Start mDNS if not already running
if (!mdns_started) {
if (start_mdns_service()) {
ESP_LOGI (TAG8, "mDNS started after AP client connection");
}
}

// Check current settings before reapplying AP settings
esp_netif_ip_info_t current_ip_info;
esp_netif_get_ip_info (ap_netif, &current_ip_info);
Expand Down Expand Up @@ -150,6 +144,12 @@ static void wifi_event_handler (void * arg, esp_event_base_t event_base, int32_t
ip_event_got_ip_t * event = (ip_event_got_ip_t *)event_data;
ESP_LOGI (TAG8, "Got IP: " IPSTR, IP2STR (&event->ip_info.ip));
wifi_connected = true;

if (!mdns_started) {
if (start_mdns_service()) {
ESP_LOGI (TAG8, "mDNS started after IP acquisition");
}
}
break;
}
case IP_EVENT_STA_LOST_IP:
Expand Down Expand Up @@ -303,6 +303,9 @@ void wifi_init () {

wifi_attenuate_power();

// Disable power save mode for better mDNS reliability
ESP_ERROR_CHECK (esp_wifi_set_ps (WIFI_PS_NONE));

ESP_LOGI (TAG8, "wifi initialization complete");
}

Expand All @@ -328,22 +331,44 @@ bool start_mdns_service () {
}

// Set the default instance
err = mdns_instance_name_set ("SOTAcat SOTAmat Service");
err = mdns_instance_name_set (MDNS_SERVICE_NAME);
if (err != ESP_OK) {
ESP_LOGE (TAG8, "mDNS instance name set failed: %s", esp_err_to_name (err));
mdns_free();
return false;
}

// Add service
err = mdns_service_add (NULL, "_http", "_tcp", 80, NULL, 0);
// Add HTTP service with TXT records
mdns_txt_item_t http_txt[] = {
{"path", "/" },
{"type", "http"}
};
err = mdns_service_add (NULL, "_http", "_tcp", 80, http_txt, sizeof (http_txt) / sizeof (http_txt[0]));
if (err != ESP_OK) {
ESP_LOGE (TAG8, "mDNS service add failed: %s", esp_err_to_name (err));
ESP_LOGE (TAG8, "mDNS HTTP service add failed: %s", esp_err_to_name (err));
mdns_free();
return false;
}

// Add device-info service with proper properties
const size_t MAX_VS_LEN = sizeof (BUILD_DATE_TIME) + sizeof ('-') + sizeof (SC_BUILD_TYPE) + 1;
char versionString[MAX_VS_LEN];
snprintf (versionString, MAX_VS_LEN, "%s-%s", BUILD_DATE_TIME, SC_BUILD_TYPE);

mdns_txt_item_t device_txt[] = {
{"model", "SOTAcat" },
{"version", versionString},
{"manufacturer", HW_TYPE_STR }
};
err = mdns_service_add (NULL, "_device-info", "_tcp", 9090, device_txt, sizeof (device_txt) / sizeof (device_txt[0]));
if (err != ESP_OK) {
ESP_LOGE (TAG8, "mDNS device-info service add failed: %s", esp_err_to_name (err));
// Don't fail completely if device-info service fails
ESP_LOGW (TAG8, "Continuing without device-info service");
}

ESP_LOGI (TAG8, "mDNS service started successfully");
mdns_started = true;
return true;
}

Expand Down Expand Up @@ -377,6 +402,18 @@ void wifi_task (void * pvParameters) {
break;
}

// Don't attempt STA connections if AP client is connected
if (s_ap_client_connected) {
vTaskDelay (pdMS_TO_TICKS (1000));
break;
}

// Add delay after connection loss before attempting reconnection
if ((current_time - attempt_start_time) * portTICK_PERIOD_MS < RECONNECT_TIMEOUT_MS) {
vTaskDelay (pdMS_TO_TICKS (100));
break;
}

if (mdns_started) {
mdns_free();
mdns_started = false;
Expand Down Expand Up @@ -452,46 +489,50 @@ void wifi_task (void * pvParameters) {
if ((current_time - last_connection_check_time) * portTICK_PERIOD_MS >= CONNECTION_CHECK_INTERVAL_MS) {
last_connection_check_time = current_time;

wifi_ap_record_t ap_info;
esp_err_t err = esp_wifi_sta_get_ap_info (&ap_info);

if (err == ESP_OK) {
ESP_LOGI (TAG8, "WiFi still connected to SSID: %s, RSSI: %d", ap_info.ssid, ap_info.rssi);
}
else {
ESP_LOGW (TAG8, "Failed to get AP info, error: %s", esp_err_to_name (err));
// Only check STA connection if we're not in AP mode with clients
if (s_sta_connected && !s_ap_client_connected) {
wifi_ap_record_t ap_info;
esp_err_t err = esp_wifi_sta_get_ap_info (&ap_info);

// Attempt to reconnect
err = esp_wifi_connect();
if (err != ESP_OK) {
ESP_LOGE (TAG8, "Failed to initiate reconnection: %s", esp_err_to_name (err));
wifi_state = NO_CONNECTION;
attempt_start_time = current_time;
if (err == ESP_OK) {
ESP_LOGI (TAG8, "WiFi still connected to SSID: %s, RSSI: %d", ap_info.ssid, ap_info.rssi);
}
else {
ESP_LOGI (TAG8, "Reconnection attempt initiated");
ESP_LOGW (TAG8, "Failed to get AP info, error: %s", esp_err_to_name (err));

// Only attempt reconnection if we're not in AP mode with clients
if (!s_ap_client_connected) {
err = esp_wifi_connect();
if (err != ESP_OK) {
ESP_LOGE (TAG8, "Failed to initiate reconnection: %s", esp_err_to_name (err));
wifi_state = NO_CONNECTION;
attempt_start_time = current_time;
}
else {
ESP_LOGI (TAG8, "Reconnection attempt initiated");
}
}
}
}
}

if (!mdns_started) {
if (s_sta_connected) { // Only start mDNS in station mode
static int mdns_retry_count = 0;
if (start_mdns_service()) {
mdns_started = true;
// Start mDNS in either AP or STA mode when connected
static int mdns_retry_count = 0;
if (start_mdns_service()) {
mdns_started = true;
mdns_retry_count = 0;
ESP_LOGI (TAG8, "mDNS service started");
}
else {
mdns_retry_count++;
ESP_LOGE (TAG8, "Failed to start mDNS service (attempt %d), will retry in 5 seconds", mdns_retry_count);
if (mdns_retry_count >= 3) {
ESP_LOGW (TAG8, "Multiple mDNS start failures, forcing WiFi reconnection");
wifi_state = NO_CONNECTION; // Force reconnection
mdns_retry_count = 0;
ESP_LOGI (TAG8, "mDNS service started");
}
else {
mdns_retry_count++;
ESP_LOGE (TAG8, "Failed to start mDNS service (attempt %d), will retry in 5 seconds", mdns_retry_count);
if (mdns_retry_count >= 3) {
ESP_LOGW (TAG8, "Multiple mDNS start failures, forcing WiFi reconnection");
wifi_state = NO_CONNECTION; // Force reconnection
mdns_retry_count = 0;
}
vTaskDelay (pdMS_TO_TICKS (5000));
}
vTaskDelay (pdMS_TO_TICKS (5000));
}
}
else {
Expand Down Expand Up @@ -567,4 +608,3 @@ void start_wifi_task (TaskNotifyConfig * config) {
bool is_wifi_connected () {
return wifi_connected;
}

0 comments on commit 42209e9

Please sign in to comment.