GEM-Remotes/GemBluetoothEmbeddedDevice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test of new pairing proceedure

Browse Source
This commit is contained in:
Dave
2024-08-28 11:48:12 -04:00
parent c5036b26e6
commit f5cd9872bd
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gem-remotes-esp32/src/ble_server.rs
View File

@ -14,9 +14,14 @@ const BLE_MAX_INTERVAL: u16 = 48; // x 1.25ms
const BLE_LATENCY: u16 = 0; // Number of packets that can be missed, extending interval const BLE_LATENCY: u16 = 0; // Number of packets that can be missed, extending interval
const BLE_TIMEOUT: u16 = 500; // x10ms const BLE_TIMEOUT: u16 = 500; // x10ms
const SVC_DATA_PAIRING: [u8; 1] = [1]; // TODO: bitflag these
const SVC_DATA_NO_PAIRING: [u8; 1] = [0];
const DEVICE_NAME: &str = "Gem Remotes"; const DEVICE_NAME: &str = "Gem Remotes";
const UUID_SERVICE_PAIR: BleUuid = uuid128!("9966ad5a-f13c-4b61-ba66-0861e08d09b4"); // The [u8] version is, for whatever reason, little-endian. This should equate to the UUID "9966ad5a-f13c-4b61-ba66-0861e08d09b4".
const UUID_SERVICE_PAIR: BleUuid = BleUuid::from_uuid128([0xB4, 0x09, 0x8D, 0xE0, 0x61, 0x08, 0x66, 0xBA, 0x61, 0x4B, 0x3C, 0xF1, 0x5A, 0xAD, 0x66, 0x99]);
const UUID_SERVICE_LIFT: BleUuid = uuid128!("c1400000-8dda-45a3-959b-d23a0f8f53d7"); const UUID_SERVICE_LIFT: BleUuid = uuid128!("c1400000-8dda-45a3-959b-d23a0f8f53d7");
const UUID_BUTTON_UP: BleUuid = uuid128!("c1401121-8dda-45a3-959b-d23a0f8f53d7"); const UUID_BUTTON_UP: BleUuid = uuid128!("c1401121-8dda-45a3-959b-d23a0f8f53d7");
@ -59,7 +64,6 @@ impl BleServer {
set_device_security(ble_device); set_device_security(ble_device);
let server = ble_device.get_server(); let server = ble_device.get_server();
set_server_callbacks(server, self.send_q.clone()); set_server_callbacks(server, self.send_q.clone());
let _pairing_service = server.create_service(UUID_SERVICE_PAIR);
let lift_service = server.create_service(UUID_SERVICE_LIFT); let lift_service = server.create_service(UUID_SERVICE_LIFT);
trace!("Setting up GATT"); trace!("Setting up GATT");
@ -197,14 +201,14 @@ fn set_server_callbacks(server: &mut BLEServer, sender: SendQ) {
fn advertise(advertiser: &Mutex<BLEAdvertising>) -> Result<()> { fn advertise(advertiser: &Mutex<BLEAdvertising>) -> Result<()> {
trace!("Setting up advertiser"); trace!("Setting up advertiser");
let mut beacon_data = BLEAdvertisementData::new();
beacon_data.name(DEVICE_NAME);
//.add_service_uuid(UUID_SERVICE_PAIR);
beacon_data.service_data(UUID_SERVICE_PAIR, &SVC_DATA_PAIRING);
advertiser advertiser
.lock() .lock()
.advertisement_type(ConnMode::Und) .advertisement_type(ConnMode::Und)
.set_data( .set_data(&mut beacon_data)?;
BLEAdvertisementData::new()
.name(DEVICE_NAME)
.add_service_uuid(UUID_SERVICE_PAIR)
)?;
info!("Staring Bluetooth Server"); info!("Staring Bluetooth Server");
advertiser.lock().start()?; advertiser.lock().start()?;
Ok(()) Ok(())