version 1

Author: Jordy van Kuijk

Example/RFDuino/Base.lproj/Main.storyboard

@@ -8,21 +8,32 @@
 
 import UIKit
 import RFDuino
+import CoreBluetooth
 
 class DetailsViewController: UIViewController {
 
     @IBOutlet weak var titleLabel: UILabel!
     @IBOutlet weak var statusLabel: UILabel!
     @IBOutlet weak var bluetoothLogo: UIImageView!
 
+    @IBOutlet weak var connectButton: UIButton!
+    @IBOutlet weak var disconnectButton: UIButton!
+    @IBOutlet weak var discoverButton: UIButton!
+    @IBOutlet weak var sendDataButton: UIButton!
+    
     var rfDuino: RFDuino?
+    var isAnimating = false
     let manager = RFDuinoBTManager.sharedInstance
+    
+    let bluetoothColor = UIColor(red: 0.04, green: 0.24, blue: 0.57, alpha: 1.0)
 
     override func viewDidLoad() {
         super.viewDidLoad()
         rfDuino?.delegate = self
         manager.delegate = self
         titleLabel.text = rfDuino?.name
+        
+        bluetoothLogo.setImageTintColor(UIColor.blackColor())
     }
 }
 
@@ -47,10 +58,17 @@ extension DetailsViewController {
 
     @IBAction func discoverServices(sender: AnyObject) {
         statusLabel.text = "discovering services".uppercaseString
+        if rfDuino!.isConnected {
+            rfDuino!.discoverServices()
+        }
     }
 
     @IBAction func sendData(sender: UIButton) {
         statusLabel.text = "sending data".uppercaseString
+        if rfDuino!.isConnected {
+            rfDuino!.send(String("lock").dataUsingEncoding(NSASCIIStringEncoding)!)
+            rfDuino!.send(String("unlock").dataUsingEncoding(NSASCIIStringEncoding)!)
+        }
     }
 }
 
@@ -62,21 +80,58 @@ extension DetailsViewController: RFDuinoBTManagerDelegate {
     func rfDuinoManagerDidConnectRFDuino(manager: RFDuinoBTManager, rfDuino: RFDuino) {
         statusLabel.text = "idle".uppercaseString
         bluetoothLogo.setImageTintColor(UIColor.greenColor())
-    }
-    
-    func rfDuinoManagerDidDisconnectRFDuino(manager: RFDuinoBTManager, rfDuino: RFDuino) {
-        statusLabel.text = "idle".uppercaseString
-        bluetoothLogo.setImageTintColor(UIColor.blackColor())
+        connectButton.enabled = false
+        disconnectButton.enabled = true
     }
 }
 
 extension DetailsViewController: RFDuinoDelegate {
+    
+    func rfDuinoDidDiscoverCharacteristics(rfDuino: RFDuino) {
+        bluetoothLogo.setImageTintColor(bluetoothColor)
+        statusLabel.text = "idle".uppercaseString
+        discoverButton.enabled = false
+    }
+    
+    func rfDuinoDidDiscoverServices(rfDuino: RFDuino) {
+        bluetoothLogo.setImageTintColor(UIColor.blueColor())
+        statusLabel.text = "idle".uppercaseString
+    }
+    
+    func rfDuinoDidSendData(rfDuino: RFDuino, forCharacteristic: CBCharacteristic, error: NSError?) {
+        if isAnimating {
+            return
+        }
+        isAnimating = true
+        dispatch_async(dispatch_get_main_queue()) { () -> Void in
+            self.bluetoothLogo.layer.backgroundColor = UIColor.whiteColor().CGColor
+            self.bluetoothLogo.layer.cornerRadius = self.bluetoothLogo.frame.size.width / 2
+            UIView.animateWithDuration(0.3, animations: { () -> Void in
+                self.bluetoothLogo.layer.backgroundColor = self.bluetoothColor.colorWithAlphaComponent(0.2).CGColor
+                }) { (bool) -> Void in
+                self.isAnimating = false
+                self.bluetoothLogo.layer.backgroundColor = UIColor.whiteColor().CGColor
+                self.statusLabel.text = "idle".uppercaseString
+            }
+        }
+    }
+    
     func rfDuinoDidTimeout(rfDuino: RFDuino) {
-        bluetoothLogo.setImageTintColor(UIColor.orangeColor())
+        bluetoothLogo.setImageTintColor(UIColor.redColor())
+        statusLabel.text = "idle".uppercaseString
     }
 
     func rfDuinoDidDiscover(rfDuino: RFDuino) {
         bluetoothLogo.setImageTintColor(UIColor.blackColor())
+        statusLabel.text = "idle".uppercaseString
+    }
+    
+    func rfDuinoDidDisconnect(rfDuino: RFDuino) {
+        connectButton.enabled = true
+        disconnectButton.enabled = false
+        discoverButton.enabled = true
+        statusLabel.text = "idle".uppercaseString
+        bluetoothLogo.setImageTintColor(UIColor.blackColor())
     }
 }
 

