未验证 提交 15bae92a 编写于 作者: M Me No Dev 提交者: GitHub

Idf release/v3.3 d8082b7f3

* Update IDF to d8082b7f3
上级 6f23cd59
......@@ -84,7 +84,7 @@ public:
void enableArduino(uint16_t port=3232, bool auth=false);
void disableArduino();
void enableWorkstation(wifi_interface_t interface=ESP_IF_WIFI_STA);
void enableWorkstation(wifi_interface_t interface=WIFI_IF_STA);
void disableWorkstation();
IPAddress queryHost(char *host, uint32_t timeout=2000);
......
......@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
compiler.c.elf.cmd=xtensa-esp32-elf-gcc
compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.project.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception
compiler.c.elf.libs=-lgcc -lesp32-camera -lpe -lfatfs -lesp-tls -lnet80211 -lsoc -lwpa_supplicant -lapp_update -ldetection -lmicro-ecc -lesp_adc_cal -ltcpip_adapter -lapp_trace -lwear_levelling -lcoap -lesp32 -lcore -lesp_ringbuf -llibsodium -lsmartconfig -lprotobuf-c -lxtensa-debug-module -limage_util -lnewlib -lunity -lm -lcoexist -lface_detection -ljson -lcxx -lesp_websocket_client -lwpa2 -ltcp_transport -lulp -lesp_event -lesp_http_server -lmqtt -lhal -lmbedtls -lfreertos -lwps -lnghttp -lface_recognition -lethernet -lbootloader_support -ldetection_cat_face -lespcoredump -lnvs_flash -lfr -lphy -lopenssl -ljsmn -lpp -llwip -lwifi_provisioning -llog -lespnow -lc_nano -lvfs -lesp_https_server -lmdns -lbtdm_app -lfreemodbus -lsmartconfig_ack -lfd -lasio -lfb_gfx -lsdmmc -lrtc -lpthread -lconsole -lmesh -lc -lesp_http_client -lspiffs -lprotocomm -lesp_https_ota -lwpa -ldriver -lbt -lspi_flash -lexpat -lheap -ldl -lefuse -lod -lstdc++
compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lod -lmdns -ldetection -lvfs -lpe -lesp_websocket_client -lespcoredump -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -ldl -lspiffs -lface_detection -lefuse -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -ldetection_cat_face -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd -lstdc++
compiler.as.cmd=xtensa-esp32-elf-as
......
......@@ -171,7 +171,7 @@ env.Append(
],
LIBS=[
"-lgcc", "-lesp32-camera", "-lpe", "-lfatfs", "-lesp-tls", "-lnet80211", "-lsoc", "-lwpa_supplicant", "-lapp_update", "-ldetection", "-lmicro-ecc", "-lesp_adc_cal", "-ltcpip_adapter", "-lapp_trace", "-lwear_levelling", "-lcoap", "-lesp32", "-lcore", "-lesp_ringbuf", "-llibsodium", "-lsmartconfig", "-lprotobuf-c", "-lxtensa-debug-module", "-limage_util", "-lnewlib", "-lunity", "-lm", "-lcoexist", "-lface_detection", "-ljson", "-lcxx", "-lesp_websocket_client", "-lwpa2", "-ltcp_transport", "-lulp", "-lesp_event", "-lesp_http_server", "-lmqtt", "-lhal", "-lmbedtls", "-lfreertos", "-lwps", "-lnghttp", "-lface_recognition", "-lethernet", "-lbootloader_support", "-ldetection_cat_face", "-lespcoredump", "-lnvs_flash", "-lfr", "-lphy", "-lopenssl", "-ljsmn", "-lpp", "-llwip", "-lwifi_provisioning", "-llog", "-lespnow", "-lc_nano", "-lvfs", "-lesp_https_server", "-lmdns", "-lbtdm_app", "-lfreemodbus", "-lsmartconfig_ack", "-lfd", "-lasio", "-lfb_gfx", "-lsdmmc", "-lrtc", "-lpthread", "-lconsole", "-lmesh", "-lc", "-lesp_http_client", "-lspiffs", "-lprotocomm", "-lesp_https_ota", "-lwpa", "-ldriver", "-lbt", "-lspi_flash", "-lexpat", "-lheap", "-ldl", "-lefuse", "-lod", "-lstdc++"
"-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lod", "-lmdns", "-ldetection", "-lvfs", "-lpe", "-lesp_websocket_client", "-lespcoredump", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-ldl", "-lspiffs", "-lface_detection", "-lefuse", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldetection_cat_face", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
],
LIBSOURCE_DIRS=[
......
......@@ -331,6 +331,12 @@ esp_err_t esp_bt_controller_disable(void);
*/
esp_bt_controller_status_t esp_bt_controller_get_status(void);
/**
* @brief Get BT MAC address.
* @return Array pointer of length 6 storing MAC address value.
*/
uint8_t* esp_bt_get_mac(void);
/** @brief esp_vhci_host_callback
* used for vhci call host function to notify what host need to do
*/
......
......@@ -396,5 +396,5 @@
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
#define CONFIG_ARDUINO_IDF_COMMIT "7e63061fa"
#define CONFIG_ARDUINO_IDF_COMMIT "d8082b7f3"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
......@@ -244,6 +244,13 @@ esp_err_t esp_modem_sleep_deregister(modem_sleep_module_t module);
* microsecond since boot when phy/rf was last switched on
*/
int64_t esp_phy_rf_get_on_ts(void);
/**
* @brief Get PHY lib version
* @return PHY lib version.
*/
char * get_phy_version_str(void);
#ifdef __cplusplus
}
#endif
......
......@@ -442,6 +442,8 @@ esp_err_t esp_wifi_scan_get_ap_records(uint16_t *number, wifi_ap_record_t *ap_re
/**
* @brief Get information of AP which the ESP32 station is associated with
*
* @attention When the obtained country information is empty, it means that the AP does not carry country information
*
* @param ap_info the wifi_ap_record_t to hold AP information
* sta can get the connected ap's phy mode info through the struct member
* phy_11b,phy_11g,phy_11n,phy_lr in the wifi_ap_record_t struct.
......@@ -905,9 +907,9 @@ esp_err_t esp_wifi_set_vendor_ie_cb(esp_vendor_ie_cb_t cb, void *ctx);
* @attention 1. Maximum power before wifi startup is limited by PHY init data bin.
* @attention 2. The value set by this API will be mapped to the max_tx_power of the structure wifi_country_t variable.
* @attention 3. Mapping Table {Power, max_tx_power} = {{8, 2}, {20, 5}, {28, 7}, {34, 8}, {44, 11},
* {52, 13}, {56, 14}, {60, 15}, {66, 16}, {72, 18}, {78, 20}}.
* @attention 4. Param power unit is 0.25dBm, range is [8, 78] corresponding to 2dBm - 20dBm.
* @attention 5. Relationship between set value and actual value. As follows: {set value range, actual value} = {{[8, 19],8}, {[20, 27],20}, {[28, 33],28}, {[34, 43],34}, {[44, 51],44}, {[52, 55],52}, {[56, 59],56}, {[60, 65],60}, {[66, 71],66}, {[72, 77],72}, {78,78}}
* {52, 13}, {56, 14}, {60, 15}, {66, 16}, {72, 18}, {80, 20}}.
* @attention 4. Param power unit is 0.25dBm, range is [8, 84] corresponding to 2dBm - 20dBm.
* @attention 5. Relationship between set value and actual value. As follows: {set value range, actual value} = {{[8, 19],8}, {[20, 27],20}, {[28, 33],28}, {[34, 43],34}, {[44, 51],44}, {[52, 55],52}, {[56, 59],56}, {[60, 65],60}, {[66, 71],66}, {[72, 79],72}, {[80, 84],80}}.
*
* @param power Maximum WiFi transmitting power.
*
......
......@@ -33,10 +33,10 @@ typedef enum {
WIFI_MODE_MAX
} wifi_mode_t;
typedef esp_interface_t wifi_interface_t;
#define WIFI_IF_STA ESP_IF_WIFI_STA
#define WIFI_IF_AP ESP_IF_WIFI_AP
typedef enum {
WIFI_IF_STA = ESP_IF_WIFI_STA,
WIFI_IF_AP = ESP_IF_WIFI_AP,
} wifi_interface_t;
typedef enum {
WIFI_COUNTRY_POLICY_AUTO, /**< Country policy is auto, use the country info of AP to which the station is connected */
......@@ -364,6 +364,7 @@ typedef enum {
#define WIFI_PROMIS_FILTER_MASK_MISC (1<<3) /**< filter the packets with type of WIFI_PKT_MISC */
#define WIFI_PROMIS_FILTER_MASK_DATA_MPDU (1<<4) /**< filter the MPDU which is a kind of WIFI_PKT_DATA */
#define WIFI_PROMIS_FILTER_MASK_DATA_AMPDU (1<<5) /**< filter the AMPDU which is a kind of WIFI_PKT_DATA */
#define WIFI_PROMIS_FILTER_MASK_FCSFAIL (1<<6) /**< filter the FCS failed packets, do not open it in general */
#define WIFI_PROMIS_CTRL_FILTER_MASK_ALL (0xFF800000) /**< filter all control packets */
#define WIFI_PROMIS_CTRL_FILTER_MASK_WRAPPER (1<<23) /**< filter the control packets with subtype of Control Wrapper */
......
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册