Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5434 commits 10 branches 75 tags 114 MiB
Commit graph

4102 commits

Author SHA1 Message Date
Angus Gratton
fcd5d0869d Merge branch 'bugfix/spi_native_pins' into 'master' 
fix several spi issues about pin configurations

See merge request idf/esp-idf!2309
 2018-05-15 14:19:20 +08:00
He Yin Ling
e8dd203e47 example test: add test case for iperf example 2018-05-15 13:42:26 +08:00
Angus Gratton
662fe55996 Merge branch 'bugfix/select_rtc_slow_clk' into 'master' 
esp32/clk: Fix starting rtc oscillator if it bad

See merge request idf/esp-idf!2215
 2018-05-15 12:57:22 +08:00
Konstantin Kondrashov
9ad0760b9d esp32/clk:Fix starting rtc oscillator if it is bad 
If the RTC crystal is bad or has no matched capacitance, then you do not need to start such the crystal. It is necessary to determine this case, output an error (about impossibility to start from the oscillator) and start from the internal RC of the chain.

Reduced the default value of the number of bootstrap cycles. Because we can oscillating the oscillator which then stops. (in Kconfig). Changed from 100 to 5.

The number of calibration cycles has been increased. It is the main criterion for estimating the launch of an oscillator. A large increase leads to an increase in the load time, as well as the stability of recognition of this case. (in Kconfig).
Changed from 1024 to 3000.
 2018-05-15 08:59:15 +05:00
Angus Gratton
31d53bc059 Merge branch 'bugfix/sdspi_delayed_write_response' into 'master' 
sdspi: handle delayed response to data write command

See merge request idf/esp-idf!2290
 2018-05-15 10:32:21 +08:00
Jiang Jiang Jian
73d20981de Merge branch 'bugfix/rmt_tx_stop_bug' into 'master' 
driver(rmt):  RMT tx stop  workaround

See merge request idf/esp-idf!1915
 2018-05-15 10:04:33 +08:00
Jiang Jiang Jian
33b11c6f6a Merge branch 'feature/adjust_log_level_about_uart' into 'master' 
feat: Adjust log level about UART

See merge request idf/esp-idf!2047
 2018-05-15 09:59:21 +08:00
Jiang Jiang Jian
97a228e6ab Merge branch 'bugfix/rename_clk_rst_bits_for_spi' into 'master' 
rename clock enable and reset bits for SPI modules

See merge request idf/esp-idf!2293
 2018-05-15 09:49:56 +08:00
Jiang Jiang Jian
6adaeb0048 Merge branch 'bugfix/btdm_fix_crash_without_smp_when_deinit_bluedroid' into 'master' 
Component/bt: fix crash without SMP when deinit bluedroid

See merge request idf/esp-idf!2375
 2018-05-14 21:20:44 +08:00
Konstantin Kondrashov
8f80cc733d soc: Change DPORT access 
When two CPUs read the area of the DPORT and the area of the APB, the result is corrupted for the CPU that read the APB area.
And another CPU has valid data.

The method of eliminating this error.
Before reading the registers of the DPORT, make a preliminary reading of the APB register.
In this case, the joint access of the two CPUs to the registers of the APB and the DPORT is successful.
 2018-05-14 17:54:57 +05:00
Hrishikesh Dhayagude
da6cb6c741 components/bt: Improve the Bluetooth debug messaging scheme 
As of now, when Bluetooth debugs are enabled, all the messages are
mapped to BT_PRINTF which is mapped to ESP_LOGE. Hence, make monitor
shows all logs in red color which might lead to missing the actual
errors

This patch maps the Bluetooth messages to appropriate ESP_LOG* messages
and improves readability.

Also, make the BT trace level be configurable in menuconfig, so that
each layer of bt trace can be enabled/disabled.

Finally, add debug log control for BTC, OSI, BLUFI and clear up
Bluetooth debug logs.

So, with this the method of enabling Bluetooth logs is as follows:
1. make menuconfig -> Component config -> Bluetooth -> Bluedroid Enable
-> BT DEBUG LOG LEVEL -> set trace level for every layer of BT

Signed-off-by: Hrishikesh Dhayagude <hrishi@espressif.com>
 2018-05-14 20:45:05 +08:00
Jiang Jiang Jian
256a9a8a33 Merge branch 'feature/wifi_add_sniffer_ctrl_pkt' into 'master' 
add sniffer control packet support

