mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-18 14:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrected HCI_EVENT_INQUIRY_RESULT and HCI_EVENT_INQUIRY_RESULT_WITH_RSSI handling

Browse Source
This commit is contained in:
mila@ringwald.ch 2014-08-08 13:14:07 +00:00
parent 2e17d07dac
commit 206a90311e
9 changed files with 174 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CocoaTouch/src/BTInquiryViewController.m
View File

@ -158,24 +158,34 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
{ {
int numResponses = packet[2]; int numResponses = packet[2];
int i; int i;
int offset = 3;
for (i=0; i<numResponses;i++){ for (i=0; i<numResponses;i++){
bd_addr_t addr; bd_addr_t addr;
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset += 6;
if ([inqView getDeviceForAddress:&addr]) { if ([inqView getDeviceForAddress:&addr]) {
// NSLog(@"Device %@ already in list", [BTDevice stringForAddress:&addr]); // NSLog(@"Device %@ already in list", [BTDevice stringForAddress:&addr]);
continue; continue;
} }
BTDevice *dev = [[BTDevice alloc] init]; BTDevice *dev = [[BTDevice alloc] init];
[dev setAddress:&addr]; [dev setAddress:&addr];
[dev setPageScanRepetitionMode:packet[3 + numResponses*6 + i]]; [dev setPageScanRepetitionMode:packet[offset]];
offset += 1;
switch (packet[0]) { switch (packet[0]) {
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
offset += 2; // Reserved + Reserved
[dev setClassOfDevice:READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3)]; [dev setClassOfDevice:READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3)];
offset += 3;
[dev setClockOffset:( READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff)]; [dev setClockOffset:( READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff)];
offset += 2;
break; break;
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:
offset += 1; // Reserved
[dev setClassOfDevice:READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3)]; [dev setClassOfDevice:READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3)];
offset += 3;
[dev setClockOffset:( READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff)]; [dev setClockOffset:( READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff)];
offset += 3; // setClockOffset(2) + RSSI(1)
break; break;
default: default:
break; break;

20
CocoaTouch/src/BTstackManager.m
View File

@ -431,10 +431,12 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
} }
break; break;
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = packet[2];
int offset = 3;
for (i=0; i<numResponses ;i++){ for (i=0; i<numResponses ;i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset += 6;
// NSLog(@"found %@", [BTDevice stringForAddress:&addr]); // NSLog(@"found %@", [BTDevice stringForAddress:&addr]);
BTDevice* device = [self deviceForAddress:&addr]; BTDevice* device = [self deviceForAddress:&addr];
if (!device) { if (!device) {
@ -442,14 +444,18 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
[discoveredDevices addObject:device]; [discoveredDevices addObject:device];
[device setAddress:&addr]; [device setAddress:&addr];
} }
device.pageScanRepetitionMode = packet [3 + numResponses*(6) + i*1]; device.pageScanRepetitionMode = packet [offset];
device.classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3); offset += 2; // pageScanRepetitionMode + Reserved
device.clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff; device.classOfDevice = READ_BT_24(offset);
device.rssi = packet [3 + numResponses*(6+1+1+3+2) + i*1]; offset += 3;
device.clockOffset = READ_BT_16(offset) & 0x7fff;
offset += 2;
device.rssi = packet[offset];
offset += 1;
[self sendDeviceInfo:device]; [self sendDeviceInfo:device];
} }
break; break;
}
case BTSTACK_EVENT_REMOTE_NAME_CACHED: case BTSTACK_EVENT_REMOTE_NAME_CACHED:
[self handleRemoteNameCached:packet]; [self handleRemoteNameCached:packet];
break; break;

32
MSP-EXP430F5438-CC256x/example/gap_inquiry.c
View File