Example/RFDuino/DetailsViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RFDuino
+import CoreBluetooth
 
 class DiscoveryTableViewController: UITableViewController {
 
@@ -47,10 +48,10 @@ class DiscoveryTableViewController: UITableViewController {
 
         if rfDuino.isTimedOut {
             cell?.textLabel?.textColor = UIColor.grayColor()
-            cell?.textLabel?.text = rfDuino.name! + " (timed out)"
+            cell?.textLabel?.text = rfDuino.name + " (timed out)"
         } else {
             cell?.textLabel?.textColor = UIColor.blackColor()
-            cell?.textLabel?.text = rfDuino.name
+            cell?.textLabel?.text = rfDuino.name + (rfDuino.RSSI != nil ? " \(rfDuino.RSSI!)" : "")
         }
 
         return cell!
@@ -94,4 +95,20 @@ extension DiscoveryTableViewController: RFDuinoDelegate {
     func rfDuinoDidDiscover(rfDuino: RFDuino) {
         tableView.reloadData()
     }
+    
+    func rfDuinoDidSendData(rfDuino: RFDuino, forCharacteristic: CBCharacteristic, error: NSError?) {
+        
+    }
+    
+    func rfDuinoDidDiscoverServices(rfDuino: RFDuino) {
+        
+    }
+    
+    func rfDuinoDidDiscoverCharacteristics(rfDuino: RFDuino) {
+        
+    }
+    
+    func rfDuinoDidDisconnect(rfDuino: RFDuino) {
+        
+    }
 }

Example/RFDuino/DiscoveryTableViewController.swift

@@ -0,0 +1,35 @@
+//
+//  RFDuino+Extensions.swift
+//  Pods
+//
+//  Created by Jordy van Kuijk on 28/01/16.
+//
+//
+
+import Foundation
+import CoreBluetooth
+
+extension Array where Element: RFDuino {
+    mutating func insertIfNotContained(rfDuino: RFDuino) {
+        if !(self.contains { return $0.peripheral == rfDuino.peripheral }) {
+            // append the newly discovered rfDuino
+            self.append(rfDuino as! Element)
+            rfDuino.confirmAndTimeout()
+        } else {
+            // find existing rfDuino and notify it of rediscovery
+            let indexOfExistingRFDuino = self.indexOf { return $0.peripheral == rfDuino.peripheral }
+            let existingRFDuino = self[indexOfExistingRFDuino!]
+            existingRFDuino.peripheral.delegate = existingRFDuino
+            existingRFDuino.confirmAndTimeout()
+        }
+    }
+    
+    func findRFDuino(peripheral: CBPeripheral) -> RFDuino? {
+        let indexOfRFDuino = self.indexOf { return $0.peripheral == peripheral }
+        if let index = indexOfRFDuino {
+            return self[index]
+        } else {
+            return nil
+        }
+    }
+}