See merge request idf/esp-idf!1904
 2018-05-14 20:42:15 +08:00
Jiang Jiang Jian
9e5318b584 Merge branch 'bugfix/btdm_reconnect_con_params_update_reject_in_smp' into 'master' 
Component/bt: update con params is rejected in smp when reconnection

See merge request idf/esp-idf!2318
 2018-05-14 20:19:29 +08:00
chenjianqiang
b5de860bcb revise the explain of a parameter(brk_len) in uart driver file 2018-05-14 19:47:16 +08:00
kooho
a8d26d7e4d driver(rmt):Fix rmt_tx_stop bug. 2018-05-14 19:46:30 +08:00
Angus Gratton
b888032a8c Merge branch 'bugfix/logging_docs_cleanup' into 'master' 
log: clean up docs, clarify esp_log_level_set usage

See merge request idf/esp-idf!2080
 2018-05-14 18:36:35 +08:00
Roland Dobai
ca08397b6b Fix compilation errors when -O3 is used 
Closes https://github.com/espressif/esp-idf/issues/718
 2018-05-14 12:29:57 +02:00
jack
c384fa2492 rename clock enable and reset bits for SPI modules 
1.The names of clock enable and reset bits do not match with TRM, just rename them.
 2018-05-14 16:45:03 +08:00
Angus Gratton
c94a5ecfdd mbedtls: Add mbedtls submodule check to build system 2018-05-14 16:07:18 +08:00
Jiang Jiang Jian
d4276efed7 Merge branch 'bugfix/bluedroid_const_char' into 'master' 
Bluedroid: remove warnings about discarding "const" for "const char*"

See merge request idf/esp-idf!2387
 2018-05-14 15:25:45 +08:00
Roland Dobai
4345e198ce Implement VFS support for access() 
Closes https://github.com/espressif/esp-idf/issues/1085
 2018-05-14 09:04:18 +02:00
XiaXiaotian
57297cf7b7 add sniffer control packet support 2018-05-14 14:16:03 +08:00
Liu Zhi Fu
1c81e4be60 esp32: fix interrupt list insert issue 
If the allocated interrupt list is not empty and the new item will be inserted
as the header of the list, insert_vector_desc() causes crash because pre is
null. This commit fix this issue.
 2018-05-14 14:13:08 +08:00
He Yin Ling
adc3315677 Merge branch 'test/add_unit_test_jobs' into 'master' 
ci: increase number of unit test jobs, temporarily disable light sleep test for short durations

See merge request idf/esp-idf!2386
 2018-05-14 14:06:05 +08:00
kooho
1bebec05c6 driver(ledc): fix duty and fade issues and add thread-safe version APIs. 
1. Fix the duty fade check issue reported from https://github.com/espressif/esp-idf/issues/1914
2. Fix the duty overflow issue when duty_scale is set to 1.
3. Fix the duty fade error when a fade operation is under way. We must configure a new duty setting after the previous fade operation has finished due to hardware limit.
4. Add thread-safe version APIs to set duty and fade.
5. Correct the duty range in driver.
 2018-05-14 12:27:21 +08:00
Angus Gratton
e23ee9fa73 Merge branch 'bugfix/ledc_error' into 'master' 
ledc driver: Clarify logging of function argument errors

See merge request idf/esp-idf!2380
 2018-05-14 09:16:02 +08:00
Angus Gratton
6817088ce4 Merge branch 'feature/mbedtls_2_9_0' into 'master' 
Re-add mbedTLS as a submodule, update to 2.9.0

See merge request idf/esp-idf!2367
 2018-05-14 09:15:44 +08:00
Angus Gratton
64c52022b9 Merge branch 'bugfix/add_comments_for_adc' into 'master' 
driver(adc): Add descriptions that starting ADC can trigger interrupt of GPIO36…

See merge request idf/esp-idf!1910
 2018-05-11 18:54:40 +08:00
Ivan Grokhotkov
1b7ed6455b esp32/test: temporarily disable test for light sleep duration 
Until the issue in CI is debugged
 2018-05-11 18:15:58 +08:00
Angus Gratton
3a53e35fe8 Merge branch 'bugfix/vfs_append' into 'master' 
VFS: use O_APPEND flag of open() correctly

See merge request idf/esp-idf!2382
 2018-05-11 18:12:47 +08:00
