This commit is contained in:
2017-02-06 20:00:33 +03:00
parent a829a3dd5c
commit 40c834f7e8
5 changed files with 47 additions and 31 deletions
+16 -23
View File
@@ -10,21 +10,22 @@ import (
"github.com/currantlabs/gatt/examples/option" "github.com/currantlabs/gatt/examples/option"
) )
var done = make(chan struct{})
type BleService struct { type BleService struct {
workers []workers.Worker workers []*workers.Worker
done chan struct{}
} }
// AddWorker - add new worker // AddWorker - add new worker
func (s BleService) AddWorker(worker workers.Worker) { func (s *BleService) AddWorker(worker workers.Worker) {
if s.workers == nil { if s.workers == nil {
s.workers = []workers.Worker{} fmt.Println("Init workers.")
s.workers = make([]*workers.Worker, 0, 0)
} }
s.workers = append(s.workers, worker) s.workers = append(s.workers, &worker)
} }
func (s BleService) Init() error { func (s *BleService) Init() error {
s.done = make(chan struct{})
d, err := gatt.NewDevice(option.DefaultClientOptions...) d, err := gatt.NewDevice(option.DefaultClientOptions...)
if err != nil { if err != nil {
log.Fatalf("Failed to open device, err: %s\n", err) log.Fatalf("Failed to open device, err: %s\n", err)
@@ -39,13 +40,13 @@ func (s BleService) Init() error {
) )
d.Init(s.onStateChanged) d.Init(s.onStateChanged)
<-done <-s.done
fmt.Println("Done") fmt.Println("Done")
return nil return nil
} }
func (s BleService) onStateChanged(d gatt.Device, state gatt.State) { func (s *BleService) onStateChanged(d gatt.Device, state gatt.State) {
fmt.Println("State:", state) fmt.Println("State:", state)
switch state { switch state {
case gatt.StatePoweredOn: case gatt.StatePoweredOn:
@@ -57,17 +58,10 @@ func (s BleService) onStateChanged(d gatt.Device, state gatt.State) {
} }
} }
func (s BleService) onPeriphDiscovered(p gatt.Peripheral, a *gatt.Advertisement, rssi int) { func (s *BleService) onPeriphDiscovered(p gatt.Peripheral, a *gatt.Advertisement, rssi int) {
fmt.Printf("\nPeripheral ID:%s, NAME:(%s)\n", p.ID(), p.Name())
fmt.Println(" Local Name =", a.LocalName)
fmt.Println(" TX Power Level =", a.TxPowerLevel)
fmt.Println(" Manufacturer Data =", a.ManufacturerData)
fmt.Println(" Service Data =", a.ServiceData)
fmt.Println(" RSSI =", rssi)
isConnect := false isConnect := false
for _, worker := range s.workers { for _, worker := range s.workers {
ret := worker.OnDiscovery(p, a, rssi) ret := (*worker).OnDiscovery(p, a, rssi)
if ret && !isConnect { if ret && !isConnect {
isConnect = true isConnect = true
} }
@@ -78,8 +72,7 @@ func (s BleService) onPeriphDiscovered(p gatt.Peripheral, a *gatt.Advertisement,
} }
} }
func (s BleService) onPeriphConnected(p gatt.Peripheral, err error) { func (s *BleService) onPeriphConnected(p gatt.Peripheral, err error) {
fmt.Println("Connected")
defer p.Device().CancelConnection(p) defer p.Device().CancelConnection(p)
if err := p.SetMTU(500); err != nil { if err := p.SetMTU(500); err != nil {
@@ -88,11 +81,11 @@ func (s BleService) onPeriphConnected(p gatt.Peripheral, err error) {
fmt.Printf("Set mtu done.\n") fmt.Printf("Set mtu done.\n")
for _, worker := range s.workers { for _, worker := range s.workers {
worker.OnConnect(p, err) (*worker).OnConnect(p, err)
} }
} }
func (s BleService) onPeriphDisconnected(p gatt.Peripheral, err error) { func (s *BleService) onPeriphDisconnected(p gatt.Peripheral, err error) {
fmt.Println("Disconnected") fmt.Println("Disconnected")
close(done) close(s.done)
} }
BIN
View File
Binary file not shown.
+3
View File
@@ -5,6 +5,9 @@ import "blegw/workers"
func main() { func main() {
service := BleService{} service := BleService{}
log := workers.Log{}
service.AddWorker(log)
scale := workers.Scale{} scale := workers.Scale{}
service.AddWorker(scale) service.AddWorker(scale)
+28
View File
@@ -0,0 +1,28 @@
package workers
import (
"fmt"
"github.com/currantlabs/gatt"
)
type Log struct {
Worker
}
func (s Log) OnDiscovery(p gatt.Peripheral, a *gatt.Advertisement, rssi int) bool {
fmt.Printf("\nPeripheral ID:%s, NAME:(%s)\n", p.ID(), p.Name())
fmt.Println(" Local Name =", a.LocalName)
fmt.Println(" Manufacturer Data =", a.ManufacturerData)
fmt.Println(" Service Data =", a.ServiceData)
fmt.Println(" RSSI =", rssi)
return false
}
func (s Log) OnConnect(p gatt.Peripheral, err error) error {
ID := p.ID()
fmt.Println("Connected to " + ID)
return nil
}
-8
View File
@@ -40,14 +40,6 @@ func (s Scale) OnConnect(p gatt.Peripheral, err error) error {
return nil return nil
} }
fmt.Println("Connected")
defer p.Device().CancelConnection(p)
if err := p.SetMTU(500); err != nil {
fmt.Printf("Failed to set MTU, err: %s\n", err)
}
fmt.Printf("Set mtu done.\n")
// Discovery services // Discovery services
services, err := p.DiscoverServices(nil) services, err := p.DiscoverServices(nil)
fmt.Printf("Services: %v+", services) fmt.Printf("Services: %v+", services)