all: change NewAdvertisement to DefaultAdvertisement
Instead of attempting to allocate multiple advertisement instances, only use one by default. If needed, a NewAdvertisement method could be added in the future for devices that actually do support multiple advertisements at a time. The motivation for this change is fix an inconsistency with the nrf51 (which already had the behavior of DefaultAdvertisement) and the discovery that nrf52 devices also don't seem to support more than one advertisement instance, even though their API does allow for multiple instances. But the primary motivation is that for consistency with hosted systems, it would be best if the nrf port would automatically re-enable advertisement when a connection is lost (or made). While BlueZ does support more than one instance, it is implemented by simply iterating through the active advertisement instances so could also be implemented by doing that manually. I haven't checked the behavior of Windows and MacOS - but as always, the API is not yet stable and can be changed if needed.
This commit is contained in:
parent
086c797e0f
commit
c034fbca54
7 changed files with 34 additions and 28 deletions
|
@ -12,6 +12,7 @@ type Adapter struct {
|
||||||
id string
|
id string
|
||||||
handler func(Event)
|
handler func(Event)
|
||||||
cancelScan func()
|
cancelScan func()
|
||||||
|
defaultAdvertisement *Advertisement
|
||||||
}
|
}
|
||||||
|
|
||||||
// DefaultAdapter is the default adapter on the system. On Linux, it is the
|
// DefaultAdapter is the default adapter on the system. On Linux, it is the
|
||||||
|
|
|
@ -10,7 +10,7 @@ var adapter = bluetooth.DefaultAdapter
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
must("enable BLE stack", adapter.Enable())
|
must("enable BLE stack", adapter.Enable())
|
||||||
adv := adapter.NewAdvertisement()
|
adv := adapter.DefaultAdvertisement()
|
||||||
must("config adv", adv.Configure(bluetooth.AdvertisementOptions{
|
must("config adv", adv.Configure(bluetooth.AdvertisementOptions{
|
||||||
LocalName: "Go Bluetooth",
|
LocalName: "Go Bluetooth",
|
||||||
Interval: bluetooth.NewAdvertisementInterval(100),
|
Interval: bluetooth.NewAdvertisementInterval(100),
|
||||||
|
|
|
@ -15,7 +15,7 @@ func main() {
|
||||||
println("starting")
|
println("starting")
|
||||||
adapter.SetEventHandler(handleBluetoothEvents)
|
adapter.SetEventHandler(handleBluetoothEvents)
|
||||||
must("enable BLE stack", adapter.Enable())
|
must("enable BLE stack", adapter.Enable())
|
||||||
adv := adapter.NewAdvertisement()
|
adv := adapter.DefaultAdvertisement()
|
||||||
must("config adv", adv.Configure(bluetooth.AdvertisementOptions{
|
must("config adv", adv.Configure(bluetooth.AdvertisementOptions{
|
||||||
LocalName: "Go HRS",
|
LocalName: "Go HRS",
|
||||||
Interval: bluetooth.NewAdvertisementInterval(100),
|
Interval: bluetooth.NewAdvertisementInterval(100),
|
||||||
|
|
|
@ -23,7 +23,7 @@ func main() {
|
||||||
println("starting")
|
println("starting")
|
||||||
adapter.SetEventHandler(handleBluetoothEvents)
|
adapter.SetEventHandler(handleBluetoothEvents)
|
||||||
must("enable BLE stack", adapter.Enable())
|
must("enable BLE stack", adapter.Enable())
|
||||||
adv := adapter.NewAdvertisement()
|
adv := adapter.DefaultAdvertisement()
|
||||||
must("config adv", adv.Configure(bluetooth.AdvertisementOptions{
|
must("config adv", adv.Configure(bluetooth.AdvertisementOptions{
|
||||||
LocalName: "LED colors",
|
LocalName: "LED colors",
|
||||||
Interval: bluetooth.NewAdvertisementInterval(100),
|
Interval: bluetooth.NewAdvertisementInterval(100),
|
||||||
|
|
11
gap_linux.go
11
gap_linux.go
|
@ -16,12 +16,15 @@ type Advertisement struct {
|
||||||
properties *advertising.LEAdvertisement1Properties
|
properties *advertising.LEAdvertisement1Properties
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewAdvertisement creates a new advertisement instance but does not configure
|
// DefaultAdvertisement returns the default advertisement instance but does not
|
||||||
// it.
|
// configure it.
|
||||||
func (a *Adapter) NewAdvertisement() *Advertisement {
|
func (a *Adapter) DefaultAdvertisement() *Advertisement {
|
||||||
return &Advertisement{
|
if a.defaultAdvertisement == nil {
|
||||||
|
a.defaultAdvertisement = &Advertisement{
|
||||||
adapter: a,
|
adapter: a,
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
return a.defaultAdvertisement
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configure this advertisement.
|
// Configure this advertisement.
|
||||||
|
|
15
gap_nrf51.go
15
gap_nrf51.go
|
@ -16,18 +16,15 @@ type Advertisement struct {
|
||||||
interval AdvertisementInterval
|
interval AdvertisementInterval
|
||||||
}
|
}
|
||||||
|
|
||||||
var globalAdvertisement Advertisement
|
var defaultAdvertisement Advertisement
|
||||||
|
|
||||||
// NewAdvertisement creates a new advertisement instance but does not configure
|
// DefaultAdvertisement returns the default advertisement instance but does not
|
||||||
// it. It can be called before the SoftDevice has been initialized.
|
// configure it.
|
||||||
//
|
func (a *Adapter) DefaultAdvertisement() *Advertisement {
|
||||||
// On the nrf51 only one advertisement is allowed at a given time, therefore
|
return &defaultAdvertisement
|
||||||
// this is a singleton.
|
|
||||||
func (a *Adapter) NewAdvertisement() *Advertisement {
|
|
||||||
return &globalAdvertisement
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configure this advertisement. Must be called after SoftDevice initialization.
|
// Configure this advertisement.
|
||||||
func (a *Advertisement) Configure(options AdvertisementOptions) error {
|
func (a *Advertisement) Configure(options AdvertisementOptions) error {
|
||||||
var payload rawAdvertisementPayload
|
var payload rawAdvertisementPayload
|
||||||
payload.addFlags(0x06)
|
payload.addFlags(0x06)
|
||||||
|
|
|
@ -28,15 +28,20 @@ type Advertisement struct {
|
||||||
handle uint8
|
handle uint8
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewAdvertisement creates a new advertisement instance but does not configure
|
// The nrf528xx devices only seem to support one advertisement instance. The way
|
||||||
// it. It can be called before the SoftDevice has been initialized.
|
// multiple advertisements are implemented is by changing the packet data
|
||||||
func (a *Adapter) NewAdvertisement() *Advertisement {
|
// frequently.
|
||||||
return &Advertisement{
|
var defaultAdvertisement = Advertisement{
|
||||||
handle: C.BLE_GAP_ADV_SET_HANDLE_NOT_SET,
|
handle: C.BLE_GAP_ADV_SET_HANDLE_NOT_SET,
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configure this advertisement. Must be called after SoftDevice initialization.
|
// DefaultAdvertisement returns the default advertisement instance but does not
|
||||||
|
// configure it.
|
||||||
|
func (a *Adapter) DefaultAdvertisement() *Advertisement {
|
||||||
|
return &defaultAdvertisement
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure this advertisement.
|
||||||
func (a *Advertisement) Configure(options AdvertisementOptions) error {
|
func (a *Advertisement) Configure(options AdvertisementOptions) error {
|
||||||
data := C.ble_gap_adv_data_t{}
|
data := C.ble_gap_adv_data_t{}
|
||||||
var payload rawAdvertisementPayload
|
var payload rawAdvertisementPayload
|
||||||
|
|
Loading…
Reference in a new issue