Roland Dobai
2041c08681 Bluedroid: remove warnings about discarding "const" for "const char*" 2018-05-11 11:29:10 +02:00
kooho
d53661a663 driver(adc): add descriptions for the issue that starting ADC can trigger interrupt of GPIO36 and GPIO39. 2018-05-11 17:08:58 +08:00
Jiang Jiang Jian
a5f36ec2d5 Merge branch 'feature/wifi_refactor_smartconfig' into 'master' 
refactor smartconfig

See merge request idf/esp-idf!2205
 2018-05-11 16:23:22 +08:00
Jiang Jiang Jian
5616491c50 Merge branch 'bugfix/i2s_dma_buf_alloc' into 'master' 
i2s: fix issue in dma descriptor allocation if SPIRAM is enabled

See merge request idf/esp-idf!2383
 2018-05-11 16:03:40 +08:00
Jiang Jiang Jian
41228c83c7 Merge branch 'bugfix/dhcp_server_max_limit' into 'master' 
dhcp/dhcpserver Fix max station limit check in dhcp server

See merge request idf/esp-idf!2298
 2018-05-11 15:50:38 +08:00
Jiang Jiang Jian
325920046f Merge branch 'bugfix/btdm_conn_fail_after_deinit_and_init_spp' into 'master' 
component/bt: Fix can't be connected if init SPP again after SPP deinit

See merge request idf/esp-idf!2369
 2018-05-11 15:38:03 +08:00
Jiang Jiang Jian
41ba013bd4 Merge branch 'bugfix/btdm_fix_service_change_write_busy' into 'master' 
Component/bt: fix service change write busy

See merge request idf/esp-idf!2359
 2018-05-11 15:20:04 +08:00
Jiang Jiang Jian
c1e0f029d1 Merge branch 'bugfix/btdm_a2dp_disconn_state_when_connecting_with_iphone' into 'master' 
component/bt: Fix bug a2dp have disconnect state when connecting with iphone 7

See merge request idf/esp-idf!2288
 2018-05-11 14:59:34 +08:00
Ivan Grokhotkov
827772df69 Merge branch 'bugfix/light_sleep_wdt_fix' into 'master' 
Fix occasional WDT reset in light sleep test

See merge request idf/esp-idf!2374
 2018-05-11 14:55:51 +08:00
XiaXiaotian
0033c3ef3a refactor smartconfig 
move wifi part to wifi lib and lwip part to idf
 2018-05-11 14:49:35 +08:00
Roland Dobai
733ff15719 VFS: use O_APPEND flag of open() correctly 
Closes https://github.com/espressif/esp-idf/pull/1455
 2018-05-11 08:28:22 +02:00
Ivan Grokhotkov
12f707932f log: clean up docs, clarify esp_log_level_set usage 
Closes https://github.com/espressif/esp-idf/issues/1713
 2018-05-11 13:55:16 +08:00
Mahavir Jain
b2a1a79eb4 i2s: fix issue in dma descriptor allocation if SPIRAM is enabled 
It has been observed that, if external SPIRAM is enabled, then under
certain scenarios (e.g. internal memory being too much fragmented),
I2S tx/rx descriptors can land in external SPIRAM and hence resulting
in failure in DMA. Adding explicit capability to allocate in only DMA
capable memory.

Signed-off-by: Mahavir Jain <mahavir@espressif.com>
 2018-05-10 18:26:01 +05:30
Angus Gratton
feb64c3be6 ledc driver: Clarify logging of function argument errors 
Some parameter errors did not specify which parameter was invalid.

Adds a new macro to name the invalid param.
 2018-05-10 17:21:35 +08:00
zhangyanjiao
be76260d81 wifi: fix some potential thread safe issue 
change some API function to throw event:

esp_wifi_deauth_sta
esp_wifi_get_country
esp_wifi_ap_get_sta_list
esp_wifi_sta_get_ap_info
esp_wifi_stop
esp_wifi_get_channel
esp_wifi_get_protocol
esp_wifi_get_bandwidth
 2018-05-10 16:24:43 +08:00
baohongde
dfbc59f1c2 component/bt: Fix can't be connected if init SPP again after SPP deinit 2018-05-10 16:16:25 +08:00
Ivan Grokhotkov
ade14518ef Merge branch 'feature/vfs_small_fds' into 'master' 
Use smaller numbers as file descriptors

