Skip to content

Fix Bluetooth connection by filtering on Aurora service UUID #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Bluetooth connection by filtering on Aurora service UUID #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/components/board-bluetooth-control/bluetooth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ const PACKET_MIDDLE = 81;
const PACKET_FIRST = 82;
const PACKET_LAST = 83;
const PACKET_ONLY = 84;
// Aurora boards (Kilter, Tension, etc.) advertise this service UUID for discovery
const AURORA_ADVERTISED_SERVICE_UUID = '4488b571-7806-4df6-bcff-a2897e4953ff';
// Nordic UART Service UUID - used for actual communication
const SERVICE_UUID = '6e400001-b5a3-f393-e0a9-e50e24dcca9e';
const CHARACTERISTIC_UUID = '6e400002-b5a3-f393-e0a9-e50e24dcca9e';

Expand Down Expand Up @@ -77,9 +80,11 @@ export const writeCharacteristicSeries = async (
}
};

export const requestDevice = async (namePrefix: string) =>
export const requestDevice = async () =>
navigator.bluetooth.requestDevice({
filters: [{ namePrefix }],
// Filter by the Aurora advertised service UUID to find Kilter/Tension/Decoy boards
// Board names can be customized by users so namePrefix filtering doesn't work reliably
filters: [{ services: [AURORA_ADVERTISED_SERVICE_UUID] }],
optionalServices: [SERVICE_UUID],
});

Expand Down
3 changes: 1 addition & 2 deletions app/components/board-bluetooth-control/send-climb-to-board-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ const SendClimbToBoardButton: React.FC<SendClimbToBoardButtonProps> = ({ boardDe
try {
// Request Bluetooth connection if not already connected
if (!bluetoothDeviceRef.current || !characteristicRef.current) {
const bluetoothboardname = boardDetails.board_name[0].toUpperCase() + boardDetails.board_name.slice(1);
const device = await requestDevice(bluetoothboardname);
const device = await requestDevice();
const characteristic = await getCharacteristic(device);

if (characteristic) {
Expand Down