Jiang Jiang Jian
8a5c08df98
Merge branch 'bugfix/fix_the_for_smartconfig_send_broadcast_to_phone_v4.0' into 'release/v4.0'
...
fix the bug that ESP32 sends broadcast to phone after smartconfig is done (backport v4.0)
See merge request espressif/esp-idf!6072
2019-09-20 14:02:19 +08:00
Jiang Jiang Jian
05d3665a14
Merge branch 'bugfix/ble_mesh_get_timer_remaining_time_v4.0' into 'release/v4.0'
...
ble_mesh: fix ble mesh get timer remaining time (v4.0)
See merge request espressif/esp-idf!6059
2019-09-18 16:38:31 +08:00
lly
1e01accaa4
ble_mesh: fix duplicate memory free during receiving status message
2019-09-16 17:30:03 +08:00
lly
77f186a7b9
ble_mesh: make unicast elem lookup O(1)
2019-09-16 15:06:52 +08:00
jiangguangming
536c131114
fix bug for cmake build system
...
The path of ${SDKCONFIG_H} does not exist, should be replaced by ${sdkconfig_header}.
2019-09-16 11:18:04 +08:00
Angus Gratton
ef17d8bba1
Merge branch 'bugfix/httpd_sess_close_v4.0' into 'release/v4.0'
...
httpd_sess_close: Check for session validity before closing (v4.0)
See merge request espressif/esp-idf!5742
2019-09-16 08:21:37 +08:00
Piyush Shah
4ee065df79
httpd_sess_close: Check for session validity before closing
...
If httpd_sess_trigger_close() gets called twice for the same socket,
the first httpd_sess_close() cb closes the correct socket, but the second
invocation closes the wrong socket which was just accepted and added to
the socket db. Checking for the lru counter will help identify this as the
counter is set only for requests actually served.
2019-09-12 08:41:31 +00:00
Roland Dobai
63c2834d7b
VFS: Fix memory access after free() in UART select()
...
Closes https://github.com/espressif/esp-idf/issues/4030
2019-09-12 08:38:31 +02:00
Jiang Jiang Jian
dbf2c3d480
Merge branch 'bugfix/btdm_config_msbc_v4.0' into 'release/v4.0'
...
components/bt: Disable Wide Bond Speech when SCO data path is PCM
See merge request espressif/esp-idf!5979
2019-09-12 13:23:54 +08:00
Jiang Jiang Jian
582d5de497
Merge branch 'bugfix/coex_bb_reset_lock_v4.0' into 'release/v4.0'
...
fix some coex bugs
See merge request espressif/esp-idf!6056
2019-09-12 11:04:10 +08:00
Jiang Jiang Jian
5a351af83f
Merge branch 'bugfix/flash_encryption_disable_plaintext_v4.0' into 'release/v4.0'
...
flash encryption: Always disable plaintext reflashes in Release mode (v4.0)
See merge request espressif/esp-idf!6070
2019-09-12 10:40:34 +08:00
Angus Gratton
00e3cb672b
Merge branch 'bugfix/flash_encryption_regressions_v4.0' into 'release/v4.0'
...
fix flash encryption regressions, add tests (backport v4.0)
See merge request espressif/esp-idf!6068
2019-09-11 12:06:02 +08:00
zhangyanjiao
67eb732dbe
fix the bug that ESP32 sends broadcast to phone after smartconfig is done
2019-09-11 11:37:29 +08:00
Angus Gratton
69241907a5
bootloader: Link RTC clock functions to the iram_loader section
...
As flash encryption & secure boot needs these functions after the app is loaded.
Fixes regression introduced in fb72a6f629
2019-09-11 10:16:43 +10:00
Angus Gratton
5b69614e32
flash encryption: Ensure flash encryption can't be disabled if Secure Boot is on
2019-09-11 10:16:43 +10:00
Ivan Grokhotkov
3e12967535
bootloader: add definition of esp_clk_apb_freq
...
Commit 8cd04c80
has added a dependency of efuse component on
esp_clk_apb_freq, however there was no definition of this function in
the bootloader context.
Reported at https://esp32.com/viewtopic.php?f=13&t=12035
2019-09-11 10:16:43 +10:00
Ivan Grokhotkov
d9f1219a21
efuse: set timing configuration before writing
2019-09-11 10:16:43 +10:00
Ivan Grokhotkov
b17ca9cb38
unit-test-app: add config with flash encryption enabled
2019-09-10 17:20:19 +02:00
Ivan Grokhotkov
801010dac6
spi_flash: fix mmap unit tests for flash encryption
2019-09-10 17:20:19 +02:00
Ivan Grokhotkov
a0256b9e9d
flash encryption: add option to require flash encryption to be enabled
...
In testing environment, to avoid accidentally enabling flash
encryption on a device, CONFIG_SECURE_FLASH_REQUIRE_ALREADY_ENABLED
can be set. If set, the bootloader will refuse to boot if flash
encryption is not enabled, instead of enabling it.
2019-09-10 17:19:08 +02:00
Ivan Grokhotkov
fae124a2c1
esp32: cpu_start: read binary image header via cache
...
When flash encryption is enabled, reading via cache also decrypts the
data, whereas spi_flash_read does not.
Closes https://github.com/espressif/esp-idf/issues/3907
2019-09-10 17:18:51 +02:00
Ivan Grokhotkov
ad100e497a
spi_flash: remove duplicate definition of spi_flash_unlock
...
The other (static) definition is in flash_ops.c, all references are
also in flash_ops.c.
2019-09-10 17:18:51 +02:00
lly
8dbb2083ea
ble_mesh: fix ble mesh get timer remaining time
2019-09-10 17:01:03 +08:00
Tian Hao
a8590c7e8e
fix some coex bugs
...
1. fix the bug that bb reset lock unhandled may cause assert in vPortCPUReleaseMutexIntsDisabledInternal
2. fix wifi mac reset may blocking then cause wdt timeout
3. fix bug wifi mac reset before coex init
2019-09-10 15:58:42 +08:00
Chinmay Chhajed
8876cda09b
esp_http_server : Bugfix in parsing of empty header values
...
This MR is intended to fix incorrect parsing of HTTP requests when empty header values are present.
The issue is was due to asymmetric behavior of `http_parser` library, which in case of:
non-empty header values : invokes callbacks with the pointer to the start of a value
empty header values : invokes callbacks with pointer to the start of next header or section
Since HTTP server relies on this pointer (along with length of the value) to locate the end of a value, and replace the line terminators (CRLFs) with null characters, the second case needed to be handled correctly.
Closes IDFGH-1539
Closes https://github.com/espressif/esp-idf/issues/3803
2019-09-10 05:58:49 +00:00
Jiang Jiang Jian
a7107d9bbd
Merge branch 'bugfix/ble_mesh_related_bugfixes_v4.0' into 'release/v4.0'
...
Bugfix/ble mesh related bugfixes v4.0
See merge request espressif/esp-idf!6042
2019-09-10 09:48:36 +08:00
Angus Gratton
850684438b
Merge branch 'bugfix/ethernet_rx_length_check_v4.0' into 'release/v4.0'
...
ethernet: bugfix and optimize (v4.0)
See merge request espressif/esp-idf!6028
2019-09-10 07:58:46 +08:00
Andrew
72264ca9b9
spi_common: remove deprecated spi_common_periph_claim macros (backport v4.0)
2019-09-10 06:42:31 +08:00
Angus Gratton
da2025a74a
Merge branch 'bugfix/newlib_time_test_v4.0' into 'release/v4.0'
...
newlib: Fix UT - test time adjustment happens linearly (v4.0)
See merge request espressif/esp-idf!6014
2019-09-10 06:40:09 +08:00
Angus Gratton
93bad7a0de
Merge branch 'bugfix/bootloader_factory_reset_with_wake_up_from_deep_sleep_v4.0' into 'release/v4.0'
...
bootloader: Blocking the Factory reset during wake up from deep sleep (v4.0)
See merge request espressif/esp-idf!6020
2019-09-10 06:39:19 +08:00
lly
55f687c763
ble_mesh: update ble mesh examples sdkconfig.defaults
2019-09-09 18:10:52 +08:00
lly
329388fa47
ble_mesh: fix ble mesh btc may caused memory leak
2019-09-09 18:10:47 +08:00
lly
0f36dabcaf
ble_mesh: fix publication period timestamp initialization
2019-09-09 18:10:42 +08:00
lly
0299e22dd0
ble_mesh: remove useless mesh_opcode
2019-09-09 18:10:34 +08:00
lly
f072c5af4e
ble_mesh: fix bt_mesh_net_resend() caused compiling error
2019-09-09 17:47:56 +08:00
lly
6982663380
ble_mesh: fix adhering to the configured Friend Queue size
2019-09-09 17:47:47 +08:00
lly
1d970ad276
ble_mesh: remove useless code bt_mesh_trans_resend()
2019-09-09 17:47:30 +08:00
lly
a73cc70af9
ble_mesh: lpn remove msg from cache on rejection
2019-09-09 17:47:24 +08:00
lly
225ee8e5d1
ble_mesh: introduce a helper for send callback function
2019-09-09 17:47:18 +08:00
lly
fa4cd56d00
ble_mesh: fix heartbeat sending on friendship established/lost
2019-09-09 17:47:07 +08:00
lly
15f8b0fccc
ble_mesh: fix checking for active heartbeat publication
2019-09-09 17:46:49 +08:00
lly
97080afba2
ble_mesh: fix starting iv update when not on primary subnet
2019-09-09 17:46:43 +08:00
lly
612822d8c9
ble_mesh: fix canceling publication retransmit timer
2019-09-09 17:46:35 +08:00
lly
ff6cb921c3
ble_mesh: fix resending segments on correct bearer
2019-09-09 17:46:27 +08:00
lly
6f7b7c552d
ble_mesh: fix not sending all segments through the Friend Queue
2019-09-09 17:46:19 +08:00
lly
e00186e683
ble_mesh: fix canceled buffer memory leak
2019-09-09 17:46:06 +08:00
lly
a734b3b1bc
ble_mesh: remove some useless copy during ecdh calculation
2019-09-09 17:45:59 +08:00
lly
6de637811f
ble_mesh: move heartbeat sending to transport layer
2019-09-09 17:45:52 +08:00
lly
6ec0c6743a
ble_mesh: fix provisioning send error handling
2019-09-09 17:45:44 +08:00
lly
299c86cc84
ble_mesh: fix rejecting invalid remote public key
2019-09-09 17:45:27 +08:00