See merge request idf/esp-idf!2300
 2018-05-10 14:29:34 +08:00
zhiweijian
b7a5fef871 Component/bt: fix crash without SMP when deinit bluedroid 
- fix crash without SMP when bluedroid deinit
- modify default menuconfig in blufi demo
 2018-05-10 11:39:34 +08:00
Ivan Grokhotkov
7dada45d60 mbedtls: enable deprecation warnings when building unit tests 2018-05-09 23:15:28 +08:00
Ivan Grokhotkov
dbc919eff5 mbedtls: update usage of mbedtls_aes_encrypt/decrypt 2018-05-09 23:15:28 +08:00
Ivan Grokhotkov
aad51ea8a0 mbedtls/port: don’t re-declare mbedtls_shaX functions 
ALT header files for sha1, sha256, sha512 are only supposed to declare
mbedtls_sha1_context data structure. Function prototypes should come
from original header files.
 2018-05-09 23:15:28 +08:00
Ivan Grokhotkov
254e29aca4 mbedtls: update usage of deprecated mbedtls_shaX APIs 
The following mbedTLS APIs have been deprecated and replaced with the
new ones which return error codes:

mbedtls_shaX_starts -> mbedtls_shaX_starts_ret
mbedtls_shaX_update -> mbedtls_shaX_update_ret
mbedtls_shaX_finish -> mbedtls_shaX_finish_ret
mbedtls_shaX_process -> mbedtls_shaX_internal_process

Update hardware implementations of SHA functions, and other IDF
components which used above functions, to use new versions.
 2018-05-09 23:15:28 +08:00
Ivan Grokhotkov
e9cbf96bd1 mbedtls: re-add version 2.9.0 as a submodule 2018-05-09 23:15:28 +08:00
Ivan Grokhotkov
8c307a5720 sleep: fix deadlock in esp_timer_impl_advance after light sleep 
When light sleep is started, the other CPU gets halted using DPORT
stall mechanism. This can happen while it is inside an esp_timer
critical section, which may lead to a deadlock. This change adds
functions to take and release esp_timer lock before entering
DPORT critical section, preventing the deadlock.
 2018-05-09 22:52:50 +08:00
Ivan Grokhotkov
296b280801 esp_timer: fix esp_timer_impl_advance not triggering expired timers 2018-05-09 22:52:41 +08:00
zhiweijian
cb59576dd0 Component/bt: fix service change write busy 2018-05-09 20:49:26 +08:00
zhiweijian
58b2cb3e0c Component/bt: update con params is rejected in smp when reconnection 2018-05-09 20:28:13 +08:00
Jiang Jiang Jian
b9aee83d9b Merge branch 'feature/put_supplicant_source_code_from_VNC_to_IDF' into 'master' 
wpa_supplicant: move part of codes to IDF

See merge request idf/esp-idf!2272
 2018-05-09 15:19:37 +08:00
Deng Xin
b00d256d5b wpa_supplicant:move part of codes to IDF 2018-05-09 10:44:35 +08:00
Ivan Grokhotkov
a2556229aa Merge branch 'bugfix/uart_fix_get_baudrate_error_bug' into 'master' 
driver(uart):   Fix uart_get_baudrate incorrect return value when using ref_tick

See merge request idf/esp-idf!2295
 2018-05-08 20:25:13 +08:00
michael
197f594b06 fix(spi): fix the issue when bus flag not set, dual mode cannot be used. 2018-05-08 15:47:26 +08:00
michael
28beafc624 fix(spi): fix the issue that native pins don't work after SPI initialized before 2018-05-08 15:47:25 +08:00
Michael (XIAO Xufeng)
1f085b1a3b feat(gpio): add function allowing switching input source from GPIO back to IOMUX 2018-05-08 15:47:25 +08:00
Angus Gratton
bb1f3ae264 Merge branch 'feature/psram_configure_in_runtime' into 'master' 
feature(psram): update psram and flash SPI frequency in runtime

See merge request idf/esp-idf!1776
 2018-05-08 15:23:47 +08:00
Jiang Jiang Jian
139a8a2745 Merge branch 'bugfix/optimize_coexist_performance' into 'master' 
component/esp32 : improve wifi and bluetooth coexistence performance

See merge request idf/esp-idf!2349
 2018-05-08 11:11:03 +08:00
