espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-06 22:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/add_ant_field_for_esp32s2' into 'master'

Browse Source 
(S2) WiFi: add ant field for esp32s2 and update phy lib v102 to v202

Closes WIFI-1787 and WIFI-1788

See merge request espressif/esp-idf!7676
This commit is contained in:
Jiang Jiang Jian
2020-02-28 21:17:40 +08:00
parent 40baff19f8 a182c0682e
commit 520ae6543d
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_wifi/include/esp_wifi_types.h
View File

@@ -333,14 +333,12 @@ typedef struct {
unsigned secondary_channel:4; /**< secondary channel on which this packet is received. 0: none; 1: above; 2: below */ unsigned secondary_channel:4; /**< secondary channel on which this packet is received. 0: none; 1: above; 2: below */
unsigned :8; /**< reserved */ unsigned :8; /**< reserved */
unsigned timestamp:32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */ unsigned timestamp:32; /**< timestamp. The local time when this packet is received. It is precise only if modem sleep or light sleep is not enabled. unit: microsecond */
#if CONFIG_IDF_TARGET_ESP32
unsigned :32; /**< reserved */
unsigned :31; /**< reserved */
unsigned ant:1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */
#elif CONFIG_IDF_TARGET_ESP32S2
unsigned :32; /**< reserved */ unsigned :32; /**< reserved */
#if CONFIG_IDF_TARGET_ESP32S2
unsigned :32; /**< reserved */ unsigned :32; /**< reserved */
#endif #endif
unsigned :31; /**< reserved */
unsigned ant:1; /**< antenna number from which this packet is received. 0: WiFi antenna 0; 1: WiFi antenna 1 */
#if CONFIG_IDF_TARGET_ESP32S2 #if CONFIG_IDF_TARGET_ESP32S2
signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: 0.25dBm*/ signed noise_floor:8; /**< noise floor of Radio Frequency Module(RF). unit: 0.25dBm*/
unsigned :24; /**< reserved */ unsigned :24; /**< reserved */

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 16aec3da86...59f2ff048a

5
components/esp_wifi/src/phy_init.c
View File

@@ -765,8 +765,3 @@ void esp_phy_load_cal_and_init(phy_rf_module_t module)
free(cal_data); // PHY maintains a copy of calibration data, so we can free this free(cal_data); // PHY maintains a copy of calibration data, so we can free this
} }
#if CONFIG_IDF_TARGET_ESP32S2
/* Just a stub to avoid SSC build failure. Need to update phylib */
void set_cca(bool en ,uint8_t cca_thr) {}
#endif