feedc0de/espwifistack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor wifi sta error log to an ring_buffer of structs

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-02-13 14:48:18 +01:00
parent ceb9190233
commit 5e23912a78
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -20,6 +20,7 @@ set(dependencies
driver driver
esp_eth esp_eth
cxx-ring-buffer
cpputils cpputils
espchrono espchrono
espcpputils espcpputils

34
src/espwifistack.cpp
View File

@@ -120,8 +120,8 @@ std::atomic<WiFiStaStatus> _sta_status{WiFiStaStatus::NO_SHIELD};
std::optional<espchrono::millis_clock::time_point> _wifiConnectFailFlag; std::optional<espchrono::millis_clock::time_point> _wifiConnectFailFlag;
uint8_t _wifiConnectFailCounter{}; uint8_t _wifiConnectFailCounter{};
std::optional<StaError> _last_sta_error; std::optional<sta_error_t> _last_sta_error;
std::string _last_sta_error_message; ring_buffer<sta_error_t, 5> _last_sta_errors;
std::optional<espchrono::millis_clock::time_point> _last_wifi_connect_failed; std::optional<espchrono::millis_clock::time_point> _last_wifi_connect_failed;
// scan // scan
@@ -147,9 +147,9 @@ const std::optional<espchrono::millis_clock::time_point> &lastStaSwitchedFromCon
const std::optional<espchrono::millis_clock::time_point> &lastStaSwitchedToConnected{_lastStaSwitchedToConnected}; const std::optional<espchrono::millis_clock::time_point> &lastStaSwitchedToConnected{_lastStaSwitchedToConnected};
const bool &esp_wifi_started{_esp_wifi_started}; const bool &esp_wifi_started{_esp_wifi_started};
const uint8_t &sta_error_count{_wifiConnectFailCounter}; const uint8_t &sta_error_count{_wifiConnectFailCounter};
const std::string &last_sta_error_message{_last_sta_error_message}; const ring_buffer<sta_error_t, 5> &last_sta_errors{_last_sta_errors};
const std::optional<espchrono::millis_clock::time_point> &last_wifi_connect_failed{_last_wifi_connect_failed}; const std::optional<espchrono::millis_clock::time_point> &last_wifi_connect_failed{_last_wifi_connect_failed};
const std::optional<StaError> &last_sta_error{_last_sta_error}; const std::optional<sta_error_t> &last_sta_error{_last_sta_error};
const std::vector<mac_t> &pastConnectPlan{_pastConnectPlan}; const std::vector<mac_t> &pastConnectPlan{_pastConnectPlan};
const mac_t &currentConnectPlanEntry{_currentConnectPlanEntry}; const mac_t &currentConnectPlanEntry{_currentConnectPlanEntry};
const std::vector<mac_t> &connectPlan{_connectPlan}; const std::vector<mac_t> &connectPlan{_connectPlan};
@@ -773,6 +773,14 @@ void update(const config &config)
#endif #endif
} }
std::string sta_error_t::toString() const
{
return fmt::format("{} WIFI_STA_DISCONNECTED ssid=\"{}\" bssid={} reason={}({})",
timestamp.time_since_epoch().count(),
ssid, wifi_stack::toString(bssid),
std::to_underlying(reason), wifi_stack::toString(reason));
}
wifi_mode_t get_wifi_mode() wifi_mode_t get_wifi_mode()
{ {
if (!_lowLevelInitDone || !_esp_wifi_started) if (!_lowLevelInitDone || !_esp_wifi_started)
@@ -1342,21 +1350,19 @@ void wifi_event_callback(const config &config, const WifiEvent &event)
{ {
const mac_t bssid{event.wifi_sta_disconnected.bssid}; const mac_t bssid{event.wifi_sta_disconnected.bssid};
_last_sta_error = StaError { _last_sta_error = sta_error_t {
.timestamp = espchrono::millis_clock::now(),
.ssid = std::string{ssid}, .ssid = std::string{ssid},
.bssid = bssid, .bssid = bssid,
.reason = reason .reason = reason
}; };
auto msg = fmt::format("{} WIFI_STA_DISCONNECTED ssid=\"{}\" bssid={} reason={}({})", {
espchrono::millis_clock::now().time_since_epoch().count(), auto msg = _last_sta_error->toString();
ssid, toString(bssid), ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
std::to_underlying(reason), wifi_stack::toString(reason)); }
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
_last_sta_error_message += msg; _last_sta_errors.push_back(*_last_sta_error);
_last_sta_error_message += '\n';
if (_last_sta_error_message.size() > 512)
_last_sta_error_message = _last_sta_error_message.substr(_last_sta_error_message.size() - 512, 512);
} }
switch (reason) switch (reason)

18
src/espwifistack.h
View File

@@ -20,6 +20,7 @@
#include <tl/expected.hpp> #include <tl/expected.hpp>
#include <espchrono.h> #include <espchrono.h>
#include <cppsignal.h> #include <cppsignal.h>
#include <ring-buffer.h>
// local includes // local includes
#include "espwifistackconfig.h" #include "espwifistackconfig.h"
@@ -51,18 +52,19 @@ void update(const config &config);
extern const bool &esp_wifi_started; extern const bool &esp_wifi_started;
extern const uint8_t &sta_error_count; extern const uint8_t &sta_error_count;
extern const std::string &last_sta_error_message; struct sta_error_t {
espchrono::millis_clock::time_point timestamp;
extern const std::optional<espchrono::millis_clock::time_point> &last_wifi_connect_failed;
struct StaError
{
espchrono::millis_clock::time_point timestamp{espchrono::millis_clock::now()};
std::string ssid; std::string ssid;
mac_t bssid; mac_t bssid;
wifi_err_reason_t reason; wifi_err_reason_t reason;
std::string toString() const;
}; };
extern const std::optional<StaError> &last_sta_error; extern const ring_buffer<sta_error_t, 5> &last_sta_errors;
extern const std::optional<espchrono::millis_clock::time_point> &last_wifi_connect_failed;
extern const std::optional<sta_error_t> &last_sta_error;
extern const std::vector<mac_t> &pastConnectPlan; extern const std::vector<mac_t> &pastConnectPlan;
extern const mac_t &currentConnectPlanEntry; extern const mac_t &currentConnectPlanEntry;