From 27cc35a60b535c74a2b4320946e440de34320532 Mon Sep 17 00:00:00 2001 From: deadprogram Date: Sat, 30 Jan 2021 22:42:17 +0100 Subject: [PATCH] examples: use standard service and characteristic UUIDs Signed-off-by: deadprogram --- examples/heartrate-monitor/main.go | 4 ++-- examples/heartrate/main.go | 8 ++++---- examples/nusclient/main.go | 6 +++--- examples/nusserver/main.go | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/heartrate-monitor/main.go b/examples/heartrate-monitor/main.go index e4b4345..693f1df 100644 --- a/examples/heartrate-monitor/main.go +++ b/examples/heartrate-monitor/main.go @@ -26,8 +26,8 @@ import ( var ( adapter = bluetooth.DefaultAdapter - heartRateServiceUUID = bluetooth.New16BitUUID(0x180D) - heartRateCharacteristicUUID = bluetooth.New16BitUUID(0x2A37) + heartRateServiceUUID = bluetooth.ServiceUUIDHeartRate + heartRateCharacteristicUUID = bluetooth.CharacteristicUUIDHeartRateMeasurement ) func main() { diff --git a/examples/heartrate/main.go b/examples/heartrate/main.go index 122a078..061e89f 100644 --- a/examples/heartrate/main.go +++ b/examples/heartrate/main.go @@ -18,19 +18,19 @@ func main() { adv := adapter.DefaultAdvertisement() must("config adv", adv.Configure(bluetooth.AdvertisementOptions{ LocalName: "Go HRS", - ServiceUUIDs: []bluetooth.UUID{bluetooth.New16BitUUID(0x180D)}, + ServiceUUIDs: []bluetooth.UUID{bluetooth.ServiceUUIDHeartRate}, })) must("start adv", adv.Start()) var heartRateMeasurement bluetooth.Characteristic must("add service", adapter.AddService(&bluetooth.Service{ - UUID: bluetooth.New16BitUUID(0x180D), // Heart Rate + UUID: bluetooth.ServiceUUIDHeartRate, Characteristics: []bluetooth.CharacteristicConfig{ { Handle: &heartRateMeasurement, - UUID: bluetooth.New16BitUUID(0x2A37), // Heart Rate Measurement + UUID: bluetooth.CharacteristicUUIDHeartRateMeasurement, Value: []byte{0, heartRate}, - Flags: bluetooth.CharacteristicNotifyPermission, + Flags: bluetooth.CharacteristicNotifyPermission, }, }, })) diff --git a/examples/nusclient/main.go b/examples/nusclient/main.go index 7ce1169..e619b66 100644 --- a/examples/nusclient/main.go +++ b/examples/nusclient/main.go @@ -9,9 +9,9 @@ import ( ) var ( - serviceUUID = bluetooth.NewUUID([16]byte{0x6E, 0x40, 0x00, 0x01, 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E}) - rxUUID = bluetooth.NewUUID([16]byte{0x6E, 0x40, 0x00, 0x02, 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E}) - txUUID = bluetooth.NewUUID([16]byte{0x6E, 0x40, 0x00, 0x03, 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E}) + serviceUUID = bluetooth.ServiceUUIDNordicUART + rxUUID = bluetooth.CharacteristicUUIDUARTRX + txUUID = bluetooth.CharacteristicUUIDUARTTX ) var adapter = bluetooth.DefaultAdapter diff --git a/examples/nusserver/main.go b/examples/nusserver/main.go index 89f1eff..2c6f9f2 100644 --- a/examples/nusserver/main.go +++ b/examples/nusserver/main.go @@ -13,9 +13,9 @@ import ( ) var ( - serviceUUID = bluetooth.NewUUID([16]byte{0x6E, 0x40, 0x00, 0x01, 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E}) - rxUUID = bluetooth.NewUUID([16]byte{0x6E, 0x40, 0x00, 0x02, 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E}) - txUUID = bluetooth.NewUUID([16]byte{0x6E, 0x40, 0x00, 0x03, 0xB5, 0xA3, 0xF3, 0x93, 0xE0, 0xA9, 0xE5, 0x0E, 0x24, 0xDC, 0xCA, 0x9E}) + serviceUUID = bluetooth.ServiceUUIDNordicUART + rxUUID = bluetooth.CharacteristicUUIDUARTRX + txUUID = bluetooth.CharacteristicUUIDUARTTX ) func main() {