Commit Graph

9746 Commits

Author SHA1 Message Date
David Cermak
6f3fa81863 http_server: Simplified httpd_get_client_list() to return clients in int array 2020-09-09 08:00:20 +02:00
David Cermak
5e1e5f8be9 http_server: Add a flag to enable using control frames in user handlers 2020-09-09 08:00:20 +02:00
David Cermak
fe862f413f https_server: Fix use of open_fn from application level
https-server uses the open_fn() callback and potentially overwrites user defined callback. This commit adds the user defined open_fn() to https-server's context and calls it upon openning a session
2020-09-09 08:00:20 +02:00
David Cermak
fbf2680427 esp_http_server: Add Websocket API to return list of active clients
Closes https://github.com/espressif/esp-idf/issues/5406
2020-09-09 08:00:20 +02:00
David Cermak
d3801be6d9 esp_http_server: Add httpd_ws_get_fd_info() API to check active WS clients
Added a new API to WebSocket server to test provided socket descriptor if it belongs to active clients for this server and if websocket handshake has been performed

Closes https://github.com/espressif/esp-idf/issues/5602
2020-09-03 20:40:11 +02:00
Ivan Grokhotkov
52d935615c Merge branch 'bugfix/window_spill_a0_corruption' into 'master'
freertos: don't clobber a4 while spilling register windows

Closes IDFGH-3852 and IDF-1935

See merge request espressif/esp-idf!10252
2020-09-04 00:23:43 +08:00
Michael (XIAO Xufeng)
91af5eaf4f Merge branch 'refactor/twai_hal_state' into 'master'
Refactor TWAI HAL to store state information

Closes IDF-1633

See merge request espressif/esp-idf!9789
2020-09-03 23:22:30 +08:00
David Čermák
9e8f4e51b2 Merge branch 'bugfix/mdns_query_id' into 'master'
mdns: Responding: Fix query ID, add questions if not strict mode

Closes IDFGH-3639 and IDFGH-3577

See merge request espressif/esp-idf!9795
2020-09-03 14:57:47 +08:00
Island
bc6d239681 Merge branch 'feat/ble_mesh_use_model_cb' into 'master'
ble_mesh: stack: Use model callback for operations [Zephyr]

See merge request espressif/esp-idf!9505
2020-09-03 14:48:13 +08:00
Krzysztof Budzynski
6211d5297d Merge branch 'doc/warn_doxygen_ver' into 'master'
docs: add warning for doxygen version

See merge request espressif/esp-idf!10219
2020-09-03 13:48:40 +08:00
Marius Vikhammer
9b552ce004 docs: add warning for doxygen version
Running with a newer doxygen version than what's
used in CI may raise warnings locally that are not
present when built by CI
2020-09-03 13:48:40 +08:00
Mahavir Jain
7f5b6d1843 Merge branch 'bugfix/time_spinlock' into 'master'
newlib: revert back from spinlocks to using newlib locks for time.h

Closes IDFGH-3858

See merge request espressif/esp-idf!10130
2020-09-03 12:34:29 +08:00
lly
043abf5750 ble_mesh: stack: Use model callback for operations [Zephyr]
- Previously when a model is initialized or deinitialized, in the
  access layer, we need to check the model id with the ids in the
  table in order to find the proper model operation function.
- Currently all the operation functions of each model will be set
  during the mesh initialization. When the model is found, we can
  directly use the corresponding callback for different operations.
- Currently only init/deinit operations are registered, later we
  will add more operations.
2020-09-03 02:02:33 +00:00
Marius Vikhammer
6fb996b1ac newlib: revert back from spinlocks to using newlib locks for time.h
Spinlocks from spinlock.h do not disable the scheduler and thus cannot safely
be directly used as a locking mechanism. A task holding the lock can get
pre-empted, and at that point the new running task will also be allowed to
take the spinlock and access whatever it was protecting.

Another issue is that the task holding a spinlock could migrate to a different
core which in turn would cause the application to fail asserts. The current
implementation assumes the core that takes the lock is also the core that
releases it.

Closes https://github.com/espressif/esp-idf/issues/5762
2020-09-03 09:56:02 +08:00
Krzysztof Budzynski
cc33c1db91 Merge branch 'doc/adc_grammar_stuff' into 'master'
Bugfix(doc): minor modifications in the adc section

Closes DOC-436

See merge request espressif/esp-idf!9620
2020-09-03 04:29:24 +08:00
Michael (XIAO Xufeng)
9e7eda9770 Merge branch 'feat/spi_flash_override_size' into 'master'
spi_flash: add config option to override flash size in bootloader header

