]> granicus.if.org Git - esp-idf/log
esp-idf
6 years agoFix the bug that in sniffer mode it asserts when receive misc data at first
XiaXiaotian [Tue, 23 Jan 2018 11:38:03 +0000 (19:38 +0800)]
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

6 years agoMerge branch 'doc/debian_build_prereqs' into 'master'
Ivan Grokhotkov [Tue, 23 Jan 2018 07:38:09 +0000 (15:38 +0800)]
Merge branch 'doc/debian_build_prereqs' into 'master'

docs: Add build dependencies for toolchain for Debian (Github PR)

See merge request !1830

6 years agoMerge branch 'bugfix/xtal_freq_estimation' into 'master'
Ivan Grokhotkov [Tue, 23 Jan 2018 07:37:47 +0000 (15:37 +0800)]
Merge branch 'bugfix/xtal_freq_estimation' into 'master'

soc/rtc_clk: fix loss of precision in estimation of XTAL frequency

See merge request !1763

6 years agoMerge branch 'bugfix/xRingbufferSend_timeout_bug' into 'master'
Ivan Grokhotkov [Tue, 23 Jan 2018 07:37:13 +0000 (15:37 +0800)]
Merge branch 'bugfix/xRingbufferSend_timeout_bug' into 'master'

bugfix(ringbuffer): Fix ringbuffer_send timeout bug

See merge request !1823

6 years agoMerge branch 'feature/support-markdown-docs' into 'master'
Ivan Grokhotkov [Tue, 23 Jan 2018 07:36:12 +0000 (15:36 +0800)]
Merge branch 'feature/support-markdown-docs' into 'master'

docs : Add support for markdown files

See merge request !1781

6 years agoAdd build dependencies for toolchain for Debian
Urs Fässler [Fri, 5 Jan 2018 09:48:35 +0000 (10:48 +0100)]
Add build dependencies for toolchain for Debian

Merges https://github.com/espressif/esp-idf/pull/1465

6 years agoMerge branch 'feature/esptool_v2_2' into 'master'
Angus Gratton [Tue, 23 Jan 2018 00:36:52 +0000 (08:36 +0800)]
Merge branch 'feature/esptool_v2_2' into 'master'

esptool: Update to v2.2

See merge request !1755

6 years agoMerge branch 'feature/aws-iot-sdk-v2.2.1' into 'master'
Angus Gratton [Tue, 23 Jan 2018 00:33:38 +0000 (08:33 +0800)]
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

6 years agoMerge branch 'bugfix/mdns_txt' into 'master'
Ivan Grokhotkov [Mon, 22 Jan 2018 14:25:13 +0000 (22:25 +0800)]
Merge branch 'bugfix/mdns_txt' into 'master'

Fix issue with some mDNS parsers

See merge request !1827

6 years agomdns: Fix case where service is NULL and that will cause exception
me-no-dev [Mon, 22 Jan 2018 12:17:59 +0000 (13:17 +0100)]
mdns: Fix case where service is NULL and that will cause exception

6 years agomdns: Fix issue with some mDNS parsers
me-no-dev [Wed, 17 Jan 2018 17:06:42 +0000 (19:06 +0200)]
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.

6 years agoMerge branch 'feature/docs_link_text_for_custom_link_roles' into 'master'
Ivan Grokhotkov [Mon, 22 Jan 2018 12:19:45 +0000 (20:19 +0800)]
Merge branch 'feature/docs_link_text_for_custom_link_roles' into 'master'

Custom link roles have been extended to provide an option of displaying some text where originally a bare link is rendered

See merge request !1828

6 years agoMerge branch 'bugfix/btdm_format_error' into 'master'
Jiang Jiang Jian [Mon, 22 Jan 2018 11:52:54 +0000 (19:52 +0800)]
Merge branch 'bugfix/btdm_format_error' into 'master'

component/bt: Fix format error

See merge request !1803

