esp32: follow update of esp-idf

This commit is contained in:
Matthias Ringwald 2017-03-06 20:52:53 +01:00
parent 75932a001c
commit 3534659c26
3 changed files with 24 additions and 9 deletions

View File

@ -45,7 +45,6 @@
#include "btstack_linked_list.h"
#include "btstack_debug.h"
#include "btstack_run_loop.h"
#include "btstack_run_loop_freertos_single_threaded.h"
// #include "hal_time_ms.h"
@ -168,13 +167,13 @@ static void btstack_run_loop_freertos_single_threaded_execute(void) {
}
}
static void btstack_run_loop_freertos_single_threaded_btstack_run_loop_init(void){
static void btstack_run_loop_freertos_single_threaded_init(void){
timers = NULL;
// queue to receive events: up to 2 calls from transport, up to 3 for app
btstack_run_loop_queue = xQueueCreate(5, sizeof(function_call_t));
log_info("run loop init");
printf("run loop init, queue item size %u\n", (int) sizeof(function_call_t));
}
/**
@ -185,7 +184,7 @@ const btstack_run_loop_t * btstack_run_loop_freertos_single_threaded_get_instanc
}
static const btstack_run_loop_t btstack_run_loop_freertos_single_threaded = {
&btstack_run_loop_freertos_single_threaded_btstack_run_loop_init,
&btstack_run_loop_freertos_single_threaded_init,
NULL,
NULL,
NULL,

View File

@ -120,8 +120,18 @@ static void transport_init(const void *transport_config){
* open transport connection
*/
static int transport_open(void){
esp_err_t ret;
log_info("transport_open");
esp_bt_controller_init();
ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM);
if (ret) {
log_error("transpprt: esp_bt_controller_enable failed");
return -1;
}
esp_vhci_host_register_callback(&vhci_host_cb);
return 0;
}

View File

@ -38,10 +38,10 @@ CONFIG_ESPTOOLPY_BAUD_OTHER=y
CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=1000000
CONFIG_ESPTOOLPY_BAUD=1000000
# CONFIG_ESPTOOLPY_COMPRESSED is not set
# CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
# CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
# CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set
# CONFIG_FLASHMODE_QIO is not set
# CONFIG_FLASHMODE_QOUT is not set
CONFIG_FLASHMODE_DIO=y
# CONFIG_FLASHMODE_DOUT is not set
CONFIG_ESPTOOLPY_FLASHMODE="dio"
# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
@ -92,6 +92,7 @@ CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
CONFIG_BT_ENABLED=y
CONFIG_BTC_TASK_STACK_SIZE=3072
# CONFIG_BLUEDROID_MEM_DEBUG is not set
# CONFIG_BT_DRAM_RELEASE is not set
CONFIG_BT_RESERVE_DRAM=0x10000
#
@ -108,6 +109,9 @@ CONFIG_TRACEMEM_RESERVE_DRAM=0x0
# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
# CONFIG_ESP32_ENABLE_COREDUMP is not set
# CONFIG_TWO_MAC_ADDRESS_FROM_EFUSE is not set
CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE=y
CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE=4
CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
CONFIG_MAIN_TASK_STACK_SIZE=4096
@ -143,7 +147,7 @@ CONFIG_PHY_ENABLED=y
#
# PHY
#
CONFIG_ESP32_PHY_AUTO_INIT=y
CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y
# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
CONFIG_ESP32_PHY_MAX_TX_POWER=20
# CONFIG_ETHERNET is not set
@ -159,6 +163,7 @@ CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL=y
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY is not set
# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3
CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
@ -167,6 +172,7 @@ CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG=y
# CONFIG_ENABLE_MEMORY_DEBUG is not set
CONFIG_FREERTOS_ISR_STACKSIZE=1536
# CONFIG_FREERTOS_LEGACY_HOOKS is not set
CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
# CONFIG_FREERTOS_DEBUG_INTERNALS is not set
#