From ff01079be91ff57f4cde9302647daaa3f8777046 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 19 Jan 2018 16:32:28 +0100 Subject: [PATCH] add le_data_channel examples to most ports --- example/Makefile.inc | 5 ++--- port/apollo2-em9304/btstack_config.h | 1 + port/libusb/Makefile | 5 ----- port/max32630-fthr/src/btstack_config.h | 1 + port/nrf5-zephyr/btstack_config.h | 3 ++- port/pic32-harmony/src/btstack_config.h | 1 + port/posix-h4-atwilc3000/btstack_config.h | 1 + port/posix-h4-da14581/btstack_config.h | 1 + port/posix-h4-zephyr/btstack_config.h | 1 + port/posix-h4/btstack_config.h | 1 + port/posix-h5-bcm/btstack_config.h | 1 + port/posix-h5/btstack_config.h | 1 + port/samv71-xplained-atwilc3000/btstack_config.h | 1 + port/stm32-f4discovery-cc256x/src/btstack_config.h | 1 + port/wiced-h4/btstack_config.h | 1 + port/wiced-h5/btstack_config.h | 1 + port/windows-h4-zephyr/btstack_config.h | 1 + port/windows-h4/btstack_config.h | 1 + port/windows-winusb/btstack_config.h | 1 + 19 files changed, 20 insertions(+), 9 deletions(-) diff --git a/example/Makefile.inc b/example/Makefile.inc index 094ed87d1..37f97796f 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -127,6 +127,8 @@ EXAMPLES = \ hsp_ag_demo \ hsp_hs_demo \ le_counter \ + le_data_channel_client \ + le_data_channel_server \ le_streamer \ le_streamer_client \ led_counter \ @@ -142,9 +144,6 @@ EXAMPLES = \ spp_streamer \ spp_streamer_client \ -# le_data_channel_client \ -# le_data_channel_server \ - EXAMPLES_USING_LE = \ ancs_client_demo \ gatt_battery_query \ diff --git a/port/apollo2-em9304/btstack_config.h b/port/apollo2-em9304/btstack_config.h index cc0750f1b..7805b3d60 100644 --- a/port/apollo2-em9304/btstack_config.h +++ b/port/apollo2-em9304/btstack_config.h @@ -12,6 +12,7 @@ #define ENABLE_BLE #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_CENTRAL +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION // #define ENABLE_LOG_INFO #define ENABLE_LOG_ERROR diff --git a/port/libusb/Makefile b/port/libusb/Makefile index 28eb4453c..6afbee657 100644 --- a/port/libusb/Makefile +++ b/port/libusb/Makefile @@ -21,11 +21,6 @@ VPATH += ${BTSTACK_ROOT}/platform/libusb CFLAGS += $(shell pkg-config libusb-1.0 --cflags) LDFLAGS += $(shell pkg-config libusb-1.0 --libs) -# override examples for now -EXAMPLES = \ - le_data_channel_client \ - le_data_channel_server \ - # use pkg-config for portaudio # CFLAGS += $(shell pkg-config portaudio-2.0 --cflags) -DHAVE_PORTAUDIO # LDFLAGS += $(shell pkg-config portaudio-2.0 --libs) diff --git a/port/max32630-fthr/src/btstack_config.h b/port/max32630-fthr/src/btstack_config.h index 00c8d6d0e..77308f7cd 100644 --- a/port/max32630-fthr/src/btstack_config.h +++ b/port/max32630-fthr/src/btstack_config.h @@ -14,6 +14,7 @@ #define ENABLE_CLASSIC #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_CENTRAL +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO //#define ENABLE_LOG_DEBUG diff --git a/port/nrf5-zephyr/btstack_config.h b/port/nrf5-zephyr/btstack_config.h index b7682f50b..8ccdc9834 100644 --- a/port/nrf5-zephyr/btstack_config.h +++ b/port/nrf5-zephyr/btstack_config.h @@ -13,6 +13,7 @@ #define ENABLE_LE_CENTRAL #define ENABLE_LOG_INFO #define ENABLE_LOG_ERROR +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION // BTstack configuration. buffers, sizes, ... @@ -37,4 +38,4 @@ // hack to fix usage of hci_init in zephry #define hci_init btstack_hci_init -#endif \ No newline at end of file +#endif diff --git a/port/pic32-harmony/src/btstack_config.h b/port/pic32-harmony/src/btstack_config.h index c12cbaf24..9e7214f72 100644 --- a/port/pic32-harmony/src/btstack_config.h +++ b/port/pic32-harmony/src/btstack_config.h @@ -16,6 +16,7 @@ //#define ENABLE_LOG_DEBUG #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_CENTRAL +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LOG_INFO #define ENABLE_LOG_ERROR diff --git a/port/posix-h4-atwilc3000/btstack_config.h b/port/posix-h4-atwilc3000/btstack_config.h index 00b876d2e..b4e6b9a41 100644 --- a/port/posix-h4-atwilc3000/btstack_config.h +++ b/port/posix-h4-atwilc3000/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/posix-h4-da14581/btstack_config.h b/port/posix-h4-da14581/btstack_config.h index 00b876d2e..b4e6b9a41 100644 --- a/port/posix-h4-da14581/btstack_config.h +++ b/port/posix-h4-da14581/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/posix-h4-zephyr/btstack_config.h b/port/posix-h4-zephyr/btstack_config.h index 00b876d2e..b4e6b9a41 100644 --- a/port/posix-h4-zephyr/btstack_config.h +++ b/port/posix-h4-zephyr/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/posix-h4/btstack_config.h b/port/posix-h4/btstack_config.h index daeb879a6..84411e5ec 100644 --- a/port/posix-h4/btstack_config.h +++ b/port/posix-h4/btstack_config.h @@ -20,6 +20,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/posix-h5-bcm/btstack_config.h b/port/posix-h5-bcm/btstack_config.h index f15b838c3..47fe5be9f 100644 --- a/port/posix-h5-bcm/btstack_config.h +++ b/port/posix-h5-bcm/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/posix-h5/btstack_config.h b/port/posix-h5/btstack_config.h index f15b838c3..47fe5be9f 100644 --- a/port/posix-h5/btstack_config.h +++ b/port/posix-h5/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/samv71-xplained-atwilc3000/btstack_config.h b/port/samv71-xplained-atwilc3000/btstack_config.h index 71d0e9e67..37bc89177 100644 --- a/port/samv71-xplained-atwilc3000/btstack_config.h +++ b/port/samv71-xplained-atwilc3000/btstack_config.h @@ -15,6 +15,7 @@ #define ENABLE_LOG_ERROR #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_CENTRAL +#define ENABLE_LE_DATA_CHANNELS #define HCI_ACL_PAYLOAD_SIZE 300 diff --git a/port/stm32-f4discovery-cc256x/src/btstack_config.h b/port/stm32-f4discovery-cc256x/src/btstack_config.h index ae8321a52..96f3bfff4 100644 --- a/port/stm32-f4discovery-cc256x/src/btstack_config.h +++ b/port/stm32-f4discovery-cc256x/src/btstack_config.h @@ -14,6 +14,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_CENTRAL #define ENABLE_CLASSIC +#define ENABLE_LE_DATA_CHANNELS // #define ENABLE_LOG_INFO #define ENABLE_LOG_ERROR #define ENABLE_CC256X_BAUDRATE_CHANGE_FLOWCONTROL_BUG_WORKAROUND diff --git a/port/wiced-h4/btstack_config.h b/port/wiced-h4/btstack_config.h index 8f0618b3f..cf186fe0b 100644 --- a/port/wiced-h4/btstack_config.h +++ b/port/wiced-h4/btstack_config.h @@ -17,6 +17,7 @@ #define ENABLE_LE_CENTRAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/wiced-h5/btstack_config.h b/port/wiced-h5/btstack_config.h index 79aa923e4..d5037213c 100644 --- a/port/wiced-h5/btstack_config.h +++ b/port/wiced-h5/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS #define ENABLE_LE_DATA_LENGTH_EXTENSION +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO // #define ENABLE_LOG_DEBUG diff --git a/port/windows-h4-zephyr/btstack_config.h b/port/windows-h4-zephyr/btstack_config.h index cfaec6053..b319840a8 100644 --- a/port/windows-h4-zephyr/btstack_config.h +++ b/port/windows-h4-zephyr/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/windows-h4/btstack_config.h b/port/windows-h4/btstack_config.h index cfaec6053..b319840a8 100644 --- a/port/windows-h4/btstack_config.h +++ b/port/windows-h4/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO diff --git a/port/windows-winusb/btstack_config.h b/port/windows-winusb/btstack_config.h index 192051c9e..e7fcdb4cc 100644 --- a/port/windows-winusb/btstack_config.h +++ b/port/windows-winusb/btstack_config.h @@ -19,6 +19,7 @@ #define ENABLE_LE_PERIPHERAL #define ENABLE_LE_SECURE_CONNECTIONS #define ENABLE_MICRO_ECC_FOR_LE_SECURE_CONNECTIONS +#define ENABLE_LE_DATA_CHANNELS #define ENABLE_LE_DATA_LENGTH_EXTENSION #define ENABLE_LOG_ERROR #define ENABLE_LOG_INFO