6 years agoMerge branch 'bugfix/dump_other_core_when_int_wdt_happens' into 'master'
Jiang Jiang Jian [Mon, 22 Jan 2018 11:52:05 +0000 (19:52 +0800)]
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

6 years agoMerge branch 'feature/btdm_add_get_error_enent_for_blufi' into 'master'
Jiang Jiang Jian [Mon, 22 Jan 2018 11:48:29 +0000 (19:48 +0800)]
Merge branch 'feature/btdm_add_get_error_enent_for_blufi' into 'master'

component/bt: add  error report event for blufi

See merge request !1702

6 years agobugfix(ringbuffer): Fix ringbuffer_send timeout bug
kooho [Wed, 17 Jan 2018 05:28:41 +0000 (13:28 +0800)]
bugfix(ringbuffer): Fix ringbuffer_send timeout bug

6 years agocomponent/bt: fix README.md format and loggings for A2DP sink example
wangmengyang [Mon, 22 Jan 2018 02:24:22 +0000 (10:24 +0800)]
component/bt: fix README.md format and loggings for A2DP sink example

6 years agoDump the frame of the other core when interrupt watchdog happens
Jack [Thu, 11 Jan 2018 13:43:58 +0000 (21:43 +0800)]
Dump the frame of the other core when interrupt watchdog happens

6 years agoCustom link roles have been extended to provide an option of displaying some text...
krzychb [Wed, 17 Jan 2018 19:01:36 +0000 (20:01 +0100)]
Custom link roles have been extended to provide an option of displaying some text where originally a bare link is rendered

6 years agoMerge branch 'bugfix/ringbuf_warnings' into 'master'
Ivan Grokhotkov [Wed, 17 Jan 2018 14:27:15 +0000 (22:27 +0800)]
Merge branch 'bugfix/ringbuf_warnings' into 'master'

ringbuf: Fix warnings seen when CONFIG_FREERTOS_ASSERT_DISABLE=y

See merge request !1824

6 years agoringbuf: Fix warnings seen when CONFIG_FREERTOS_ASSERT_DISABLE=y
Piyush Shah [Wed, 17 Jan 2018 08:30:05 +0000 (16:30 +0800)]
ringbuf: Fix warnings seen when CONFIG_FREERTOS_ASSERT_DISABLE=y

Signed-off-by: Piyush Shah <piyush@espressif.com>
6 years agoMerge branch 'feature/btdm_ble_spp_docs' into 'master'
Jiang Jiang Jian [Wed, 17 Jan 2018 02:19:30 +0000 (10:19 +0800)]
Merge branch 'feature/btdm_ble_spp_docs' into 'master'

component/bt: add readme for ble spp demo

See merge request !1748

6 years agoMerge branch 'feature/mdns_again' into 'master'
Ivan Grokhotkov [Tue, 16 Jan 2018 10:38:42 +0000 (18:38 +0800)]
Merge branch 'feature/mdns_again' into 'master'

New mDNS implementation

See merge request !1683

6 years agoMerge branch 'bugfix/btdm_pair_fail_with_random_address' into 'master'
Jiang Jiang Jian [Tue, 16 Jan 2018 10:17:45 +0000 (18:17 +0800)]
Merge branch 'bugfix/btdm_pair_fail_with_random_address' into 'master'

component/bt: Fix bug when pair with random address

See merge request !1784

6 years agoMerge branch 'bugfix/console_example_nvs_init' into 'master'
Ivan Grokhotkov [Tue, 16 Jan 2018 10:10:32 +0000 (18:10 +0800)]
Merge branch 'bugfix/console_example_nvs_init' into 'master'

console example: initialize nvs on startup

See merge request !1766

6 years agoMerge branch 'bugfix/gitignore_dsstore' into 'master'
Ivan Grokhotkov [Tue, 16 Jan 2018 10:10:08 +0000 (18:10 +0800)]
Merge branch 'bugfix/gitignore_dsstore' into 'master'

Add MacOS .DS_Store files to .gitignore

See merge request !1806

