diff --git a/demos/Android-Demos/PolarSDK-Broadcast-Demo/app/src/main/java/com/polar/polarsdkbroadcastdemo/BroadcastActivity.java b/demos/Android-Demos/PolarSDK-Broadcast-Demo/app/src/main/java/com/polar/polarsdkbroadcastdemo/BroadcastActivity.java index bda5ab0f..6f1bd385 100644 --- a/demos/Android-Demos/PolarSDK-Broadcast-Demo/app/src/main/java/com/polar/polarsdkbroadcastdemo/BroadcastActivity.java +++ b/demos/Android-Demos/PolarSDK-Broadcast-Demo/app/src/main/java/com/polar/polarsdkbroadcastdemo/BroadcastActivity.java @@ -9,6 +9,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; +import java.util.UUID; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -44,16 +45,16 @@ public void blePowerStateChanged(boolean b) { } @Override - public void polarDeviceConnected(PolarDeviceInfo s) { + public void deviceConnected(PolarDeviceInfo s) { } @Override - public void polarDeviceConnecting(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnecting(PolarDeviceInfo polarDeviceInfo) { } @Override - public void polarDeviceDisconnected(PolarDeviceInfo s) { + public void deviceDisconnected(PolarDeviceInfo s) { } @Override @@ -82,7 +83,7 @@ public void hrFeatureReady(String s) { } @Override - public void fwInformationReceived(String s, String s1) { + public void disInformationReceived(String s, UUID u, String s1) { } @Override diff --git a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/ECGActivity.java b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/ECGActivity.java index 05d1075d..c423c7a6 100755 --- a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/ECGActivity.java +++ b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/ECGActivity.java @@ -15,6 +15,7 @@ import org.reactivestreams.Publisher; import java.util.List; +import java.util.UUID; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -63,19 +64,19 @@ public void blePowerStateChanged(boolean b) { } @Override - public void polarDeviceConnected(PolarDeviceInfo s) { + public void deviceConnected(PolarDeviceInfo s) { Log.d(TAG, "Device connected " + s.deviceId); Toast.makeText(classContext, R.string.connected, Toast.LENGTH_SHORT).show(); } @Override - public void polarDeviceConnecting(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnecting(PolarDeviceInfo polarDeviceInfo) { } @Override - public void polarDeviceDisconnected(PolarDeviceInfo s) { + public void deviceDisconnected(PolarDeviceInfo s) { Log.d(TAG, "Device disconnected " + s); } @@ -112,10 +113,12 @@ public void hrFeatureReady(String s) { } @Override - public void fwInformationReceived(String s, String s1) { - String msg = "Firmware: " + s1.trim(); - Log.d(TAG, "Firmware: " + s + " " + s1.trim()); - textViewFW.append(msg + "\n"); + public void disInformationReceived(String s, UUID u, String s1) { + if( u.equals(UUID.fromString("00002a28-0000-1000-8000-00805f9b34fb"))) { + String msg = "Firmware: " + s1.trim(); + Log.d(TAG, "Firmware: " + s + " " + s1.trim()); + textViewFW.append(msg + "\n"); + } } @Override @@ -138,7 +141,7 @@ public void polarFtpFeatureReady(String s) { Log.d(TAG, "Polar FTP ready " + s); } }); - api.connectToPolarDevice(DEVICE_ID); + api.connectToDevice(DEVICE_ID); plotter = new Plotter(this, "ECG"); plotter.setListener(this); diff --git a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/HRActivity.java b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/HRActivity.java index 1930d1d9..4cb9ff36 100755 --- a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/HRActivity.java +++ b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/app/src/main/java/com/polar/polarsdkecghrdemo/HRActivity.java @@ -15,6 +15,7 @@ import java.text.DecimalFormat; import java.util.List; +import java.util.UUID; import io.reactivex.disposables.Disposable; import polar.com.sdk.api.PolarBleApi; @@ -56,19 +57,19 @@ public void blePowerStateChanged(boolean b) { } @Override - public void polarDeviceConnected(PolarDeviceInfo s) { + public void deviceConnected(PolarDeviceInfo s) { Log.d(TAG, "Device connected " + s.deviceId); Toast.makeText(classContext, R.string.connected, Toast.LENGTH_SHORT).show(); } @Override - public void polarDeviceConnecting(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnecting(PolarDeviceInfo polarDeviceInfo) { } @Override - public void polarDeviceDisconnected(PolarDeviceInfo s) { + public void deviceDisconnected(PolarDeviceInfo s) { Log.d(TAG, "Device disconnected " + s); } @@ -104,10 +105,12 @@ public void hrFeatureReady(String s) { } @Override - public void fwInformationReceived(String s, String s1) { - String msg = "Firmware: " + s1.trim(); - Log.d(TAG, "Firmware: " + s + " " + s1.trim()); - textViewFW.append(msg + "\n"); + public void disInformationReceived(String s, UUID u, String s1) { + if( u.equals(UUID.fromString("00002a28-0000-1000-8000-00805f9b34fb"))) { + String msg = "Firmware: " + s1.trim(); + Log.d(TAG, "Firmware: " + s + " " + s1.trim()); + textViewFW.append(msg + "\n"); + } } @Override @@ -139,7 +142,7 @@ public void polarFtpFeatureReady(String s) { Log.d(TAG, "Polar FTP ready " + s); } }); - api.connectToPolarDevice(DEVICE_ID); + api.connectToDevice(DEVICE_ID); plotter = new TimePlotter(this, "HR/RR"); plotter.setListener(this); diff --git a/demos/Android-Demos/PolarSDK-Exercise-Demo/app/src/main/java/com/polar/polarsdkexercisedemo/ExerciseActivity.java b/demos/Android-Demos/PolarSDK-Exercise-Demo/app/src/main/java/com/polar/polarsdkexercisedemo/ExerciseActivity.java index 34c3f599..c4044983 100644 --- a/demos/Android-Demos/PolarSDK-Exercise-Demo/app/src/main/java/com/polar/polarsdkexercisedemo/ExerciseActivity.java +++ b/demos/Android-Demos/PolarSDK-Exercise-Demo/app/src/main/java/com/polar/polarsdkexercisedemo/ExerciseActivity.java @@ -14,6 +14,8 @@ import com.androidplot.xy.XYPlot; import java.util.ArrayList; import java.util.List; +import java.util.UUID; + import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.functions.Action; import io.reactivex.functions.Consumer; @@ -59,7 +61,7 @@ public void blePowerStateChanged(boolean b) { } @Override - public void polarDeviceConnected(PolarDeviceInfo s) { + public void deviceConnected(PolarDeviceInfo s) { Log.d(TAG,"Device connected " + s); deviceId = s.deviceId; Toast.makeText(classContext, getString(R.string.connected) + " " + s.deviceId, Toast.LENGTH_SHORT).show(); @@ -73,12 +75,12 @@ public void polarDeviceConnected(PolarDeviceInfo s) { } @Override - public void polarDeviceConnecting(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnecting(PolarDeviceInfo polarDeviceInfo) { } @Override - public void polarDeviceDisconnected(PolarDeviceInfo s) { + public void deviceDisconnected(PolarDeviceInfo s) { Log.d(TAG,"Device disconnected " + s.deviceId); } @@ -113,7 +115,7 @@ public void hrFeatureReady(String s) { } @Override - public void fwInformationReceived(String s, String s1) { + public void disInformationReceived(String s, UUID u, String s1) { } @Override @@ -132,7 +134,7 @@ public void polarFtpFeatureReady(String s) { } }); - api.autoConnectToPolarDevice(-50, null).subscribe(); + api.autoConnectToDevice(-50, "180D", null).subscribe(); plotter = new Plotter(this, "Exercise"); plotter.setListener(this); @@ -171,7 +173,7 @@ public void run() throws Exception { @Override protected void onDestroy() { super.onDestroy(); - api.disconnectFromPolarDevice(deviceId); + api.disconnectFromDevice(deviceId); } //PlotterListener diff --git a/examples/example-android/androidBleSdkTestApp/app/src/main/java/polar/com/androidblesdk/MainActivity.java b/examples/example-android/androidBleSdkTestApp/app/src/main/java/polar/com/androidblesdk/MainActivity.java index 42b43203..580e897e 100644 --- a/examples/example-android/androidBleSdkTestApp/app/src/main/java/polar/com/androidblesdk/MainActivity.java +++ b/examples/example-android/androidBleSdkTestApp/app/src/main/java/polar/com/androidblesdk/MainActivity.java @@ -14,6 +14,7 @@ import java.util.Calendar; import java.util.Date; +import java.util.UUID; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; @@ -88,19 +89,19 @@ public void blePowerStateChanged(boolean powered) { } @Override - public void polarDeviceConnected(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnected(PolarDeviceInfo polarDeviceInfo) { Log.d(TAG,"CONNECTED: " + polarDeviceInfo.deviceId); DEVICE_ID = polarDeviceInfo.deviceId; } @Override - public void polarDeviceConnecting(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnecting(PolarDeviceInfo polarDeviceInfo) { Log.d(TAG,"CONNECTING: " + polarDeviceInfo.deviceId); DEVICE_ID = polarDeviceInfo.deviceId; } @Override - public void polarDeviceDisconnected(PolarDeviceInfo polarDeviceInfo) { + public void deviceDisconnected(PolarDeviceInfo polarDeviceInfo) { Log.d(TAG,"DISCONNECTED: " + polarDeviceInfo.deviceId); ecgDisposable = null; accDisposable = null; @@ -145,8 +146,8 @@ public void hrFeatureReady(String identifier) { } @Override - public void fwInformationReceived(String identifier, String fwVersion) { - Log.d(TAG,"FW: " + fwVersion); + public void disInformationReceived(String identifier, UUID uuid, String value) { + Log.d(TAG,"uuid: " + uuid + " value: " + value); } @@ -278,14 +279,14 @@ public void run() throws Exception { connect.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - api.connectToPolarDevice(DEVICE_ID); + api.connectToDevice(DEVICE_ID); } }); disconnect.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - api.disconnectFromPolarDevice(DEVICE_ID); + api.disconnectFromDevice(DEVICE_ID); } }); @@ -296,7 +297,7 @@ public void onClick(View view) { autoConnectDisposable.dispose(); autoConnectDisposable = null; } - autoConnectDisposable = api.autoConnectToPolarDevice(-50, null).subscribe( + autoConnectDisposable = api.autoConnectToDevice(-50, "180D", null).subscribe( new Action() { @Override public void run() throws Exception { diff --git a/examples/example-ios/polarBleSdkTestApp.xcodeproj/project.pbxproj b/examples/example-ios/polarBleSdkTestApp.xcodeproj/project.pbxproj index 753bc9ff..0ddad4e3 100644 --- a/examples/example-ios/polarBleSdkTestApp.xcodeproj/project.pbxproj +++ b/examples/example-ios/polarBleSdkTestApp.xcodeproj/project.pbxproj @@ -343,7 +343,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 96TQ43SDNE; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/../", @@ -371,7 +371,7 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = 96TQ43SDNE; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/../", diff --git a/examples/example-ios/polarBleSdkTestApp/ApiWrapperSwift.swift b/examples/example-ios/polarBleSdkTestApp/ApiWrapperSwift.swift index 2697ea23..cd633e37 100644 --- a/examples/example-ios/polarBleSdkTestApp/ApiWrapperSwift.swift +++ b/examples/example-ios/polarBleSdkTestApp/ApiWrapperSwift.swift @@ -86,7 +86,7 @@ import RxSwift @objc func startAutoConnectToPolarDevice(_ rssi: Int, polarDeviceType: String?) { stopAutoConnectToPolarDevice() - autoConnect = self.api.startAutoConnectToPolarDevice(rssi, polarDeviceType: polarDeviceType).subscribe() + autoConnect = self.api.startAutoConnectToDevice(rssi, service: nil, polarDeviceType: polarDeviceType).subscribe() } @objc func stopAutoConnectToPolarDevice() { @@ -95,11 +95,11 @@ import RxSwift } @objc func connectToPolarDevice(_ identifier: String) { - self.api.connectToPolarDevice(identifier) + self.api.connectToDevice(identifier) } @objc func disconnectFromPolarDevice(_ identifier: String) { - self.api.disconnectFromPolarDevice(identifier) + self.api.disconnectFromDevice(identifier) } @objc func isFeatureReady(_ identifier: String, feature: Int) -> Bool { diff --git a/examples/example-ios/polarBleSdkTestApp/ViewController.swift b/examples/example-ios/polarBleSdkTestApp/ViewController.swift index 0f2b08d4..356bf4ff 100644 --- a/examples/example-ios/polarBleSdkTestApp/ViewController.swift +++ b/examples/example-ios/polarBleSdkTestApp/ViewController.swift @@ -30,6 +30,7 @@ class ViewController: UIViewController, api.powerStateObserver = self api.deviceFeaturesObserver = self api.logger = self + api.polarFilter(false) NSLog("\(PolarBleApiDefaultImpl.versionInfo())") } @@ -40,7 +41,7 @@ class ViewController: UIViewController, @IBAction func autoConnect(_ sender: Any) { autoConnect?.dispose() - autoConnect = api.startAutoConnectToPolarDevice(-45, polarDeviceType: nil).subscribe{ e in + autoConnect = api.startAutoConnectToDevice(-55, service: nil, polarDeviceType: nil).subscribe{ e in switch e { case .completed: NSLog("auto connect search complete") @@ -69,11 +70,11 @@ class ViewController: UIViewController, } @IBAction func connectToDevice(_ sender: Any) { - api.connectToPolarDevice(deviceId) + api.connectToDevice(deviceId) } @IBAction func disconnectFromDevice(_ sender: Any) { - api.disconnectFromPolarDevice(deviceId) + api.disconnectFromDevice(deviceId) } @IBAction func accToggle(_ sender: Any) { @@ -184,7 +185,7 @@ class ViewController: UIViewController, @IBAction func searchToggle(_ sender: Any) { if searchToggle == nil { - searchToggle = api.searchForPolarDevice().observeOn(MainScheduler.instance).subscribe{ e in + searchToggle = api.searchForDevice().observeOn(MainScheduler.instance).subscribe{ e in switch e { case .completed: NSLog("search complete") @@ -262,16 +263,16 @@ class ViewController: UIViewController, } // PolarBleApiObserver - func polarDeviceConnecting(_ polarDeviceInfo: PolarDeviceInfo) { + func deviceConnecting(_ polarDeviceInfo: PolarDeviceInfo) { NSLog("DEVICE CONNECTING: \(polarDeviceInfo)") } - func polarDeviceConnected(_ polarDeviceInfo: PolarDeviceInfo) { + func deviceConnected(_ polarDeviceInfo: PolarDeviceInfo) { NSLog("DEVICE CONNECTED: \(polarDeviceInfo)") deviceId = polarDeviceInfo.deviceId } - func polarDeviceDisconnected(_ polarDeviceInfo: PolarDeviceInfo) { + func deviceDisconnected(_ polarDeviceInfo: PolarDeviceInfo) { NSLog("DISCONNECTED: \(polarDeviceInfo)") }