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

Fixes with on/off dual ant config

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-05-06 18:48:19 +02:00
parent 63628ce68d
commit ab236a065d
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/espwifistackconfig.h
View File

@@ -19,6 +19,15 @@
// local includes // local includes
#include "espwifiutils.h" #include "espwifiutils.h"
inline bool operator==(const wifi_country_t &left, const wifi_country_t &right)
{
return left.cc == right.cc &&
left.schan == right.schan &&
left.nchan == right.nchan &&
left.max_tx_power == right.max_tx_power &&
left.policy == right.policy;
}
namespace wifi_stack { namespace wifi_stack {
struct static_ip_config struct static_ip_config
{ {
@@ -137,6 +146,17 @@ struct dual_ant_config
{ {
gpio_num_t selectPin0{GPIO_NUM_2}; gpio_num_t selectPin0{GPIO_NUM_2};
gpio_num_t selectPin1{GPIO_NUM_25}; gpio_num_t selectPin1{GPIO_NUM_25};
friend bool operator==(const dual_ant_config &left, const dual_ant_config &right)
{
return left.selectPin0 == right.selectPin0 &&
left.selectPin1 == right.selectPin1;
}
friend bool operator!=(const dual_ant_config &left, const dual_ant_config &right)
{
return !(left == right);
}
}; };
#endif #endif
@@ -251,12 +271,15 @@ struct config
friend bool operator==(const config &left, const config &right) friend bool operator==(const config &left, const config &right)
{ {
return left.base_mac_override == right.base_mac_override && return left.base_mac_override == right.base_mac_override &&
left.sta == right.sta && #ifdef CONFIG_WIFI_DUAL_ANT
left.ap == right.ap left.dual_ant == right.dual_ant &&
#ifdef CONFIG_ETH_ENABLED
&& left.eth == right.eth
#endif #endif
; left.sta == right.sta &&
left.ap == right.ap &&
#ifdef CONFIG_ETH_ENABLED
left.eth == right.eth &&
#endif
left.country == right.country;
} }
friend bool operator!=(const config &left, const config &right) friend bool operator!=(const config &left, const config &right)