@ -118,23 +118,34 @@ static void packet_handler (uint8_t packet_type, uint8_t *packet, uint16_t size)
case ACTIVE: case ACTIVE:
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = packet[2];
int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset =+ 6;
int index = getDeviceIndexForAddress(addr); int index = getDeviceIndexForAddress(addr);
if (index >= 0) continue; // already in our list if (index >= 0) continue; // already in our list
memcpy(devices[deviceCount].address, addr, 6); memcpy(devices[deviceCount].address, addr, 6);
devices[deviceCount].pageScanRepetitionMode = packet [3 + numResponses*(6) + i*1];
devices[deviceCount].pageScanRepetitionMode = packet[offset];
offset += 1;
if (event == HCI_EVENT_INQUIRY_RESULT){ if (event == HCI_EVENT_INQUIRY_RESULT){
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3); offset += 2; // Reserved + Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2;
devices[deviceCount].rssi = 0; devices[deviceCount].rssi = 0;
} else { } else {
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3); offset += 1; // Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
devices[deviceCount].rssi = packet [3 + numResponses*(6+1+1+3+2) + i*1]; offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2
devices[deviceCount].rssi = packet[offset];
offset += 1;
} }
devices[deviceCount].state = REMOTE_NAME_REQUEST; devices[deviceCount].state = REMOTE_NAME_REQUEST;
printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr), printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr),
@ -142,8 +153,9 @@ static void packet_handler (uint8_t packet_type, uint8_t *packet, uint16_t size)
devices[deviceCount].clockOffset, devices[deviceCount].rssi); devices[deviceCount].clockOffset, devices[deviceCount].rssi);
deviceCount++; deviceCount++;
} }
break;
break;
}
case HCI_EVENT_INQUIRY_COMPLETE: case HCI_EVENT_INQUIRY_COMPLETE:
for (i=0;i<deviceCount;i++) { for (i=0;i<deviceCount;i++) {
// retry remote name request // retry remote name request

34
example/inquiry.c
View File

@ -144,30 +144,44 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case ACTIVE: case ACTIVE:
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = packet[2];
int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset =+ 6;
int index = getDeviceIndexForAddress(addr); int index = getDeviceIndexForAddress(addr);
if (index >= 0) continue; if (index >= 0) continue; // already in our list
memcpy(devices[deviceCount].address, addr, 6); memcpy(devices[deviceCount].address, addr, 6);
devices[deviceCount].pageScanRepetitionMode = packet [3 + numResponses*(6) + i*1];
devices[deviceCount].pageScanRepetitionMode = packet[offset];
offset += 1;
if (event == HCI_EVENT_INQUIRY_RESULT){ if (event == HCI_EVENT_INQUIRY_RESULT){
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3); offset += 2; // Reserved + Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2;
devices[deviceCount].rssi = 0; devices[deviceCount].rssi = 0;
} else { } else {
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3); offset += 1; // Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
devices[deviceCount].rssi = packet [3 + numResponses*(6+1+1+3+2) + i*1]; offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2
devices[deviceCount].rssi = packet[offset];
offset += 1;
} }
devices[deviceCount].state = REMOTE_NAME_REQUEST; devices[deviceCount].state = REMOTE_NAME_REQUEST;
printf("Device found: %s with COD: 0x%06x, pageScan %u, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr), printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr),
devices[deviceCount].classOfDevice, devices[deviceCount].pageScanRepetitionMode, devices[deviceCount].classOfDevice, devices[deviceCount].pageScanRepetitionMode,
devices[deviceCount].clockOffset, devices[deviceCount].rssi); devices[deviceCount].clockOffset, devices[deviceCount].rssi);
deviceCount++; deviceCount++;
} }
break; break;
}
case HCI_EVENT_INQUIRY_COMPLETE: case HCI_EVENT_INQUIRY_COMPLETE:
for (i=0;i<deviceCount;i++) { for (i=0;i<deviceCount;i++) {

32
example/libusb/classic_test.c
View File

@ -150,23 +150,34 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = packet[2];
int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset =+ 6;
int index = getDeviceIndexForAddress(addr); int index = getDeviceIndexForAddress(addr);
if (index >= 0) continue; // already in our list if (index >= 0) continue; // already in our list
memcpy(devices[deviceCount].address, addr, 6); memcpy(devices[deviceCount].address, addr, 6);
devices[deviceCount].pageScanRepetitionMode = packet [3 + numResponses*(6) + i*1];
devices[deviceCount].pageScanRepetitionMode = packet[offset];
offset += 1;
if (event == HCI_EVENT_INQUIRY_RESULT){ if (event == HCI_EVENT_INQUIRY_RESULT){
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3); offset += 2; // Reserved + Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2;
devices[deviceCount].rssi = 0; devices[deviceCount].rssi = 0;
} else { } else {
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3); offset += 1; // Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
devices[deviceCount].rssi = packet [3 + numResponses*(6+1+1+3+2) + i*1]; offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2
devices[deviceCount].rssi = packet[offset];
offset += 1;
} }
devices[deviceCount].state = REMOTE_NAME_REQUEST; devices[deviceCount].state = REMOTE_NAME_REQUEST;
printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr), printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr),
@ -174,8 +185,9 @@ static void inquiry_packet_handler (uint8_t packet_type, uint8_t *packet, uint16
devices[deviceCount].clockOffset, devices[deviceCount].rssi); devices[deviceCount].clockOffset, devices[deviceCount].rssi);
deviceCount++; deviceCount++;
} }
break;
break;
}
case HCI_EVENT_INQUIRY_COMPLETE: case HCI_EVENT_INQUIRY_COMPLETE:
for (i=0;i<deviceCount;i++) { for (i=0;i<deviceCount;i++) {
// retry remote name request // retry remote name request

162
example/libusb/gap_inquiry.c
View File

@ -10,168 +10,68 @@
#include <string.h> #include <string.h>
#include "btstack-config.h" #include "btstack-config.h"
#include <btstack/run_loop.h> #include <btstack/run_loop.h>
#include <btstack/sdp_util.h> #include <btstack/sdp_util.h>
#include <btstack/utils.h>
#include <btstack/utils.h>
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#define MAX_DEVICES 10 #define OPCODE(ogf, ocf) (ocf | ogf << 10)
enum DEVICE_STATE { REMOTE_NAME_REQUEST, REMOTE_NAME_INQUIRED, REMOTE_NAME_FETCHED };
struct device {
bd_addr_t address;
uint16_t clockOffset;
uint32_t classOfDevice;
uint8_t pageScanRepetitionMode;
uint8_t rssi;
enum DEVICE_STATE state;
};
#define INQUIRY_INTERVAL 5 enum STATE {INIT, W4_1, W4_2, W4_3, DONE} ;
struct device devices[MAX_DEVICES];
int deviceCount = 0;
enum STATE {INIT, W4_INQUIRY_MODE_COMPLETE, ACTIVE} ;
enum STATE state = INIT; enum STATE state = INIT;
static const hci_cmd_t hci_write_linkkey = {
OPCODE(OGF_CONTROLLER_BASEBAND, 0x11), "1BP"
};
int getDeviceIndexForAddress( bd_addr_t addr){ static const hci_cmd_t hci_read_linkkeys = {
int j; OPCODE(OGF_CONTROLLER_BASEBAND, 0x0D), "B1"
for (j=0; j< deviceCount; j++){ };
if (BD_ADDR_CMP(addr, devices[j].address) == 0){
return j;
}
}
return -1;
}
void start_scan(void){
printf("Starting inquiry scan..\n");
hci_send_cmd(&hci_inquiry, HCI_INQUIRY_LAP, INQUIRY_INTERVAL, 0);
}
int has_more_remote_name_requests(void){
int i;
for (i=0;i<deviceCount;i++) {
if (devices[i].state == REMOTE_NAME_REQUEST) return 1;
}
return 0;
}
void do_next_remote_name_request(void){
int i;
for (i=0;i<deviceCount;i++) {
// remote name request
if (devices[i].state == REMOTE_NAME_REQUEST){
devices[i].state = REMOTE_NAME_INQUIRED;
printf("Get remote name of %s...\n", bd_addr_to_str(devices[i].address));
hci_send_cmd(&hci_remote_name_request, devices[i].address,
devices[i].pageScanRepetitionMode, 0, devices[i].clockOffset | 0x8000);
return;
}
}
}
static void continue_remote_names(){
if (has_more_remote_name_requests()){
do_next_remote_name_request();
return;
}
start_scan();
}
static void packet_handler (uint8_t packet_type, uint8_t *packet, uint16_t size){ static void packet_handler (uint8_t packet_type, uint8_t *packet, uint16_t size){
bd_addr_t addr; bd_addr_t a = {1,2,3,4,5,6};
int i; uint8_t linkkey[16];
int numResponses;
// printf("packet_handler: pt: 0x%02x, packet[0]: 0x%02x\n", packet_type, packet[0]); // printf("packet_handler: pt: 0x%02x, packet[0]: 0x%02x\n", packet_type, packet[0]);
if (packet_type != HCI_EVENT_PACKET) return; if (packet_type != HCI_EVENT_PACKET) return;
uint8_t event = packet[0];
switch(state){ switch(state){
case INIT: case INIT:
if (packet[2] == HCI_STATE_WORKING) { if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI // hci_send_cmd(&hci_write_inquiry_mode, 0x01); // with RSSI
state = W4_INQUIRY_MODE_COMPLETE; hci_send_cmd(&hci_write_linkkey, 1, a, linkkey);
state = W4_1;
} }
break; break;
case W4_INQUIRY_MODE_COMPLETE: case W4_1:
if ( COMMAND_COMPLETE_EVENT(packet, hci_write_inquiry_mode) ) { if ( COMMAND_COMPLETE_EVENT(packet, hci_write_linkkey) ) {
start_scan(); a[0] = 2;
state = ACTIVE; hci_send_cmd(&hci_write_linkkey, 1, a, linkkey);
state = W4_2;
} }
break; break;
case W4_2:
case ACTIVE: if ( COMMAND_COMPLETE_EVENT(packet, hci_write_linkkey) ) {
switch(event){ a[0] = 4;
case HCI_EVENT_INQUIRY_RESULT: hci_send_cmd(&hci_write_linkkey, 1, a, linkkey);
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: state = W4_3;
numResponses = packet[2];
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
bt_flip_addr(addr, &packet[3+i*6]);
int index = getDeviceIndexForAddress(addr);
if (index >= 0) continue; // already in our list
memcpy(devices[deviceCount].address, addr, 6);
devices[deviceCount].pageScanRepetitionMode = packet [3 + numResponses*(6) + i*1];
if (event == HCI_EVENT_INQUIRY_RESULT){
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3);
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff;
devices[deviceCount].rssi = 0;
} else {
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3);
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff;
devices[deviceCount].rssi = packet [3 + numResponses*(6+1+1+3+2) + i*1];
}
devices[deviceCount].state = REMOTE_NAME_REQUEST;
printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr),
devices[deviceCount].classOfDevice, devices[deviceCount].pageScanRepetitionMode,
devices[deviceCount].clockOffset, devices[deviceCount].rssi);
deviceCount++;
} }
break; break;
case W4_3:
case HCI_EVENT_INQUIRY_COMPLETE: if ( COMMAND_COMPLETE_EVENT(packet, hci_write_linkkey) ) {
for (i=0;i<deviceCount;i++) { hci_send_cmd(&hci_read_linkkeys, a, 1);
// retry remote name request state = DONE;
if (devices[i].state == REMOTE_NAME_INQUIRED)
devices[i].state = REMOTE_NAME_REQUEST;
}
continue_remote_names();
break;
case BTSTACK_EVENT_REMOTE_NAME_CACHED:
bt_flip_addr(addr, &packet[3]);
printf("Cached remote name for %s: '%s'\n", bd_addr_to_str(addr), &packet[9]);
break;
case HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE:
bt_flip_addr(addr, &packet[3]);
int index = getDeviceIndexForAddress(addr);
if (index >= 0) {
if (packet[2] == 0) {
printf("Name: '%s'\n", &packet[9]);
devices[index].state = REMOTE_NAME_FETCHED;
} else {
printf("Failed to get name: page timeout\n");
}
}
continue_remote_names();
break;
default:
break;
} }
break; break;
case DONE:
break;
default: default:
break; break;
} }

