moogle19 · GrootYuan · Mar 16, 2018 · Mar 16, 2018 · Apr 4, 2018 · Apr 4, 2018
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 .tags1
 
 /examples/bin/*
+vendor
+.idea
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,6 @@ os:
         - linux
 
 go:
-        - 1.7
         - 1.8
         - 1.9
         - tip

diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@
 [![codebeat badge](https://codebeat.co/badges/ba9fae6e-77d2-4173-8587-36ac8756676b)](https://codebeat.co/projects/github-com-go-ble-ble-master)
 [![Build Status](https://travis-ci.org/go-ble/ble.svg?branch=master)](https://travis-ci.org/go-ble/ble)
 
+**ble** is a Golang [Bluetooth Low Energy](https://en.wikipedia.org/wiki/Bluetooth_Low_Energy) package for Linux and Mac OS.
 
-
-**ble** is a [Bluetooth Low Energy](https://en.wikipedia.org/wiki/Bluetooth_Low_Energy) package for Linux and macOS.
-
+**Note:** The Mac OS portion is not being actively maintained.
diff --git a/client.go b/client.go
@@ -66,4 +66,7 @@ type Client interface {
 
 	// Disconnected returns a receiving channel, which is closed when the client disconnects.
 	Disconnected() <-chan struct{}
+
+	// Conn returns the client's current connection.
+	Conn() Conn
 }
diff --git a/conn.go b/conn.go
@@ -33,6 +33,9 @@ type Conn interface {
 	// SetTxMTU sets the ATT_MTU which the remote device is capable of accepting.
 	SetTxMTU(mtu int)
 
+	// ReadRSSI retrieves the current RSSI value of remote peripheral. [Vol 2, Part E, 7.5.4]
+	ReadRSSI() int
+
 	// Disconnected returns a receiving channel, which is closed when the connection disconnects.
 	Disconnected() <-chan struct{}
 }
diff --git a/darwin/adv.go b/darwin/adv.go
@@ -2,72 +2,55 @@ package darwin
 
 import (
 	"github.com/go-ble/ble"
-	"github.com/raff/goble/xpc"
 )
 
 type adv struct {
-	args xpc.Dict
-	ad   xpc.Dict
+	localName   string
+	rssi        int
+	mfgData     []byte
+	powerLevel  int
+	connectable bool
+	svcUUIDs    []ble.UUID
+	svcData     []ble.ServiceData
+	peerUUID    ble.Addr
 }
 
 func (a *adv) LocalName() string {
-	return a.ad.GetString("kCBAdvDataLocalName", a.args.GetString("kCBMsgArgName", ""))
+	return a.localName
 }
 
 func (a *adv) ManufacturerData() []byte {
-	return a.ad.GetBytes("kCBAdvDataManufacturerData", nil)
+	return a.mfgData
 }
 
 func (a *adv) ServiceData() []ble.ServiceData {
-	xSDs, ok := a.ad["kCBAdvDataServiceData"]
-	if !ok {
-		return nil
-	}
-
-	xSD := xSDs.(xpc.Array)
-	var sd []ble.ServiceData
-	for i := 0; i < len(xSD); i += 2 {
-		sd = append(
-			sd, ble.ServiceData{
-				UUID: ble.UUID(xSD[i].([]byte)),
-				Data: xSD[i+1].([]byte),
-			})
-	}
-	return sd
+	return a.svcData
 }
 
 func (a *adv) Services() []ble.UUID {
-	xUUIDs, ok := a.ad["kCBAdvDataServiceUUIDs"]
-	if !ok {
-		return nil
-	}
-	var uuids []ble.UUID
-	for _, xUUID := range xUUIDs.(xpc.Array) {
-		uuids = append(uuids, ble.UUID(ble.Reverse(xUUID.([]byte))))
-	}
-	return uuids
+	return a.svcUUIDs
 }
 
 func (a *adv) OverflowService() []ble.UUID {
 	return nil // TODO
 }
 
 func (a *adv) TxPowerLevel() int {
-	return a.ad.GetInt("kCBAdvDataTxPowerLevel", 0)
+	return a.powerLevel
 }
 
 func (a *adv) SolicitedService() []ble.UUID {
 	return nil // TODO
 }
 
 func (a *adv) Connectable() bool {
-	return a.ad.GetInt("kCBAdvDataIsConnectable", 0) > 0
+	return a.connectable
 }
 
 func (a *adv) RSSI() int {
-	return a.args.GetInt("kCBMsgArgRssi", 0)
+	return a.rssi
 }
 
 func (a *adv) Addr() ble.Addr {
-	return a.args.MustGetUUID("kCBMsgArgDeviceUUID")
+	return a.peerUUID
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,5 @@ @@
     .tags1
     /examples/bin/*
+    vendor
+    .idea