6 years agoComponent/bt: add get error event for blufi
zhiweijian [Fri, 22 Dec 2017 07:02:33 +0000 (15:02 +0800)]
Component/bt: add get error event for blufi

6 years agoMerge branch 'bugfix/btdm_modify_license' into 'master'
Jiang Jiang Jian [Tue, 16 Jan 2018 09:13:56 +0000 (17:13 +0800)]
Merge branch 'bugfix/btdm_modify_license' into 'master'

Component/bt: BLE demo modify license

See merge request !1808

6 years agoImport mDNS changes
me-no-dev [Thu, 7 Dec 2017 13:21:40 +0000 (14:21 +0100)]
Import mDNS changes

6 years agoMerge branch 'bugfix/btdm_discon_when_upd_conn_params_in_smp' into 'master'
Jiang Jiang Jian [Tue, 16 Jan 2018 08:41:18 +0000 (16:41 +0800)]
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

6 years agoMerge branch 'bugfix/btdm_fix_conn_params_update_failed_in_SMP' into 'master'
Jiang Jiang Jian [Tue, 16 Jan 2018 08:38:22 +0000 (16:38 +0800)]
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

6 years agocomponent/bt: Fix bug when pair with random address
baohongde [Mon, 15 Jan 2018 09:35:35 +0000 (17:35 +0800)]
component/bt: Fix bug when pair with random address

6 years agoMerge branch 'feature/btdm_add_get_wifi_list_for_blufi' into 'master'
Jiang Jiang Jian [Tue, 16 Jan 2018 08:31:55 +0000 (16:31 +0800)]
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

6 years agoMerge branch 'bugfix/int_wdt_in_ocd_mode' into 'master'
Angus Gratton [Tue, 16 Jan 2018 07:07:26 +0000 (15:07 +0800)]
Merge branch 'bugfix/int_wdt_in_ocd_mode' into 'master'

panic: prevent INT WDT from re-triggering in OCD mode

See merge request !1764

6 years agoMerge branch 'test/fix_update_conn_param' into 'master'
He Yin Ling [Tue, 16 Jan 2018 06:12:16 +0000 (14:12 +0800)]
Merge branch 'test/fix_update_conn_param' into 'master'

test: fix BLE update conn param test case errors

See merge request !1814

6 years agotest: fix BLE update conn param test case errors
chensheng [Tue, 16 Jan 2018 02:26:41 +0000 (10:26 +0800)]
test: fix BLE update conn param test case errors

6 years agoMerge branch 'bugfix/multi_ping_crash' into 'master'
Wu Jian Gang [Tue, 16 Jan 2018 01:05:32 +0000 (09:05 +0800)]
Merge branch 'bugfix/multi_ping_crash' into 'master'

fix(ping): fix crash when multi-ping

See merge request !1768

6 years agoComponent/bt: add get wifi list cmd for blufi
zhiweijian [Mon, 25 Dec 2017 10:04:07 +0000 (18:04 +0800)]
Component/bt: add get wifi list cmd for blufi

6 years agoComponent/bt: modify license
zhiweijian [Mon, 15 Jan 2018 11:47:23 +0000 (19:47 +0800)]
Component/bt: modify license

6 years agoMerge branch 'feature/btdm_a2dp_src' into 'master'
Jiang Jiang Jian [Mon, 15 Jan 2018 10:55:01 +0000 (18:55 +0800)]
Merge branch 'feature/btdm_a2dp_src' into 'master'

Feature/btdm a2dp src

See merge request !1190

6 years agoAdd MacOS .DS_Store files to .gitignore
me-no-dev [Mon, 15 Jan 2018 09:45:14 +0000 (11:45 +0200)]
Add MacOS .DS_Store files to .gitignore

6 years agocomponent/bt: fix disconnect after connection params update in smp
zhiweijian [Mon, 15 Jan 2018 09:03:56 +0000 (17:03 +0800)]
component/bt: fix disconnect after connection params update in smp

