chenyudong
f6d0a913de
test: fix test case MESH_EST_2403
2019-09-12 02:50:17 +00:00
Jiang Jiang Jian
149171f119
Merge branch 'bugfix/lwip_prefer_allocate_memory_in_psram_v3.3' into 'release/v3.3'
...
l: Try to allocate some L memories in SPIRAM first. If failed, try to allocate in internal RAM then.(Backport v3.3)
See merge request espressif/esp-idf!5671
2019-09-12 10:39:14 +08:00
Angus Gratton
30f93365b5
Merge branch 'bugfix/kconfig_no_split_headers_v3.3' into 'release/v3.3'
...
kconfig: Don't create "split" directory structures under build/include/config (v3.3)
See merge request espressif/esp-idf!6000
2019-09-11 07:54:09 +08:00
Xia Xiaotian
e0748cdaf2
lwip: Try to allocate some LWIP memories in SPIRAM first. If failed, try to allocate in internal RAM then.
2019-09-10 14:26:50 +08:00
Angus Gratton
6cd6423092
kconfig: Don't create "split" directory structures under build/include/config
...
Reported in https://github.com/espressif/esp-idf/issues/3299
If a config item contains a reserved filename in Windows like _CON_ then an invalid
directory is created.
We don't rely on this feature all, so disable it.
2019-09-10 05:52:29 +00:00
Jiang Jiang Jian
9f3f7009c0
Merge branch 'bugfix_kconfig_deps_missing_v3.3' into 'release/v3.3'
...
kconfig: Add -MP option so .d files include empty targets (v3.3)
See merge request espressif/esp-idf!5847
2019-09-08 23:17:29 +08:00
Jiang Jiang Jian
69d8fab619
Merge branch 'update/cjson_v1_7_12_v3.3' into 'release/v3.3'
...
Update cJSON to v1.7.12 (v3.3)
See merge request espressif/esp-idf!5851
2019-09-08 23:16:25 +08:00
Jiang Jiang Jian
cc50d88a89
Merge branch 'test/use_correct_config_for_nvs_compatible_case_v3.3' into 'release/v3.3'
...
test: fix nvs compatible case error (backport v3.3)
See merge request espressif/esp-idf!5894
2019-09-08 23:14:29 +08:00
Jiang Jiang Jian
4aea2dce15
Merge branch 'fix/sdio_slave_reset_infloop_leak_3.3' into 'release/v3.3'
...
sdio_slave: fix the send_flush infinite loop issue (backport v3.3)
See merge request espressif/esp-idf!5836
2019-09-08 23:13:41 +08:00
Jiang Jiang Jian
54c7379060
Merge branch 'feature/move_gettimeofday_in_clock_gettime_v3.3' into 'release/v3.3'
...
newlib: Move _gettimeofday_r call in clock_gettime (v3.3)
See merge request espressif/esp-idf!5717
2019-09-08 23:13:13 +08:00
Jiang Jiang Jian
b12c2646fa
Merge branch 'bugfix/fix_wifi_stack_can_freeze_v3.3' into 'release/v3.3'
...
esp_wifi: ESP32_WIFI_RX_BA_WIN should be less than ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM (v3.3)
See merge request espressif/esp-idf!5617
2019-09-08 23:11:57 +08:00
Jiang Jiang Jian
39ac9cb44b
Merge branch 'bugfix/btdm_fix_hci_enhance_conn_complete_evt_unpack_error_v3.3' into 'release/v3.3'
...
component/bt: fix unpack hci enhance connection complete event error(backport v3.3)
See merge request espressif/esp-idf!5281
2019-09-08 23:11:18 +08:00
Jiang Jiang Jian
64fbce50c2
Merge branch 'bugfix/pm_isr_exit_lock_v3.3' into 'release/v3.3'
...
pm: prevent interrupt nesting during esp_pm_impl_isr_hook (backport v3.3)
See merge request espressif/esp-idf!4970
2019-09-08 23:10:02 +08:00
Jiang Jiang Jian
d1e8b4473d
Merge branch 'test/detect_exception_in_idf_dut_v3.3' into 'release/v3.3'
...
tiny-test-fw: support detect exception in IDFDUT (backport v3.3)
See merge request espressif/esp-idf!4542
2019-09-08 23:09:48 +08:00
Jiang Jiang Jian
38e2d3bec6
Merge branch 'bugfix/btdm_mem_leak_v3.3' into 'release/v3.3'
...
components/bt: Fix memory leak about rfcomm
See merge request espressif/esp-idf!5622
2019-09-08 23:09:24 +08:00
Angus Gratton
3201333f06
Merge branch 'bugfix/flash_encryption_disable_plaintext_v3.3' into 'release/v3.3'
...
flash encryption: Add config option to disable any plaintext reflashes (3.3)
See merge request espressif/esp-idf!5280
2019-09-05 08:00:39 +08:00
Angus Gratton
85a89db863
Merge branch 'bugfix/fix_i2s_channels_swapped_issue_v3.3' into 'release/v3.3'
...
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.3.
See merge request espressif/esp-idf!5899
2019-09-03 13:36:54 +08:00
Angus Gratton
21a8a9a170
Merge branch 'bugfix/dis_interrupts_up_to_6_level_for_dport_wa_v3.3' into 'release/v3.3'
...
esp32: Dis interrupts up to 5 lvl for DPORT (v3.3)
See merge request espressif/esp-idf!5713
2019-09-03 13:34:54 +08:00
Angus Gratton
d4e13c011e
Merge branch 'bugfix/httpd_sess_close_v3.3' into 'release/v3.3'
...
httpd_sess_close: Check for session validity before closing (v3.3)
See merge request espressif/esp-idf!5743
2019-09-03 09:57:37 +08:00
Angus Gratton
f380d72825
Merge branch 'bugfix/add_flash_config_in_app_startup_v3.3' into 'release/v3.3'
...
bugfix(flash): add flash config in app startup (backport v3.3)
See merge request espressif/esp-idf!5928
2019-09-02 08:50:38 +08:00
Jiang Jiang Jian
6ccb4cf5b7
Merge branch 'bugfix/btdm_security_vulnerability_on_encryption_key_size_v3.3' into 'release/v3.3'
...
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link
See merge request espressif/esp-idf!5872
2019-08-30 19:09:02 +08:00
Angus Gratton
f8e24754d1
Merge branch 'bugfix/test_esp_efuse_table_on_host_v3.3' into 'release/v3.3'
...
CI: Fix path in the Efuse table test (v3.3)
See merge request espressif/esp-idf!5954
2019-08-30 16:28:07 +08:00
Mahavir Jain
86975b7e8f
Merge branch 'bugfix/pr_3250_v3.3' into 'release/v3.3'
...
(backport v3.3) Fix: Lost username when setting new URL with a path.
See merge request espressif/esp-idf!5665
2019-08-29 18:40:15 +08:00
Roland Dobai
c2bb7d7cd6
Fix path in the Efuse table test
2019-08-29 09:53:17 +02:00
redchenjs
3451f3526f
Bugfix(i2s): fixed i2s left/right channels swapped issue for release/v3.3.
...
The right channel data is in the high position, so the I2S_TX_MSB_RIGHT & I2S_RX_MSB_RIGHT bits should be set.
2019-08-28 19:24:17 +08:00
Roland Dobai
cc3ba7186f
esp_http_client: fix CI issues & return value
2019-08-28 16:46:04 +05:30
Nguyễn Hồng Quân
7d28c02fd5
Fix: Lost username when setting new URL with a path.
...
Closes https://github.com/espressif/esp-idf/pull/3250
2019-08-28 14:54:59 +05:30
Piyush Shah
1aa2f36dec
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-08-28 09:03:55 +00:00
wangmengyang
3becdd7850
components/bt: set the minimum encryption key size to be 7 octects for BR/EDR link for preventing KNOB attack
...
This patch is to address the CVE-2019-9506 vulnerability.
2019-08-28 08:13:30 +00:00
chenjianqiang
cf2062f1d7
bugfix(flash): add flash config in app startup
...
We fixed some flash bugs in bootloader, but for the users used the old
vrsion bootloader, they can not fix these bugs via OTA, the solution is
add these updates in app startup.
These updates include:
1. SPI flash gpio matrix and drive strength configuration
2. SPI flash clock configuration
3. SPI flash read dummy configuration
4. SPI flash cs timing configuration
5. Update flash id of g_rom_flashchip
2019-08-27 21:04:36 +08:00
He Yin Ling
a742bad8f3
test: fix nvs compatible case error:
...
nvs compatible test case uses new test env and app. update test config
file.
2019-08-27 02:49:44 +00:00
He Yin Ling
ef11260310
Merge branch 'bugfix/reduce_ci_config_file_size_v3.3' into 'release/v3.3'
...
CI: use parallel attribute in CI config file
See merge request espressif/esp-idf!5895
2019-08-27 10:47:42 +08:00
He Yin Ling
7b39d5e5c5
Apply suggestion to tools/ci/build_examples_cmake.sh
2019-08-26 11:00:46 +08:00
He Yin Ling
d5b0b36758
Apply suggestion to tools/ci/build_examples.sh
2019-08-26 11:00:33 +08:00
He Yin Ling
0a609be968
CI: use parallel attribute in CI config file
2019-08-26 10:46:39 +08:00
Konstantin Kondrashov
8fa409a0b5
esp32: Add UTs for DPORT and Hi-interrupt
2019-08-21 09:48:16 +00:00
Konstantin Kondrashov
2e9904556f
esp32: Dis interrupts up to 5 lvl for DPORT
...
Disable interrupts for both DPORT workarounds up to 5 lvl.
Closes: https://esp32.com/viewtopic.php?f=2&t=10981&sid=d125cec233070ed4d2c5410bf5d3d74a
Closes: IDF-728
2019-08-21 09:48:16 +00:00
Angus Gratton
8e32eb78a4
Update cJSON to v1.7.12
...
Fixes potential DoS in cJSON_Minify, see https://github.com/DaveGamble/cJSON/issues/354
2019-08-21 18:55:32 +10:00
Angus Gratton
a3adc6c202
kconfig: Add -MP option so .d files include empty targets
...
Prevents make-level errors when switching IDF versions, as headers may be removed.
Similar to some mentioned here:
https://github.com/espressif/esp-idf/issues/712
2019-08-21 18:37:42 +10:00
Jiang Jiang Jian
148a269808
Merge branch 'bugfix/improve_spi_timing_for_flash_v3.3' into 'release/v3.3'
...
bugfix(flash): improve spi cs timing settings for flash (backport v3.3)
See merge request espressif/esp-idf!5514
2019-08-20 16:33:57 +08:00
Michael (XIAO Xufeng)
7b3bedbc10
sdio_slave: fix the send_flush infinite loop issue
...
Also add some helper functions.
2019-08-20 16:25:58 +08:00
Angus Gratton
5b11428f00
Merge branch 'bugfix/fix_flash_read_error_in_dio_mode_v3.3' into 'release/v3.3'
...
bugfix(flash): add spi dio address bitlen configure in psram init (backport v3.3)
See merge request espressif/esp-idf!5788
2019-08-19 13:03:54 +08:00
chenjianqiang
4cd7fd89f5
bugfix(flash): add spi dio address bitlen configure in psram init
2019-08-16 07:38:54 +00:00
Angus Gratton
ceb56a7a72
Merge branch 'feature/dport_eco_revision2_v3.3' into 'release/v3.3'
...
make dport workaround depend on chip revision (v3.3)
See merge request espressif/esp-idf!5766
2019-08-16 13:14:49 +08:00
Angus Gratton
ebfa74310c
Merge branch 'bugfix/link_test_components_to_executable_directly' into 'release/v3.3'
...
cmake: link test components to executable directly
See merge request espressif/esp-idf!5739
2019-08-15 14:59:56 +08:00
suda-morris
b482ba117d
efuse: update the scheme of getting chip revision
2019-08-13 15:49:01 +08:00
Angus Gratton
07735424a2
Merge branch 'bugfix/xTaskIncrementTick_v3.3' into 'release/v3.3'
...
freertos: Fix xTaskIncrementTick for unwind the Tick for CPU1 (v3.3)
See merge request espressif/esp-idf!5034
2019-08-13 13:42:26 +08:00
Angus Gratton
f2f5a237c0
Merge branch 'bugfix/gpio_intr_enable_bug_v3.3' into 'release/v3.3'
...
bugfix(GPIO): Fixed GPIO interrupt bug for v3.3
See merge request espressif/esp-idf!5650
2019-08-12 13:00:15 +08:00
Angus Gratton
3be1c70d46
Merge branch 'bugfix/cmake_extra_component_dirs_v3.3' into 'release/v3.3'
...
CI: additional CMake build system tests wrt EXTRA_COMPONENT_DIRS (v3.3)
See merge request espressif/esp-idf!5109
2019-08-12 12:44:19 +08:00
Angus Gratton
beb34b5390
Merge branch 'bugfix/hwcrypt_fault_inj_v3.3' into 'release/v3.3'
...
AES & SHA fault injection checks (backport v3.3)
See merge request espressif/esp-idf!5710
2019-08-11 14:04:36 +08:00