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

Add strange log related workaround

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-05-15 10:54:09 +02:00
parent 4c50bcd443
commit 4b5da21029
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Kconfig.projbuild
View File

@ -40,4 +40,8 @@ config WIFI_DUAL_ANT
bool "Enable dual antenna functionality" bool "Enable dual antenna functionality"
default false default false
config WIFI_LOG_WORKAROUND
bool "Enable disabled-log bug workaround (by enabling certain log statements)"
default false
endmenu endmenu

32
src/espwifistack.cpp
View File

@ -1,7 +1,11 @@
#include "espwifistack.h" #include "espwifistack.h"
#include "sdkconfig.h" #include "sdkconfig.h"
#ifdef CONFIG_WIFI_LOG_WORKAROUND
#define LOG_LOCAL_LEVEL ESP_LOG_INFO
#else
#define LOG_LOCAL_LEVEL CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK #define LOG_LOCAL_LEVEL CONFIG_LOG_LOCAL_LEVEL_WIFI_STACK
#endif
// system includes // system includes
#include <optional> #include <optional>
@ -53,6 +57,24 @@
#include <cpputils.h> #include <cpputils.h>
#include <cleanuphelper.h> #include <cleanuphelper.h>
#ifdef CONFIG_WIFI_LOG_WORKAROUND
#pragma push_macro("ESP_LOGE")
#undef ESP_LOGE
#define ESP_LOGE(...) do {} while (0)
#pragma push_macro("ESP_LOGW")
#undef ESP_LOGW
#define ESP_LOGW(...) do {} while (0)
#pragma push_macro("ESP_LOGI")
#undef ESP_LOGI
#define ESP_LOGI(...) do {} while (0)
#pragma push_macro("ESP_LOGD")
#undef ESP_LOGD
#define ESP_LOGD(...) do {} while (0)
#pragma push_macro("ESP_LOGV")
#undef ESP_LOGV
#define ESP_LOGV(...) do {} while (0)
#endif
using namespace std::chrono_literals; using namespace std::chrono_literals;
namespace wifi_stack { namespace wifi_stack {
@ -1346,6 +1368,10 @@ cleanup:
wifi_clear_status_bits(WIFI_SCANNING_BIT); wifi_clear_status_bits(WIFI_SCANNING_BIT);
} }
#ifdef CONFIG_WIFI_LOG_WORKAROUND
#pragma pop_macro("ESP_LOGI")
#endif
void wifi_event_callback(const config &config, const WifiEvent &event) void wifi_event_callback(const config &config, const WifiEvent &event)
{ {
ESP_LOGD(TAG, "%d %s", int(event.event_id), toString(event.event_id).c_str()); ESP_LOGD(TAG, "%d %s", int(event.event_id), toString(event.event_id).c_str());
@ -2101,6 +2127,12 @@ esp_err_t wifi_stop()
return ESP_OK; return ESP_OK;
} }
#ifdef CONFIG_WIFI_LOG_WORKAROUND
#pragma push_macro("ESP_LOGI")
#undef ESP_LOGI
#define ESP_LOGI(...) do {} while (0)
#endif
std::expected<void, std::string> applyBaseMac(const mac_t &mac) std::expected<void, std::string> applyBaseMac(const mac_t &mac)
{ {
if (const auto result = set_base_mac_addr(mac); result) if (const auto result = set_base_mac_addr(mac); result)