Tian Hao
8cd9deed5c component/esp32 : improve wifi and bluetooth coexistence performance 
1. update coexistence and wifi libraries. Coexist version update to
v0.9.2
2. Cancel the restriction of use AMPDU when SW_COEXIST_ENABLE is y.
 2018-05-07 19:55:41 +08:00
Jiang Jiang Jian
db90f49758 Merge branch 'bugfix/update_emac_h' into 'master' 
update emac_reg_v2.h

See merge request idf/esp-idf!2050
 2018-05-07 16:16:52 +08:00
Roland Dobai
80ff8d55ac bluedroid: use the new socket registering API 2018-05-07 09:01:56 +02:00
Roland Dobai
5129bca67c VFS: Use smaller numbers as file descriptors 2018-05-07 09:01:56 +02:00
Angus Gratton
06082d9308 Merge branch 'doc/spi_master_thread_safety' into 'master' 
driver: Add notes to SPI driver docs about thread safety

See merge request idf/esp-idf!2354
 2018-05-07 14:49:41 +08:00
Jiang Jiang Jian
dc13f489ca Merge branch 'bugfix/fix_two_wifi_bugs' into 'master' 
esp32: fix two wifi bugs

See merge request idf/esp-idf!2352
 2018-05-07 14:00:24 +08:00
Ivan Grokhotkov
73ec743a0a Merge branch 'bugfix/nvs_page_compaction' into 'master' 
nvs: Fix recovery from power-off while page is being freed

See merge request idf/esp-idf!2327
 2018-05-07 09:08:23 +08:00
Angus Gratton
b90ad81f22 driver: Add notes to SPI driver docs about thread safety 2018-05-07 09:03:48 +08:00
Liu Zhi Fu
a9dfa06125 esp32: fix two wifi bugs 
1. Fix the bug that WiFi receives duplicate MPDU
2. Deauth the station if soft-AP already has max WiFi connections
 2018-05-06 17:29:06 +08:00
baohongde
cbab7fec76 component/bt: Fix bug a2dp have disconnect state when connecting with iphone 7 2018-05-04 19:44:40 +08:00
Jiang Jiang Jian
b827e0e331 Merge branch 'feature/btdm_get_end_handle_when_get_include_service' into 'master' 
Component/bt: get end_handle when get include services

See merge request idf/esp-idf!2319
 2018-05-04 19:31:43 +08:00
Jiang Jiang Jian
ade78d3850 Merge branch 'bugfix/btdm_fix_version_excahnge_issue' into 'master' 
Component/bt: fix version exchange issue

See merge request idf/esp-idf!2329
 2018-05-04 19:30:03 +08:00
Jiang Jiang Jian
25440cbc23 Merge branch 'bugfix/tw12351_wifi_lock_op' into 'master' 
esp32: optimize wifi lock

See merge request idf/esp-idf!2345
 2018-05-04 19:27:14 +08:00
Jiang Jiang Jian
dc7280c1d9 Merge branch 'bugfix/tw20575_fix_potential_phy_calibration_bug' into 'master' 
esp32: fix potential PHY calibration bug

See merge request idf/esp-idf!2339
 2018-05-04 19:24:05 +08:00
Liu Zhi Fu
017f109f6e esp32: optimize wifi lock 
Replace portENTER_CRITICAL/portEXIT_CRITICAL with semaphore lock if
the protected resource is only accessed by different tasks
 2018-05-04 10:36:04 +08:00
kooho
0dca2d4c68 driver(uart): Fix uart_get_baudrate incorrect return value when using ref_tick 2018-05-04 09:41:41 +08:00
baohongde
c22c070e07 component/bt: Add APIs of get and remove bond device 
1. Add APIs of get and remove bond device
2. Add ESP_BT_GAP_AUTH_CMPL_EVT
 2018-05-03 19:05:57 +08:00
Liu Zhi Fu
402dee17a1 esp32: fix potential PHY calibration bug 
1. Add error log if failed to store calibration version/mac/data
2. Change the NVS calibration version/mac/data store sequence
3. Pass the init_data instead of NULL to esp_phy_rf_init() in esp_phy_load_cal_and_init()
 2018-05-03 15:48:14 +08:00
Jiang Jiang Jian
444d6606e7 Merge branch 'bugfix/mark_auto_connect_api_as_obsolete' into 'master' 
esp32: mark WiFi auto connect API as deprecated

See merge request idf/esp-idf!1970
 2018-05-03 10:40:27 +08:00