6 years agoComponent/bt: fix update connection params error in smp
zhiweijian [Fri, 12 Jan 2018 09:19:36 +0000 (17:19 +0800)]
Component/bt: fix update connection params error in smp

6 years agodocs : Add support for markdown files
Anuj Deshpande [Thu, 11 Jan 2018 06:52:54 +0000 (14:52 +0800)]
docs : Add support for markdown files

6 years agoMerge branch 'bugfix/uart_fifo_ovf_workaround' into 'master'
Angus Gratton [Sun, 14 Jan 2018 23:32:20 +0000 (07:32 +0800)]
Merge branch 'bugfix/uart_fifo_ovf_workaround' into 'master'

driver(uart): fix uart rx fifo length error after overflow.

See merge request !1735

6 years agoMerge branch 'feature/doc_translations' into 'master'
Wu Jian Gang [Fri, 12 Jan 2018 13:09:03 +0000 (21:09 +0800)]
Merge branch 'feature/doc_translations' into 'master'

Feature/doc translations

See merge request !1718

6 years agodocs: add CN translation of Windows setup guide
lvxinyue [Wed, 19 Apr 2017 08:05:01 +0000 (16:05 +0800)]
docs: add CN translation of Windows setup guide

6 years agodocs: add CN translation of Linux setup guide
lvxinyue [Wed, 19 Apr 2017 02:58:48 +0000 (10:58 +0800)]
docs: add CN translation of Linux setup guide

6 years agofix(ping): fix crash when multi-ping
Chen Wu [Tue, 9 Jan 2018 09:44:26 +0000 (17:44 +0800)]
fix(ping): fix crash when multi-ping

1. "lwip_socket" should close by "lwip_close_r" other than "lwip_close"
2. for generally compatible, fix all lwip interface to normally socket interface
3. call vTaskDelete when new socket failed in case of task crash

close #https://github.com/espressif/esp32-at/issues/58

6 years agocomponent/bt: add readme for ble spp demo
xiewenxiang [Fri, 5 Jan 2018 03:40:28 +0000 (11:40 +0800)]
component/bt: add readme for ble spp demo

6 years agoFix uart fifo overflow bug
kooho [Wed, 3 Jan 2018 09:18:32 +0000 (17:18 +0800)]
Fix uart fifo overflow bug

6 years agoMerge branch 'feature/toolchain-80-g6c4433a' into 'master'
Ivan Grokhotkov [Thu, 11 Jan 2018 13:44:42 +0000 (21:44 +0800)]
Merge branch 'feature/toolchain-80-g6c4433a' into 'master'

Toolchain: Update to version 1.22.0-80-g6c4433a

See merge request !1771

6 years agodocs: Add a temporary index page to get CN docs started
Angus Gratton [Fri, 24 Mar 2017 05:19:34 +0000 (13:19 +0800)]
docs: Add a temporary index page to get CN docs started

6 years agoMerge branch 'feature/ulp_i2c_reg' into 'master'
Ivan Grokhotkov [Thu, 11 Jan 2018 04:08:25 +0000 (12:08 +0800)]
Merge branch 'feature/ulp_i2c_reg' into 'master'

soc,ulp: add register definitions of RTC_I2C peripheral

See merge request !1762

6 years agobuild: Remove explict -lstdc++-psram-workaround
Angus Gratton [Wed, 10 Jan 2018 23:30:36 +0000 (10:30 +1100)]
build: Remove explict -lstdc++-psram-workaround

This is now handled internally to the toolchain.

6 years agoMerge branch 'bugfix/full_calibration_will_not_use_init_data' into 'master'
Jiang Jiang Jian [Wed, 10 Jan 2018 09:01:53 +0000 (17:01 +0800)]
Merge branch 'bugfix/full_calibration_will_not_use_init_data' into 'master'

Fix bug that when we do full calibration init data bin is not used

See merge request !1746

6 years agoMerge branch 'bugfix/assert_in_PSRAM_WIFI' into 'master'
Jiang Jiang Jian [Wed, 10 Jan 2018 08:47:40 +0000 (16:47 +0800)]
Merge branch 'bugfix/assert_in_PSRAM_WIFI' into 'master'

