Michael (XIAO Xufeng)
61ce037fc1
Merge branch 'feat/esp_flash_support_mxic' into 'master'
...
esp_flash: support MXIC flash chips
See merge request espressif/esp-idf!8037
2020-04-03 16:04:49 +08:00
Michael (XIAO Xufeng)
2f8a13c89b
Merge branch 'feat/esp_dram_log' into 'master'
...
log: new macros to log when the cache is disabled
See merge request espressif/esp-idf!8135
2020-04-03 14:51:02 +08:00
Angus Gratton
a7c2e86f87
Merge branch 'feature/ds_peripheral' into 'master'
...
Security: ESP32S2 Digital Signature HW support
See merge request espressif/esp-idf!8080
2020-04-03 12:10:13 +08:00
Anton Maklakov
e599b794be
Merge branch 'bugfix/ci_nr_ut_jobs' into 'master'
...
ci: raise number of parallel job count for S2 unit tests
See merge request espressif/esp-idf!8215
2020-04-03 01:06:28 +08:00
michael
ed012abcfa
ci: increase S2 job count
2020-04-02 23:55:11 +08:00
Jiang Jiang Jian
79eb0d7a7d
Merge branch 'bugfix/fix_ble_hci_desync_deadlock' into 'master'
...
components/bt: Fix for HCI desync deadlock issue in BLE controller
See merge request espressif/esp-idf!8106
2020-04-02 22:22:17 +08:00
Krzysztof Budzynski
7a92dd431f
Merge branch 'bugfix/partition_types_cxx' into 'master'
...
docs: Explain custom partition types/subtypes in more detail
Closes IDFGH-2882
See merge request espressif/esp-idf!8192
2020-04-02 21:52:52 +08:00
Jiang Jiang Jian
59660c67cd
Merge branch 'mesh/power_save_function_with_local_duty' into 'master'
...
mesh/ps: add mesh network power save function
See merge request espressif/esp-idf!8203
2020-04-02 19:43:12 +08:00
Angus Gratton
dcaa9e385a
Merge branch 'bugfix/restore_rtc_wdt_driver' into 'master'
...
Restore rtc_wdt driver
Closes IDF-1514
See merge request espressif/esp-idf!8148
2020-04-02 19:11:49 +08:00
sushant.chougule
4cd6f09427
components/bt: Fix for HCI desync deadlock issue in BLE controller
2020-04-02 09:54:16 +00:00
David Cermak
09ca8a273c
ci: raise number of parallel job count for S2 unit tests
2020-04-02 11:43:03 +02:00
Michael (XIAO Xufeng)
188240d5c7
log: new macros to log when the cache is disabled
2020-04-02 15:35:13 +08:00
David Čermák
3de8b7922f
Merge branch 'bugfix/reenable_esp32s2_ut' into 'master'
...
Re-enable mqtt/esp-netif unit tests for esp32s2
Closes IDF-1398 and IDF-1396
See merge request espressif/esp-idf!8038
2020-04-02 14:43:21 +08:00
Mahavir Jain
6866f9c996
Merge branch 'bugfix/eth2ap' into 'master'
...
example/eth2ap: Fix station multi-connection problem
See merge request espressif/esp-idf!8051
2020-04-02 13:18:42 +08:00
Jiang Jiang Jian
037ad6f64e
Merge branch 'bugfix/fix_supplicant_tlsv12' into 'master'
...
wpa_supplicant: Fix wpa_supplicant TLS 1.2 issues
Closes WIFI-2003
See merge request espressif/esp-idf!8147
2020-04-02 12:17:59 +08:00
Jiang Jiang Jian
20a972d91e
Merge branch 'feat/ble_mesh_ble_adv_simultaneously' into 'master'
...
ble_mesh: Support BLE advertising simultaneously
Closes BLEMESH-125
See merge request espressif/esp-idf!7802
2020-04-02 12:17:42 +08:00
Jiang Jiang Jian
881cdbd743
Merge branch 'nimble/fix_ble_hs_reset' into 'master'
...
NimBLE: Reset master and slave states on host reset
Closes IDFGH-2743
See merge request espressif/esp-idf!8139
2020-04-02 12:16:49 +08:00
Michael (XIAO Xufeng)
15026d1b84
Merge branch 'bugfix/fix_adc_driver_for_esp32s2' into 'master'
...
Bugfix/fix adc driver for esp32s2
Closes IDF-1448, IDF-1449, IDF-1450, IDF-1451, and IDF-1458
See merge request espressif/esp-idf!7776
2020-04-02 11:02:21 +08:00
lly
a919e20c1a
ble_mesh: Support BLE advertising simultaneously
2020-04-02 01:03:25 +00:00
Angus Gratton
d76bf19ffd
docs: Explain custom partition types/subtypes in more detail
...
Including how to use with C++ (closes https://github.com/espressif/esp-idf/pull/1832 )
2020-04-02 10:00:17 +11:00
qiyuexia
6d01dc4cfa
mesh/ps: add mesh network power save function
2020-04-01 22:09:23 +08:00
Michael (XIAO Xufeng)
3b429766bc
esp_flash: support MXIC flash chips
...
The default chip driver (chip_generic) use command 01H + 2 bytes to
clear the QE bit. However this will accidently change the configuration
register value of the MXIC chip.
MXIC chip driver is added to fix that.
2020-04-01 20:54:23 +08:00
Krzysztof Budzynski
8210802703
Merge branch 'bugfix/expand_defines_dict' into 'master'
...
doc: fix defines dict expansion
See merge request espressif/esp-idf!8169
2020-04-01 20:36:12 +08:00
InfiniteYuan
1f43f025d8
example/eth2ap: fix station multi-connection problem and add channel config item.
...
Closes https://github.com/espressif/esp-idf/issues/5029
2020-04-01 19:20:30 +08:00
Ivan Grokhotkov
168660aebf
Merge branch 'feature/toolchain_2020r1-RC1' into 'master'
...
Toolchain 2020r1 support bringing (esp32, esp32s2)
See merge request espressif/esp-idf!7509
2020-04-01 18:17:28 +08:00
Prasad Alatkar
be8c847b06
NimBLE: Reset master and slave states on host reset
...
Closes IDFGH-2743 & IDFGH-2956
2020-04-01 10:09:26 +00:00
Mahavir Jain
05d95c0e7e
Merge branch 'bugfix/esp_http_server_docs' into 'master'
...
Fixed syntax error in esp_http_server.rst
See merge request espressif/esp-idf!8170
2020-04-01 17:48:16 +08:00
Krzysztof Budzynski
53879a853d
Merge branch 'doc/openocd_security_features' into 'master'
...
doc: Add caveats about using JTAG debugging with hardware security features
See merge request espressif/esp-idf!8091
2020-04-01 16:50:52 +08:00
Darian Leung
53928ab98b
Restore rtc_wdt driver
...
This commit restores rtc_wdt.c and rtc_wdt.h that were removed
in commit 91841a53
.
2020-04-01 16:13:35 +08:00
Ivan Grokhotkov
1ab285bebe
Merge branch 'bugfix/ci_config_merge_newlines' into 'master'
...
ci: Support joining sdkconfig.ci files that don't end in a newline
See merge request espressif/esp-idf!8198
2020-04-01 16:08:02 +08:00
David Cermak
4fad90b0b1
esp-netif: reenabled dhcp unit tests for esp32s2
2020-04-01 07:06:13 +00:00
David Cermak
db677e6898
mqtt: reenable outbox unit tests for esp32s2
2020-04-01 07:06:13 +00:00
Angus Gratton
4358f3b573
doc: Add warnings about using JTAG debugging with hardware security features
...
This is related to the following issues but is not a fix, just documentation of a workaround until we can
improve the support:
https://github.com/espressif/esp-idf/issues/4878
https://github.com/espressif/esp-idf/issues/4734
2020-04-01 17:36:08 +11:00
Angus Gratton
ff427c9650
ci: Support joining sdkconfig.ci files that don't end in a newline
...
If trailing newline is missing, the last line of that item gets merged
with the first line of the next item.
2020-04-01 17:17:30 +11:00
Jakob Hasse
0b02e5358e
Digital Signature HW: adding S2 support
2020-04-01 13:47:13 +08:00
Mahavir Jain
2f0a57dece
Merge branch 'bugfix/size_calculation_in_ota' into 'master'
...
Fix size calculation to erase partition range for OTA image
Closes IDFGH-2909
See merge request espressif/esp-idf!8140
2020-04-01 13:06:25 +08:00
fuzhibo
baa7898e35
driver(adc/dac): fix adc dac driver for esp32s2
...
1. update register file about adc; 2. fix adc driver; 3. add UT for adc/dac;
See merge request espressif/esp-idf!7776
2020-04-01 12:41:51 +08:00
fuzhibo
dfbb108ab4
Driver(touch): fix touch sensor driver for esp32s2.
...
1.update touch sensor driver for esp32s2;
2.update unit test for touch sensor;
3.update register files about touch sensor;
2020-04-01 12:41:51 +08:00
Michael (XIAO Xufeng)
c9f29e0b59
Merge branch 'bugfix/spi_eeprom_build_fix' into 'master'
...
spi: fix spi eeprom example build
See merge request espressif/esp-idf!8175
2020-04-01 02:14:39 +08:00
David Cermak
abcc3fe6da
spi: fix spi eeprom example build
...
Fix GNU make build error introduced in f53812d27a
2020-03-31 17:48:01 +02:00
morsisko
9759aa4ad2
Fixed syntax error in esp_http_server.rst
...
Merges: https://github.com/espressif/esp-idf/pull/5021
2020-03-31 14:59:27 +00:00
Shubham Kulkarni
c82a4d59ee
esp_ota_ops.c: Fix size calculation to erase partition range for OTA image
...
Closes https://github.com/espressif/esp-idf/issues/4953
2020-03-31 14:58:32 +00:00
Michael (XIAO Xufeng)
4a005a02f9
Merge branch 'bugfix/spi_eeprom_example_make_build' into 'master'
...
spi: fix the component.mk for eeprom example
See merge request espressif/esp-idf!8187
2020-03-31 22:33:07 +08:00
David Čermák
8b0063588f
Merge branch 'bugfix/udp_client_build_error' into 'master'
...
socket examples: Fix udp_client build error
Closes IDFGH-2982
See merge request espressif/esp-idf!8176
2020-03-31 22:25:48 +08:00
Sagar Bijwe
a830ddd9ba
wpa_supplicant: Fix wpa_supplicant TLS 1.2 issues
...
1) Fixed compilation issues.
2) Added tlsprf.c from upstream
3) Enabled SHA256 in supplicant compilation.
2020-03-31 17:16:10 +05:30
Jiang Jiang Jian
dcc2963d43
Merge branch 'bugfix/btdm_dont_dequeue_the_command_queue' into 'master'
...
component/bt: fix don't dequeue the command queue after process the read_by_type_req
See merge request espressif/esp-idf!8161
2020-03-31 19:03:37 +08:00
Michael (XIAO Xufeng)
6998257514
spi: fix the component.mk for eeprom example
...
introduced in f53812d27a
.
2020-03-31 18:18:18 +08:00
Jiang Jiang Jian
c08bb08d2d
Merge branch 'bugfix/crypto_test_mem_align' into 'master'
...
crypto tests: fix mallocs that were missing MALLOC_CAP_8BIT
See merge request espressif/esp-idf!8132
2020-03-31 18:11:38 +08:00
Angus Gratton
9a5e4f9acb
Merge branch 'bugfix/secure_boot_v2_wrdis' into 'master'
...
secure boot v2: esp32: Prevent read disabling additional efuses
Closes IDF-1502
See merge request espressif/esp-idf!8045
2020-03-31 16:08:01 +08:00
xiewenxiang
5d0b6da6a0
component/bt: fix don't dequeue the command queue after process the read_by_type_req
2020-03-31 15:10:01 +08:00