34
example/libusb/gap_inquiry_and_bond.c
View File

@ -116,32 +116,44 @@ static void packet_handler (uint8_t packet_type, uint8_t *packet, uint16_t size)
case ACTIVE: case ACTIVE:
switch(event){ switch(event){
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
numResponses = packet[2]; numResponses = packet[2];
int offset = 3;
for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){ for (i=0; i<numResponses && deviceCount < MAX_DEVICES;i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset =+ 6;
int index = getDeviceIndexForAddress(addr); int index = getDeviceIndexForAddress(addr);
if (index >= 0) continue; // already in our list if (index >= 0) continue; // already in our list
memcpy(devices[deviceCount].address, addr, 6); memcpy(devices[deviceCount].address, addr, 6);
devices[deviceCount].pageScanRepetitionMode = packet [3 + numResponses*(6) + i*1];
devices[deviceCount].pageScanRepetitionMode = packet[offset];
offset += 1;
if (event == HCI_EVENT_INQUIRY_RESULT){ if (event == HCI_EVENT_INQUIRY_RESULT){
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1+1) + i*3); offset += 2; // Reserved + Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2;
devices[deviceCount].rssi = 0; devices[deviceCount].rssi = 0;
} else { } else {
devices[deviceCount].classOfDevice = READ_BT_24(packet, 3 + numResponses*(6+1+1) + i*3); offset += 1; // Reserved
devices[deviceCount].clockOffset = READ_BT_16(packet, 3 + numResponses*(6+1+1+3) + i*2) & 0x7fff; devices[deviceCount].classOfDevice = READ_BT_24(packet, offset);
devices[deviceCount].rssi = packet [3 + numResponses*(6+1+1+3+2) + i*1]; offset += 3;
devices[deviceCount].clockOffset = READ_BT_16(packet, offset) & 0x7fff;
offset += 2
devices[deviceCount].rssi = packet[offset];
offset += 1;
} }
devices[deviceCount].state = BONDING_REQUEST; devices[deviceCount].state = REMOTE_NAME_REQUEST;
printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr), printf("Device found: %s with COD: 0x%06x, pageScan %d, clock offset 0x%04x, rssi 0x%02x\n", bd_addr_to_str(addr),
devices[deviceCount].classOfDevice, devices[deviceCount].pageScanRepetitionMode, devices[deviceCount].classOfDevice, devices[deviceCount].pageScanRepetitionMode,
devices[deviceCount].clockOffset, devices[deviceCount].rssi); devices[deviceCount].clockOffset, devices[deviceCount].rssi);
deviceCount++; deviceCount++;
} }
break;
break;
}
case HCI_EVENT_INQUIRY_COMPLETE: case HCI_EVENT_INQUIRY_COMPLETE:
continue_bonding(); continue_bonding();
break; break;