bug fix of assert happen in PSRAM

See merge request !1745

6 years agoToolchain: Update to version 1.22.0-80-g6c4433a
Angus Gratton [Wed, 10 Jan 2018 03:29:10 +0000 (14:29 +1100)]
Toolchain: Update to version 1.22.0-80-g6c4433a

Includes updated prebuilt Windows MSYS2 environment.

6 years agoMerge branch 'test/support_specify_docker_image' into 'master'
Ivan Grokhotkov [Wed, 10 Jan 2018 07:41:46 +0000 (15:41 +0800)]
Merge branch 'test/support_specify_docker_image' into 'master'

CI: support specify docker image with bot

See merge request !1586

6 years agoMerge branch 'feature/rmt_end_transmission_callback' into 'master'
Angus Gratton [Tue, 9 Jan 2018 20:59:26 +0000 (04:59 +0800)]
Merge branch 'feature/rmt_end_transmission_callback' into 'master'

rmt: Adds a simple handler that can be called when transmission ends.

See merge request !1726

6 years agocomponent/bt: implement A2DP source
wangmengyang [Mon, 25 Dec 2017 11:39:37 +0000 (19:39 +0800)]
component/bt: implement A2DP source

1. Modified symbol names of A2DP sink APIs include:
- esp_a2d_data_cb_t --> esp_a2d_sink_data_cb_t
- esp_a2d_register_data_callback --> esp_a2d_sink_register_data_callback

6 years agobug fix of assert happen in PSRAM
Deng Xin [Wed, 3 Jan 2018 11:47:42 +0000 (19:47 +0800)]
bug fix of assert happen in PSRAM

6 years agoMerge branch 'bugfix/btdm_avrc_connect_state_evt' into 'master'
Jiang Jiang Jian [Tue, 9 Jan 2018 11:33:06 +0000 (19:33 +0800)]
Merge branch 'bugfix/btdm_avrc_connect_state_evt' into 'master'

Bugfix/btdm avrc connect state evt

See merge request !1717

6 years agoMerge branch 'bugfix/update_bt_lib_with_updated_toolchain_for_master' into 'master'
Jiang Jiang Jian [Tue, 9 Jan 2018 08:55:45 +0000 (16:55 +0800)]
Merge branch 'bugfix/update_bt_lib_with_updated_toolchain_for_master' into 'master'

component/bt: build libbtdm_app.a with updated toolchain

See merge request !1728

6 years agocomponent/bt: add AVRC event for remote features indication
wangmengyang [Wed, 27 Dec 2017 11:49:11 +0000 (19:49 +0800)]
component/bt: add AVRC event for remote features indication

1. remove the feature mask parameter from AVRC connection state event, as the AVCTP connection can be initiated by remote device before service discovery to remote device is performed. \
In this case, AVRCP connection state event may not be reported after connection initated by remote device is established.
2. remove ESP_AVRC_CT_MAX_EVT
3. add more documentations to AVRC APIs

6 years agoFix bug that when we do full calibration init data bin is not used
Jack [Thu, 4 Jan 2018 03:48:24 +0000 (11:48 +0800)]
Fix bug that when we do full calibration init data bin is not used

6 years agoconsole example: initialize nvs on startup
Ivan Grokhotkov [Tue, 9 Jan 2018 04:47:32 +0000 (12:47 +0800)]
console example: initialize nvs on startup

Fixes https://github.com/espressif/esp-idf/issues/1478

6 years agoMerge branch 'bugfix/btdm_fix_cant_remove_boned_device_if_its_connected' into 'master'
Jiang Jiang Jian [Tue, 9 Jan 2018 03:42:45 +0000 (11:42 +0800)]
Merge branch 'bugfix/btdm_fix_cant_remove_boned_device_if_its_connected' into 'master'

Component/bt: fix can not remove boned device if it is connected

See merge request !1758

