Merge branch 'bugfix/wifi_support_null_mode_again' into 'master'

support WiFi null mode again

See merge request idf/esp-idf!2577
This commit is contained in:
Jiang Jiang Jian 2018-06-21 15:25:45 +08:00
commit 4df08f9815
2 changed files with 4 additions and 2 deletions

View File

@ -58,6 +58,7 @@ typedef enum{
MODEM_WIFI_STATION_MODULE, //!< Wi-Fi Station used
MODEM_WIFI_SOFTAP_MODULE, //!< Wi-Fi SoftAP used
MODEM_WIFI_SNIFFER_MODULE, //!< Wi-Fi Sniffer used
MODEM_WIFI_NULL_MODULE, //!< Wi-Fi Null mode used
MODEM_USER_MODULE, //!< User used
MODEM_MODULE_COUNT //!< Number of items
}modem_sleep_module_t;
@ -73,7 +74,8 @@ typedef enum{
*/
#define MODEM_WIFI_MASK ((1<<MODEM_WIFI_STATION_MODULE) | \
(1<<MODEM_WIFI_SOFTAP_MODULE) | \
(1<<MODEM_WIFI_SNIFFER_MODULE))
(1<<MODEM_WIFI_SNIFFER_MODULE) | \
(1<<MODEM_WIFI_NULL_MODULE))
/**
* @brief Modules needing to call phy_rf_init

@ -1 +1 @@
Subproject commit e5f0e45e97e550444006b98f9617d2d5e138dbfb
Subproject commit 67fe3bdfb2f82b1befed076c659951bc03a54eed