Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d5e2bb1

Browse filesBrowse files
me-no-devme-no-dev
authored
Update IDF to 90747cc8b (espressif#3118)
1 parent f4acac4 commit d5e2bb1
Copy full SHA for d5e2bb1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

91 files changed

+253
-116
lines changed

‎tools/sdk/bin/bootloader_dio_40m.bin

Copy file name to clipboard
224 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_dio_80m.bin

Copy file name to clipboard
224 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_dout_40m.bin

Copy file name to clipboard
224 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_dout_80m.bin

Copy file name to clipboard
224 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qio_40m.bin

Copy file name to clipboard
208 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qio_80m.bin

Copy file name to clipboard
224 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qout_40m.bin

Copy file name to clipboard
208 Bytes
Binary file not shown.

‎tools/sdk/bin/bootloader_qout_80m.bin

Copy file name to clipboard
224 Bytes
Binary file not shown.

‎tools/sdk/include/bootloader_support/bootloader_common.h

Copy file name to clipboardExpand all lines: tools/sdk/include/bootloader_support/bootloader_common.h
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,11 @@ esp_err_t bootloader_common_get_sha256_of_partition(uint32_t address, uint32_t s
9696
* @brief Configure VDDSDIO, call this API to rise VDDSDIO to 1.9V when VDDSDIO regulator is enabled as 1.8V mode.
9797
*/
9898
void bootloader_common_vddsdio_configure();
99+
100+
/**
101+
* @brief Set the flash CS setup and hold time.
102+
*
103+
* CS setup time is recomemded to be 1.5T, and CS hold time is recommended to be 2.5T.
104+
* cs_setup = 1, cs_setup_time = 0; cs_hold = 1, cs_hold_time = 1
105+
*/
106+
void bootloader_common_set_flash_cs_timing();

‎tools/sdk/include/esp32/esp_event_legacy.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/esp_event_legacy.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ typedef enum {
4040
SYSTEM_EVENT_STA_WPS_ER_FAILED, /**< ESP32 station wps fails in enrollee mode */
4141
SYSTEM_EVENT_STA_WPS_ER_TIMEOUT, /**< ESP32 station wps timeout in enrollee mode */
4242
SYSTEM_EVENT_STA_WPS_ER_PIN, /**< ESP32 station wps pin code in enrollee mode */
43+
SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP, /*!< ESP32 station wps overlap in enrollee mode */
4344
SYSTEM_EVENT_AP_START, /**< ESP32 soft-AP start */
4445
SYSTEM_EVENT_AP_STOP, /**< ESP32 soft-AP stop */
4546
SYSTEM_EVENT_AP_STACONNECTED, /**< a station connected to ESP32 soft-AP */

‎tools/sdk/include/esp32/esp_private/esp_wifi_private.h

Copy file name to clipboard
+24Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
14+
#ifndef _ESP_WIFI_PRIVATE_H
15+
#define _ESP_WIFI_PRIVATE_H
16+
17+
#include "freertos/FreeRTOS.h"
18+
#include "freertos/queue.h"
19+
#include "rom/queue.h"
20+
#include "sdkconfig.h"
21+
#include "esp_wifi_crypto_types.h"
22+
#include "esp_wifi_os_adapter.h"
23+
24+
#endif /* _ESP_WIFI_PRIVATE_H */

‎tools/sdk/include/esp32/esp_private/esp_wifi_types_private.h

Copy file name to clipboard
+21Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#ifndef _ESP_WIFI_TYPES_PRIVATE_H
16+
#define _ESP_WIFI_TYPES_PRIVATE_H
17+
18+
#include "rom/queue.h"
19+
#include "esp_interface.h"
20+
21+
#endif

‎tools/sdk/include/esp32/esp_wifi.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/esp_wifi.h
+21-73Lines changed: 21 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,10 @@
5959

6060
#include <stdint.h>
6161
#include <stdbool.h>
62-
#include "freertos/FreeRTOS.h"
63-
#include "freertos/queue.h"
64-
#include "rom/queue.h"
65-
#include "sdkconfig.h"
6662
#include "esp_err.h"
6763
#include "esp_wifi_types.h"
68-
#include "esp_wifi_crypto_types.h"
6964
#include "esp_event.h"
70-
#include "esp_wifi_os_adapter.h"
65+
#include "esp_private/esp_wifi_private.h"
7166

7267
#ifdef __cplusplus
7368
extern "C" {
@@ -89,6 +84,10 @@ extern "C" {
8984
#define ESP_ERR_WIFI_WOULD_BLOCK (ESP_ERR_WIFI_BASE + 14) /*!< The caller would block */
9085
#define ESP_ERR_WIFI_NOT_CONNECT (ESP_ERR_WIFI_BASE + 15) /*!< Station still in disconnect status */
9186

87+
#define ESP_ERR_WIFI_POST (ESP_ERR_WIFI_BASE + 18) /*!< Failed to post the event to WiFi task */
88+
#define ESP_ERR_WIFI_INIT_STATE (ESP_ERR_WIFI_BASE + 19) /*!< Invalod WiFi state when init/deinit is called */
89+
#define ESP_ERR_WIFI_STOP_STATE (ESP_ERR_WIFI_BASE + 20) /*!< Returned when WiFi is stopping */
90+
9291
/**
9392
* @brief WiFi stack configuration parameters passed to esp_wifi_init call.
9493
*/
@@ -581,7 +580,7 @@ esp_err_t esp_wifi_get_channel(uint8_t *primary, wifi_second_chan_t *second);
581580
* and the country info of the AP to which the station is connected is {.cc="JP", .schan=1, .nchan=14}
582581
* then the country info that will be used is {.cc="JP", .schan=1, .nchan=14}. If the station disconnected
583582
* from the AP the country info is set back back to the country info of the station automatically,
584-
* {.cc="USA", .schan=1, .nchan=11} in the example.
583+
* {.cc="US", .schan=1, .nchan=11} in the example.
585584
* @attention 3. When the country policy is WIFI_COUNTRY_POLICY_MANUAL, always use the configured country info.
586585
* @attention 4. When the country info is changed because of configuration or because the station connects to a different
587586
* external AP, the country IE in probe response/beacon of the soft-AP is changed also.
@@ -840,6 +839,16 @@ esp_err_t esp_wifi_set_auto_connect(bool en) __attribute__ ((deprecated));
840839
*/
841840
esp_err_t esp_wifi_get_auto_connect(bool *en) __attribute__ ((deprecated));
842841

842+
/**
843+
* @brief Function signature for received Vendor-Specific Information Element callback.
844+
* @param ctx Context argument, as passed to esp_wifi_set_vendor_ie_cb() when registering callback.
845+
* @param type Information element type, based on frame type received.
846+
* @param sa Source 802.11 address.
847+
* @param vnd_ie Pointer to the vendor specific element data received.
848+
* @param rssi Received signal strength indication.
849+
*/
850+
typedef void (*esp_vendor_ie_cb_t) (void *ctx, wifi_vendor_ie_type_t type, const uint8_t sa[6], const vendor_ie_data_t *vnd_ie, int rssi);
851+
843852
/**
844853
* @brief Set 802.11 Vendor-Specific Information Element
845854
*
@@ -858,16 +867,6 @@ esp_err_t esp_wifi_get_auto_connect(bool *en) __attribute__ ((deprecated));
858867
*/
859868
esp_err_t esp_wifi_set_vendor_ie(bool enable, wifi_vendor_ie_type_t type, wifi_vendor_ie_id_t idx, const void *vnd_ie);
860869

861-
/**
862-
* @brief Function signature for received Vendor-Specific Information Element callback.
863-
* @param ctx Context argument, as passed to esp_wifi_set_vendor_ie_cb() when registering callback.
864-
* @param type Information element type, based on frame type received.
865-
* @param sa Source 802.11 address.
866-
* @param vnd_ie Pointer to the vendor specific element data received.
867-
* @param rssi Received signal strength indication.
868-
*/
869-
typedef void (*esp_vendor_ie_cb_t) (void *ctx, wifi_vendor_ie_type_t type, const uint8_t sa[6], const vendor_ie_data_t *vnd_ie, int rssi);
870-
871870
/**
872871
* @brief Register Vendor-Specific Information Element monitoring callback.
873872
*
@@ -881,60 +880,22 @@ typedef void (*esp_vendor_ie_cb_t) (void *ctx, wifi_vendor_ie_type_t type, const
881880
esp_err_t esp_wifi_set_vendor_ie_cb(esp_vendor_ie_cb_t cb, void *ctx);
882881

883882
/**
884-
* @brief Set maximum WiFi transmiting power
885-
*
886-
* @attention WiFi transmiting power is divided to six levels in phy init data.
887-
* Level0 represents highest transmiting power and level5 represents lowest
888-
* transmiting power. Packets of different rates are transmitted in
889-
* different powers according to the configuration in phy init data.
890-
* This API only sets maximum WiFi transmiting power. If this API is called,
891-
* the transmiting power of every packet will be less than or equal to the
892-
* value set by this API. If this API is not called, the value of maximum
893-
* transmitting power set in phy_init_data.bin or menuconfig (depend on
894-
* whether to use phy init data in partition or not) will be used. Default
895-
* value is level0. Values passed in power are mapped to transmit power
896-
* levels as follows:
897-
* - [78, 127]: level0
898-
* - [76, 77]: level1
899-
* - [74, 75]: level2
900-
* - [68, 73]: level3
901-
* - [60, 67]: level4
902-
* - [52, 59]: level5
903-
* - [44, 51]: level5 - 2dBm
904-
* - [34, 43]: level5 - 4.5dBm
905-
* - [28, 33]: level5 - 6dBm
906-
* - [20, 27]: level5 - 8dBm
907-
* - [8, 19]: level5 - 11dBm
908-
* - [-128, 7]: level5 - 14dBm
909-
*
910-
* @param power Maximum WiFi transmiting power.
883+
* @brief Set maximum WiFi transmitting power
884+
*
885+
* @param power Maximum WiFi transmitting power, unit is 0.25dBm, range is [40, 82] corresponding to 10dBm - 20.5dBm here.
911886
*
912887
* @return
913888
* - ESP_OK: succeed
914889
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
915890
* - ESP_ERR_WIFI_NOT_START: WiFi is not started by esp_wifi_start
891+
* - ESP_ERR_WIFI_NOT_ARG: invalid argument
916892
*/
917893
esp_err_t esp_wifi_set_max_tx_power(int8_t power);
918894

919895
/**
920896
* @brief Get maximum WiFi transmiting power
921897
*
922-
* @attention This API gets maximum WiFi transmiting power. Values got
923-
* from power are mapped to transmit power levels as follows:
924-
* - 78: 19.5dBm
925-
* - 76: 19dBm
926-
* - 74: 18.5dBm
927-
* - 68: 17dBm
928-
* - 60: 15dBm
929-
* - 52: 13dBm
930-
* - 44: 11dBm
931-
* - 34: 8.5dBm
932-
* - 28: 7dBm
933-
* - 20: 5dBm
934-
* - 8: 2dBm
935-
* - -4: -1dBm
936-
*
937-
* @param power Maximum WiFi transmiting power.
898+
* @param power Maximum WiFi transmitting power, unit is 0.25dBm.
938899
*
939900
* @return
940901
* - ESP_OK: succeed
@@ -1102,19 +1063,6 @@ esp_err_t esp_wifi_set_ant(const wifi_ant_config_t *config);
11021063
*/
11031064
esp_err_t esp_wifi_get_ant(wifi_ant_config_t *config);
11041065

1105-
/**
1106-
* @brief A general API to set/get WiFi internal configuration, it's for debug only
1107-
*
1108-
* @param cmd : ioctl command type
1109-
* @param cfg : configuration for the command
1110-
*
1111-
* @return
1112-
* - ESP_OK: succeed
1113-
* - others: failed
1114-
*/
1115-
esp_err_t esp_wifi_internal_ioctl(int cmd, wifi_ioctl_config_t *cfg);
1116-
1117-
11181066
#ifdef __cplusplus
11191067
}
11201068
#endif

‎tools/sdk/include/esp32/esp_wifi_internal.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/esp_wifi_internal.h
+27-4Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,15 +170,26 @@ esp_err_t esp_wifi_internal_osi_funcs_md5_check(const char *md5);
170170
esp_err_t esp_wifi_internal_crypto_funcs_md5_check(const char *md5);
171171

172172
/**
173-
* @brief Check the git commit id of WiFi library
173+
* @brief Check the MD5 values of the esp_wifi_types.h in IDF and WiFi library
174174
*
175-
* @attention 1. It is used for internal CI WiFi library check
175+
* @attention 1. It is used for internal CI version check
176+
*
177+
* @return
178+
* - ESP_OK : succeed
179+
* - ESP_WIFI_INVALID_ARG : MD5 check fail
180+
*/
181+
esp_err_t esp_wifi_internal_wifi_type_md5_check(const char *md5);
182+
183+
/**
184+
* @brief Check the MD5 values of the esp_wifi.h in IDF and WiFi library
185+
*
186+
* @attention 1. It is used for internal CI version check
176187
*
177188
* @return
178189
* - ESP_OK : succeed
179-
* - ESP_FAIL : fail
190+
* - ESP_WIFI_INVALID_ARG : MD5 check fail
180191
*/
181-
esp_err_t esp_wifi_internal_git_commit_id_check(void);
192+
esp_err_t esp_wifi_internal_esp_wifi_md5_check(const char *md5);
182193

183194
/**
184195
* @brief Allocate a chunk of memory for WiFi driver
@@ -233,6 +244,18 @@ typedef esp_err_t (* wifi_mac_time_update_cb_t)( uint32_t time_delta );
233244
*/
234245
esp_err_t esp_wifi_internal_update_mac_time( uint32_t time_delta );
235246

247+
/**
248+
* @brief A general API to set/get WiFi internal configuration, it's for debug only
249+
*
250+
* @param cmd : ioctl command type
251+
* @param cfg : configuration for the command
252+
*
253+
* @return
254+
* - ESP_OK: succeed
255+
* - others: failed
256+
*/
257+
esp_err_t esp_wifi_internal_ioctl(int cmd, wifi_ioctl_config_t *cfg);
258+
236259
#ifdef __cplusplus
237260
}
238261
#endif

‎tools/sdk/include/esp32/esp_wifi_types.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/esp_wifi_types.h
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818

1919
#include <stdint.h>
2020
#include <stdbool.h>
21-
#include "rom/queue.h"
2221
#include "esp_err.h"
23-
#include "esp_interface.h"
22+
#include "esp_private/esp_wifi_types_private.h"
2423

2524
#ifdef __cplusplus
2625
extern "C" {
@@ -49,7 +48,7 @@ typedef struct {
4948
char cc[3]; /**< country code string */
5049
uint8_t schan; /**< start channel */
5150
uint8_t nchan; /**< total channel number */
52-
int8_t max_tx_power; /**< maximum tx power */
51+
int8_t max_tx_power; /**< This field is used for getting WiFi maximum transmitting power, call esp_wifi_set_max_tx_power to set the maximum transmitting power. */
5352
wifi_country_policy_t policy; /**< country policy */
5453
} wifi_country_t;
5554

‎tools/sdk/include/esp32/hwcrypto/aes.h

Copy file name to clipboardExpand all lines: tools/sdk/include/esp32/hwcrypto/aes.h
+1-5Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,13 @@ extern "C" {
4141
/**
4242
* \brief AES context structure
4343
*
44-
* \note buf is able to hold 32 extra bytes, which can be used:
45-
* - for alignment purposes if VIA padlock is used, and/or
46-
* - to simplify key expansion in the 256-bit case by
47-
* generating an extra round key
4844
*/
4945
typedef struct {
5046
uint8_t key_bytes;
47+
volatile uint8_t key_in_hardware; /* This variable is used for fault injection checks, so marked volatile to avoid optimisation */
5148
uint8_t key[32];
5249
} esp_aes_context;
5350

54-
5551
/**
5652
* \brief The AES XTS context-type definition.
5753
*/

‎tools/sdk/include/lwip/lwip/mem.h

Copy file name to clipboardExpand all lines: tools/sdk/include/lwip/lwip/mem.h
-16Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,6 @@ typedef size_t mem_size_t;
5555
typedef u16_t mem_size_t;
5656
#define MEM_SIZE_F U16_F
5757

58-
#if ESP_LWIP
59-
/**
60-
* lwip_malloc: if CONFIG_ALLOC_MEMORY_IN_SPIRAM_FIRST is enabled, Try to
61-
* allocate memory for lwip in SPIRAM firstly. If failed, try to allocate
62-
* internal memory then.
63-
*/
64-
#if CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST
65-
#ifndef mem_malloc
66-
#define mem_malloc(size) heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL)
67-
#endif
68-
#ifndef mem_calloc
69-
#define mem_calloc(n, size) heap_caps_calloc_prefer(n, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL)
70-
#endif
71-
#endif
72-
#endif
73-
7458
#else
7559

7660
/* MEM_SIZE would have to be aligned, but using 64000 here instead of

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.