Merge branch 'release-3.1.5'

Author: Stephen Schiffli

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.1.4
+current_version = 3.1.5
 
 [bumpversion:file:Docs/source/conf.py]
 

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "MetaWear/MetaWear-SDK-Cpp"]
 	path = MetaWear/MetaWear-SDK-Cpp
-	url = git@github.com:mbientlab/MetaWear-SDK-Cpp.git
+	url = https://github.com/mbientlab/MetaWear-SDK-Cpp.git

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Bluetooth State Restoration on MetaWearScanner.shared
+
+### Changed
+- CPP submodule accessed with https instead of git protocol
 
 ## [3.1.4] - 2018-07-23
 

Docs/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.4'
+version = '3.1.5'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.4'
+release = '3.1.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Docs/source/project_setup.rst

@@ -9,9 +9,8 @@ Compile Dependency
 
 To add the MetaWear SDK as a dependency to your project you should setup `CocoaPods <https://guides.cocoapods.org/using/getting-started.html>`_, and add the following line to your Podfile:  ::
 
-    pod "MetaWear"
-    # Bolts-Swift hasn't pushed the latest Xcode 9 + Swift 4 compatiable version, so require it directly
-    pod 'Bolts-Swift', :git => 'https://github.com/BoltsFramework/Bolts-Swift.git', :commit => 'e9baa72'
+    # The subspecs are all optional, but might be useful
+    pod "MetaWear", :subspecs => ['UI', 'AsyncUtils', 'Mocks', 'DFU']
 
 .. highlight:: console
 

MetaWear.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = 'MetaWear'
-  s.version            = '3.1.4'
+  s.version            = '3.1.5'
   s.license            = { :type => 'Commercial', :text => 'See https://www.mbientlab.com/terms/', :file => 'LICENSE' }
   s.homepage           = 'https://mbientlab.com'
   s.summary            = 'iOS/macOS/tvOS/watchOS API and documentation for the MetaWear platform'

MetaWear/AsyncUtils/MblMwDataSignal+Async.swift

@@ -36,6 +36,7 @@
 import BoltsSwift
 import MetaWearCpp
 
+ /// Task wrappers around various CPP functions with callbacks
 extension OpaquePointer {
     /// Tasky interface to reading a MetaWear data signal
     public func read() -> Task<MetaWearData> {

MetaWear/Core/CBUUID.swift

@@ -35,7 +35,7 @@
 
 import CoreBluetooth
 
-
+/// Bluetooth ID's used by MetaWear
 extension CBUUID {
     public static let metaWearService = CBUUID(string: "326A9000-85CB-9195-D9DD-464CFBBAE75A")
     public static let metaWearCommand = CBUUID(string: "326A9001-85CB-9195-D9DD-464CFBBAE75A")

MetaWear/Core/MetaWearScanner.swift

@@ -43,7 +43,7 @@ fileprivate var scannerCount = 0
 /// Scanner utility, make is simple to start scanning for MetaWear devices without
 /// having to understand all of CoreBluetooth
 public class MetaWearScanner: NSObject {
-    public static let shared = MetaWearScanner()
+    public static let shared = MetaWearScanner(restoreIdentifier: "MetaWearScanner.shared")
     public var central: CBCentralManager! = nil
     public var deviceMap: [CBPeripheral: MetaWear] = [:]
     public var didUpdateState: ((CBCentralManager) -> Void)? {
@@ -52,10 +52,9 @@ public class MetaWearScanner: NSObject {
         }
     }
 
-    public override init() {
+    public init(restoreIdentifier: String? = nil) {
         super.init()
-        let options: [String : Any] = [:]
-        //options[CBCentralManagerOptionRestoreIdentifierKey] = restoreIdentifier
+        let options: [String : Any] = restoreIdentifier == nil ? [:] : [CBCentralManagerOptionRestoreIdentifierKey: restoreIdentifier!]
         self.central = CBCentralManager(delegate: self,
                                         queue: bleQueue,
                                         options: options)
@@ -231,22 +230,9 @@ extension MetaWearScanner: CBCentralManagerDelegate {
     public func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
         deviceMap[peripheral]?.didDisconnectPeripheral(error: error)
     }
-    // public func centralManager(_ central: CBCentralManager, willRestoreState dict: [String : Any]) {
-    // MetaWearScanner.willRestoreState?(dict)
-    
-    // An array (an instance of NSArray) of CBPeripheral objects that contains
-    // all of the peripherals that were connected to the central manager
-    // (or had a connection pending) at the time the app was terminated by the system.
-    // let a = dict[CBCentralManagerRestoredStatePeripheralsKey]
-    
-    // An array (an instance of NSArray) of service UUIDs (represented by CBUUID objects)
-    // that contains all the services the central manager was scanning for at the
-    // time the app was terminated by the system.
-    // let b = dict[CBCentralManagerRestoredStateScanServicesKey]
-    
-    // A dictionary (an instance of NSDictionary) that contains all of the
-    // peripheral scan options that were being used by the central manager
-    // at the time the app was terminated by the system.
-    // let c = dict[CBCentralManagerRestoredStateScanOptionsKey]
-    // }
+    public func centralManager(_ central: CBCentralManager, willRestoreState dict: [String : Any]) {        
+        // As an SDK, we arn't sure what operations the user is acutally doing.
+        // You should place code in didFinishLaunchingWithOptions to kick off any tasks
+        // you expect to take place
+    }
 }

MetaWear/Core/String+VersionCompare.swift

@@ -34,6 +34,7 @@
  */
 
 
+/// String helper functions
 extension String {
     /// Inner comparison utility to handle same versions with different length. (Ex: "1.0.0" & "1.0")
     private func compare(toVersion targetVersion: String) -> ComparisonResult {