]>
granicus.if.org Git - esp-idf/log
Jiang Jiang Jian [Thu, 22 Jun 2017 08:38:14 +0000 (16:38 +0800)]
Merge branch 'bugfix/hci_acl_ctlr_to_host_fc' into 'master'
component/bt: bugfix for NULL pointer access when HCI CTLR to HOST flow control is in use
See merge request !907
wangmengyang [Thu, 22 Jun 2017 06:59:51 +0000 (14:59 +0800)]
component/bt: bugfix for NULL pointer access when HCI CTLR to HOST flow control is in use
Ivan Grokhotkov [Thu, 22 Jun 2017 03:48:34 +0000 (11:48 +0800)]
Merge branch 'bugfix/vfs_write_return_type' into 'master'
Change esp_vfs_t.write return value to ssize_t
See merge request !897
Jiang Jiang Jian [Thu, 22 Jun 2017 03:03:01 +0000 (11:03 +0800)]
Merge branch 'bugfix/btdm_modify_some_log_info' into 'master'
component /bt: modify some log infor
See merge request !905
Jiang Jiang Jian [Wed, 21 Jun 2017 13:24:54 +0000 (21:24 +0800)]
Merge branch 'bugfix/hci_le_rd_rmt_used_feats' into 'master'
component/bt: bugfix for hci_le_rd_rmt_used_feats_cmd handler which does not check connection state
See merge request !904
wangmengyang [Wed, 21 Jun 2017 07:52:32 +0000 (15:52 +0800)]
component/bt: bugfix for hci_le_rd_rmt_used_feats_cmd handler which does not check connection state
zhiweijian [Tue, 20 Jun 2017 09:54:28 +0000 (17:54 +0800)]
Component /bt: modify some log infor
Ivan Grokhotkov [Tue, 20 Jun 2017 09:27:08 +0000 (17:27 +0800)]
Merge branch 'bugfix/uxTaskGetSystemState_github_#12142' into 'master'
Bugfix for uxTaskGetSystemState
See merge request !883
Ivan Grokhotkov [Tue, 20 Jun 2017 09:25:03 +0000 (17:25 +0800)]
Merge branch 'bugfix/doc_bugfixes' into 'master'
Corrected small issues in documentation, fixes #694 and merges #706
See merge request !894
Jiang Jiang Jian [Tue, 20 Jun 2017 09:12:44 +0000 (17:12 +0800)]
Merge branch 'bugfix/tw13318_wifi_fail_connect_to_TP842N' into 'master'
esp32: update wifi lib to fix two wifi connect issues
See merge request !893
krzychb [Mon, 19 Jun 2017 20:15:05 +0000 (22:15 +0200)]
Fixed link to JTAG Debugging for ESP32
krzychb [Mon, 19 Jun 2017 20:12:54 +0000 (22:12 +0200)]
[TW#13322] Typo in documentation, fixes #694
José Luis Aracil Gómez del Campo [Fri, 16 Jun 2017 15:34:47 +0000 (17:34 +0200)]
Update README.md, merges #706
Signed-off-by: krzychb <krzychb@gazeta.pl>
Liu Zhi Fu [Mon, 19 Jun 2017 13:23:24 +0000 (21:23 +0800)]
esp32: update wifi lib to fix a wifi connect issue
Fix WiFi fails to connect TP842N bug
Anton Maklakov [Mon, 19 Jun 2017 08:19:49 +0000 (16:19 +0800)]
Merge branch 'fix/ci_deps_optimize' into 'master'
Optimize CI dependences
See merge request !851
Anton Maklakov [Mon, 12 Jun 2017 07:22:09 +0000 (15:22 +0800)]
CI: Add CI options to use more attempts in some transfer situations
Anton Maklakov [Fri, 9 Jun 2017 10:14:29 +0000 (18:14 +0800)]
CI: Minor changes in code formatting and cleanup
Anton Maklakov [Fri, 9 Jun 2017 11:05:17 +0000 (19:05 +0800)]
CI: Put in order the job dependences
He Yin Ling [Thu, 8 Jun 2017 03:55:27 +0000 (11:55 +0800)]
CI: check if internal submodule synced to GH
See MR !834
Ivan Grokhotkov [Mon, 19 Jun 2017 03:16:13 +0000 (11:16 +0800)]
Merge branch 'bugfix/ci_build_ssc_workaround' into 'master'
CI build_ssc: Workaround for the SSC build error
See merge request !885
Anton Maklakov [Fri, 16 Jun 2017 08:31:46 +0000 (16:31 +0800)]
CI build_ssc: Workaround for the SSC build error
Angus Gratton [Mon, 19 Jun 2017 00:59:20 +0000 (08:59 +0800)]
Merge branch 'feature/add_wrover_kit_v3_doc' into 'master'
Add WROVER-KIT v3 hw to hw reference
See merge request !818
Angus Gratton [Mon, 19 Jun 2017 00:37:10 +0000 (08:37 +0800)]
Merge branch 'feature/esptool_v20' into 'master'
esptool: Update to v2.0 final release
See merge request !862
Jiang Jiang Jian [Fri, 16 Jun 2017 08:52:38 +0000 (16:52 +0800)]
Merge branch 'bugfix/btdm_ble_client_muti_conn_issue' into 'master'
component/bt: change the MAX_L2CAP_CHANNELS macro from 2 to MAX_ACL_CONNECTIONS …
See merge request !882
Darian Leung [Fri, 16 Jun 2017 03:49:48 +0000 (11:49 +0800)]
BugFix: uxTaskGetSystemState test case update
Updated test case to include configASSERT cases (+1 squashed commits)
Squashed commits:
[
871ec26f ] Freertos:Bugfix uxTaskGetSystemState
Bug (github #12142) with uxTaskGetSystemState where
if called immediately after creating a bunch of tasks,
those tasks would be added twice into the TaskStatusArray.
Bug caused due to use old implementation using vTaskSuspendAll
which did not stop newly created task on other core from accessing the
read/waiting task lists whilst the list were being read by
uxTaskGetSystemState. Fixed bug by replacing vTaskSuspendAll
with taskENTER_CRITICAL and added test case for the bugfix
Yulong [Fri, 16 Jun 2017 07:46:46 +0000 (03:46 -0400)]
component/bt: change the MAX_L2CAP_CHANNELS macro from 2 to MAX_ACL_CONNECTIONS when in the BLE only mode.
Jiang Jiang Jian [Fri, 16 Jun 2017 07:43:04 +0000 (15:43 +0800)]
Merge branch 'bugfix/pcnt_reset' into 'master'
pcnt: Fix pcnt_set_pin/pcnt_counter_clear reported on github
See merge request !872
Jiang Jiang Jian [Fri, 16 Jun 2017 07:29:56 +0000 (15:29 +0800)]
Merge branch 'bugfix/rtc_time_issues' into 'master'
Fixes for RTC time issues
See merge request !849
Jiang Jiang Jian [Fri, 16 Jun 2017 07:04:01 +0000 (15:04 +0800)]
Merge branch 'bugfix/spi_flash_large_writes' into 'master'
spi_flash: Fix large writes, unaligned writes, and writes from flash
See merge request !843
Jiang Jiang Jian [Fri, 16 Jun 2017 07:03:03 +0000 (15:03 +0800)]
Merge branch 'bugfix/phy_init_procedure' into 'master'
component/esp32 : fix phy init with NULL init_data
See merge request !879
Nilay [Fri, 16 Jun 2017 05:48:00 +0000 (11:18 +0530)]
PCNT: fix for pcnt_set_pin API, it can now use all pcnt channels
Nilay [Fri, 16 Jun 2017 05:41:52 +0000 (11:11 +0530)]
PCNT: Fixed pcnt_counter_clear, Pulse Count now able to resume after API call
Jiang Jiang Jian [Fri, 16 Jun 2017 05:18:41 +0000 (13:18 +0800)]
Merge branch 'bugfix/btdm_conn_enhanecd_issue' into 'master'
component/bt: added the temp enhanced to solve the conn_interval not collect issues.
See merge request !881
Tian Hao [Thu, 15 Jun 2017 10:37:53 +0000 (18:37 +0800)]
component/esp32 : fix phy init with NULL init_data
1. fix phy init with NULL init_data
2. do full calibration without CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE
3. fix libphy.a printf
Ivan Grokhotkov [Mon, 12 Jun 2017 11:51:17 +0000 (19:51 +0800)]
esp32: make time monotonic across resets
Small changes to clock calibration value will cause increasing errors
the longer the device runs. Consider the case of deep sleep, assuming
that RTC counter is used for timekeeping:
- before sleep:
time_before = rtc_counter * calibration_val
- after sleep:
time_after = (rtc_counter + sleep_count) * (calibration_val + epsilon)
where 'epsilon' is a small estimation error of 'calibration_val'.
The apparent sleep duration thus will be:
time_after - time_before = sleep_count * (calibration_val + epsilon)
+ rtc_counter * epsilon
Second term on the right hand side is the error in time difference
estimation, it is proportional to the total system runtime (rtc_counter).
To avoid this issue, this change makes RTC_SLOW_CLK calibration value
persistent across restarts. This allows the calibration value update to
be preformed, while keeping time after update same as before the update.
Jiang Jiang Jian [Fri, 16 Jun 2017 03:36:27 +0000 (11:36 +0800)]
Merge branch 'bugfix/always_disable_ints_in_critical_region' into 'master'
Always disable interrupts in a critical region
See merge request !821
Yulong [Thu, 15 Jun 2017 14:15:49 +0000 (10:15 -0400)]
component/bt: added the temp enhanced to solve the conn_interval not collect issues.
Jiang Jiang Jian [Thu, 15 Jun 2017 14:10:13 +0000 (22:10 +0800)]
Merge branch 'bugfix/sw_reset_fixes' into 'master'
Fixes for esp_restart
See merge request !865
Jiang Jiang Jian [Thu, 15 Jun 2017 13:28:36 +0000 (21:28 +0800)]
Merge branch 'bugfix/classicBT_SMP_dependence' into 'master'
component/bt: add constraint in Kconfig to enable SMP_ENABLE when using classic BT
See merge request !877
Jiang Jiang Jian [Thu, 15 Jun 2017 12:45:57 +0000 (20:45 +0800)]
Merge branch 'bugfix/intrrupt_num_conflict' into 'master'
component/bt : fix interrupt number conflict
See merge request !878
wangmengyang [Thu, 15 Jun 2017 07:48:20 +0000 (15:48 +0800)]
component/bt: add constraint in Kconfig to enable SMP_ENABLE when using classic BT
1. For now, some security related functions used in classic Bluetooth are controlled by "SMP_ENABLE". This commit fixes the dependency.
2. The two options, "CLASSIC_BT_ENABLED" and "SMP_ENABLED" The two options will be decoupled in the future.
Jiang Jiang Jian [Thu, 15 Jun 2017 11:51:22 +0000 (19:51 +0800)]
Merge branch 'bugfix/btdm_add_set_pkt_data_length_evt_cback' into 'master'
component / bt: add set pkt data length event callback
See merge request !869
Tian Hao [Thu, 15 Jun 2017 09:20:25 +0000 (17:20 +0800)]
component/bt : fix interrupt number conflict
1. the typical problem is when push keyboard on serial tool, the bluetooth may stop.
Ivan Grokhotkov [Thu, 15 Jun 2017 10:11:58 +0000 (18:11 +0800)]
libsodium: don’t link tests when TEST_ALL=1 is used
Currently libsodium tests add about 800kB to the binary, which is too
much for a partition table constrained to 2MB. Disable libsodium tests
until we start building multiple unit test apps for different subsets.
Ivan Grokhotkov [Thu, 15 Jun 2017 10:00:49 +0000 (18:00 +0800)]
esp_system: remove link time dependency on WiFi stack
- esp_restart will not pull in WiFi stack (if it is not used otherwise)
- esp_restore is moved into a separate file to break link time
dependency
Ivan Grokhotkov [Thu, 15 Jun 2017 09:58:57 +0000 (17:58 +0800)]
cxx: don’t pull libstdc++ local support in unit tests
Ivan Grokhotkov [Thu, 15 Jun 2017 09:58:19 +0000 (17:58 +0800)]
unit-test-app: increase space for factory partition to 1280K
Ivan Grokhotkov [Wed, 14 Jun 2017 10:07:15 +0000 (18:07 +0800)]
esp32: reset APP CPU when doing esp_restart
This fixes a bug introduced by !848, where APP CPU would not be reset
during esp_restart, if esp_restart was called from a task running on APP
CPU, and wouldn’t be reset by PRO CPU on startup.
This change replaces stalling APP CPU with resetting it.
Also adds a non-automated esp_restart tests.
Ivan Grokhotkov [Wed, 14 Jun 2017 10:00:26 +0000 (18:00 +0800)]
esp32: disable DPORT access protection when doing esp_restart
DPORT access protection can not work when the other CPU is stalled.
Writes to DPORT registers in esp_restart caused the program to hang due
to access protection, and the reset happened due to RTC_WDT, not SW_RST.
This change adds esp_dport_access_int_deinit function and calls it from
esp_restart once the other core is stalled.
Ivan Grokhotkov [Wed, 14 Jun 2017 09:56:32 +0000 (17:56 +0800)]
bootloader: workaround for clock switching bug in ESP32 rev. 0
In ESP32 rev. 0, switching between 240MHz and 80MHz (even via an
intermediate frequency of 40MHz) may cause the chip to lock up.
The bootloader used to enable 80MHz CPU clock at startup, which could
cause lock up after software reset. With this change, if 240MHz CPU
clock is enabled in menuconfig, bootloader will also use 240MHz to avoid
lock-up.
zhiweijian [Wed, 14 Jun 2017 13:19:48 +0000 (21:19 +0800)]
component / bt: add set pkt data length event callback
Jiang Jiang Jian [Thu, 15 Jun 2017 07:38:21 +0000 (15:38 +0800)]
Merge branch 'bugfix/btdm_hci_example' into 'master'
component/bt : fix controller_hci_uart sdkconfig.defaults
See merge request !876
Jiang Jiang Jian [Thu, 15 Jun 2017 07:14:10 +0000 (15:14 +0800)]
Merge branch 'bugfix/btdm_cherry_pick_hit_limit_github_#12259' into 'master'
component/bt: cherry-pick the btdm_hit_limit_github_#12259 branch to this branch.
See merge request !867
Jiang Jiang Jian [Thu, 15 Jun 2017 07:10:52 +0000 (15:10 +0800)]
Merge branch 'bugfix/btdm_ll_get_remote_feature' into 'master'
component/bt: Fix can't get remote's feature bug
See merge request !871
Tian Hao [Thu, 15 Jun 2017 06:23:08 +0000 (14:23 +0800)]
component/bt : fix controller_hci_uart sdkconfig.defaults
Yulong [Thu, 15 Jun 2017 06:13:31 +0000 (02:13 -0400)]
component/bt: Added the lmp_verion default value to 4.0.
Jiang Jiang Jian [Thu, 15 Jun 2017 05:37:31 +0000 (13:37 +0800)]
Merge branch 'bugfix/btdm_blufi' into 'master'
component/bt : fix blufi second init fail bug
See merge request !866
Yulong [Thu, 15 Jun 2017 03:40:25 +0000 (23:40 -0400)]
component/bt: Change the return position in the btc_gatts_inter_cb function.
Jiang Jiang Jian [Thu, 15 Jun 2017 03:20:12 +0000 (11:20 +0800)]
Merge branch 'bugfix/fail_to_disconn_after_pair_#13172' into 'master'
component/bt: Added the judgment to check the address is public or not.
See merge request !868
Jiang Jiang Jian [Thu, 15 Jun 2017 03:06:04 +0000 (11:06 +0800)]
Merge branch 'bugfix/fix_wifi_assert_at_ieee80211_output_line_733' into 'master'
fix the bug that wifi assert at ieee80211_output.c line 733
See merge request !870
Tian Hao [Wed, 14 Jun 2017 10:42:15 +0000 (18:42 +0800)]
component/bt : fix blufi second init fail bug
Jiang Jiang Jian [Thu, 15 Jun 2017 03:02:35 +0000 (11:02 +0800)]
Merge branch 'bugfix/btdm_gattc_refresh_cache_does_not_work_properly' into 'master'
component /bt: using esp_ble_gattc_cache_refresh() does not work when open event callback
See merge request !864
island [Wed, 14 Jun 2017 10:08:03 +0000 (18:08 +0800)]
component/bt: Fix can't get remote's feature bug
- Slave send version_ind cause some Android 7.0 devices can't encrypt correctly
XiaXiaotian [Wed, 14 Jun 2017 13:20:28 +0000 (21:20 +0800)]
fix the bug that wifi assert at ieee80211_output.c line 733
Yulong [Wed, 14 Jun 2017 13:01:29 +0000 (09:01 -0400)]
component/bt: Added the judgment to check the address is public or not.
Yulong [Wed, 14 Jun 2017 11:14:23 +0000 (07:14 -0400)]
component/bt: cherry-pick the btdm_hit_limit_github_#12259 branch to this branch.
Jiang Jiang Jian [Wed, 14 Jun 2017 09:47:22 +0000 (17:47 +0800)]
Merge branch 'bugfix/i2c_delete_interrupt_race' into 'master'
i2c driver: When deleting, disable interrupts before freeing data structures
See merge request !836
zhiweijian [Wed, 14 Jun 2017 08:45:17 +0000 (16:45 +0800)]
Component /bt: using esp_ble_gattc_cache_refresh() does not work when open event callback.
Jiang Jiang Jian [Wed, 14 Jun 2017 07:16:38 +0000 (15:16 +0800)]
Merge branch 'bugfix/btdm_smp_auth_complete_error' into 'master'
component/bt: Change the btc layer data copy method.
See merge request !844
Jiang Jiang Jian [Wed, 14 Jun 2017 07:12:45 +0000 (15:12 +0800)]
Merge branch 'bugfix/btdm_master_write_service_change_ccc' into 'master'
component/bt: Fix slave initiate service change ccc discovery procedure bug
See merge request !847
Angus Gratton [Wed, 14 Jun 2017 06:58:16 +0000 (14:58 +0800)]
Merge branch 'feature/libsodium' into 'master'
Add libsodium cryptography library component (v1.0.12)
See merge request !852
Jiang Jiang Jian [Wed, 14 Jun 2017 06:01:53 +0000 (14:01 +0800)]
Merge branch 'feature/optimize_task_priority_in_wifi_lib' into 'master'
Optimize priorities of pp, pm, timer, wps and wpa2 tasks.
See merge request !861
Angus Gratton [Mon, 7 Nov 2016 00:54:44 +0000 (11:54 +1100)]
Add libsodium v1.0.12
Run some unit test cases based (poorly) around sodium's test infrastructure.
Increase in unity test task stack is due to signature tests, load a lot of data onto the stack.
Angus Gratton [Wed, 14 Jun 2017 05:45:36 +0000 (13:45 +0800)]
Merge branch 'bugfix/abort_in_interrupt_context' into 'master'
Panic handler backtrace fixes
See merge request !835
Angus Gratton [Wed, 14 Jun 2017 05:41:51 +0000 (15:41 +1000)]
esptool: Update to v2.0 final release
For IDF use, most changes are minor compared to 2.0-beta3.
One notable addition, esptool.py now prints chip model & silicon
revision when it connects.
island [Sun, 11 Jun 2017 13:59:49 +0000 (21:59 +0800)]
component/bt: Fix bug while writing slave's service change characteristic
- Fix slave initiate service discovery procedure
- Fix master re-discovery every time connection established
- Optimize service discovery char ccc write procedure
- Optimize esp_log_buffer function
- Modify default supervision timeout from 20s to 2s
Jiang Jiang Jian [Wed, 14 Jun 2017 03:18:34 +0000 (11:18 +0800)]
Merge branch 'bugfix/btdm_config_bluedroid_mem_debug_github_#12631' into 'master'
component/bt: Change the osi_mem_dbg_init to the esp_bluedroid_init function.
See merge request !860
XiaXiaotian [Tue, 13 Jun 2017 13:04:01 +0000 (21:04 +0800)]
Optimize priorities of pp, pm, timer, wps and wpa2 tasks.
Jiang Jiang Jian [Wed, 14 Jun 2017 02:57:59 +0000 (10:57 +0800)]
Merge branch 'bugfix/wps_receive_m2d_fail_process' into 'master'
ESP32: Add error wps fail reason
See merge request !855
Jiang Jiang Jian [Wed, 14 Jun 2017 02:52:56 +0000 (10:52 +0800)]
Merge branch 'bugfix/btdm_task_post' into 'master'
component/bt : fix task post bug && fix controller init protection
See merge request !856
Yulong [Wed, 14 Jun 2017 02:37:44 +0000 (22:37 -0400)]
component/bt: Added the unhandle log to the btc dm case.
Ivan Grokhotkov [Wed, 14 Jun 2017 01:16:58 +0000 (09:16 +0800)]
Merge branch 'bugfix/doc_adding_to_path' into 'master'
Fixed adding to PATH and setting up IDF_PATH procedures, ref. issue report #656
See merge request !807
Ivan Grokhotkov [Wed, 14 Jun 2017 01:15:59 +0000 (09:15 +0800)]
Merge branch 'bugfix/nvs_max_value_size' into 'master'
nvs: check value size before writing, document limitations
See merge request !796
Ivan Grokhotkov [Wed, 14 Jun 2017 01:14:02 +0000 (09:14 +0800)]
Merge branch 'bugifx/cplusplus_guards' into 'master'
add C++ include guards to header files which are missing them
See merge request !799
Ivan Grokhotkov [Wed, 14 Jun 2017 01:12:55 +0000 (09:12 +0800)]
Merge branch 'bugfix/ulp_fixes' into 'master'
Minor fixes for ULP
See merge request !800
Ivan Grokhotkov [Wed, 14 Jun 2017 01:11:50 +0000 (09:11 +0800)]
Merge branch 'bugfix/esp_event_send_init_check' into 'master'
esp_event_send: check if the event loop is initialized
See merge request !817
Angus Gratton [Wed, 14 Jun 2017 00:35:22 +0000 (08:35 +0800)]
Merge branch 'bugfix/rmt_driver_interrupts' into 'master'
rmt driver: Fix some issues around interrupts
See merge request !837
Angus Gratton [Wed, 14 Jun 2017 00:31:00 +0000 (08:31 +0800)]
Merge branch 'feature/freertos_get_priority' into 'master'
freertos: Mark uxTaskPriorityGet() as tested, add SMP task priority unit tests
See merge request !794
Angus Gratton [Thu, 8 Jun 2017 05:27:50 +0000 (15:27 +1000)]
panic handler: Print backtraces with calling address not return address
This seems to clean up some of the more wrong addr2line output results (not
sure why, something to do with optimisations I think - perhaps the return
address may also be a jump target from some earlier line of the code.)
Deng Xin [Tue, 13 Jun 2017 11:37:22 +0000 (19:37 +0800)]
Merge branch bugfix/wps_receive_m2d_fail_process to master
ESP32: Add error wps fail reason enum in esp_event.h
see merge request !226
Ivan Grokhotkov [Tue, 13 Jun 2017 13:32:50 +0000 (21:32 +0800)]
Merge branch 'test/nvs_compatible_test' into 'master'
test: add WIFI NVS compatible test case
See merge request !812
Jiang Jiang Jian [Tue, 13 Jun 2017 13:14:33 +0000 (21:14 +0800)]
Merge branch 'bugfix/tw13140_fix_assoc_timeout_bug' into 'master'
esp32: update wifi lib to fix assoc timeout issue
See merge request !854
Jiang Jiang Jian [Tue, 13 Jun 2017 13:03:55 +0000 (21:03 +0800)]
Merge branch 'bugfix/btdm_uuid_convert' into 'master'
component/bt : fix uuid convert warning
See merge request !857
Yulong [Tue, 13 Jun 2017 12:52:26 +0000 (08:52 -0400)]
component/bt: Change the osi_mem_dbg_init to the esp_bluedroid_init function.
Tian Hao [Tue, 13 Jun 2017 12:21:59 +0000 (20:21 +0800)]
component/bt : fix uuid convert warning
Liu Zhi Fu [Tue, 13 Jun 2017 08:37:56 +0000 (16:37 +0800)]
esp32: update wifi lib to fix assoc timeout issue
Fix assoc timeout thread-safe issue
Jiang Jiang Jian [Tue, 13 Jun 2017 10:22:39 +0000 (18:22 +0800)]
Merge branch 'bugfix/tw13140_fix_throughput_test_crash_issue' into 'master'
esp32: update wifi lib to fix wifi crash bug
See merge request !840
Jiang Jiang Jian [Tue, 13 Jun 2017 10:18:30 +0000 (18:18 +0800)]
Merge branch 'bugfix/btdm_write_API_to_write_char_get_wrong_status_when_server_response_NULL' into 'master'
component /bt: write_API_to_write_char_get_wrong_status_when_server_response_NULL
See merge request !842
Ivan Grokhotkov [Tue, 13 Jun 2017 10:15:47 +0000 (18:15 +0800)]
Merge branch 'bugfix/app_cpu_reset' into 'master'
esp32: don’t reset APP CPU if it was already reset by OpenOCD
See merge request !848
Jiang Jiang Jian [Tue, 13 Jun 2017 10:14:39 +0000 (18:14 +0800)]
Merge branch 'bugfix/btdm_auth_val_error_#12962' into 'master'
component/bt: correct the security demo pair status code.
See merge request !841