6 years agoMerge branch 'feature/btdm_bt_spp' into 'master'
Jiang Jiang Jian [Tue, 9 Jan 2018 02:44:46 +0000 (10:44 +0800)]
Merge branch 'feature/btdm_bt_spp' into 'master'

component/bt: Add bt spp profile

See merge request !1593

6 years agoMerge branch 'bugfix/docs-pico-kit-swapped-pins' into 'master'
Angus Gratton [Tue, 9 Jan 2018 00:53:10 +0000 (08:53 +0800)]
Merge branch 'bugfix/docs-pico-kit-swapped-pins' into 'master'

Fixed swapped GPIO6 and GPIO11 in ESP-PICO-KIT 'Pin Descriptions', ref. https://esp32.com/viewtopic.php?f=2&t=3880

See merge request !1736

6 years agoMerge branch 'bugfix/ci_rare_examples_error' into 'master'
Angus Gratton [Tue, 9 Jan 2018 00:52:35 +0000 (08:52 +0800)]
Merge branch 'bugfix/ci_rare_examples_error' into 'master'

CI: Fix an occasional error in the build_examples

See merge request !1752

6 years agoMerge branch 'bugfix/eclipse_cxx_include_paths' into 'master'
Angus Gratton [Tue, 9 Jan 2018 00:52:02 +0000 (08:52 +0800)]
Merge branch 'bugfix/eclipse_cxx_include_paths' into 'master'

Eclipse: Fix bug with C++ include paths (Github PR)

See merge request !1756

6 years agoeclipse: Add space between -I and build directory
Angus Gratton [Mon, 8 Jan 2018 22:27:00 +0000 (09:27 +1100)]
eclipse: Add space between -I and build directory

See https://github.com/espressif/esp-idf/pull/1474

6 years agopanic: prevent INT WDT from re-triggering in OCD mode
Ivan Grokhotkov [Mon, 8 Jan 2018 17:46:24 +0000 (01:46 +0800)]
panic: prevent INT WDT from re-triggering in OCD mode

When INT WDT fires, panicHandler is invoked. In OCD mode, panicHandler
sets a breakpoint on the PC from the exception frame and returns.
However in case of INT WDT, interrupt flag is still set in TIMERG1
peripheral, which causes INT WDT to trigger again. This causes an
endless stream of "Core  0 panic'ed (Interrupt wdt timeout on CPU1)"
messages. OpenOCD also gets terribly confused at this point.

Disable watchdogs when exiting panic handler in OCD mode.
Clear TIMERG1 WDT interrupt flag to prevent re-entry into panic handler.

6 years agosoc/rtc_clk: fix loss of precision in estimation of XTAL frequency
Ivan Grokhotkov [Mon, 8 Jan 2018 15:31:21 +0000 (23:31 +0800)]
soc/rtc_clk: fix loss of precision in estimation of XTAL frequency

RTC_FAST_CLK_FREQ_APPROX is defined as 8500000, so 0.5MHz part was lost
when dividing by MHZ. Since cal_val is 64-bit the parens can be removed.

With 40MHz XTAL for a nominal ESP32 chip, this fixes estimated XTAL
frequency from 38 to 40MHz.

6 years agosoc,ulp: add register definitions of RTC_I2C peripheral
Ivan Grokhotkov [Mon, 8 Jan 2018 13:27:28 +0000 (21:27 +0800)]
soc,ulp: add register definitions of RTC_I2C peripheral

6 years agoMerge branch 'bugfix/btdm_error_when_add_device_to_whitelist_twice' into 'master'
Jiang Jiang Jian [Mon, 8 Jan 2018 11:16:34 +0000 (19:16 +0800)]
Merge branch 'bugfix/btdm_error_when_add_device_to_whitelist_twice' into 'master'

component/bt: Fix bug when add device to whitelist twice

See merge request !1700

6 years agoComponent/bt: fix can not remove boned device if it is connected
zhiweijian [Mon, 8 Jan 2018 07:37:36 +0000 (15:37 +0800)]
Component/bt: fix can not remove boned device if it is connected