Angus Gratton
ec536b3961 Merge branch 'bugfix/wifi_log_level' into 'master' 
wifi: Set default wifi library log level based on sdkconfig

See merge request idf/esp-idf!2334
 2018-05-03 10:21:19 +08:00
Ivan Grokhotkov
0d65f3b7f9 Merge branch 'bugfix/light_sleep_fixes' into 'master' 
light sleep fixes

See merge request idf/esp-idf!2242
 2018-05-02 20:09:36 +08:00
Ivan Grokhotkov
34816ff008 Merge branch 'bugfix/free_mem_console' into 'master' 
Free allocations in command.c after error conditions

See merge request idf/esp-idf!2332
 2018-05-02 15:48:31 +08:00
Ivan Grokhotkov
5cc966e5b4 Merge branch 'feature/aws_iot_mqtt_on_443' into 'master' 
aws_iot: add support for MQTT TLS over port 443

See merge request idf/esp-idf!2292
 2018-05-02 15:43:29 +08:00
Ivan Grokhotkov
57630bf5ec Merge branch 'bugfix/cjson_include_objs' into 'master' 
cJSON : Include only source file objects

See merge request idf/esp-idf!2326
 2018-05-02 15:42:59 +08:00
Sagar Bijwe
7ae1df1c5e nvs: Fix recovery from power-off while page is being freed 
Currently when page is being freed, items are individually moved from
FREEING page to ACTIVE page and erased. If power-off happens during the
process, the remaining entries are moved to ACTIVE page during recovery.
The problem with this approach is there may not be enough space on
ACTIVE page for all items if an item was partially written before
power-off and erased during recovery. This change moves all the items
from FREEING to ACTIVE page and then erased the FREEING page, If
power-off happens during the process, then ACTIVE page is erased and the
process is restarted.
 2018-05-02 12:18:02 +05:30
Angus Gratton
b9126e69bc wifi: Set default wifi library log level based on sdkconfig 
Has to be set at runtime, due to precompiled wifi libraries.

Prompted by discussion on forum: https://esp32.com/viewtopic.php?f=2&t=5570&p=24216#p24216
 2018-05-02 15:11:21 +10:00
Ivan Grokhotkov
5f956125c1 Merge branch 'feature/mfg_bin_create_utility' into 'master' 
nvs_flash: Add external binary creation support for NVS partition.

See merge request idf/esp-idf!2031
 2018-05-02 11:58:38 +08:00
Liu Zhi Fu
c23915939d esp32: mark WiFi auto connect API as obsolete 
Mark esp_wifi_set/get_auto_connect as obsolete
 2018-05-02 09:54:31 +08:00
Jiang Jiang Jian
1e8ab3d18e Merge branch 'bugfix/gap_appearance_fixes' into 'master' 
components/bt: Make modifications to the support of GAP appearance/icon characteristic

See merge request idf/esp-idf!2249
 2018-05-01 23:00:24 +08:00
Jiang Jiang Jian
0bb551c051 Merge branch 'bugfix/btdm_prepare_write_status_correct' into 'master' 
component/bt: Check the value received from the peer device when sent the data used prepare write.

See merge request idf/esp-idf!2320
 2018-05-01 22:57:20 +08:00
Jiang Jiang Jian
95cbdd76dc Merge branch 'feature/btdm_read_bredr_rssi' into 'master' 
component/bt : add class bt read RSSI delta (golden range)

See merge request idf/esp-idf!2325
 2018-05-01 22:55:50 +08:00
Anuj Deshpande
87adbd3229 console: Fix formatting 2018-04-30 14:22:45 +05:30
Anuj Deshpande
b3894dba97 console: Free alloc'd memory after error conditions 
Closes https://github.com/espressif/esp-idf/issues/1901
 2018-04-30 14:21:03 +05:30
Anuj Deshpande
9356d6af3f cJSON : Include only source file objects 
- test.c can cause issues if there is another main function
- Closes https://github.com/espressif/esp-idf/issues/1883
 2018-04-30 13:51:54 +05:30
Jiang Jiang Jian
5a080ee37a Merge branch 'bugfix/btdm_genrate_hash_key_by_bluedroid' into 'master' 
component/bt: Added the hash key generated directly in the bluedroid module.

See merge request idf/esp-idf!2321
 2018-04-28 16:42:27 +08:00