10
example/libusb/gatt_browser.c
View File

@ -211,15 +211,16 @@ static void handle_hci_event(void * connection, uint8_t packet_type, uint16_t ch
} }
printf("BTstack activated, start scanning!\n"); printf("BTstack activated, start scanning!\n");
state = TC_W4_SCAN_RESULT; state = TC_W4_SCAN_RESULT;
le_central_set_scan_parameters(0,0x0030, 0x0030);
le_central_start_scan(); le_central_start_scan();
break; break;
case GAP_LE_ADVERTISING_REPORT: case GAP_LE_ADVERTISING_REPORT:
if (state != TC_W4_SCAN_RESULT) return; if (state != TC_W4_SCAN_RESULT) return;
state = TC_W4_CONNECT;
fill_advertising_report_from_packet(&report, packet); fill_advertising_report_from_packet(&report, packet);
// stop scanning, and connect to the device // stop scanning, and connect to the device
le_central_stop_scan(); // state = TC_W4_CONNECT;
le_central_connect(&report.address,report.address_type); //le_central_stop_scan();
//le_central_connect(&report.address,report.address_type);
break; break;
case HCI_EVENT_LE_META: case HCI_EVENT_LE_META:
// wait for connection complete // wait for connection complete
@ -249,7 +250,7 @@ void setup(void){
run_loop_init(RUN_LOOP_POSIX); run_loop_init(RUN_LOOP_POSIX);
// use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT // use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT
hci_dump_open("/tmp/ble_client.pklg", HCI_DUMP_PACKETLOGGER); hci_dump_open("/tmp/gatt_browser.pklg", HCI_DUMP_PACKETLOGGER);
// init HCI // init HCI
remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_memory; remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_memory;
@ -293,7 +294,6 @@ int main(int argc, const char * argv[])
arg++; arg++;
continue; continue;
} }
usage(argv[0]); usage(argv[0]);
return 0; return 0;
} }

