Merge branch 'development'

This commit is contained in:
ole.reinhardt@googlemail.com 2014-09-02 21:56:37 +00:00
parent d2effbcc76
commit f59d59529d
4 changed files with 36 additions and 4 deletions

7
.gitignore vendored Normal file
View File

@ -0,0 +1,7 @@
# .gitignore-file
*.o
*.*~
.netrc
include/btstack/version.h

19
example/libusb/.gitignore vendored Normal file
View File

@ -0,0 +1,19 @@
# local .gitignore-file
ancs_client
ancs_client.h
ble_peripheral
ble_peripheral_sm_minimal
classic_test
gap_dedicated_bonding
gap_inquiry
gap_inquiry_and_bond
gatt_browser
l2cap_test
profile.h
sdp_bnep_query
sdp_general_query
sdp_rfcomm_query
spp_and_le_counter
spp_and_le_counter.h
spp_counter
spp_streamer

View File

@ -94,7 +94,7 @@ spp_counter: ${CORE_OBJ} ${COMMON_OBJ} spp_counter.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
spp_and_le_counter: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_REAL_OBJ} spp_and_le_counter.c spp_and_le_counter.h
${CC} ${CFLAGS} ${LDFLAGS} ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${SM_REAL_OBJ} spp_and_le_counter.c -o $@
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
spp_counter_ssp: ${CORE_OBJ} ${COMMON_OBJ} spp_counter_ssp.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
@ -154,5 +154,9 @@ clean:
rm -f ${BTSTACK_ROOT}/src/*.o
rm -f ${BTSTACK_ROOT}/ble/*.o
rm -f ${BTSTACK_ROOT}/chipset-cc256x/*.o
rm -f ${BTSTACK_ROOT}/include/btstack/version.h
rm -f ${BTSTACK_ROOT}/example/libusb/ancs_client.h
rm -f ${BTSTACK_ROOT}/example/libusb/profile.h
rm -f ${BTSTACK_ROOT}/example/libusb/spp_and_le_counter.h
rm -rf *.dSYM

View File

@ -33,9 +33,11 @@ typedef enum {
DONE
} state_t;
#define DATA_VOLUME (1000 * 1000)
// configuration area {
static bd_addr_t remote = {0x84, 0x38, 0x35, 0x65, 0xD1, 0x15}; // address of remote device
static const int data_volume = 1000 * 1000; // amout of test data to send in bytes
static const int data_volume = DATA_VOLUME; // amout of test data to send in bytes
static const char * spp_service_name_prefix = "Bluetooth-Incoming"; // default on OS X
// configuration area }
@ -44,7 +46,7 @@ static uint16_t test_data_len = sizeof(test_data);
static uint8_t channel_nr = 0;
static uint16_t mtu;
static uint16_t rfcomm_cid = 0;
static uint32_t data_to_send = data_volume;
static uint32_t data_to_send = DATA_VOLUME;
static state_t state = W4_SDP_RESULT;
static void create_test_data(void){