See merge request espressif/esp-idf!10131
2020-09-03 02:57:31 +08:00
Ivan Grokhotkov
52cc05108e Revert "CXX: removed exception windowspill test"
This reverts commit f3e180de72.
2020-09-02 15:44:18 +02:00
Ivan Grokhotkov
04b95f3567 freertos: don't clobber a4 while spilling register windows
Commit 891eb3b0 was fixing an issue with PS and EPC1 not being
preserved after the window spill procedure. It did so by saving PS in
a2 and EPC1 in a4. However the a4 register may be a live register of
another window in the call stack, and if it is overwritten and then
spilled to the stack, then the corresponding register value will end
up being corrupted. In practice the problem would show up as an
IllegalInstruction exception, when trying to return from a function
when a0 value was 0x40020.
Fix by using a0 register instead of a4 as scratch. Also fix a comment
about xthal_save_extra_nw, as this function in fact doesn't clobber
a4 or a5 because XCHAL_NCP_NUM_ATMPS is defined as 1.

Closes https://github.com/espressif/esp-idf/issues/5758
2020-09-02 15:40:41 +02:00
David Čermák
40f3cc4a34 Merge branch 'feature/mqtt_outbox_expired_config' into 'master'
MQTT: add configurable msg expired timeout

See merge request espressif/esp-idf!9997
2020-09-02 20:40:45 +08:00
Wu Bo Wen
658b56a690 doc/adc: modifications in the adc documentation and adc headers 2020-09-02 11:30:48 +00:00
David Cermak
bcfa36db8f mdns: Support queries in responses in mDNS non-strict mode
By default adds original queries to responses in order to be resolved by some resolvers, such as lwIP mdns library. This functionality however is discouraged by the RFC6762, so it could be disabled in menuconfig if MDNS_STRICT_MODE configured

Closes https://github.com/espressif/esp-idf/issues/5521
2020-09-02 11:12:08 +02:00
David Cermak
f62e321d87 mdns: Fix include query ID in reponses
Closes https://github.com/espressif/esp-idf/issues/5574
2020-09-02 11:12:08 +02:00
Jiang Jiang Jian
685d6af004 Merge branch 'feature/pmf_espnow_coexistance' into 'master'
espnow/pmf: Implement ESPNOW + PMF Co-existance

Closes WIFI-2712, WIFI-2774, WIFI-2775, and WIFI-2778

See merge request espressif/esp-idf!9885
2020-09-02 14:35:15 +08:00
Darian Leung
7398390049 TWAI: Track HW state in HAL
This commit refactors the TWAI HAL such that it
now tracks  harwdare state instead of the driver
layer. Some HAL and LL cleanup was also done.
2020-09-02 13:03:41 +08:00
Jiang Jiang Jian
36720504f9 Merge branch 'bugfix/add_protection_for_spp_api' into 'master'
componnet_bt:/ Add protection for btc and some comment correction

Closes BT-899 and BTCI-78

See merge request espressif/esp-idf!9329
2020-09-02 12:01:34 +08:00
Nachiket Kukade
3308ede898 espnow/pmf: Implement ESPNOW + PMF Co-existance
H/W decryption of Mgmt frames was disabled for PMF and done through
S/W. If ESPNOW packets go through this path, it affects backward
compatibility since method of decrypting Mgmt packets is different in H/W.

To address PMF + ESPNOW Co-existance, CCMP decryption method is modified
for ESPNOW packets so that they can be decrypted correctly. Since Tx
of ESPNOW packets can still be done in H/W alongside PMF, no change
required in encryption method in S/W.

Co-Authored-By: Nachiket Kukade <nachiket.kukade@espressif.com>
Co-Authored-By: zhangyanjiao <zhangyanjiao@espressif.com>
Co-Authored-By: kapil.gupta <kapil.gupta@espressif.com>
2020-09-02 09:26:39 +05:30
Ivan Grokhotkov
fdba279970 Merge branch 'ci/adc_calib_test_failures' into 'master'
bugfix/CI: fix for adc-calib test failures

See merge request espressif/esp-idf!10215
2020-09-02 03:05:27 +08:00
Michael (XIAO Xufeng)
c15c6a2803 Merge branch 'fix/esp_flash_delay_type' into 'master'
esp_flash: fix the data type of delay_us

See merge request espressif/esp-idf!10115
2020-09-02 01:21:12 +08:00
Michael (XIAO Xufeng)
37423083bb spi_flash: add config option to override flash size in bootloader header
Sometimes the flash size read from bootloader is not correct. This may
forbid SPI Flash driver from reading the the area larger than the size
in bootloader header.

When the new config option is enabled, the latest configured
ESPTOOLPY_FLAHSIZE in the app header will be used to override the value
read from bootloader header.
2020-09-02 00:35:53 +08:00
Michael (XIAO Xufeng)
ea63bd3de4 Merge branch 'feat/extract_hal_from_soc' into 'master'
hal: extract hal component from soc component

