Ivan Grokhotkov
d3d2c077f9
Merge branch 'bugfix/log_invalid_comparison' into 'master'
...
log: fix preprocessor comparison against an enum value
See merge request idf/esp-idf!1865
2018-01-29 17:26:43 +08:00
Ivan Grokhotkov
00da9c1cab
Merge branch 'bugfix/esp_console_header_guards' into 'master'
...
console: Add C++ guards to header
See merge request idf/esp-idf!1867
2018-01-29 14:15:12 +08:00
Angus Gratton
1249659931
Merge branch 'bugfix/system_restore_duplicate' into 'master'
...
esp32: remove duplicate definition of system_restore
See merge request idf/esp-idf!1864
2018-01-29 14:02:02 +08:00
Angus Gratton
2536d50d2e
console: Add C++ guards to header
...
As reported on forum https://esp32.com/viewtopic.php?f=2&t=4478&p=19659
2018-01-29 09:22:04 +08:00
Ivan Grokhotkov
527be440f8
log: fix preprocessor comparison against an enum value
...
Fix `#if (LOG_LOCAL_LEVEL >= ESP_LOG_INFO)` which is always false and
produces a warning with -Wundef.
Use same pattern to compare LOG_LOCAL_LEVEL with ESP_LOG_INFO as is used
in definition of `ESP_LOG_BUFFER_HEX_LEVEL` and
`ESP_LOG_BUFFER_CHAR_LEVEL`.
Also reformat existing definitions for better readability.
Closes https://github.com/espressif/esp-idf/issues/1526
2018-01-28 19:45:25 +08:00
Ivan Grokhotkov
1979235df2
esp32: remove duplicate definition of system_restore
...
Fixes https://github.com/espressif/esp-idf/issues/1520 .
2018-01-28 19:26:37 +08:00
Jiang Jiang Jian
daa8cfa800
Merge branch 'bugfix/btdm_fix_stop_adv_no_callback_when_adv_has_been_stoped' into 'master'
...
Component/bt: fix stop adv no callback when adv has already stoped
See merge request !1838
2018-01-26 20:37:12 +08:00
Jiang Jiang Jian
4cbc0198a0
Merge branch 'bugfix/btdm_fix_BT_load_boned_in_smp' into 'master'
...
Component/bt: fix bt load boned in smp
See merge request !1854
2018-01-26 20:34:24 +08:00
wangmengyang
95af1c22b5
components/phy: add IRAM_ATTR attribute to the two APIs used in phy calibration
...
1. the two APIs used in phy calibration are called in bluetooth baseband ISR, so locate the them in IRAM
2018-01-26 17:12:59 +08:00
zhiweijian
41f338d23c
Component/bt: fix bt load boned in smp
2018-01-26 14:38:54 +08:00
Jiang Jiang Jian
5b1f869880
Merge branch 'feature/btdm_bluedroid_env_dynomic_malloc_enable' into 'master'
...
This MR added the bluedroid env variable can dynamic malloc and BT variable use psram malloc supported
See merge request !1698
2018-01-26 10:06:43 +08:00
XiaXiaotian
1bc87e972b
Added two functions in PHY API for disable interrupts and add rfcal data checking to PHY
2018-01-25 17:58:14 +08:00
zhiweijian
d54e188e61
Component/bt: fix stop adv no callback when adv has been stoped
2018-01-25 15:31:17 +08:00
Jiang Jiang Jian
c73ea7a804
Merge branch 'bugfix/wifi_fix_sniffer_rx_misc_data_assert' into 'master'
...
Fix the bug that in sniffer mode it asserts when receive misc data at first
See merge request !1837
2018-01-25 14:09:46 +08:00
Jiang Jiang Jian
b98da5da97
Merge branch 'bugfix/btdm_classicbt_pscan_assert' into 'master'
...
component/bt : fix the bug of pscan when interrupt react slowly
See merge request !1816
2018-01-25 13:52:00 +08:00
Jiang Jiang Jian
62fade9970
Merge branch 'bugfix/btdm_fix_bonded_device_list_error_after_reboot' into 'master'
...
component/bt: fix bonded device list error after reboot
See merge request !1750
2018-01-25 12:05:58 +08:00
XiaXiaotian
cdd7a87674
Fix the bug that in sniffer mode it asserts when receive misc data at first
...
close github issue#1037 WiFi Promiscuous filter breaks w/
WIFI_PROMIS_FILTER_MASK_ALL and issue#1404
esp_wifi_set_promiscuous_filter set WIFI_PROMIS_FILTER_MASK_ALL error
2018-01-24 16:06:53 +08:00
Yulong
63e5cbbd66
component/bt: Added the bluedroid environment variable dynomic malloc support & support to malloc the memory to the psram.
...
component/bt: Added the Macro for the classic BT support.
component/bt: added the bluedroid deinit method.
component/bt: allow more classic BT global variables to use dynamic allocation scheme
1. allocate memory for AVDT, AVCT control blocks when dynamic memory is used
2. allow SBC decoder buffer to use dynamic allocation scheme
component/bt: Remove the wrong changes in bt/Kconfig & Added the GATTS_INCLUDED in the gatt_free function when gatt service close.
component/bt: Shorten the abbreviation BT_ALLOCATION_FROM_SPIRAM_FIRST and BT_BLE_DYNAMIC_ENV_MEMORY two macros.
2018-01-24 15:18:02 +08:00
Angus Gratton
6736908eaf
esptool: Update to v2.2.1
...
Fixes a bug with >230400bps flashing on macOS, possibly other platforms.
Full release notes: https://github.com/espressif/esptool/releases/tag/v2.2.1
2018-01-24 17:45:49 +11:00
Angus Gratton
2a10ffce5f
Merge branch 'feature/dma_attr' into 'master'
...
feat(attr): add new macro `DMA_ATTR` and `STATIC_DMA_ATTR` to help dma buffer declaration.
See merge request !1550
2018-01-24 12:04:03 +08:00
michael
fcfcab7678
feat(attr): add new macro DMA_ATTR
and WORD_ALIGNED_ATTR
to help dma buffer declaration.
2018-01-24 11:28:14 +08:00
Angus Gratton
d89542eb2b
Merge branch 'bugfix/uart_pattern_detect' into 'master'
...
bugfix(uart): patten detect function
See merge request !1235
2018-01-24 06:12:48 +08:00
Jiang Jiang Jian
ce2e4cbc4f
Merge branch 'bugfix/log_hex_buffer_pr1519' into 'master'
...
Fix hexdump comment and array size. See issue #1518 .
See merge request !1832
2018-01-23 22:45:41 +08:00
Ivan Grokhotkov
ffaf145056
Merge branch 'bugfix/xtal_freq_estimation' into 'master'
...
soc/rtc_clk: fix loss of precision in estimation of XTAL frequency
See merge request !1763
2018-01-23 15:37:47 +08:00
Ivan Grokhotkov
02821571dd
Merge branch 'bugfix/xRingbufferSend_timeout_bug' into 'master'
...
bugfix(ringbuffer): Fix ringbuffer_send timeout bug
See merge request !1823
2018-01-23 15:37:13 +08:00
Angus Gratton
ffd4187883
Merge branch 'feature/esptool_v2_2' into 'master'
...
esptool: Update to v2.2
See merge request !1755
2018-01-23 08:36:52 +08:00
Angus Gratton
84741e85e7
Merge branch 'feature/aws-iot-sdk-v2.2.1' into 'master'
...
AWS IoT SDK: Update version from v2.1.1 to v2.2.1
See merge request !1732
2018-01-23 08:33:38 +08:00
me-no-dev
4fa130ae4f
mdns: Fix case where service is NULL and that will cause exception
2018-01-22 13:56:53 +01:00
me-no-dev
51dde19a76
mdns: Fix issue with some mDNS parsers
...
Some mDNS parser have issue with zero terminated TXT lists. This fix targets to overcome this issue. Found and tested with jmdns.
2018-01-22 13:56:34 +01:00
Jiang Jiang Jian
8af04997f3
Merge branch 'bugfix/dump_other_core_when_int_wdt_happens' into 'master'
...
Dump the frame of the other core when interrupt watchdog happens
See merge request !1787
2018-01-22 19:52:05 +08:00
Jiang Jiang Jian
84b92a4ead
Merge branch 'feature/btdm_add_get_error_enent_for_blufi' into 'master'
...
component/bt: add error report event for blufi
See merge request !1702
2018-01-22 19:48:29 +08:00
kooho
a0a2422541
bugfix(ringbuffer): Fix ringbuffer_send timeout bug
2018-01-22 14:17:58 +08:00
Wangjialin
870efdb9d4
bugfix(uart): patten detect function
...
requirement from github(https://github.com/espressif/esp-idf/issues/805 ): to provide the position in the buffer of the pattern detected.
requirement from AT application: in AT app, when no hardware flow control is enabled, in some situation the rx buffer might be full, and the terminator “+++” might be lost, we can use pattern detect interrupt to avoid missing the terminator. When pattern detect interrupt happens, it will not send a data event at the same time.
1. Add API to get position of detected pattern in rx buffer
2. Modify UART event example
3. Add comments for uart_flush, add alias API uart_flush_input to clear the rx buffer
4. Modify the way rx_buffered_len is calculated
2018-01-22 13:33:51 +08:00
David Antliff
19f10c4960
Fix hexdump comment and array size. See issue #1518 .
...
Closes https://github.com/espressif/esp-idf/pull/1518
Merges https://github.com/espressif/esp-idf/pull/1519
2018-01-22 16:25:09 +11:00
Jack
624828ce83
Dump the frame of the other core when interrupt watchdog happens
2018-01-18 23:10:29 +00:00
zhiweijian
1861d6e137
Component/bt: fix bonded device list error after reboot
2018-01-17 19:54:49 +08:00
Piyush Shah
b66d80ed95
ringbuf: Fix warnings seen when CONFIG_FREERTOS_ASSERT_DISABLE=y
...
Signed-off-by: Piyush Shah <piyush@espressif.com>
2018-01-17 16:30:05 +08:00
Tian Hao
b617118df3
component/bt : fix the bug of pscan when interrupt react slowly
2018-01-17 11:48:23 +08:00
Ivan Grokhotkov
429371c182
Merge branch 'feature/mdns_again' into 'master'
...
New mDNS implementation
See merge request !1683
2018-01-16 18:38:42 +08:00
Jiang Jiang Jian
f0ed404448
Merge branch 'bugfix/btdm_pair_fail_with_random_address' into 'master'
...
component/bt: Fix bug when pair with random address
See merge request !1784
2018-01-16 18:17:45 +08:00
zhiweijian
cf91ad32dc
Component/bt: add get error event for blufi
2018-01-16 17:29:48 +08:00
me-no-dev
4bddbc031c
Import mDNS changes
2018-01-16 10:58:34 +02:00
Jiang Jiang Jian
f2e51bc08a
Merge branch 'bugfix/btdm_discon_when_upd_conn_params_in_smp' into 'master'
...
component/bt: fix disconnect after connection params update in smp
See merge request !1804
2018-01-16 16:41:18 +08:00
Jiang Jiang Jian
ee0af80843
Merge branch 'bugfix/btdm_fix_conn_params_update_failed_in_SMP' into 'master'
...
component/bt: fix conn params update failed in smp
See merge request !1796
2018-01-16 16:38:22 +08:00
baohongde
088dc40e48
component/bt: Fix bug when pair with random address
2018-01-16 08:35:26 +00:00
Jiang Jiang Jian
0ef0db08d5
Merge branch 'feature/btdm_add_get_wifi_list_for_blufi' into 'master'
...
component/bt: add get wifi list cmd for blufi
See merge request !1708
2018-01-16 16:31:55 +08:00
Angus Gratton
f620a3c4f3
Merge branch 'bugfix/int_wdt_in_ocd_mode' into 'master'
...
panic: prevent INT WDT from re-triggering in OCD mode
See merge request !1764
2018-01-16 15:07:26 +08:00
chensheng
c9607e9753
test: fix BLE update conn param test case errors
2018-01-16 13:39:12 +08:00
Wu Jian Gang
c25be19ebf
Merge branch 'bugfix/multi_ping_crash' into 'master'
...
fix(ping): fix crash when multi-ping
See merge request !1768
2018-01-16 09:05:32 +08:00
zhiweijian
4d2c3edc07
Component/bt: add get wifi list cmd for blufi
2018-01-15 12:16:19 +00:00