6 years agoMerge branch 'bugfix/freertos_eventgroup_isr_test' into 'master'
Ivan Grokhotkov [Mon, 8 Jan 2018 08:51:27 +0000 (16:51 +0800)]
Merge branch 'bugfix/freertos_eventgroup_isr_test' into 'master'

freertos/Fix Event Group ISR test case

See merge request !1733

6 years agoMerge branch 'bugfix/esp_log_local_level' into 'master'
Ivan Grokhotkov [Mon, 8 Jan 2018 08:41:42 +0000 (16:41 +0800)]
Merge branch 'bugfix/esp_log_local_level' into 'master'

Log: fix definition of LOG_LOCAL_LEVEL, fix typos

See merge request !1747

6 years agoAdd space between -I and path for CPPFLAGS
Alexander Sparkowsky [Sun, 7 Jan 2018 12:25:37 +0000 (13:25 +0100)]
Add space between -I and path for CPPFLAGS

In order for the Eclipse CDT GCC Build Output Parser to be able to
pick up the include paths for C++/cpp files a space is required
between the compiler option (-I) and the actual path.

Merges https://github.com/espressif/esp-idf/pull/1474

6 years agoesptool: Update to v2.2
Angus Gratton [Mon, 8 Jan 2018 00:45:09 +0000 (11:45 +1100)]
esptool: Update to v2.2

6 years agoMerge branch 'bugfix/BLE_SM_Security_Flags_pr1320' into 'master'
Angus Gratton [Sun, 7 Jan 2018 23:35:19 +0000 (07:35 +0800)]
Merge branch 'bugfix/BLE_SM_Security_Flags_pr1320' into 'master'

bt: Fix ble sm security flags (Github PR 1320)

See merge request !1740

6 years agoMerge branch 'bugfix/btdm_standardize_code' into 'master'
Jiang Jiang Jian [Fri, 5 Jan 2018 10:56:08 +0000 (18:56 +0800)]
Merge branch 'bugfix/btdm_standardize_code' into 'master'

component/bt: Standardize code

See merge request !1696

6 years agocomponent/bt: Add SPP profile
baohongde [Fri, 5 Jan 2018 08:48:29 +0000 (16:48 +0800)]
component/bt: Add SPP profile

6 years agoMerge branch 'bugfix/recompile_with_new_psram_toolchain' into 'master'
Jiang Jiang Jian [Fri, 5 Jan 2018 08:40:30 +0000 (16:40 +0800)]
Merge branch 'bugfix/recompile_with_new_psram_toolchain' into 'master'

recompile wifi lib with new toolchain 1.22.0-78-g4b87650

See merge request !1730

6 years agolog: fix typos in header files
Ivan Grokhotkov [Fri, 5 Jan 2018 04:58:00 +0000 (12:58 +0800)]
log: fix typos in header files

6 years agolog: define LOG_LOCAL_LEVEL before using it, don't use type cast
Ivan Grokhotkov [Fri, 5 Jan 2018 04:57:35 +0000 (12:57 +0800)]
log: define LOG_LOCAL_LEVEL before using it, don't use type cast

LOG_LOCAL_LEVEL is now used in a construct like:
 #if (LOG_LOCAL_LEVEL >= ESP_LOG_INFO)
Make sure that LOG_LOCAL_LEVEL is defined, and don't use a type cast in
its definition, because preprocessor can not parse that.

6 years agormt: Add void * argument for end-of-transmission callback
Angus Gratton [Fri, 5 Jan 2018 06:10:37 +0000 (17:10 +1100)]
rmt: Add void * argument for end-of-transmission callback

Ref https://github.com/espressif/esp-idf/pull/1174

6 years agormt: Adds a simple handler that can be called when transmission ends.
Krzysztof Bociurko [Fri, 27 Oct 2017 13:23:07 +0000 (15:23 +0200)]
rmt: Adds a simple handler that can be called when transmission ends.

