Ivan Grokhotkov
960c240578
Merge branch 'bugfix/cmake_ut_parsing' into 'master'
...
cmake: fix for parsing unit test config
See merge request idf/esp-idf!3696
2018-11-16 22:11:14 +08:00
Ivan Grokhotkov
8c9407f22f
Merge branch 'bugfix/fat_lock_log' into 'master'
...
fatfs: Do not log from critical sections
See merge request idf/esp-idf!3683
2018-11-16 21:29:56 +08:00
Ivan Grokhotkov
96f152341a
esp_timer: improve unit test robustness
...
1. call esp_timer_get_time and ref_clock_get in the same order on
start and in the loop
2. disable interrupts when calculating delta between ref_clock
and esp_timer
3. ensure both functions are in cache before calculating the delta
2018-11-16 12:00:39 +00:00
Ivan Grokhotkov
0db8c2e618
Merge branch 'feature/ut_filter_test_groups' into 'master'
...
unit test: allow filtering tests using TEST_GROUPS
See merge request idf/esp-idf!3695
2018-11-16 19:31:47 +08:00
Ivan Grokhotkov
a55d350f43
Merge branch 'bugfix/adjtime_test2' into 'master'
...
Resolve ""test for thread safety adjtime and gettimeofday functions" fails randomly"
Closes #37
See merge request idf/esp-idf!3657
2018-11-16 19:21:45 +08:00
Roland Dobai
ad2cdeb476
fatfs: Do not log from critical sections
...
Logging in the critical section can result in a deadlock when the logger
is redirected to FATFS.
Closes https://github.com/espressif/esp-idf/issues/1693
2018-11-16 11:19:01 +00:00
zhangyanjiao
8be8ea2488
wifi: fix the bug that if station (sleep is enabled) and sniffer are enabled at the same time,
...
when disable sniffer, station will never enable phy and rf again.
Closes: https://github.com/espressif/esp-idf/issues/2545
2018-11-16 11:16:37 +00:00
Jiang Jiang Jian
6fa2f388ef
Merge branch 'bugfix/btdm_controller_disable' into 'master'
...
Fix two bugs when disable bluetooth controller
See merge request idf/esp-idf!3692
2018-11-16 17:10:37 +08:00
David Cermak
d16762a036
mdns: sending search packets also in probing and announcing state
...
mdns queries did not work properly when send imeadiately after set_hostname, which cuased reinit of pcb and therefore restarted probing, so search packets were blocked until probing finished
closes #2507 , closes #2593
2018-11-16 07:22:29 +00:00
Renz Bagaporo
63411fc556
tools: implement linker script generation
2018-11-16 12:42:02 +08:00
Konstantin Kondrashov
b00be955ee
newlib: Fix UT adjtime
2018-11-16 04:11:55 +00:00
baohongde
ac5a3443a4
components/bt: Some errors in comment
2018-11-16 11:27:22 +08:00
Tian Hao
9c9aa4ea4c
Fix two bugs when disable bluetooth controller
...
1. Fix the bug that disable controller suddenly cause crash when ble is working. (585cfba1)
2. Fix the bug that when disable controller, it will cause wifi cannot RX, TX timeout, buffer lack and etc. (f8546145)
2018-11-16 02:42:38 +00:00
Ivan Grokhotkov
7b86247428
unit-test: use TEST_GROUPS to filter tests for psram_vspi and psram_hspi
2018-11-15 12:27:05 +00:00
Alexey Gerenkov
78a7a152d1
esp32: Fixes freezing core dump process when flash write address checks are enabled
2018-11-15 06:13:48 +00:00
Alexey Gerenkov
b152c1020c
esp32: Adds logging level to core dump script
2018-11-15 06:13:48 +00:00
Alexey Gerenkov
76e02cadcc
esp32: Adds support for core dump format version
2018-11-15 06:13:48 +00:00
Alexey Gerenkov
181a40ae30
esp32: Adds menuconfig option for max tasks number in core dump
2018-11-15 06:13:48 +00:00
Alexey Gerenkov
30e766ee6b
esp32: Core dump API to retrieve current core data layout in flash
2018-11-15 06:13:48 +00:00
Alexey Gerenkov
a55cc99f50
esp32: Replaces magic numbers with CRC for core dump in flash
2018-11-15 06:13:48 +00:00
Ivan Grokhotkov
8b5f61eb35
Merge branch 'bugfix/ethernet_fail_twice_init' into 'master'
...
fix bug of multi-call failure in esp_eth_init
See merge request idf/esp-idf!3673
2018-11-15 12:35:55 +08:00
Jiang Jiang Jian
bbdcff1f45
Merge branch 'bugfix/tw27096_fix_lwip_mbox_free_crash' into 'master'
...
fix the crash bug caused by sys_mbox_free
See merge request idf/esp-idf!3654
2018-11-15 10:31:35 +08:00
Ivan Grokhotkov
f1949a59b6
Merge branch 'bugfix/readdir_ut_timeout' into 'master'
...
spiffs: increase timeout in readdir test
Closes #41
See merge request idf/esp-idf!3687
2018-11-13 22:54:21 +08:00
morris
eec6de57ff
ethernet: multi-call failure in esp_eth_init
...
Because of incomplete state machine, ethernet driver will broken if esp_eth_init is called twice.
Detailed information here: https://ezredmine.espressif.cn:8765/issues/27332
2018-11-13 16:38:45 +08:00
michael
26626dfbf2
spi: add documents explicitly showing the executing core of the ISR
...
It is an ESP specific FreeRTOS feature that the ISR is always executed
on the core which calls the interrupt register function. In the SPI
driver, the function is always called in the bus initialization
function.
Hence, the ISR will be executed on the core which initialize the driver.
If the core is starved due to higher priority ISRs, or the interrupt is
disabled on the core (spinlock called, etc.), the ISR will not get
executed and SPI transactions will not be handled.
(MINOR CHANGE)
Resolves https://github.com/espressif/esp-idf/issues/2432 .
2018-11-13 11:49:31 +08:00
michael
a52ab8ca87
spi_master: modify the error msg a little when over freq limit
...
The MISO signal will be delayed if the GPIO matrix is enabled.
However, delay also comes from the slave.
Previous code only considers the former case, and assume the frequency
limitations is only violated when GPIO matrix is used.
Now we are able to calculate the freq limit when extenal MISO delay is
given (feature introduced in 9c6c6ec34ab0641ace89aeb9b1a133eb6fae1a18).
The frequency limit is lower when the external MISO delay is large, and
the limit is likely to be violated even with IOMUX.
Resolves https://github.com/espressif/esp-idf/issues/2690 .
2018-11-13 11:49:31 +08:00
Ivan Grokhotkov
356fe47ce1
spiffs: increase timeout in readdir test
...
Timeout of 15 seconds is not sufficient if SPIFFS partition needs to
be formatted, on some of the boards.
2018-11-13 11:41:19 +08:00
morris
5fccb73f86
ethernetif: fix potential memory leak
...
1. If L2_TO_L3_RX_BUF_MODE is not selected, we must assign l2_owner explictly before we call pbuf_free.
2. free intr resource in esp_eth_deinit
Closes https://github.com/espressif/esp-idf/issues/2670
2018-11-13 10:11:48 +08:00
Jiang Jiang Jian
ef4a87d62e
Merge branch 'bugfix/http_literal_caseinsensitive' into 'master'
...
Compare case-insensitive URI schemes
See merge request idf/esp-idf!3558
2018-11-12 17:03:06 +08:00
Ivan Grokhotkov
7efb3926c5
Merge branch 'feature/build_system_multi_target' into 'master'
...
build system: support for multiple targets (CMake only)
See merge request idf/esp-idf!3499
2018-11-12 15:30:36 +08:00
Jiang Jiang Jian
c7fb749b84
Merge branch 'bugfix/btdm_fix_memory_leak_in_v3.2' into 'master'
...
Component/bt: fix memory leak in service change char
See merge request idf/esp-idf!3631
2018-11-12 11:27:00 +08:00
Jiang Jiang Jian
ccb3841a9e
Merge branch 'feature/btdm_add_vendor_hci_cmd' into 'master'
...
component/bt: add vendor hci cmd
See merge request idf/esp-idf!3577
2018-11-12 11:26:35 +08:00
Angus Gratton
3685d325d8
Merge branch 'bugfix/multiple_github_pr' into 'master'
...
Multiple github PR's
See merge request idf/esp-idf!3665
2018-11-12 09:14:35 +08:00
Angus Gratton
a96deceb27
Merge branch 'feature/cmake_secure_boot_support' into 'master'
...
CMake : Secure Boot support added
See merge request idf/esp-idf!3522
2018-11-12 09:09:30 +08:00
Ivan Grokhotkov
ccfa134533
build system: support for multiple targets
2018-11-11 21:46:02 +08:00
Liu Zhi Fu
4fe3673f35
lwip: fix crash caused by sys_mbox_free
...
Fix lwip crashed bug caused by sys_mbox_free()
2018-11-11 12:15:51 +08:00
Jiang Jiang Jian
9859428606
Merge branch 'bugfix/btdm_add_scan_window_interval_check' into 'master'
...
Component/bt: add scan window and interval check when set scan params
See merge request idf/esp-idf!3581
2018-11-09 19:32:11 +08:00
zwj
baf57b9702
component/bt: add vendor hci cmd
2018-11-09 14:39:04 +08:00
zhiweijian
fb3aa88565
Component/bt: add BLE Blocking APIs
2018-11-09 03:31:08 +00:00
Stephen Bird
0c9f7271a9
Add checks to for CONFIG_MBEDTLS_SSL_ALPN
...
Merges https://github.com/espressif/esp-idf/pull/2569
2018-11-08 15:57:13 +05:30
Stephen Bird
b5c58557fc
bt: Fix bracket warning
...
Merges https://github.com/espressif/esp-idf/pull/2568
2018-11-08 15:57:12 +05:30
Damian Reboredo
049c9f7bea
esp_http_client: Fix infinite loop on esp_http_client_fetch_headers
...
error must also be returned if esp_tls_conn_read return 0 because socket was closed
Merges https://github.com/espressif/esp-idf/pull/2534
2018-11-08 15:57:11 +05:30
Paul Reimer
b358581ab8
heap: Compile heap_task_info.c conditionally on CONFIG_HEAP_TASK_TRACKING in heap CMakeLists.txt
...
Merges https://github.com/espressif/esp-idf/pull/2498
2018-11-08 15:57:11 +05:30
shawwwn
288d9b75e9
rtc_clk: bugfix: incorrect divider setting in rtc_clk_cpu_freq_to_config()
...
Merges https://github.com/espressif/esp-idf/pull/2404
2018-11-08 15:57:10 +05:30
Jiang Jiang Jian
71f1a34540
Merge branch 'feature/btdm_support_oob_in_SMP' into 'master'
...
Component/bt: support OOB in SMP
See merge request idf/esp-idf!3496
2018-11-08 16:44:15 +08:00
Jiang Jiang Jian
05838641ff
Merge branch 'bugfix/mesh_start_stop' into 'master'
...
mesh: update libs
See merge request idf/esp-idf!3569
2018-11-07 14:29:27 +08:00
qiyuexia
2d34a93dc4
mesh: update libs
...
1. fix ap_loss that occurs when the parent turns off the mesh function and becomes a normal WiFi with a different SSID.
2. add an event MESH_EVENT_NETWORK_STATE that contains information about whether there is a root in the current network.
3. modify the mechanism of mesh IE update.
4. fix a problem in the process of re-voting to select the root, the device that does not meet the conditions of being a root votes for itself.
5. fix an issue that occurs in esp_mesh_recv_toDS() when stopping the mesh.
6. when the user specifies a parent for the device, the device will set the authmode and password of its AP mode to the same value as the specified parent.
7. add two disconnected reason codes MESH_REASON_EMPTY_PASSWORD and MESH_REASON_PARENT_UNENCRYPTED.
2018-11-06 22:55:48 +08:00
Hrishikesh Dhayagude
2c353edbc4
components/bt: Fix btc_gatts_arg_deep_copy() and bta_gatts_indicate_handle()
2018-11-06 21:01:54 +08:00
Ivan Grokhotkov
621e316725
Merge branch 'feat/psram_support_hspi' into 'master'
...
esp32: support to use hspi to output clock for 4M psram
See merge request idf/esp-idf!3377
2018-11-06 20:34:41 +08:00
Anurag Kar
1f6622b2d1
CMake : Secure Boot support added
2018-11-06 17:09:55 +05:30
Jiang Jiang Jian
17c70a4a32
Merge branch 'bugfix/wifi_do_not_load_phy_data_if_fail_to_open_nvs' into 'master'
...
esp32: do not try to load PHY data if fail to open NVS
See merge request idf/esp-idf!3538
2018-11-06 18:01:58 +08:00
Jiang Jiang Jian
888406231c
Merge branch 'bugfix/btdm_fuction_in_isr_is_not_in_iram' into 'master'
...
components/bt: Put function in isr into iram
See merge request idf/esp-idf!3619
2018-11-06 17:13:34 +08:00
zhiweijian
77668b3912
Component/bt: add scan window and interval check when set scan params
2018-11-06 08:45:25 +00:00
zhiweijian
2e139c7885
Component/bt: fix memory leak in service change char
2018-11-06 08:43:59 +00:00
Ivan Grokhotkov
28f1e1597b
Merge branch 'bugfix/tickless_idle_single_core' into 'master'
...
freertos, pm: fix tickless idle not entered in single core mode
See merge request idf/esp-idf!3584
2018-11-06 12:15:03 +08:00
Ivan Grokhotkov
35d1c7b173
Merge branch 'bugfix/freertos_idle_tick_count' into 'master'
...
freertos: use xTaskQueueMutex to protect tick count
See merge request idf/esp-idf!3478
2018-11-06 12:14:51 +08:00
Ivan Grokhotkov
ddfd62ee66
Merge branch 'bugfix/register_map_LAN8720' into 'master'
...
ethernet: fix some bugs in Ethernet driver
See merge request idf/esp-idf!3490
2018-11-06 12:13:47 +08:00
Jiang Jiang Jian
ded53bd0ff
Merge branch 'bugfix/btdm_allow_a2dp_codec_dynamic_alloc' into 'master'
...
bugfix/btdm_allow_a2dp_codec_dynamic_allocated
See merge request idf/esp-idf!3598
2018-11-06 11:56:30 +08:00
morris
b6d7675e60
ethernet: fix some bugs in phy&mac driver
...
1. Original register mapping for LAN8720 has some registers that doesn't exist/support.
So just remove them, and fix the power and init function for LAN8720.
2. GPIO16 and GPIO17 is occupied by PSRAM, so only ETH_CLOCK_GPIO_IN mode is supported in that case if using PSRAM.
3. Fix bug of OTA failing with Ethernet
4. Fix bug of multicast with Ethernet
Closes https://github.com/espressif/esp-idf/issues/2564
Closes https://github.com/espressif/esp-idf/issues/2620
Closes https://github.com/espressif/esp-idf/issues/2657
2018-11-06 11:07:22 +08:00
Ivan Grokhotkov
364f033a49
Merge branch 'feature/vfs_utime' into 'master'
...
VFS: Implement utime() for FATFS and SPIFFS
See merge request idf/esp-idf!3610
2018-11-06 10:47:02 +08:00
Ivan Grokhotkov
761d44bd36
Merge branch 'bugfix/xts_compile_err' into 'master'
...
mbedtls: Fix compilation errors when CONFIG_MBEDTLS_HARDWARE_AES is disabled
See merge request idf/esp-idf!3506
2018-11-05 16:58:38 +08:00
Roland Dobai
fb334baa7c
VFS: Implement utime()
2018-11-05 09:54:01 +01:00
Ivan Grokhotkov
ada3bc3fb5
Merge branch 'bugfix/aes_sha_mpi_shared_regs' into 'master'
...
aes/sha/mpi: Bugfix a use of shared registers.
See merge request idf/esp-idf!3580
2018-11-05 16:31:03 +08:00
kooho
ea963c480c
driver(uart):update the comment of uart_set_wakeup_threshold
...
closes https://github.com/espressif/esp-idf/issues/2627
2018-11-05 13:09:12 +08:00
Ivan Grokhotkov
13046e7625
Merge branch 'bugfix/esp-tls-doc' into 'master'
...
esp-tls: Fix documentaion issue in esp_tls_conn_new_async API
See merge request idf/esp-idf!3545
2018-11-05 12:30:22 +08:00
Ivan Grokhotkov
ee0dea3d0d
Merge branch 'bugfix/esp_http_client_async_crash' into 'master'
...
esp_http_client: Fix crash in async mode
See merge request idf/esp-idf!3551
2018-11-05 12:30:04 +08:00
Konstantin Kondrashov
8bba348528
aes/sha/mpi: Bugfix a use of shared registers.
...
This commit resolves a blocking in esp_aes_block function.
Introduce:
The problem was in the fact that AES is switched off at the moment when he should give out the processed data. But because of the disabled, the operation can not be completed successfully, there is an infinite hang. The reason for this behavior is that the registers for controlling the inclusion of AES, SHA, MPI have shared registers and they were not protected from sharing.
Fix some related issue with shared using of AES SHA RSA accelerators.
Closes: https://github.com/espressif/esp-idf/issues/2295#issuecomment-432898137
2018-11-05 04:22:47 +00:00
Ivan Grokhotkov
fb7ba1baa0
Merge branch 'bugfix/unit_test_adjtime' into 'master'
...
Resolve ""test for thread safety adjtime and gettimeofday functions" fails randomly"
Closes #37
See merge request idf/esp-idf!3613
2018-11-05 12:20:07 +08:00
Ivan Grokhotkov
0716e65955
pm: prevent entering light sleep again immediately after wakeup
...
When light sleep is finished on one CPU, it is possible that the other
CPU will enter light sleep again very soon, before interrupts on the
first CPU get a chance to run. To avoid such situation, set a flag
for the other CPU to skip light sleep attempt.
2018-11-05 12:18:29 +08:00
Ivan Grokhotkov
22dd3103bd
pm: fix entering light sleep in single core mode
...
Tickless idle/light sleep procedure had a bug in single core mode.
Consider the flow of events:
1. Idle task runs and calls vApplicationIdleHook
2. This calls esp_vApplicationIdleHook, which calls esp_pm_impl_idle_hook, and pm lock for RTOS on the current core is released.
3. Then esp_vApplicationIdleHook calls esp_pm_impl_waiti, which checks that s_entered_light_sleep[core_id]==false and goes into waiti state.
4. Some interrupt happens, calls esp_pm_impl_isr_hook, which takes pm lock for RTOS. PM state goes back to CPU_FREQ_MAX.
5. Once the interrupt is over, vApplicationIdleHook returns, and Idle task continues to run, finally reaching the call to vApplicationSleep.
6. vApplicationSleep does not enter light sleep, because esp_pm_impl_isr_hook has already changed PM state from IDLE to CPU_FREQ_MAX.
This didn’t happen in dual core mode, because waiti state of one CPU was interrupted by CCOMPARE update interrupt from the other CPU, in which case PM lock for FreeRTOS was not taken.
Fix by inverting the meaning of the flag (for convenience) and only setting it to true when vApplicationSleep actually fails to enter light sleep.
2018-11-05 12:18:29 +08:00
Ivan Grokhotkov
ae08bdcc31
freertos: fix compilation warning in single core mode
...
When tickless idle is enabled
2018-11-05 12:18:29 +08:00
Ivan Grokhotkov
b7841ec313
freertos: use xTaskQueueMutex to protect tick count
...
Having two different spinlocks is problematic due to possibly
different order in which the locks will be taken. Changing the order
would require significant restructuring of kernel code which is
undesirable.
An additional place where taking xTickCountMutex was needed was in
vApplicationSleep function. Not taking xTickCountMutex resulted in
other CPU sometimes possibly advancing tick count while light sleep
entry/exit was happening. Taking xTickCountMutex in addition to
xTaskQueueMutex has shown a problem that in different code paths,
these two spinlocks could be taken in different order, leading to
(unlikely, but possible) deadlocks.
2018-11-05 03:08:26 +00:00
He Yin Ling
242724bbe9
Merge branch 'test/fix_bug_of_scan_interval_and_windows' into 'master'
...
test: fix bug of scan interval and window
See merge request idf/esp-idf!3606
2018-11-05 11:00:58 +08:00
baohongde
b33cdfc1f5
components/bt: Put function in isr into iram
2018-11-02 16:37:52 +08:00
Jiang Jiang Jian
930da8fd31
Merge branch 'bugfix/iperf_bt_error_when_wifi_connect' into 'master'
...
components/bt: Point ACL RX buffer ptr to ACL RX buffer if ACL RX buffer ptr is null
See merge request idf/esp-idf!3536
2018-11-02 16:12:31 +08:00
Ivan Grokhotkov
7d465a5487
Merge branch 'bugfix/event_perf_test_psram' into 'master'
...
esp_event: lower test performance threshold for PSRAM config
Closes #34
See merge request idf/esp-idf!3603
2018-11-02 14:12:17 +08:00
Konstantin Kondrashov
84f1eb5eac
newlib: Fix UT adjtime
2018-11-01 20:34:39 +08:00
baohongde
f2309f1013
components/bt: Point ACL RX buffer ptr to ACL RX buffer if ACL RX buffer ptr is null
...
1. When WIFI task or other high priority task blocks the Bluetooth task, ACL RX buffer will use up, ACL RX buffer ptr will point to null and will never point to a valid adress. Causing errors in Bluetooth.
2. hcimsgs.h used whether flow control is on or off
2018-11-01 17:33:44 +08:00
Jiang Jiang Jian
12b2268ee5
Merge branch 'bugfix/btdm_sniff_anchor_point_calculation_error' into 'master'
...
bugfix/btdm_sniff_anchor_point_calculation_error
See merge request idf/esp-idf!3582
2018-11-01 15:58:00 +08:00
Jiang Jiang Jian
a60a71ff07
Merge branch 'bugfix/btdm_name_buffer_allocation_size_differs' into 'master'
...
components/bt: Fix the different size of name buffer allocation size
See merge request idf/esp-idf!3587
2018-11-01 15:56:45 +08:00
Jiang Jiang Jian
cac7b951a8
Merge branch 'bugfix/btdm_fix_get_attr_value_error' into 'master'
...
Component/bt: fix get attr value API error
See merge request idf/esp-idf!3583
2018-11-01 15:55:22 +08:00
Jiang Jiang Jian
b601fcfde0
Merge branch 'bugfix/btdm_fix_ble_cannt_send_or_receive_packet_sometimes' into 'master'
...
Component/bt: fix ble cannot send or receive packet sometimes
See merge request idf/esp-idf!3585
2018-11-01 15:55:05 +08:00
Sagar Bijwe
fbcc160675
mbedtls: Fix compilation errors when CONFIG_MBEDTLS_HARDWARE_AES is disabled
2018-11-01 12:08:45 +05:30
Ivan Grokhotkov
d98d1ef1c2
Merge branch 'bugfix/bootloader_iram_overlap_check' into 'master'
...
bootloader: verify that loaded image does not overlap bootloader code
See merge request idf/esp-idf!3409
2018-11-01 13:56:43 +08:00
Ivan Grokhotkov
d28c99d36c
esp_event: lower test performance threshold for PSRAM config
2018-11-01 13:50:08 +08:00
Ivan Grokhotkov
cd38970ef9
Merge branch 'bugfix/wl_version_update' into 'master'
...
Version update from V1 to V2 now done in correct way.
See merge request idf/esp-idf!3557
2018-11-01 12:50:49 +08:00
chensheng
d336f1513f
test: fix bug of scan interval and window
2018-11-01 11:54:52 +08:00
baohongde
373f1c121b
component/bt: bugfix of error when entering sniff mode with attempt large than 0xFF
2018-10-31 16:16:49 +00:00
wangmengyang
159d4ac742
component/bt: bugfix for the error in calculation sniff anchor point which can result in supervision timeout after connection is brought into sniff mode
2018-10-31 16:16:49 +00:00
zhiweijian
1716d12547
Component/bt: fix ble cannot send or receive packet sometimes
2018-10-31 16:13:51 +00:00
wangmengyang
7bb83b0056
component/bt: allow dynamic allocation of SBC encoder/decoder buffer used in A2DP to save internal DRAM
2018-10-31 16:11:49 +00:00
Ivan Grokhotkov
a4357aed91
Merge branch 'fix/spi_test_memory_layout' into 'master'
...
test: fix the unit test fail issue under single_core config
See merge request idf/esp-idf!3596
2018-10-31 21:37:56 +08:00
Jiang Jiang Jian
dba29eeb2e
Merge branch 'bugfix/btdm_change_default_CoD_of_BT_profile' into 'master'
...
components/bt: Set default Class of Device of BT profile
See merge request idf/esp-idf!3564
2018-10-31 20:51:15 +08:00
baohongde
e19a352a2b
components/bt: Fix the different size of name buffer allocation size
...
Close https://github.com/espressif/esp-idf/issues/2615
2018-10-31 17:39:31 +08:00
Jiang Jiang Jian
39c03558e8
Merge branch 'bugfix/btdm_add_attr_handle_for_ESP_GATTS_CONF_EVT' into 'master'
...
Component/bt: add attr_handle for ESP_GATTS_CONF_EVT
See merge request idf/esp-idf!3492
2018-10-31 17:20:47 +08:00
Michael (XIAO Xufeng)
4132834faa
test: fix the unit test fail issue under single_core config
...
Introduced in 97e3542947
.
The previous commit frees the IRAM part when single core, but doesn't
change the memory layout functions. The unit test mallocs IRAM memory
from the heap, accidently into the new-released region, which doesn't
match the memory layout function.
This commit update the memory layout function to fix this.
2018-10-31 17:04:32 +08:00
Angus Gratton
e4369aaed4
Merge branch 'feature/mqtt_mutual_auth' into 'master'
...
MQTT: Added client cert ssl example per PR from GitHub
See merge request idf/esp-idf!3473
2018-10-31 07:06:58 +08:00
Jitin George
3551b84c3a
esp_http_client: Fix crash in async mode
...
Closes https://github.com/espressif/esp-idf/issues/2624
2018-10-30 09:58:57 +00:00
Jiang Jiang Jian
97e3542947
Merge branch 'bugfix/release_some_memory_on_single_core_mode' into 'master'
...
release memory not used in single core mode
See merge request idf/esp-idf!2733
2018-10-30 15:53:31 +08:00
Jiang Jiang Jian
f6dd3520c4
Merge branch 'bugfix/assert_when_do_wps_with_mikrotik' into 'master'
...
wifi: bugfix of assert when do wps with mikrotik
See merge request idf/esp-idf!3572
2018-10-30 15:52:02 +08:00
Jiang Jiang Jian
d335bdcf71
Merge branch 'bugfix/btdm_reduce_iram_size' into 'master'
...
components/bt: Reduce IRAM size
See merge request idf/esp-idf!3574
2018-10-30 15:17:06 +08:00
David Cermak
0cdb33c9dd
mqtt: ssl mutual authentication example added per PR from github, corrected cmake build, updated per idf style
...
Merges https://github.com/espressif/esp-idf/pull/2490
2018-10-30 08:04:09 +01:00
Riccardo Binetti
9ce8e1e5a1
transport_ssl: add support for mutual SSL authentication
...
Signed-off-by: David Cermak <cermak@espressif.com>
2018-10-30 08:04:09 +01:00
Riccardo Binetti
dec70a7601
esp-tls: add support for mutual SSL authentication
...
Signed-off-by: David Cermak <cermak@espressif.com>
2018-10-30 08:04:09 +01:00
zhiweijian
950fe25120
Component/bt: fix get attr value API error
2018-10-30 15:00:23 +08:00
Angus Gratton
b650d19c6b
Merge branch 'bugfix/docs_fixes_from_github' into 'master'
...
Documentation bugfixes from GitHub
See merge request idf/esp-idf!3570
2018-10-30 07:40:16 +08:00
Deng Xin
b8784a1863
wifi: bugfix of assert when do wps with mikrotik
...
Problem Decribe
The problem happenned when do wps with a mikrotik router
1. router always want to do connect with 32 without EAP-WSC step
2. after 4 way timeour, 32 crash
Root Cause
The reason why can not start EAP-WSC step is router's check method is RSN > WPA > WPS, when it found there include RSN and WPS in assoc, it will choice do 4 way rather than WPS
The reason of second problem is 32's EAPOL start timer didn't stop and send EAPOL start to a null pointer
Soultion
1. remove RSN and WPA ie when do WPS step
2. check mac address's pointer before send EAPOL start
closes: https://github.com/espressif/esp-idf/issues/2382
2018-10-29 13:29:41 +00:00
Michael (XIAO Xufeng)
ff346f92af
psram: add test for 4M psram
2018-10-29 20:26:30 +08:00
Michael (XIAO Xufeng)
20a666fe03
esp32: support to use hspi to output clock for 4MB PSRAM
...
Resolves https://github.com/espressif/esp-idf/issues/2128 .
2018-10-29 20:22:44 +08:00
Michael (XIAO Xufeng)
9b5d0f3322
spi: shown owner of spi host explicitly
2018-10-29 20:22:44 +08:00
baohongde
df5839420d
components/bt: Reduce IRAM size
...
libbtdm: 2608B
idf: 924B
2018-10-29 16:54:32 +08:00
Angus Gratton
98a80ccdab
Merge branch 'bugfix/mdns_crash_on_network_change' into 'master'
...
Fixed mdns crashes on network changes
See merge request idf/esp-idf!3546
2018-10-29 16:31:52 +08:00
XiaXiaotian
901e2af793
esp32: do not try to load PHY data if fail to open NVS
2018-10-29 02:24:58 +00:00
Peter Meerwald-Stadler
6a197d305f
Fix some typos related to ethernet documentation and Kconfig. Closes https://github.com/espressif/esp-idf/pull/2642
2018-10-28 21:12:09 +01:00
baohongde
67e62aa105
components/bt: Set default Class of Device of BT profile
...
The CoD of each profile both are 0x2c0414, now they are as follow:
A2DP sink: 0x240414
A2DP source: 0x280400
HFP: 0x200408
SPP: 0x001F00
2018-10-26 17:03:39 +08:00
Dmitry
82eca97300
Version update from V1 to V2 now done in correct way.
...
Before this works only first time.
The source and test updated.
State length was changed to macro.
2018-10-26 09:21:30 +03:00
Renz Christian Bagaporo
5a83347bec
event: Implement event loop library
2018-10-26 13:14:19 +08:00
Angus Gratton
cdb10ec5ad
Merge branch 'bugfix/rename_http_server' into 'master'
...
Rename http_server component to esp_http_server
See merge request idf/esp-idf!3553
2018-10-26 12:59:38 +08:00
Ivan Grokhotkov
73d1b5a7a0
bootloader: verify that loaded image does not overlap bootloader code
...
Fixes CVE-2018-18558
2018-10-26 12:44:10 +08:00
Angus Gratton
5bcd864430
Merge branch 'fix/spi_polling_speed_test' into 'master'
...
spi: speed up polling performance and fix several tests
Closes #33
See merge request idf/esp-idf!3530
2018-10-26 12:41:00 +08:00
Angus Gratton
705d184af2
Merge branch 'bugfix/missing_header_file' into 'master'
...
esp32: Add missing header file in esp_task.h
See merge request idf/esp-idf!3353
2018-10-26 12:19:50 +08:00
Jiang Jiang Jian
c884d0a3bc
Merge branch 'bugfix/fix_some_wifi_bugs_1022' into 'master'
...
esp32: fix some wifi bugs
See merge request idf/esp-idf!3539
2018-10-26 11:50:44 +08:00
Jiang Jiang Jian
93dbf2f3ba
Merge branch 'bugfix/btdm_read_multiple_return_callback_status_ESP_GATT_STACK_RSP' into 'master'
...
Component/bt: fix read multiple return callback status: ESP_GATT_STACK_RSP
See merge request idf/esp-idf!3437
2018-10-26 11:41:18 +08:00
Jiang Jiang Jian
0bc364f7ea
Merge branch 'bugfix/btdm_add_sniff_mode_to_spp' into 'master'
...
components/bt: Add sniff mode to SPP
See merge request idf/esp-idf!3472
2018-10-26 11:38:50 +08:00
Jiang Jiang Jian
762c04bd61
Merge branch 'bugfix/btdm_disconnect_ble_when_ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH_failed' into 'master'
...
Component/bt: add ble disconnect when ACCEPT_SPECIFIED_SEC_AUTH failed
See merge request idf/esp-idf!3465
2018-10-26 11:34:26 +08:00
Anton Maklakov
6e6f07ba59
http: Compare case-insensitive URI schemes like as in other places
2018-10-25 21:03:44 +08:00
Jitin George
e37aba0d93
esp-tls: Fix documentaion issue in esp_tls_conn_new_async API
...
Closes https://github.com/espressif/esp-idf/issues/2576
2018-10-25 09:13:49 +00:00
Liu Zhi Fu
8404b2546d
esp32: fix some wifi bugs
...
Fix following WiFi bugs:
1. Fix the bug that MIC verification fails on soft-AP mode
2. Modify mesh root to have same behavior as normal WiFi STA in state change
3. Fix the bug that sniffer can't catch control packets
4. Fix crash bug in soft-AP mode
5. Fix ACM(Admission Control Management) bug
2018-10-25 16:47:57 +08:00
zhiweijian
4e81705ca2
Component/bt: support OOB in SMP
2018-10-25 07:09:59 +00:00
zhiweijian
6b96a3c23b
Component/bt: add ble disconnect when ACCEPT_SPECIFIED_SEC_AUTH failed
2018-10-25 06:03:16 +00:00
Michael (XIAO Xufeng)
90d229eb6d
spi_master: speed up polling performance by putting into IRAM
2018-10-25 12:31:45 +08:00
Michael (XIAO Xufeng)
d0361a32d7
test: fix the IRAM type conflict issue using heap_caps_malloc
2018-10-25 12:31:44 +08:00
zwj
501ebabc4e
component/bt: fix remove bond list failed
2018-10-24 23:23:50 +00:00
Anurag Kar
e2b1ae259d
Protocomm : Use esp_http_server instead of http_server
2018-10-24 17:32:43 +05:30
Anurag Kar
2af9d7e0ed
HTTP Server : Added esp_ prefix to http_server component files
2018-10-24 17:32:20 +05:30
David Cermak
097282a8e3
mdns: fixed crashes on network changes
...
1) two events AP_STOP, AP_START shortly after each other may cause IGMP config on already stopped netif
2) not properly locked sending packets to queue from timer task
closes #2580
2018-10-24 12:03:41 +02:00
Jiang Jiang Jian
0de637cf9e
Merge branch 'bugfix/tw26711_fix_wifi_memory' into 'master'
...
esp32: fix wifi memory leak
See merge request idf/esp-idf!3523
2018-10-22 21:20:14 +08:00
Angus Gratton
38bd836d05
Merge branch 'feature/cmake-unit-test' into 'master'
...
cmake: add unit tests build support
See merge request idf/esp-idf!3003
2018-10-22 16:29:15 +08:00
Liu Zhi Fu
20217c7dfe
esp32: fix wifi memory leak
...
Fix a WiFi memory leak bug
2018-10-21 20:37:08 +08:00
Anton Maklakov
4319e234e2
tcp_transport: Remove the ignore warning because we had idf/esp-idf!3359
2018-10-21 15:11:45 +08:00
Anton Maklakov
e3fce506b8
test_spi_slave: fix warnings about unused identifiers
2018-10-21 15:11:45 +08:00
Anton Maklakov
ef84773689
intr: fix a type mismatch warning
2018-10-21 15:11:45 +08:00
Anton Maklakov
92caddb501
pthread: fix a type mismatch warning
2018-10-21 15:11:45 +08:00
Renz Bagaporo
cc774111bf
cmake: Add support for test build
2018-10-20 12:07:24 +08:00
zhiweijian
44827bb681
Component/bt: add attr_handle for ESP_GATTS_CONF_EVT
2018-10-19 08:19:36 +00:00
Jiang Jiang Jian
129d32772e
Merge branch 'feature/add_ping_packet_len_and_QoS' into 'master'
...
ping: add length and QoS
See merge request idf/esp-idf!3379
2018-10-19 15:29:58 +08:00
Ivan Grokhotkov
0663ab7609
Merge branch 'feature/uart_rs485_test' into 'master'
...
driver: rs485 test support
See merge request idf/esp-idf!2701
2018-10-19 13:05:55 +08:00
Ivan Grokhotkov
3e65ce3e93
Merge branch 'bugfix/unit_tests_tcpip_adapter' into 'master'
...
unit tests: Only initialise tcpip_adapter() when needed by the test
See merge request idf/esp-idf!3364
2018-10-19 12:33:09 +08:00
Ivan Grokhotkov
bd11965f6c
Merge branch 'bugfix/ndebug_build' into 'master'
...
soc,sdmmc: fix build failures when NDEBUG is used
See merge request idf/esp-idf!3352
2018-10-19 11:55:37 +08:00
Ivan Grokhotkov
c76f71cd5f
Merge branch 'bugfix/move_ringbuf_lib_to_iram' into 'master'
...
esp_ringbuf: fix default placement from flash to IRAM
See merge request idf/esp-idf!3452
2018-10-18 22:57:46 +08:00
Ivan Grokhotkov
efa43df039
Merge branch 'bugfix/fix_random_failure_with_ota_updates' into 'master'
...
app_update: fix intermittent failure with firmware updates
See merge request idf/esp-idf!3401
2018-10-18 22:32:33 +08:00
Jiang Jiang Jian
f47ae9fc26
Merge branch 'bugfix/coex_hw_blocking_2nd' into 'master'
...
coexist : fix coexist bugs related to coex hw blocking
See merge request idf/esp-idf!3414
2018-10-18 21:25:24 +08:00
Jiang Jiang Jian
88d4217f07
Merge branch 'bugfix/fix_autoip_bug' into 'master'
...
fix the compile bug for autoip
See merge request idf/esp-idf!3450
2018-10-18 14:55:34 +08:00
Mahavir Jain
26845936b3
app_update: remove unrequired static attribute from mmap handle
2018-10-18 04:38:31 +00:00
Mahavir Jain
b3aff63db4
app_update: fix intermittent failure with firmware updates
...
Routine `spi_flash_cache2phys` sometimes return incorrect value,
resulting in failure in getting currently running ota partition.
This in turn aborts firmware update process.This issue was more
prominent with SPIRAM enabled cases.
Fix ensures proper cache guards during `spi_flash_cache2phys`, and
also for few other similar APIs.
In addition, `esp_ota_get_running_partition` has also been optimized
to save currently running partition for subsequent invocations.
Fixes https://github.com/espressif/esp-idf/issues/2451
2018-10-18 04:38:31 +00:00
Mahavir Jain
49130c6b34
esp_ringbuf: fix default placement from flash to IRAM
...
In earlier change this component was decoupled from freertos and hence
regression was introduced which changed default placement to flash. Some
device drivers make use of ringbuffer while flash cache is being disabled
and hence default placement should instead be internal memory.
Closes: https://github.com/espressif/esp-idf/issues/2517
2018-10-17 23:34:07 -05:00
Tian Hao
6934a739d7
coexist : fix coexist bugs related to coex hw blocking
...
1. fix some bugs by previous coex hw blocking bugfix,
such like, rwble.c (64, 0) line 222
2. fix bug that ble scan performance is very low when software coexist
is working.
3. update libcoexist version to v1.1.0
2018-10-18 11:49:10 +08:00
Ivan Grokhotkov
18684f53ee
Merge branch 'bugfix/uart_wait_idle' into 'master'
...
uart: fix uart_tx_wait_idle to wait for fifo empty
See merge request idf/esp-idf!3489
2018-10-18 11:25:59 +08:00
Jiang Jiang Jian
9b566a8965
Merge branch 'bugfix/wpa2_fixes' into 'master'
...
wpa2_enterprise fixes from Github
See merge request idf/esp-idf!3166
2018-10-18 11:10:10 +08:00
Jiang Jiang Jian
7f9dfc060c
Merge branch 'mesh/bugfix_esp_ssid_ie' into 'master'
...
mesh: fix a bug in generating ESP-SSID IE
See merge request idf/esp-idf!3382
2018-10-18 11:06:44 +08:00
Angus Gratton
159ff6e08e
unit tests: Only initialise tcpip_adapter() when needed by the test
...
Prevents unexpected memory allocations when running tests which
don't require tcpip_adapter.
2018-10-17 22:53:46 +00:00
zhiweijian
30ea8c7048
Component/bt: read multiple return callback status: ESP_GATT_STACK_RSP
2018-10-17 12:34:34 +00:00
Anurag Kar
1437646ae0
HTTP Server : Automated 408 error response restricted to timeout in receiving packet header
2018-10-17 17:36:50 +05:30
Anurag Kar
ae5989528e
HTTP Server : Added helper functions for sending HTTP error 408 and 500
2018-10-17 17:36:50 +05:30
Anurag Kar
30632c0c34
HTTP Server : Bug fixed in httpd_recv logic and updated function descriptions
2018-10-17 17:36:50 +05:30
Anurag Kar
7e04e283d5
HTTP Server : Use getsockopt instead of errno
2018-10-17 17:36:50 +05:30
Anurag Kar
47a106879a
HTTP Server : Return HTTPD_SOCK_ERR_ based on errno set during send / recv
...
This feature allows `httpd_req_recv()` and `httpd_send()` functions to return
specific `HTTPD_SOCK_ERR_` codes in case of socket errors. This is useful
in case of errors like `EAGAIN`, `EINTR`, etc. when the user may want to
retry `httpd_req_recv()` / `httpd_send()` function call.
2018-10-17 17:36:50 +05:30
Alex Lisitsyn
f0eb9985b9
examples: freemodbus port slave basic implementation
...
This example adds functionality to support basic communication in RS485 networks using Modbus protocol.
This example uses FreeModbus stack and regular UART driver API to communicate in RS485 half duplex mode.
Added initial support of modbus controller pure C api to access device parameters over Modbus transport.
Move freemodbus stack and port files into components folder
Move the modbus_controller interface into components idf folder
Source files updated after review.
Add modbus interface documentation docs/en/api-reference/protocols/modbus.rst
porttimer.c: fix bug with timer1 selected in the Kconfig
Add support of cmake system (added cmake files)
Closes https://github.com/espressif/esp-idf/issues/858
2018-10-17 12:47:12 +02:00
Alex Lisitsyn
5b7b64b946
driver: rs485 test support (remove timeout tag)
...
Adds test functionality with TEST_CASE_MULTIPLE_DEVICES() macro for RS485 test support.
2018-10-17 12:47:12 +02:00
Alex Lisitsyn
61bc733791
driver: rs485 test support
...
Adds test functionality with TEST_CASE_MULTIPLE_DEVICES() macro for RS485 test support.
2018-10-17 12:45:56 +02:00
qiyueixa
71b5dcfd73
mesh: fix a bug in generating ESP-SSID IE
...
1. wifi: if Wi-Fi is not scanning, ignore beacons from different channels.
2018-10-17 17:52:29 +08:00
zhangyanjiao
32f3972284
add ping length and QoS
2018-10-17 09:39:27 +00:00
zhangyanjiao
e3322bde6f
fix the compile bug for autoip
2018-10-17 09:32:08 +00:00
island
024f27f3d5
component/bt: modify the BLE example to make it run with "numeric comparison" mode
2018-10-17 16:55:11 +08:00
Angus Gratton
222a7118a9
Merge branch 'docs/freertos_words_to_bytes' into 'master'
...
FreeRTOS: Update API reference from words to bytes
See merge request idf/esp-idf!3453
2018-10-17 16:41:28 +08:00
Ivan Grokhotkov
d57132b212
Merge branch 'bugfix/tw26696_fix_wifi_timer' into 'master'
...
esp32: fix WiFi timer inaccurate bug
See merge request idf/esp-idf!3471
2018-10-17 16:37:22 +08:00
Angus Gratton
dad3531f96
Merge branch 'update/mfg_gen' into 'master'
...
Update mfg utility and nvs partition utility to make Python2 and Python3 compatible
See merge request idf/esp-idf!3243
2018-10-17 15:23:27 +08:00
Liu Zhi Fu
1afb8001dd
esp32: fix WiFi timer inaccurate bug
...
Fix the bug that WiFi timer is not accurate when sleep is on
2018-10-17 09:47:25 +08:00
Angus Gratton
95e4bdf030
Merge branch 'bugfix/run_esptool_espport' into 'master'
...
cmake: Handle ESPPORT environment variable correctly
See merge request idf/esp-idf!3482
2018-10-17 08:14:20 +08:00
Angus Gratton
66a54c7abf
Merge branch 'feature/34_coding_scheme' into 'master'
...
bootloader: 3/4 Coding Scheme support
See merge request idf/esp-idf!3430
2018-10-16 15:07:43 +08:00
Angus Gratton
f53fef9936
Secure Boot & Flash encryption: Support 3/4 Coding Scheme
...
Includes esptool update to v2.6-beta1
2018-10-16 16:24:10 +11:00
Angus Gratton
7d7975d6c6
Merge branch 'bugfix/fuzzer_ci_tests_to_new_lwip' into 'master'
...
LWIP Fuzzer: updated fuzzer tests to be compatible with new lwip module
See merge request idf/esp-idf!3278
2018-10-16 08:01:00 +08:00
Ivan Grokhotkov
508fb79a26
uart: fix uart_tx_wait_idle to wait for fifo empty
...
In some cases, when data was just written into UART FIFO, transmitter
state could be still zero while the FIFO did contain some data.
This resulted in uart_tx_wait_idle occasionally returning before all
the data was sent out.
Fix by checking both UART transmitter state and TX FIFO count.
2018-10-15 20:08:16 +08:00
Jeroen Domburg
a78fd2b13c
Merge branch 'feature/64mb_psram_support_base' into 'master'
...
Feature/64mb psram support base
See merge request idf/esp-idf!2887
2018-10-15 15:54:10 +08:00
Ivan Grokhotkov
a1f809fcc5
bootloader: provide implementation of abort
...
ROM definition of `abort` was removed in 9240bbb
. The old definition
resulted in a panic due to a jump to a null pointer (abort member in
ROM stub table was zero). The new definition triggers a debug
exception if JTAG is connected, or goes into an infinite loop to be
reset by the WDT.
2018-10-15 15:02:56 +08:00
Ivan Grokhotkov
a20d9287fe
soc: use _EARLY versions of ESP_LOG
...
Some logging done in soc component may happen before logging via
stdout is possible. Use _EARLY version of log calls to make sure that
output is visible. The downside is that application does not have a
way to silence these logs. However since the soc component doesn’t
use any LOGV/LOGD/LOGI and only logs warnings and errors, this should
not impact the application.
2018-10-15 14:59:46 +08:00
Ivan Grokhotkov
ab68b9d90d
soc,sdmmc: fix build failures when NDEBUG is used
...
Use explicit error checking instead of asserts, use SOC_LOG to print
error/warning messages where needed.
2018-10-15 14:57:12 +08:00
Jeroen Domburg
81e35a142a
Spiram: Add option to reserve MMU banks; add himem API to make use of those banks
2018-10-15 14:32:58 +08:00
Angus Gratton
897670b0ab
cmake: Handle ESPPORT environment variable correctly
...
Closes https://github.com/espressif/esp-idf/issues/2553
2018-10-15 10:25:44 +11:00
Shivani Tipnis
7c08fcccaf
util: Update docs as per review comments
2018-10-12 11:04:49 +05:30
Shivani Tipnis
5bee9faf49
tools: Add Python2 and Python3 compatibility support to nvs util tool and mfg tool
2018-10-12 11:04:49 +05:30
Shivani Tipnis
1d38d8a17f
nvs_util: Add Python2 and Python3 compatible
2018-10-12 11:04:49 +05:30
Shivani Tipnis
0f6bcec2bc
nvs_part_gen: Add changes to partition size input
2018-10-12 11:04:49 +05:30
Shivani Tipnis
60df21115e
nvs_part_gen: Update to make python version compatible
...
(cherry picked from commit 3506b2d60792e5d4ed4f744b28f2da6733c6aae7)
2018-10-12 11:04:49 +05:30
Shivani Tipnis
1460f03065
nvs_util: Add Python2 and Python3 compatible
2018-10-12 11:04:49 +05:30
Shivani Tipnis
fb31788504
nvs_part_gen: Add changes to partition size input
2018-10-12 11:04:49 +05:30
Shivani Tipnis
4bc87a414f
nvs_part_gen: Update to make python version compatible
...
(cherry picked from commit 3506b2d60792e5d4ed4f744b28f2da6733c6aae7)
2018-10-12 11:04:49 +05:30
baohongde
a6d054b079
components/bt: Add sniff mode to SPP
...
In idle state for a while, SPP will enter sniff mode.
2018-10-12 11:22:28 +08:00
David Cermak
67153be14f
lwip: updated fuzzer tests to be compatible with new lwip module
2018-10-11 08:05:14 +02:00
Jiang Jiang Jian
1a743ad66d
Merge branch 'bugfix/several_bugfix_about_ba_session_setup' into 'master'
...
esp32: several fixes/optimizations about BlockAck(BA) setup
See merge request idf/esp-idf!3374
2018-10-11 11:28:20 +08:00
Angus Gratton
299704cec3
Merge branch 'feature/unified_provisioning' into 'master'
...
provisioning: This patch adds the unified provisioning support
See merge request idf/esp-idf!2812
2018-10-10 16:29:11 +08:00
Angus Gratton
3e0ff8e843
Merge branch 'doc/nvs_encr_doc' into 'master'
...
nvs_flash: Update documentation at various places to indicate NVS encryotion is supported
See merge request idf/esp-idf!3431
2018-10-10 14:58:15 +08:00
Angus Gratton
31cf117404
Merge branch 'feature/bss_seg_in_external_memory' into 'master'
...
memory: support .bss segment can be in psram
See merge request idf/esp-idf!2236
2018-10-10 14:40:21 +08:00
Angus Gratton
fc2230aeda
Merge branch 'feature/error_check_without_abort' into 'master'
...
esp32: Add macro to check a condition without abort
See merge request idf/esp-idf!3348
2018-10-10 14:31:38 +08:00
Angus Gratton
f1ccd47fdb
Merge branch 'bugfix/fix_psram_eid' into 'master'
...
bugfix(psram): fix psram eid
See merge request idf/esp-idf!3392
2018-10-10 11:37:43 +08:00
Angus Gratton
7904da0600
Merge branch 'bugfix/httpd_default_content_type' into 'master'
...
HTTP Server : Default content type of response should be HTTPD_TYPE_TEXT
See merge request idf/esp-idf!3443
2018-10-10 08:21:56 +08:00
Angus Gratton
aaacd5412d
Merge branch 'bugfix/httpd_chunked_content_len' into 'master'
...
Remove Content-Length from chunked encoding
See merge request idf/esp-idf!3442
2018-10-10 08:21:50 +08:00
Krzysztof Budzynski
cd5f8bcf74
MCPWM API doc update
2018-10-10 08:15:23 +08:00
Darian Leung
6f91640690
FreeRTOS: Update API reference from words to bytes
...
This commit updates some of the API references in task.h so
that stack sizes are referred to in bytes rather than words as
found in the vanilla version.
Closes #2528
2018-10-09 20:49:19 +08:00
Jiang Jiang Jian
9c148f6ad6
Merge branch 'bugfix/btdm_fix_connect_interval_error_in_slave_adv_params' into 'master'
...
Component/bt: fix connection interval error in slave adv params
See merge request idf/esp-idf!3407
2018-10-09 17:01:44 +08:00
Roland Dobai
d4e572bdb1
esp32: Add macro to check a condition without abort
...
Closes https://github.com/espressif/esp-idf/issues/2325
2018-10-09 08:57:23 +02:00
Liu Zhi Fu
660770ea97
esp32: several fixes about BA session setup
...
1. Fix the bug that ESP32 will reject the retry AddBA request frame
if AddBA response frame is failed to sent by WiFi LMAC
2. Fix the bug that AddBA request retrys too frequently
3. Forbid BA session setup for VO queue related TID
2018-10-09 12:07:30 +08:00
Jiang Jiang Jian
83d4081fba
Merge branch 'bugfix/fix_close_socket_crash_bug' into 'master'
...
lwip: fix the crash when close socket
See merge request idf/esp-idf!3384
2018-10-08 21:23:57 +08:00
Anurag Kar
8be9e0946f
HTTP Server : Default content type of response should be HTTPD_TYPE_TEXT
...
Closes https://github.com/espressif/esp-idf/issues/2527
2018-10-08 18:12:15 +05:30
chenjianqiang
a10b7e892c
bugfix(psram): fix psram driver
...
1. remove use EID to distinguish psram voltage
2. 1V8 64Mbit psram and 3V3 64Mbit psram use the same psram driver(standard spi interface)
3. set cs hold time register as 1
2018-10-08 19:55:13 +08:00
Assaf Inbal
f4e867a148
Remove Content-Length from chunked encoding
...
Content-Length header should not be included when using chunked encoding.
Some browsers will close the socket after seeing the 0 sized response instead of
reading the chunks.
Merges https://github.com/espressif/esp-idf/pull/2458
2018-10-08 15:58:41 +05:30
Angus Gratton
05c510b44e
Merge branch 'test/spi_slave_psram_disable' into 'master'
...
test: disable the spi slave startup test when psram is enabled
See merge request idf/esp-idf!3373
2018-10-08 16:28:41 +08:00
Angus Gratton
a85a633384
Merge branch 'fix/spi_master_cmd_addr_lsbfirst' into 'master'
...
spi_master: fix the command and address field when LSB_FIRST enabled
See merge request idf/esp-idf!3398
2018-10-08 16:26:27 +08:00
Jiang Jiang Jian
221eced06d
Merge branch 'bugfix/no_disconnect_event_report_if_no_correct_status_code_report' into 'master'
...
WiFi: bugfix of no disconnect event report if no correct status code report
See merge request idf/esp-idf!3370
2018-10-08 15:59:07 +08:00
Angus Gratton
1d58429bad
Merge branch 'feature/global_ca_store' into 'master'
...
esp_tls: Support for global CA store.
See merge request idf/esp-idf!3432
2018-10-08 14:51:02 +08:00
Angus Gratton
e99035af94
Merge branch 'feature/ethernet_example_iperf' into 'master'
...
ethernet: add iperf example to test real bandwidth
See merge request idf/esp-idf!3332
2018-10-08 12:27:05 +08:00
morris
7bc36d23e1
ethernet: add iperf example to test real bandwidth
...
1. Add command for Ethernet based on console component.
2. Make cmd_system and iperf a component that can be referenced by other examples
3. Add "version" command to cmd_system.c
4. Clean up the README.md in all ethernet examples[TW#26525]
2018-10-08 09:51:17 +08:00
Chirag Atal
b7cca3c414
Feature: Support for global CA store.
...
Added a new API esp_tls_set_global_ca_store(esp_tls_cfg_t *cfg) which creates a global_cacert which can be used by multiple connections by setting the use_global_ca_store variable to true in their respective structure of esp_tls_cfg_t. Also changed the cacert in the structure of esp_tls_t to a pointer.
2018-10-05 19:35:57 +05:30
Sagar Bijwe
454b69d2ea
nvs_flash: Update documentation at different places to indicate NVS encryotion is supported
2018-10-05 14:05:21 +05:30
Angus Gratton
1b272bb77e
Merge branch 'bugfix/rom_export_functions' into 'master'
...
esp32, bootloader: fix issues related to linking order
See merge request idf/esp-idf!3375
2018-10-05 12:40:05 +08:00
michael
6b180f70ac
test: modify the command/address test a bit to test the LSBFIRST feature
2018-10-04 15:03:26 +08:00
michael
e5ed450d95
spi: move gpio direction config to common func for coinsistence
...
(MINOR CHANGE)
2018-10-04 14:57:31 +08:00
Michael (XIAO Xufeng)
2600f43822
spi_master: fix the command and address field when LSB_FIRST enabled
...
Resolves https://github.com/espressif/esp-idf/issues/2444 .
2018-10-04 14:57:30 +08:00
Angus Gratton
3977d4b565
Merge branch 'feature/transpost_methods_renamed_no_collision' into 'master'
...
Renamed transport header files to esp_ prefixed
See merge request idf/esp-idf!3359
2018-10-04 13:11:49 +08:00
Anurag Kar
84f094453b
Examples : Added provisioning examples, tests and client tool.
...
* BLE and softAP provisioning examples added along with tests.
* An application specific example added for demonstrating custom provisioning scheme.
* tools/esp_prov/esp_prov.py can be used as a provisioning client for SoftAP, BLE and CLI based transports.
Co-Authored-By: Amey Inamdar <amey@espressif.com>
Co-Authored-By: Anurag Kar <anurag.kar@espressif.com>
2018-10-02 19:07:28 +05:30
Amey Inamdar
2b52465416
WiFi Provisioning : Added component providing framework for configuring WiFi credentials during provisioning
...
Co-Authored-By: Amey Inamdar <amey@espressif.com>
Co-Authored-By: Anurag Kar <anurag.kar@espressif.com>
2018-10-02 19:07:28 +05:30
Amey Inamdar
9428375368
Protocomm : Added support for choice of transport - WiFi (SoftAP+HTTPD), BLE, Console (development friendly transport)
...
Co-Authored-By: Amey Inamdar <amey@espressif.com>
Co-Authored-By: Anurag Kar <anurag.kar@espressif.com>
2018-10-02 19:07:28 +05:30
Amey Inamdar
e94dffc9c5
Protocomm : Added unit tests and protobuf-c generated files
...
Co-Authored-By: Amey Inamdar <amey@espressif.com>
Co-Authored-By: Anurag Kar <anurag.kar@espressif.com>
2018-10-02 19:07:28 +05:30
Amey Inamdar
d0c777b2e1
Protocomm : Added component core for protocol communication
...
* This manages secure sessions and provides framework for multiple transports.
* The application can use protocomm layer directly to have application specific extensions for provisioning (or non-provisioning) use cases.
* Following features are available for provisioning :
* Security - Security0 (no security), Security1 (curve25519 key exchange + AES-CTR encryption)
* Proof-of-possession support for Security1
* Protocomm requires specific protocol buffer modules for compilation which can be generated from the `.proto` files in the `proto` directory using make.
Co-Authored-By: Amey Inamdar <amey@espressif.com>
Co-Authored-By: Anurag Kar <anurag.kar@espressif.com>
2018-10-02 19:07:28 +05:30
Amey Inamdar
3ba8eed60a
protobuf-c : Added Google's protocol buffer C library as sub-module
...
Source https://github.com/protobuf-c/protobuf-c
Co-Authored-By: Amey Inamdar <amey@espressif.com>
Co-Authored-By: Anurag Kar <anurag.kar@espressif.com>
2018-10-02 19:07:28 +05:30
David Cermak
0d4f5cc495
tcp_transport: transport set handle refactoring, web socket client name updated
2018-10-02 15:19:46 +02:00
David Cermak
e02225cc07
tcp_transport: renamed possibly generic function names to be esp_ prefixed and not to colide with user namespace
2018-10-02 14:16:48 +02:00
Anton Maklakov
2c5a25a42e
tcp_transport: Use getrandom() instead of rand() in the entire esp-mqtt
...
Signed-off-by: David Cermak <cermak@espressif.com>
2018-10-02 14:16:26 +02:00
Anton Maklakov
e3c6839802
tcp_transport: Fix warning, put in order the nearest code, replace sprintf with snprintf
...
Signed-off-by: David Cermak <cermak@espressif.com>
2018-10-02 14:15:27 +02:00
David Cermak
40c6cbb3ab
tcp_transport: renamed transport related header files to esp_ prefixed to avoid collisions
...
tcp_transport component used public header files such as 'transport.h', etc. which are too generic and might collide with user or user libraries headers
This change closes #2417
2018-10-02 14:15:00 +02:00
Angus Gratton
127693126a
esp_err: Don't compile in error message strings in "silent assertions" mode
...
Reported on forum https://esp32.com/viewtopic.php?f=13&t=7396&p=31419#p31419
2018-10-02 17:00:57 +10:00
Angus Gratton
326d791ebb
bootloader: Fix secure boot digest generation for image length where (len%128 < 32)
2018-10-02 15:17:14 +10:00
Ivan Grokhotkov
9240bbb708
esp32: remove ROM functions redefined in IDF from LD script
...
In some cases, linker could choose to use ROM functions instead of the
ones defined in IDF.
For functions used in ROM stub table, this would lead to infinite
recursion when the corresponding function was called from ROM.
For crypto functions, some of these were modified in IDF, and
incompatible with ROM counterparts.
2018-10-02 01:20:04 +00:00
Ivan Grokhotkov
f694d057be
bootloader_support: exclude bootloader_init.c when building app
...
Depending on link order of libraries, bootloader implementation of
__assert_func could be linked instead of the one provided by newlib.
2018-10-02 01:20:04 +00:00
Angus Gratton
98b42a8b71
Merge branch 'bugfix/disable_coding_scheme_security_features' into 'master'
...
bootloader: Don't enable secure boot or flash encryption for 3/4 Coding Scheme
See merge request idf/esp-idf!3369
2018-10-02 07:54:11 +08:00
Ivan Grokhotkov
23984c8a03
Merge branch 'bugfix/rtc_fastmem_data_init' into 'master'
...
esp32: fixes related to CONFIG_ESP32_RTCDATA_IN_FAST_MEM
See merge request idf/esp-idf!3403
2018-10-01 18:13:43 +08:00
Ivan Grokhotkov
94e5ffdedc
Merge branch 'bugfix/workaround_free_peripherals_isr_when_using_dual_core' into 'master'
...
driver(interrupt): fix the issue that interrupt might be allocated and freed on different cores.
See merge request idf/esp-idf!3152
2018-09-30 21:42:52 +08:00
zhiweijian
fe7fd3bf4d
Component/bt: fix connection interval error in slave adv params
2018-09-30 11:14:27 +00:00
Jiang Jiang Jian
fda865b002
Merge branch 'bugfix/btdm_watchdog_timeout_after_pair_with_iphone' into 'master'
...
component/bt: Fix BTU task watchdog timeout after pair with iphone
See merge request idf/esp-idf!3366
2018-09-30 14:39:00 +08:00
Jiang Jiang Jian
42a9f99bc8
Merge branch 'bugfix/btdm_controller_stuck_on_waking_up' into 'master'
...
bugfix/btdm_controller_stuck_on_waking_up
See merge request idf/esp-idf!3395
2018-09-30 14:25:58 +08:00
Zhi Wei Jian
5d71940178
component/bt: add sequential check when add include service
2018-09-30 14:19:54 +08:00
Jiang Jiang Jian
d6bc6fad8b
Merge branch 'bugfix/btdm_add_ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH_in_set_security_param_API' into 'master'
...
Component/bt: add only accept sepecified authentication function for SMP
See merge request idf/esp-idf!3385
2018-09-30 14:18:23 +08:00
zhiweijian
3050e55801
Component/bt: add only accept sepecified Authentication
2018-09-29 21:23:55 +08:00
Jiang Jiang Jian
7014c14537
Merge branch 'bugfix/btdm_add_service_source_param_for_ESP_GATTC_SEARCH_CMPL_EVT' into 'master'
...
Component/bt: add “service from” param for ESP_GATTC_SEARCH_CMPL_EVT
See merge request idf/esp-idf!3399
2018-09-29 20:18:26 +08:00
Deng Xin
b557cca6b9
WiFi: bugfix of no disconnect event report if no correct status code report
...
Problem Description
The reporduce steps are as follows:
1. put more than one same ssid AP in the environment;
2. set the STA mac address in one of the APs blacklist, and make sure the AP is closest to STA;
3. set the scan method in station config as all channel scan;
4. try to connect the AP which set STA in blacklist
Phenmenon
STA fail to connect after send auth or assoc with a wrong status code, but no disconnect event report and can not connect the next one in the envrionment
Root Cause
Because there are some same ssid APs in the evnrionment, when do all channel scan, it will collect all the matched AP in rc list, because rc list is not empty, so it would send disconnect event, however, we didn't do other step such as connect to other one
VNC MR 570
closes https://github.com/espressif/esp-idf/issues/2323
2018-09-29 16:16:22 +08:00
Ivan Grokhotkov
c4a712b0bc
sleep: fix checking length of RTC data sections
...
_rtc_data_{start,end} can now describe data placed into RTC_FAST
segment, if CONFIG_ESP32_RTCDATA_IN_FAST_MEM is enabled.
Use new _rtc_slow_length symbol instead.
2018-09-29 14:02:16 +08:00
Ivan Grokhotkov
70412928de
esp32: fix placement of .rtc_noinit
...
When CONFIG_ESP32_RTCDATA_IN_FAST_MEM is enabled, .rtc_noinit should
be in RTC_FAST memory, same as .rtc.data
2018-09-29 14:02:16 +08:00
Ivan Grokhotkov
3e1c065493
esp32/test: split rtc_fast test cases
...
Move runtime behaviour test cases into test_reset_reason.c, move
placement test cases into test_rtc_fast.c
2018-09-29 14:02:16 +08:00
Ivan Grokhotkov
22b840f3df
bootloader: don’t reload RTC_FAST DRAM after deep sleep
...
When CONFIG_ESP32_RTCDATA_IN_FAST_MEM is enabled, RTC data is placed
into RTC_FAST memory region, viewed from the data bus. However the
bootloader was missing a check that this region should not be
overwritten after deep sleep, which caused .rtc.bss segment to loose
its contents after wakeup.
2018-09-29 14:02:16 +08:00
zhiweijian
e6d737780a
Component/bt: add “service from” param for ESP_GATTC_SEARCH_CMPL_EVT
2018-09-28 12:59:01 +00:00
zhiweijian
54b841dc30
Component/bt: fix service change char can’t read and write and no descr
2018-09-28 19:57:25 +08:00
wangmengyang
334cb88256
component/bt: bugfix that hci down stream datapath is unblocked too early on waking up from sleep
...
This issue can cause the controller to stuck after sleep interrupt happens and clock interrupt enabled
2018-09-28 03:45:52 +00:00
Ivan Grokhotkov
0a7065195c
Merge branch 'bugfix/regression_in_light_sleep_mode' into 'master'
...
esp32: fix regression introduced in automatic light sleep pm
See merge request idf/esp-idf!3371
2018-09-28 09:49:39 +08:00
Ivan Grokhotkov
4981c10ab3
Merge branch 'fix/sdio_slave_reset_ret_queue' into 'master'
...
sdio_slave: fix the ret_queue crash issue when being reset by the master
See merge request idf/esp-idf!3360
2018-09-27 18:25:57 +08:00
zhangyanjiao
54b431f2a8
lwip: fix the crash when close socket
2018-09-27 17:35:40 +08:00
Ivan Grokhotkov
71b5ce55d3
Merge branch 'feature/mbedtls_2_13_1' into 'master'
...
mbedtls: update to 2.13.1
See merge request idf/esp-idf!3301
2018-09-27 14:15:25 +08:00
Ivan Grokhotkov
5ebf4f7022
Merge branch 'feature/move_rtc_data_rtc_rodata_to_RTC_FAST_seg' into 'master'
...
esp32: Add option to place .rtc_data and .rtc_rodata into the RTC_FAST segment
See merge request idf/esp-idf!2128
2018-09-27 13:05:06 +08:00
Ivan Grokhotkov
11b444b8f4
Merge branch 'bugfix/sysview_enable_cmake' into 'master'
...
cmake: add app_trace as FreeRTOS dependency
See merge request idf/esp-idf!3335
2018-09-27 11:21:54 +08:00
Ivan Grokhotkov
6baf743212
Merge branch 'bugfix/lwip_compat_headers' into 'master'
...
lwip: add compatibility headers for sntp.h and esp_ping.h
See merge request idf/esp-idf!3231
2018-09-27 11:21:37 +08:00
Angus Gratton
d8c84cff3a
esptool: Update to v2.5.1
...
Release notes: https://github.com/espressif/esptool/releases/tag/v2.5.1
Needed to no longer burn keys if 3/4 Coding Scheme is enabled.
2018-09-27 10:12:32 +10:00
Tian Hao
337960338d
component/bt : fix coexist hardware blocking bug
...
fix the bug following:
1. after disable bluetooth controller, wifi cannot TX/RX any packets.
2. when software coexist working, there's a little ratio cause wifi task watchdog timeout
3. when software coexist working, there's a little ratio cause bluetooth cannot receive anything.
feature:
1. add libbtdm_app.a git commit local and remote checking
Known issues:
1. there's still a bug occurs with a very very low ratio cause bluetooth
cannot receive anything. The reproduce interval may great than 3days ~ 1week via
7x24 hours heavy testing.
2018-09-26 21:24:46 +08:00
Jiang Jiang Jian
93df37522f
Merge branch 'feature/mesh_decoupling' into 'master'
...
mesh: decoupling
See merge request idf/esp-idf!3261
2018-09-26 20:20:27 +08:00
Jiang Jiang Jian
fa784476ba
Merge branch 'bugfix/btdm_fix_get_bond_list_error_sometimes' into 'master'
...
Component/bt: fix get bond list error sometimes
See merge request idf/esp-idf!3288
2018-09-26 18:06:23 +08:00
Jiang Jiang Jian
042ef68ea5
Merge branch 'feature/btdm_add_send_service_change_indication_API' into 'master'
...
Component/bt: add gatts send service change indication API
See merge request idf/esp-idf!3302
2018-09-26 18:05:04 +08:00
michael
f4d4183000
test: disable the spi slave startup test when psram is enabled
2018-09-26 17:55:37 +08:00
Angus Gratton
4d99513bdb
bootloader: Fix crash enabling flash encryption
...
Regression in 9c715d7946
2018-09-26 18:26:06 +10:00
Angus Gratton
ff33406e74
bootloader: Don't enable secure boot or flash encryption for 3/4 Coding Scheme
2018-09-26 18:26:06 +10:00
baohongde
15fae990c1
component/bt: Fix BTU task watchdog timeout after pair with iphone
...
Create a new pending queue, then re-submit pending requests in old pending queue,preventing new events being inserted into it.
Closes https://github.com/espressif/esp-idf/issues/2191
2018-09-26 11:59:54 +08:00
Mahavir Jain
b5c321d981
esp32: fix regression introduced in automatic light sleep pm
...
Closes: https://github.com/espressif/esp-idf/issues/2459
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
2018-09-26 08:52:15 +05:30
TianZhongXing
01308df8a6
doc: update document of external memory
2018-09-26 10:39:57 +08:00
kooho
bbca0e46ed
driver(interrupt): fix the issue that interrupt might be allocated and freed on different cores
...
closes https://github.com/espressif/esp-idf/issues/2211
2018-09-26 10:31:09 +08:00
qiyueixa
fe4dabe869
mesh: decoupling
...
Remove dependencies which cause mesh code to be linked even if mesh is not used.
2018-09-25 23:49:27 +08:00
michael
d4071a7c19
sdio_slave: fix the ret_queue crash issue when being reset by the master
2018-09-25 20:30:25 +08:00
Jiang Jiang Jian
46ad2c6ad0
Merge branch 'feature/wifi_esptouch_support_both_multicast_and_broadcast_packet' into 'master'
...
esp32: esp-touch supports both multicast and broadcast packets
See merge request idf/esp-idf!3291
2018-09-25 19:48:33 +08:00
Ivan Grokhotkov
e1ac237169
Merge branch 'doc/fix_config_links' into 'master'
...
doc: Fix config links, add navigation lists to config items page
See merge request idf/esp-idf!3310
2018-09-25 18:23:24 +08:00
zhiweijian
9fb188a1d9
Component/bt: add gatts send service change indication API
2018-09-25 08:26:55 +00:00
Ivan Grokhotkov
0139749ba6
esp32: only touch g_ticks_per_us_app in dual core mode
2018-09-25 15:13:47 +08:00
Ivan Grokhotkov
4ff262ecff
ipc: initialise automatically, if called from the app
2018-09-25 15:13:47 +08:00
Jack
2efd6859ed
release memory not used in single core mode
...
1. do not start ipc task in single core mode
2. do not use APP cpu cache memory in single core mode
3. relase data used in rom by APP cpu
2018-09-25 15:13:47 +08:00
Darian Leung
3c362f4d75
esp32: Add missing header file in esp_task.h
...
This commit adds a missing header file in esp_task.h
required for configMAX_PRIORITIES.
Closes #2341
2018-09-25 11:21:23 +08:00
XiaXiaotian
7b7964b47a
esp32: esp-touch supports both multicast and broadcast packets
...
Previously, esp-touch only supports multicast packets which are
transmitted from cellphone. But for most dual frequency routers
whose SSIDs of 5G and 2.4G are the same, broadcast packets are
forwarded from 5G interface to 2.4G interface while multicast
packets are not. In order to make esp-touch work when cellphone
connects to 5G interface of these routers, esp-touch is improved
to support both multicast and broadcast packets. Meanwhile, new
APP which is compiled with Andriod or IOS library(>= v0.3.6.2)
must be used in this situation. Note that for some routers,
broadcast and multicast packets are forwarded from 5G interface
to 2.4G interface only when another WiFi device is connected to
2.4G interface of the router. Old APP which is compiled with
Android or IOS library(< v0.3.6.2) also works with this improvement
when cellphone connects to 2.4G interface of the router.
The Android and IOS library of new esp-touch APP is now available
on Github.
Android: https://github.com/EspressifApp/EsptouchForAndroid
IOS: https://github.com/EspressifApp/EsptouchForIOS
2018-09-25 10:38:01 +08:00
Angus Gratton
96cd3b75cd
Merge branch 'feature/mbedtls_mem_alloc_options' into 'master'
...
mbedtls: configurable options for controlling dynamic memory allocations
See merge request idf/esp-idf!3343
2018-09-25 08:24:29 +08:00
Angus Gratton
66fd7e9cc3
Merge branch 'bugfix/python_gen_empty_partition' into 'master'
...
app_update: Make gen_empty_partition.py Python 2 & 3 compatible
See merge request idf/esp-idf!3347
2018-09-25 08:23:38 +08:00
Angus Gratton
dc135ed1f6
Merge branch 'feature/async_esp_http_client' into 'master'
...
Non Blocking `esp_http_perform()` API in esp_http_client
See merge request idf/esp-idf!3049
2018-09-25 08:20:06 +08:00
Angus Gratton
a4aadd1926
Merge branch 'feature/nvs_encryption' into 'master'
...
nvs_flash: Add support for nvs encryption
See merge request idf/esp-idf!2700
2018-09-25 08:15:55 +08:00
Angus Gratton
6ed00f50be
Merge branch 'bug_fix/multipage_blob_support' into 'master'
...
nvs_util: Fix generation of multipage blob data format
See merge request idf/esp-idf!3349
2018-09-25 08:01:57 +08:00
Jiang Jiang Jian
3665715d4d
Merge branch 'mesh/bugfix' into 'master'
...
mesh: bugfix
See merge request idf/esp-idf!3286
2018-09-24 20:31:31 +08:00
Roland Dobai
baca21050f
app_update: Make gen_empty_partition.py Python 2 & 3 compatible
...
Closes https://github.com/espressif/esp-idf/issues/2457
2018-09-24 12:16:16 +02:00
Shivani Tipnis
7c1360b10a
nvs_util: Fix multipage blob data format generate
2018-09-24 15:44:31 +05:30
Sagar Bijwe
48fccbf5dd
nvs_flash: Add support for nvs encryption
2018-09-24 11:25:21 +05:30
Mahavir Jain
54382277b6
mbedtls: configurable options for controlling dynamic memory allocations
...
Modifies https://github.com/espressif/esp-idf/pull/2237
2018-09-24 11:17:48 +05:30
Jitin George
0aec63c18e
examples/protocols/esp_http_client: Add example for asynchronous HTTP request
2018-09-24 05:42:28 +00:00
Jitin George
5309ca04d1
esp_http_client: Add support for non-blocking feature in esp_http_client_perform() API
...
Four internal APIs `esp_http_client_connect()`, `http_client_prepare_first_line()`, `esp_http_client_request_send()` and
`esp_http_client_send_post_data()` API have been added for perfoming connection establishment (sync as well as async),
preparing first line, sending request and sending post data respectively.
In `transport_ssl`, `ssl_connect_async()` API has been added for establishing asynchronous connection.
2018-09-24 05:42:28 +00:00
Jitin George
1be97fad09
esp-tls: Add support for non blocking connect
2018-09-24 05:42:28 +00:00
Angus Gratton
4d50427e87
Merge branch 'feature/nvs_util_backport' into 'master'
...
nvs_util: Add changes for utility to support old and new multipage blob
See merge request idf/esp-idf!3270
2018-09-24 11:53:29 +08:00
Angus Gratton
ae5df5d6ce
Merge branch 'feature/pthread_attributes' into 'master'
...
pthread : Add support for attributes
See merge request idf/esp-idf!2980
2018-09-24 11:19:41 +08:00
qiyueixa
9c4cc55012
mesh: bugfix
...
1. suppport mesh type, mesh ID, router and IE crypt func&key at any time after mesh is initalized.
2. support modify parent at any time after mesh is configured.
3. modify manual networking example.
4. update header file.
5. fix issues in root conflicts handling.
6. add max length of beacon to menuconfig.
7. fix issue when received a beacon without DSSS.
2018-09-23 21:11:02 +08:00
Jiang Jiang Jian
623641f26c
Merge branch 'bugfix/two_scenario_may_cause_no_disconnect_event_report' into 'master'
...
Wifi: bugfix of two sceanrio may cause no disconnect event report
See merge request idf/esp-idf!3322
2018-09-23 10:58:44 +08:00
Jiang Jiang Jian
da3c6220a5
Merge branch 'bugfix/IPv6_TCP_connection_fail' into 'master'
...
lwip: fix the bug that IPv6 TCP connection fail
See merge request idf/esp-idf!3331
2018-09-23 08:39:34 +08:00
Anurag Kar
f27db1f241
pthread : Add support for attributes and few APIs
...
This introduces the following changes :
* Implmentation added for pthread attribute related functions :
* pthread_attr_init
* pthread_attr_destroy
* pthread_attr_setdetachstate
* pthread_attr_getdetachstate
* pthread_attr_getstacksize
* pthread_attr_setstacksize
* pthread_create now supports passing attributes/configs through pthread_attr_t structure
* pthread_mutex_timedlock added
* pthread_exit added
* memory for joinable thread is freed before returning from pthread_join
2018-09-22 02:35:27 +05:30
Jiang Jiang Jian
93b588a0cf
Merge branch 'bugfix/wpa2_fixes_2' into 'master'
...
wpa_supplicant: more fixes from github
See merge request idf/esp-idf!3255
2018-09-21 20:14:56 +08:00
TianZhongXing
19a67271ef
lwip:move lwip bss segment to psram
2018-09-21 16:20:31 +08:00
TianZhongXing
974112378b
feature: allow .bss segment in external memory
2018-09-21 16:20:26 +08:00
Ivan Grokhotkov
b97e52210a
cmake: add app_trace as FreeRTOS dependency
...
This is needed because FreeRTOSConfig.h includes header file provided
by app_trace when CONFIG_SYSVIEW_ENABLE=y.
2018-09-21 14:58:34 +08:00
Deng Xin
7186475d94
Wifi: bugfix of two sceanrio may cause no disconnect event report
...
Problem Description
set some of routers as the same ssid in the same channel, when 32 in the fast scan connect mode, there may no disconnect event report in that two sceanrio:
1. set the correct password and connect, if target router didn't report 32's auth req before timeout, the state machine change to init but no disconnect event report
2. set a wrong password, if router send disassoc or deauth after run, rather than wait 4 way handshake timeout, the state machine change to init but no disconnect event report
Root Cause
Because the routers are in the same channel, all of them are matched the ssid, so all of them can be instore in the rc list wait for connect, when the first one want to connect fail at auth or receive
disassoc or deauth when password wrong, the rc list is not empty, it can not send disconnect event because rc is not empty
Solution
1. put the fail the router in the blacklist
2. Judge whether there is another router can be connect, if it has, try to connect with the next one
VNC MR 561
2018-09-21 06:22:20 +00:00
Roland Dobai
bf443a763f
tools: Support overwrite of includes for gen_esp_err_to_name.py
...
gen_esp_err_to_name.py includes files like
components/lwip/include/apps/esp_ping.h as "apps/esp_ping.h" because all
subdirectories of "include" are used. If "components/lwip/include/apps"
is in the path of the compiler instead of "components/lwip/include" then
include "apps/esp_ping.h" will fail. This fix allows to process lines
like:
'// gen_esp_err_to_name.py: some text "esp_ping.h" some text'
in header files for overwriting the include.
2018-09-21 14:09:37 +08:00
Ivan Grokhotkov
f8750eb58d
lwip: add compatibility headers for sntp.h and esp_ping.h
...
Before LwIP was moved into a submodule, sntp and esp_ping were
available as the following includes:
#include "apps/sntp/sntp.h"
#include "esp_ping.h"
This commit makes header files available at the old location, and adds
a deprecation warning for sntp.h.
Closes https://github.com/espressif/esp-idf/issues/2392
2018-09-21 14:09:37 +08:00
Ivan Grokhotkov
2e6e87816c
Merge branch 'feature/crosstool_backport' into 'master'
...
Backport of work of gcc8 toolchain to v3
See merge request idf/esp-idf!3154
2018-09-21 14:07:41 +08:00
zhiweijian
81e7689bf3
Component/bt: fix get bond list error sometimes
2018-09-21 02:44:16 +00:00
zhangyanjiao
e7d6c861b5
lwip: fix the bug that IPv6 TCP connection fail
...
The lwip code didn't create an new mld group when netif is up,
this will lead to the server can't find the matching netif when
receiving NS(neighbor solicitation) packet
2018-09-21 10:17:20 +08:00
Michael (Xiao Xufeng)
4af51833f3
spi_master: add new polling mode to decrease time cost each transaction
2018-09-20 19:46:46 +08:00
Anton Maklakov
3004744f2c
Merge branch 'bugfix/py273_gen_esp32part' into 'master'
...
partition_table: Fix encoding for Python 2.7.3
See merge request idf/esp-idf!3330
2018-09-20 19:06:52 +08:00
Anton Maklakov
7b4054a468
espcoredump: Fix a test case of new gdb from the new toolchain
2018-09-20 18:53:15 +08:00
Anton Maklakov
0d1285ebcf
bluetooth: fix indentation warning
2018-09-20 18:53:15 +08:00
Anton Maklakov
d6a5cd6e82
mqtt: silence a format warning
2018-09-20 18:53:15 +08:00
Anton Maklakov
d4cbfd34cc
cmake: silence some warnings in coap, bt, expat, libsodium, lwip and examples/bluetooth
2018-09-20 18:53:15 +08:00
Anton Maklakov
3471d369f9
lwip: silence uninitialized and fallthrough warnings
2018-09-20 18:53:15 +08:00
Anton Maklakov
ccbe517702
vfs: fix a fallthrough comment to silence the warning
2018-09-20 18:53:15 +08:00
Anton Maklakov
fdb369c76f
test/cxx: Test for exception from libstdc++ with -fno-exceptions
2018-09-20 18:53:15 +08:00
Alexey Gerenkov
e0f7e196f2
cxx: don’t define stubs for __throw_* functions
...
If exception support is disabled in IDF, and libstdc++ tries to throw
an exception, it will call __cxa_allocate_exception which is replaced
with abort in IDF.
We have a dramatically size reduction of the RO-section in binary when using '__throw_'-stubs in GCC5
In the case of using GCC8, we are faced with 'multiple definition' errors when using '__throw_'-stubs.
Good that we don't have the size problem due to gcc8
2018-09-20 18:53:15 +08:00
Alexey Gerenkov
f0c15e749a
gcov: use GCC API to control GCOV data dumps
2018-09-20 18:53:14 +08:00
Anton Maklakov
9a55557ad8
build system: Add a compatible old GCC flag
2018-09-20 18:53:14 +08:00
Ivan Grokhotkov
51c9b6b82d
bt: disable implicit fall through warnings
2018-09-20 18:53:14 +08:00
Ivan Grokhotkov
dd5d01a83e
bt: silence unused const variables warning
2018-09-20 18:53:14 +08:00
Jiang Jiang Jian
d68df94d2b
Merge branch 'bugfix/fix_the_bug_create_socket_fail' into 'master'
...
LWIP: fix the bug that failed to create socket
See merge request idf/esp-idf!3300
2018-09-20 18:43:58 +08:00
Roland Dobai
4465dc29bb
partition_table: Fix encoding for Python 2.7.3
...
struct.pack can handle Unicode argument in latest Python 2.7 but cannot
(at least) in 2.7.3.
2018-09-20 12:01:54 +02:00
Angus Gratton
8cf0f36dcc
Merge branch 'feature/ecc_crypto_wrappers' into 'master'
...
wpa_supplicant: Implement BIGNUM and ECC crypto wrapper apis for ESP using mbedtls
See merge request idf/esp-idf!3225
2018-09-20 13:46:08 +08:00
Ivan Grokhotkov
9188cb066a
mbedtls: update to 2.13.1
...
See release notes:
https://github.com/ARMmbed/mbedtls/releases/tag/mbedtls-2.13.0
2018-09-20 04:35:45 +00:00
Ivan Grokhotkov
07211ffeff
Merge branch 'bugfix/py23_nvs_flash_division' into 'master'
...
nvs_flash: fix division for Python 2 & 3
See merge request idf/esp-idf!3292
2018-09-20 12:10:18 +08:00
Ivan Grokhotkov
f5e772242d
Merge branch 'feature/py23_partition_table' into 'master'
...
partition_table: Add Python 2 & 3 support
See merge request idf/esp-idf!3290
2018-09-20 12:09:12 +08:00
Ivan Grokhotkov
af453841ea
Merge branch 'bugfix/ci_cmake_examples' into 'master'
...
CI/cmake: Fix cmake example build failures, gcov
See merge request idf/esp-idf!3296
2018-09-20 12:05:07 +08:00
Jiang Jiang Jian
7657c1c7d4
Merge branch 'bugfix/btdm_fix_crash_when_test_multi_connect' into 'master'
...
Component/bt: fix crash when test multi_connect
See merge request idf/esp-idf!3274
2018-09-20 12:04:18 +08:00
Ivan Grokhotkov
2e411aeccb
Merge branch 'bugfix/ethernet_infinite_loop' into 'master'
...
ethernet: fix infinite loop when init phy or reset mac
See merge request idf/esp-idf!3307
2018-09-20 11:59:51 +08:00
Ivan Grokhotkov
c09d4787ef
Merge branch 'bugfix/parttool_spaces' into 'master'
...
Remove trailing spaces from parttool.py output
See merge request idf/esp-idf!3317
2018-09-20 11:58:40 +08:00
Jiang Jiang Jian
ffbe5b7ae5
Merge branch 'bugfix/btdm_fix_iphoneX_error_when_get_wifi_list' into 'master'
...
Component/bt: fix iPhoneX error when getting wifi list
See merge request idf/esp-idf!3303
2018-09-20 10:54:43 +08:00
Jiang Jiang Jian
57573d0ed7
Merge branch 'feature/btdm_add_clear_rand_addr_API' into 'master'
...
component/bt: add clear rand address API
See merge request idf/esp-idf!3137
2018-09-20 10:47:37 +08:00
morris
20b7f0ec87
ethernet: fix infinite loop when init phy or reset mac
...
1. fix infinite loop problem when init phy device
2. fix infinite loop problem when reset mac
3. fix little bugs in ethernetif_init
4. fix incompatible return value between lwip and esp-idf
Closes https://github.com/espressif/esp-idf/issues/2331
Closes https://github.com/espressif/esp-idf/issues/2141
2018-09-20 10:09:38 +08:00
Angus Gratton
930ddf2b2c
Merge branch 'bugfix/use_component_srcs' into 'master'
...
List files manually for recently added components
See merge request idf/esp-idf!3315
2018-09-20 07:27:37 +08:00
Shivani Tipnis
ca3acef82c
nvs_util: Add support for old and new multipage blob
2018-09-19 22:00:08 +05:30
zhangyanjiao
f2d3efd875
lwip: fix the bug that failed to create socket
...
Closes: https://github.com/espressif/esp-idf/issues/2403
https://github.com/espressif/esp-idf/issues/2414
2018-09-19 09:44:28 +00:00
Ivan Grokhotkov
4e9338e357
Merge branch 'test/fix_incorrect_connect_ap_command' into 'master'
...
test: fix case use depreacated sta connect command
See merge request idf/esp-idf!3309
2018-09-19 17:39:58 +08:00
Renz Bagaporo
8f85fa1bfb
tcp_transport: list files manually in component cmake file
2018-09-19 16:48:31 +08:00
Renz Bagaporo
8fdfc22e2e
mqtt: list files manually in component cmake file
2018-09-19 16:48:12 +08:00
Angus Gratton
9add51bc6d
doc: Re-add summaries of what children each menu item has
...
Slightly different to the original version of this, but same goal.
2018-09-19 17:27:48 +10:00
zhiweijian
fdc352d090
Component/bt: fix iPhoneX error when getting wifi list
2018-09-19 15:17:57 +08:00
Ivan Grokhotkov
789855e71b
esp32: abort when running on single core chip in dual core mode
...
Ref. https://esp32.com/viewtopic.php?f=2&t=7307
2018-09-19 15:05:26 +08:00
Sagar Bijwe
112244bac4
wpa_supplicant: Implement BIGNUM and ECC crypto wrapper apis for ESP using mbedtls
2018-09-19 11:10:28 +05:30
He Yin Ling
60f0e9b77b
test: fix case use depreacated sta connect command
2018-09-19 13:31:56 +08:00
Angus Gratton
440b08c128
Merge branch 'bugfix/py23_unit_test' into 'master'
...
Correct Python 3 support for some test related scripts
See merge request idf/esp-idf!3236
2018-09-19 12:39:24 +08:00
Angus Gratton
b38a6da74b
cmake: Fix some failing example builds, fix gcov
2018-09-19 14:38:19 +10:00
Deomid Ryabkov
d40bfd21dc
Remove trailing spaces from parttool.py output
2018-09-18 16:49:30 +03:00
Roland Dobai
9dc024bc4c
partition_table: Add Python 2 & 3 support
2018-09-18 14:10:55 +02:00
Jiang Jiang Jian
72aaeb26ac
Merge branch 'bugfix/btdm_fix_save_error_key_in_smp_when_reconnect' into 'master'
...
Component/bt: fix save error key in smp when reconnect
See merge request idf/esp-idf!3251
2018-09-18 20:06:38 +08:00
Roland Dobai
da6479e6b7
Correct Python 3 support for some test related scripts
2018-09-18 09:55:51 +00:00
Ivan Grokhotkov
91f7a9a9e7
Merge branch 'feature/lwip_task_affinity' into 'master'
...
lwip: allow setting LwIP tasks affinity via sdkconfig
See merge request idf/esp-idf!2913
2018-09-18 15:10:17 +08:00
Angus Gratton
3276a1316f
Merge branch 'feature/cleanup_freertos_hooks' into 'master'
...
Cleanup freertos idle/tick hooks functionality
See merge request idf/esp-idf!3131
2018-09-18 08:07:41 +08:00
Angus Gratton
822fdd6e53
Merge branch 'feature/tasks_can_return' into 'master'
...
freertos: enclose task functions in wrapper function
See merge request idf/esp-idf!2935
2018-09-18 07:38:24 +08:00
Angus Gratton
3246404740
Merge branch 'bugfix/cmake_make_flash_target' into 'master'
...
cmake: Fix "make flash" & "ninja flash" targets
See merge request idf/esp-idf!3260
2018-09-18 07:31:57 +08:00
Roland Dobai
7183112cc4
nvs_flash: fix division for Python 2 & 3
2018-09-17 16:01:54 +02:00
zwj
fa00e6d4f7
component/bt: add clear rand address API
2018-09-17 20:09:03 +08:00
Mahavir Jain
ff81dc16e0
freertos: cleanup tick/idle hook functionality
...
If CONFIG_FREERTOS_LEGACY_HOOKS is kept enabled then defining
idle/tick hooks will be applications responsibility as was the
case earlier.
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
2018-09-17 17:05:17 +05:30
Mahavir Jain
152043d469
esp_ringbuf: move ringbuf to seperate component
...
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
2018-09-17 17:04:57 +05:30
Mahavir Jain
b0ef95b6eb
task_wdt: correct critical section API in ISR context
...
Signed-off-by: Mahavir Jain <mahavir@espressif.com>
2018-09-17 16:11:15 +05:30
Ivan Grokhotkov
5d1ccb9501
lwip: allow setting LwIP tasks affinity via sdkconfig
...
In some cases applications need to ensure that WiFi/BT related tasks
run on CPU1. This option can be used to set task affinity in such case.
https://github.com/espressif/esp-idf/issues/2233#issuecomment-409220381
2018-09-17 18:17:52 +08:00
Ivan Grokhotkov
5bcb7e26d7
freertos: add Kconfig FREERTOS_NO_AFFINITY constant
...
Use in place of tskNO_AFFINITY in Kconfig files
2018-09-17 18:17:52 +08:00
Jiang Jiang Jian
25c8ecaaf5
Merge branch 'bugfix/tw24884_fix_ampdu_sequence_compitable_issue' into 'master'
...
esp32: Fix AMPDU sequence incompitable bug
See merge request idf/esp-idf!3200
2018-09-17 18:07:14 +08:00
Jiang Jiang Jian
d41ee5c628
Merge branch 'bugfix/btdm_enable_modem_sleep_by_default' into 'master'
...
bugfix/btdm_enable_modem_sleep_by_default
See merge request idf/esp-idf!3284
2018-09-17 16:17:34 +08:00
Liu Zhi Fu
0828e8bd53
esp32: fix AMPDU sequence compitability issue
...
Fix AMPDU RX sequence compitability issue when connecting to some special APs, such as Mercury, Fast etc
2018-09-17 13:57:59 +08:00
Ivan Grokhotkov
eea49d250a
Merge branch 'feature/dhcp_skip_discovery' into 'master'
...
DHCP restore last ip and skip discovery
See merge request idf/esp-idf!3132
2018-09-17 12:27:56 +08:00
Ivan Grokhotkov
c305bd09dc
Merge branch 'bugfix/ethernet_low_level_output' into 'master'
...
ethernet: fix some bugs and complete some optimization
See merge request idf/esp-idf!3235
2018-09-17 11:33:50 +08:00
MartinValik
2e79baa1db
lwip: DHCP restore last IP
...
Closes https://github.com/espressif/esp-idf/issues/799
2018-09-17 11:11:25 +08:00
Ivan Grokhotkov
49125a87bb
Merge branch 'bugfix/mdns-lwip-update' into 'master'
...
Update network code for mDNS to work with newest LwIP
See merge request idf/esp-idf!3268
2018-09-17 10:42:04 +08:00
wangmengyang
bca2e110fc
component/bt: enable bluetooth modem sleep as default setting
2018-09-17 10:38:13 +08:00
morris
3063a62e3e
ethernet: fix some bugs in ethernet driver
...
1. create a new pbuf to squash linked pbuf
2. optimize emac driver by adding ESP_IRAM_ATTR
3. remove duplicated function declare in esp_eth.h
4. remove duplicated code in emac_setup_tx_desc
5. disable Promiscuous mode
2018-09-17 10:12:46 +08:00
Ivan Grokhotkov
0c6ff65b34
Merge branch 'bugfix/bootloader_set_freq' into 'master'
...
soc: fix CPU frequency not updated in rtc_clk_init
See merge request idf/esp-idf!3256
2018-09-17 09:49:43 +08:00
Jiang Jiang Jian
518942ec61
Merge branch 'bugfix/tw24694_dns_request_no_reply' into 'master'
...
lwip: add code for sending gratuitous ARP periodically
See merge request idf/esp-idf!3241
2018-09-16 15:18:32 +08:00
Jiang Jiang Jian
67160b2236
Merge branch 'bugfix/mdns_memory_leak' into 'master'
...
feat(mdns): fix bug when clean action memory
See merge request idf/esp-idf!3276
2018-09-16 15:04:46 +08:00
Deng Xin
427fa52276
Wifi: Optimize scan capability
2018-09-14 22:25:28 +08:00
Jiang Jiang Jian
18a893bd35
Merge branch 'bugfix/btdm_unreserve_scn1_for_hfp' into 'master'
...
component/bt: Unlock reserve of SCN 1 for HFP
See merge request idf/esp-idf!3269
2018-09-14 19:49:47 +08:00
Jiang Jiang Jian
8001737d3e
Merge branch 'bugfix/ble_adv_data_tx_power' into 'master'
...
fix TX power value in ble adv data is incorrect
See merge request idf/esp-idf!3185
2018-09-14 19:46:16 +08:00
me-no-dev
3ec0e7e2d2
Update network code for mDNS to work with newest LwIP
...
- Uses one PCB that listens to all interfaces
- Manages multicast groups for each interface
2018-09-14 11:02:47 +02:00
Liu Han
3d4deb9726
feat(mdns): fix bug when clean action memory
2018-09-14 15:36:52 +08:00
Liu Zhi Fu
9121ba22e9
esp32: fix some bugs of modem sleep
...
1. Keep awake to receive beacon at TBTT time no matter which state
station is on.
2. If there is any packet to send on dream or sleep state, send NULL
data with power save bit clear first.
2018-09-14 15:12:34 +08:00
Angus Gratton
773fb42a3a
Merge branch 'bugfix/mqtt_move_kconfig_to_idf' into 'master'
...
MQTT: Moved Kconfig from esp-mqtt submodule to esp-idf to support docs genration in RTD
See merge request idf/esp-idf!3265
2018-09-14 15:05:13 +08:00
baohongde
738522f1a3
component/bt: Unlock reserve of SCN 1 for HFP
2018-09-14 06:22:58 +00:00
Ivan Grokhotkov
31c14a5ee4
Merge branch 'feature/py3_espcoredump' into 'master'
...
espcoredump: Add tests and Python3 support
See merge request idf/esp-idf!3212
2018-09-14 12:39:30 +08:00
Angus Gratton
61835faed1
Merge branch 'bugfix/tcpip_stack_size_default' into 'master'
...
Default stack size for TCPIP task increased to avoid stack overflow.
See merge request idf/esp-idf!3258
2018-09-14 12:23:35 +08:00
David Cermak
1f8bf057a0
MQTT: Moved Kconfig from esp-mqtt submodule to esp-idf to support docs genration in RTD
2018-09-14 04:22:13 +00:00
zhiweijian
d0721e8f6d
Component/bt: fix crash when test multi_connect
2018-09-14 11:18:44 +08:00
Darian Leung
3ba63a520c
freertos: Add task function wrapper
...
This commit adds an option to enclose all FreeRTOS task functions within a
wrapper function. In the case that a task function returns, the wrapper function
will log an error and abort the application immediately.
Closes #2269
Closes #2300
2018-09-14 11:07:54 +08:00