2741 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
XiaXiaotian	176107f845	update expiration date of wpa2 enterprise certificates to 2027/06/05.	2017-06-07 16:30:39 +08:00
Jiang Jiang Jian	99d5959d8a	Merge branch 'bugfix/btdm_library' into 'master' ... component/bt : revert the bluetooth library See merge request !827	2017-06-07 14:17:33 +08:00
Jiang Jiang Jian	35f6a2a8af	Merge branch 'feature/tw10091_add_sniffer_filter' into 'master' ... esp32: add sniffer filter api See merge request !790	2017-06-07 13:55:35 +08:00
Tian Hao	460c37ddf6	component/bt : revert the bluetooth library ... bluetooth library use a old one, so update to the newest.	2017-06-07 13:52:28 +08:00
Jiang Jiang Jian	7da4b42ed1	Merge branch 'feature/btdm_add_connect_event_and_disconnect_event_for_gattc' into 'master' ... component/bt: Add disconnect & connect func and event See merge request !806	2017-06-07 13:45:43 +08:00
Jiang Jiang Jian	82b8b1db1f	Merge branch 'bugfix/bt_ble_separation' into 'master' ... component/bt: fix the build error when using classic BT, with GATTC, GATTS and SMP disabled See merge request !822	2017-06-06 20:56:05 +08:00
Jiang Jiang Jian	b78242da58	Merge branch 'bugfix/btdm_rebase_update_param_#9626' into 'master' ... component/bt: rebase the btdm_updata_param_bug_#9626 to the new master. See merge request !808	2017-06-06 20:55:23 +08:00
Jiang Jiang Jian	b2b9dd6302	Merge branch 'bugfix/btdm_cherrypick_no_doc_for_value_type_github_#118659' into 'master' ... component/bt: Cherry-pick the btdm_no_doc_for_value_type_github_#118659 to this … See merge request !825	2017-06-06 20:53:31 +08:00
Liu Zhi Fu	f40be8eb77	esp32: add sniffer filter api ... Add sniffer filter to filter specified packets	2017-06-06 19:07:12 +08:00
Yulong	e6acc32df6	component/bt: rebase the btdm_updata_param_bug_#9626 to the new master. ... - Added the error code for the time out status.	2017-06-06 05:51:31 -04:00
Yulong	531f751fd3	component/bt: Cherry-pick the btdm_no_doc_for_value_type_github_#118659 to this branch to avoid conflict.	2017-06-06 05:22:17 -04:00
zhiweijian	db96edc5d9	component/bt: Add disconnect & connect func and event ... - Add disconnect func for gap - Add connect event and disconnect event for gattc	2017-06-06 16:53:37 +08:00
Angus Gratton	1cbdb35e1e	Merge branch 'bugfix/i2s_channel_setting' into 'master' ... bugfix(i2s): fix error when changing channel number in i2s_set_clk function See merge request !784	2017-06-06 14:40:43 +08:00
Angus Gratton	99454d4a73	Merge branch 'feature/nghttp2_v1_22' into 'master' ... nghttp module: Update to v1.22, use submodule instead of in-tree source See merge request !763	2017-06-06 14:38:41 +08:00
Angus Gratton	ae05787a51	Merge branch 'bugfix/make_srcdirs_order' into 'master' ... build system: Fix bug where component src subdirs needed listing before parent source dirs See merge request !778	2017-06-06 14:37:21 +08:00
Angus Gratton	d00b2428bb	Merge branch 'feature/doc_note_about_component_search_order' into 'master' ... Add a note about handling of same-named components in different component search paths See merge request !788	2017-06-06 14:36:33 +08:00
Jiang Jiang Jian	b0d93fccce	Merge branch 'bugfix/btdm_ble_scan_5min_stop_github_#12723' into 'master' ... component/bt: Change the duration type from UINT8 to UINT32 See merge request !815	2017-06-06 14:11:05 +08:00
Ivan Grokhotkov	7ea33771c7	Merge branch 'bugfix/ut_crlf_fix' into 'master' ... unit-test-app: Fix incorrect CR+LF sequence See merge request !816	2017-06-06 14:08:46 +08:00
Jiang Jiang Jian	bb6189b335	Merge branch 'bugfix/wdt_reset_info_for_cpu1_not_correct' into 'master' ... bugfix:Fix bug that wdt reset information for CPU1 was not correct See merge request !823	2017-06-06 14:02:41 +08:00
wangmengyang	ca4506fba9	component/bt: fix the build error when using classic BT, with GATTC, GATTS and SMP disabled	2017-06-05 21:01:58 +08:00
jack	ba32dd30a1	bugfix:Fix bug that wdt reset information for CPU1 was not correct	2017-06-05 18:26:14 +08:00
Anton Maklakov	91718cc776	unit-test-app: Fix incorrect CR+LF sequence. ... This caused problems with handling output by grep, sed, etc	2017-06-05 10:51:48 +08:00
Ivan Grokhotkov	e45a288516	Merge branch 'bugfix/duplicate_unit_test_case_id' into 'master' ... CI: fix bug that generates duplicate unit test case ID See merge request !813	2017-06-04 00:51:12 +08:00
Yulong	a42bf640bc	component/bt: Change the duration type from UINT8 to UINT32	2017-06-03 01:00:10 -04:00
He Yin Ling	592b8a4325	CI: add one more UT runner	2017-06-03 11:38:52 +08:00
He Yin Ling	9b39be9559	CI: fix bug of duplicated unit test case ID: ... need to compare if different file names has the same hash value. use relative path to IDF to keep test case ID consist.	2017-06-03 11:38:05 +08:00
Jiang Jiang Jian	cc46038142	Merge branch 'bugfix/add_dport_protect_in_libphy' into 'master' ... Add dport protect in libphy.a See merge request !803	2017-06-02 19:13:18 +08:00
Jiang Jiang Jian	bd17791fd4	Merge branch 'bugfix/tw12798_dhcp_server_crash' into 'master' ... lwip: fix dhcp server crash issue See merge request !797	2017-06-02 19:09:43 +08:00
Jiang Jiang Jian	0a66f0db4c	Merge branch 'bugfix/btdm_bit_against_enums_github_#12289' into 'master' ... component/bt: Change the esp_gatt_perm_t & esp_gatt_char_prop_t type from enum t… See merge request !809	2017-06-02 15:41:01 +08:00
Liu Zhi Fu	cd58f089c2	lwip: fix dhcp server crash issue ... Fix long dhcp request packet cause dhcp server crash issue	2017-06-02 14:02:33 +08:00
Jiang Jiang Jian	1eaf88262d	Merge branch 'bugfix/btdm_add_open_and_close_event_for_gatts' into 'master' ... component/bt: add open and close event for gatts See merge request !786	2017-06-02 13:53:03 +08:00
Yulong	be3eda0044	component/bt: Change the esp_gatt_perm_t & esp_gatt_char_prop_t type from enum to uint16_t & uint8_t.	2017-06-02 01:48:56 -04:00
Jiang Jiang Jian	77a53e528a	Merge branch 'example/smartconfig' into 'master' ... feat: add smartconfig example See merge request !716	2017-06-02 13:11:12 +08:00
XiaXiaotian	66ef886d77	Add dport protect in libphy.a	2017-06-01 19:43:55 +08:00
Jiang Jiang Jian	ab0f7264ee	Merge branch 'bugfix/tw12174_connect_ap_fail' into 'master' ... Fix the bug that station fails to connect to AP sometimes. See merge request !802	2017-06-01 19:40:02 +08:00
zhiweijian	f5a59f4f78	component/bt: add open and close event for gatts ... 1.added open event and close event for gatts. 2.used esp_log_buffer_char/hex for gattc scan result.	2017-06-01 15:01:54 +08:00
Anton Maklakov	6873c19131	Merge branch 'bugfix/ut_inverse_filter' into 'master' ... unit-test-app: Fix capability to use !<filter> to inverse that filter See merge request !805	2017-06-01 14:26:36 +08:00
Anton Maklakov	144d345b3b	unit-test-app: Fix capability to use !<filter> to inverse that filter	2017-06-01 12:23:14 +08:00
Jiang Jiang Jian	5389329729	Merge branch 'bugfix/wrong_merge_of_MR773' into 'master' ... fix bug that files missing commit in MR 773 See merge request !801	2017-05-31 20:39:59 +08:00
XiaXiaotian	d2f24f1b81	Fix the bug that station fails to connect to AP sometimes.	2017-05-31 20:27:02 +08:00
jack	fc130fba86	fix bug that files missing commit in MR 773	2017-05-31 19:37:39 +08:00
fuzhibo	d1fb51afd2	feat: add smartconfig example	2017-05-31 15:32:15 +08:00
Angus Gratton	d718cbd873	Merge branch 'bugfix/deep_sleep_example_stub_delay' into 'master' ... sdkconfig: set CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 by default See merge request !758	2017-05-29 12:11:56 +08:00
Angus Gratton	034d37b9cb	Merge branch 'bugfix/doc-small-updates' into 'master' ... Small fixes/updates to toolchain installation procedures See merge request !782	2017-05-29 07:09:47 +08:00
Angus Gratton	2b1365a51b	Merge branch 'feature/docs_gen-dxd' into 'master' ... docs: Automatically generate API reference list / Doxygen directives See merge request !723	2017-05-29 07:08:53 +08:00
Jiang Jiang Jian	636d2b384e	Merge branch 'bugfix/ble_comfirm_reply_not_work_#12881' into 'master' ... component/bt: Added the esp_ble_passkey_reply BTC_GAP_BLE_PASSKEY_REPLY_EVT &BTC… See merge request !793	2017-05-27 14:40:26 +08:00
Jiang Jiang Jian	28cec08450	Merge branch 'bugfix/btdm_set_invalid_rand_addr_error_12303' into 'master' ... component/bt: Added the set static random address callback to the bt project. See merge request !773	2017-05-27 14:38:08 +08:00
Yulong	e9fae704e3	component/bt: Merge the new master to avoid conflict.	2017-05-26 22:47:56 -04:00
Yulong	9679c238aa	component/bt: Added the esp_ble_passkey_reply BTC_GAP_BLE_PASSKEY_REPLY_EVT &BTC_GAP_BLE_CONFIRM_REPLY_EVT ... event.	2017-05-26 05:26:15 -04:00
Jiang Jiang Jian	826e96248d	Merge branch 'bugfix/btdm_ble_crash_read_long_char_#12338' into 'master' ... component/bt: Change the fragement method to avoid crash when the data transmit should fragement. See merge request !789	2017-05-26 14:40:47 +08:00