See merge request espressif/esp-idf!9992
2020-09-01 23:56:15 +08:00
Ivan Grokhotkov
7da6d6c1b5 Merge branch 'bugfix/get_time_in_less_than_microsecond' into 'master'
esp_timer: inline is initialized check

See merge request espressif/esp-idf!10080
2020-09-01 23:29:14 +08:00
Ivan Grokhotkov
2ee480163d Merge branch 'bugfix/disable_failing_ut_for_S2' into 'master'
esp_system: Disable UTs for ESP32-S2 linked to sleep mode

See merge request espressif/esp-idf!10235
2020-09-01 23:18:24 +08:00
Michael (XIAO Xufeng)
9d09f739da Merge branch 'refactor/unit_test_ref_clock' into 'master'
unit_test:refactor ref clock to use RMT carrier

See merge request espressif/esp-idf!10045
2020-09-01 22:13:03 +08:00
Jiang Jiang Jian
2e65e3a7d1 Merge branch 'bugfix/fix_softAP_set_channel_bug' into 'master'
esp_wifi: fix softAP set channel bug

Closes WIFI-2575 and WIFI-1972

See merge request espressif/esp-idf!10134
2020-09-01 21:20:03 +08:00
KonstantinKondrashov
b1e667cdcc esp_system: Disable UTs for ESP32-S2 linked to sleep mode
- disable source trigger behavior
- light sleep followed by deep sleep
- wake up from light sleep using timer
2020-09-01 17:10:28 +08:00
Island
cfd13d8c90 Merge branch 'bugfix/btdm_blufi_data_sequence_not_reset_after_disconnect' into 'master'
component/bt: fix Blufi sends data after disconnecting the seq still increase

See merge request espressif/esp-idf!10217
2020-09-01 15:38:26 +08:00
Mahavir Jain
ae15603c91 Merge branch 'bugfix/ota_documentation' into 'master'
Update OTA README, set custom headers in esp_https_ota

Closes IDFGH-3535 and IDFGH-3619

See merge request espressif/esp-idf!10053
2020-09-01 15:36:06 +08:00
Renz Bagaporo
e70f240e12 esp_timer: do init check in timer implementation 2020-09-01 15:01:11 +08:00
zhangyanjiao
f8ea1f0045 esp_wifi:
1. get primary channel from HT info
2. fix the bug that set_channel doesn't work for softAP when STA connects
2020-09-01 14:46:50 +08:00
Marius Vikhammer
0ea20bed43 MQTT: add configurable msg expired timeout 2020-09-01 06:40:18 +00:00
Wu Bo Wen
a8b5592762 ci: quick fix for adc-calib failures 2020-09-01 14:01:58 +08:00
Michael (XIAO Xufeng)
5425ef4ee4 hal: extract hal component from soc component 2020-09-01 13:25:32 +08:00
XieWenxiang
e92c2f553b component/bt: fix Blufi sends data after disconnect the seq still increase 2020-09-01 09:54:14 +08:00
Michael (XIAO Xufeng)
2d440e408a esp_flash: fix the data type of delay_us
unsigned can be 16-bit on some architecture, which doesn't meet the
requirements of delaying for several hundreds of us.
2020-08-31 18:10:32 +00:00
David Čermák
ffd7f39189 Merge branch 'feature/mqtt_sub_update_01594bf1' into 'master'
MQTT: Update submodule reference to 01594bf11

Closes IDFGH-3408, IDFGH-3217, IDFGH-3565, IDFGH-3710, IDFGH-3786, IDF-2006, and IDFGH-3748

See merge request espressif/esp-idf!10079
2020-08-31 21:17:09 +08:00
Krzysztof Budzynski
94cc8fc4b3 Merge branch 'doc/tinyusb' into 'master'
TinyUSB documentation

See merge request espressif/esp-idf!8862
2020-08-31 20:57:29 +08:00
Jiang Jiang Jian
80969f5a4c Merge branch 'bugfix/esp_wifi_log_level' into 'master'
wifi: Fix esp_wifi log levels

Closes WIFI-2543 and WIFI-2706

See merge request espressif/esp-idf!9830
2020-08-31 18:40:20 +08:00
Jiang Jiang Jian
16e0ff273c Merge branch 'bugfix/enter_sniff_mode_attr_err' into 'master'
bugfix/enter_sniff_mode_attr_err

See merge request espressif/esp-idf!9407
2020-08-31 14:28:57 +08:00
morris
4dd649d533 unit_test:refactor ref clock to use RMT carrier 2020-08-31 14:25:23 +08:00
David Čermák
9bc2773b22 Merge branch 'bugfix/ws_stop_deadlock' into 'master'
Websocket client: avoid deadlock if stop called from event handler

See merge request espressif/esp-idf!9963
2020-08-31 14:17:28 +08:00