Merges https://github.com/espressif/esp-idf/pull/1174

6 years agoCI: Fix an occasional error caused by reordering the commands along with 'tee' in...
Anton Maklakov [Fri, 5 Jan 2018 04:38:44 +0000 (12:38 +0800)]
CI: Fix an occasional error caused by reordering the commands along with 'tee' in the script

6 years agoMerge branch 'bugfix/uart_semaphore_pr1387' into 'master'
Ivan Grokhotkov [Fri, 5 Jan 2018 03:05:05 +0000 (11:05 +0800)]
Merge branch 'bugfix/uart_semaphore_pr1387' into 'master'

uart driver: Remove unnecessary xSemaphoreGive()

See merge request !1739

6 years agoMerge branch 'feature/esp_intr_set_in_iram' into 'master'
Angus Gratton [Wed, 3 Jan 2018 22:04:05 +0000 (06:04 +0800)]
Merge branch 'feature/esp_intr_set_in_iram' into 'master'

Add esp_intr_set_in_iram (Github PR)

See merge request !1629

6 years agoMerge branch 'refactor/spi_clk_pre_cal' into 'master'
Angus Gratton [Wed, 3 Jan 2018 22:03:12 +0000 (06:03 +0800)]
Merge branch 'refactor/spi_clk_pre_cal' into 'master'

bugfix(spi_master): improve spi time cost for each transfer.

See merge request !1670

6 years agoMerge branch 'bugfix/small_fixes_github' into 'master'
Angus Gratton [Wed, 3 Jan 2018 05:36:03 +0000 (13:36 +0800)]
Merge branch 'bugfix/small_fixes_github' into 'master'

Some small fixes from Github

See merge request !1737

6 years agoMerge branch 'feature/btdm_add_bluetooth_examples_tutorials' into 'master'
Jiang Jiang Jian [Wed, 3 Jan 2018 05:04:16 +0000 (13:04 +0800)]
Merge branch 'feature/btdm_add_bluetooth_examples_tutorials' into 'master'

component/bt: Add bluetooth example tutorials

See merge request !1592

6 years agon btm_sec_save_le_key() set BTM_SEC_LE_LINK_KEY_KNOWN (and BTM_SEC_LE_LINK_KEY_AUTHED...
Tim Cook [Sun, 26 Nov 2017 21:25:46 +0000 (16:25 -0500)]
n btm_sec_save_le_key() set BTM_SEC_LE_LINK_KEY_KNOWN (and BTM_SEC_LE_LINK_KEY_AUTHED if MITM was used) when process a local Long Term Key (key type BTM_LE_KEY_LENC). This is because these flags share bits with the BTM_SEC_FLAG_LKEY_KNOWN (and BTM_SEC_FLAG_LKEY_AUTHED) flag in btm_api.h. Without this code a link that is encrypted via SM pairing where only the local device exchanges the LTK (peer does not send its LTK) will not allow GATT operations that require encryption (request will be incorrectly rejected with insufficient authentication reason, regardless of if MITM is required).

Merges https://github.com/espressif/esp-idf/pull/1320

6 years agoset ble_rsp_key member of structure bte_appl_cfg in function bta_dm_co_ble_set_rsp_ke...
Tim Cook [Sun, 26 Nov 2017 21:24:21 +0000 (16:24 -0500)]
set ble_rsp_key member of structure bte_appl_cfg in function bta_dm_co_ble_set_rsp_key_req (function incorrectly uses ble_init_key member).

Merges https://github.com/espressif/esp-idf/pull/1320

6 years agocomponent/bt: change pictures from .pdf to .png
island [Wed, 3 Jan 2018 03:11:44 +0000 (11:11 +0800)]
component/bt: change pictures from .pdf to .png

6 years agocomponent/bt: Modify docs to be compatible with "Github Standard Markdown"
island [Wed, 3 Jan 2018 03:07:55 +0000 (11:07 +0800)]
component/bt: Modify docs to be compatible with "Github Standard Markdown"