7
src/hci.c
View File

@ -1054,18 +1054,21 @@ static void event_handler(uint8_t *packet, int size){
break; break;
case HCI_EVENT_INQUIRY_RESULT: case HCI_EVENT_INQUIRY_RESULT:
case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI: case HCI_EVENT_INQUIRY_RESULT_WITH_RSSI:{
if (!hci_stack->remote_device_db) break; if (!hci_stack->remote_device_db) break;
// first send inq result packet // first send inq result packet
hci_stack->packet_handler(HCI_EVENT_PACKET, packet, size); hci_stack->packet_handler(HCI_EVENT_PACKET, packet, size);
// then send cached remote names // then send cached remote names
int offset = 3;
for (i=0; i<packet[2];i++){ for (i=0; i<packet[2];i++){
bt_flip_addr(addr, &packet[3+i*6]); bt_flip_addr(addr, &packet[offset]);
offset += 14; // 6 + 1 + 1 + 1 + 3 + 2;
if (hci_stack->remote_device_db->get_name(&addr, &device_name)){ if (hci_stack->remote_device_db->get_name(&addr, &device_name)){
hci_emit_remote_name_cached(&addr, &device_name); hci_emit_remote_name_cached(&addr, &device_name);
} }
} }
return; return;
}
#endif #endif
case HCI_EVENT_DISCONNECTION_COMPLETE: case HCI_EVENT_DISCONNECTION_COMPLETE: