diff --git a/README.md b/README.md index 6b1ac120..afedf89c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This SDK uses ReactiveX. You can read more about ReactiveX from their website [r By exploiting the SDK, you indicate your acceptance of [License](Polar_SDK_License.txt). -If you wish to collaborate with Polar commercially, [click here](http://polar.com/developers) +If you wish to collaborate with Polar commercially, [click here](https://polar.com/developers) ### Quick License Summary / Your rights to use the SDK You may use, copy and modify the SDK as long as you @@ -26,11 +26,35 @@ Most accurate Heart rate sensor in the markets. The H10 is used in the Getting s #### H10 heart rate sensor available data types * From version 3.0.35 onwards. * Heart rate as beats per minute. RR Interval in ms and 1/1024 format. +* Heart rate broadcast. * Electrocardiography (ECG) data in µV. Default epoch for timestamp is 1.1.2000 * Accelerometer data with sample rates of 25Hz, 50Hz, 100Hz and 200Hz and range of 2G, 4G and 8G. Axis specific acceleration data in mG. Default epoch for timestamp is 1.1.2000 * Start and stop of internal recording and request for internal recording status. Recording supports RR, HR with one second sampletime or HR with five second sampletime. * List, read and remove for stored internal recording (sensor supports only one recording at the time). +### H9 Heart rate sensor +Reliable high quality heart rate chest strap. +[Store page](https://www.polar.com/en/products/accessories/H9_heart_rate_sensor) + +#### H9 heart rate sensor available data types +* From version 1.0.0 onwards. +* Heart rate as beats per minute. RR Interval in ms and 1/1024 format. +* Heart rate broadcast. + +### Polar Verity Sense Optical heart rate sensor +Optical heart rate sensor is a rechargeable device that measures user’s heart rate with LED technology. +[Store page](https://www.polar.com/en/products/accessories/polar-verity-sense) + +#### Polar Verity Sense Optical heart rate sensor available data types +* From version 1.0.0 onwards. +* Heart rate as beats per minute. +* Heart rate broadcast. +* Photoplethysmograpy (PPG) values. +* PP interval (milliseconds) representing cardiac pulse-to-pulse interval extracted from PPG signal. +* Accelerometer data with sample rate of 52Hz and range of 8G. Axis specific acceleration data in mG. +* Gyroscope data with sample rate of 52Hz and ranges of 250dps, 500dps, 1000dps and 2000dps. Axis specific gyroscope data in dps. +* Magnetometer data with sample rates of 10Hz, 20Hz, 50HZ and 100Hz and range of +/-50 Gauss. Axis specific magnetometer data in Gauss. +* List, read and remove stored exercise. Recording of exercise requires that sensor is registered to Polar Flow account. ### OH1 Optical heart rate sensor Optical heart rate sensor is a rechargeable device that measures user’s heart rate with LED technology. @@ -39,6 +63,7 @@ Optical heart rate sensor is a rechargeable device that measures user’s heart #### OH1 Optical heart rate sensor available data types * From version 2.0.8 onwards. * Heart rate as beats per minute. +* Heart rate broadcast. * Photoplethysmograpy (PPG) values. * PP interval (milliseconds) representing cardiac pulse-to-pulse interval extracted from PPG signal. * Accelerometer data with samplerate of 50Hz and range of 8G. Axis specific acceleration data in mG. @@ -52,17 +77,6 @@ Optical heart rate sensor is a rechargeable device that measures user’s heart * [gatt specification](technical_documentation/Polar_Measurement_Data_Specification.pdf) contains gatt specification for polar measurement data streaming * [H10 ecg technical document](technical_documentation/H10_ECG_Explained.docx) -### Android proguard-rules -``` --dontwarn rx.internal.util.** --dontwarn com.google.protobuf.** --keep class fi.polar.remote.representation.protobuf.** {public private protected *;} --keep class protocol.** {public private protected *;} --keep class data.** {public private protected *;} --keep class com.androidcommunications.polar.api.ble.model.** {public private protected *;} --keep class com.androidcommunications.polar.enpoints.ble.bluedroid.host.** -``` - # Android: Getting started Detailed documentation [Full Documentation](polar-sdk-android/docs/html/). ## Installation @@ -106,6 +120,16 @@ dependencies { ``` +## Android proguard-rules +``` +-dontwarn rx.internal.util.** +-dontwarn com.google.protobuf.** +-keep class fi.polar.remote.representation.protobuf.** {public private protected *;} +-keep class protocol.** {public private protected *;} +-keep class data.** {public private protected *;} +-keep class com.androidcommunications.polar.api.ble.model.** {public private protected *;} +-keep class com.androidcommunications.polar.enpoints.ble.bluedroid.host.** +``` ## Code example: Heart rate See the [example](examples/example-android) folder for the full project. @@ -116,34 +140,33 @@ This is not required if you are using automatic connection. 1. Import following packages. ``` -import io.reactivex.CompletableObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.functions.Function; + import polar.com.sdk.api.PolarBleApi; import polar.com.sdk.api.PolarBleApiCallback; import polar.com.sdk.api.PolarBleApiDefaultImpl; +import polar.com.sdk.api.errors.PolarInvalidArgument; import polar.com.sdk.api.model.PolarAccelerometerData; import polar.com.sdk.api.model.PolarDeviceInfo; import polar.com.sdk.api.model.PolarEcgData; -import polar.com.sdk.api.model.PolarExerciseData; import polar.com.sdk.api.model.PolarExerciseEntry; -import polar.com.sdk.api.model.PolarHrBroadcastData; +import polar.com.sdk.api.model.PolarGyroData; import polar.com.sdk.api.model.PolarHrData; -import polar.com.sdk.api.model.PolarOhrPPGData; +import polar.com.sdk.api.model.PolarMagnetometerData; +import polar.com.sdk.api.model.PolarOhrData; import polar.com.sdk.api.model.PolarOhrPPIData; import polar.com.sdk.api.model.PolarSensorSetting; ``` 2. Load the default api implementation and add callback. ``` -// NOTICE only FEATURE_HR is enabled, to enable more features like battery info +// NOTICE all features are enabled, if only interested on particular feature(s) like info Heart rate and Battery info then // e.g. PolarBleApiDefaultImpl.defaultImplementation(this, PolarBleApi.FEATURE_HR | // PolarBleApi.FEATURE_BATTERY_INFO); // batteryLevelReceived callback is invoked after connection -PolarBleApi api = PolarBleApiDefaultImpl.defaultImplementation(this, PolarBleApi.FEATURE_HR); +PolarBleApi api = PolarBleApiDefaultImpl.defaultImplementation(this, PolarBleApi.ALL_FEATURES); api.setApiCallback(new PolarBleApiCallback() { @Override @@ -152,39 +175,27 @@ api.setApiCallback(new PolarBleApiCallback() { } @Override - public void polarDeviceConnected(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnected(PolarDeviceInfo polarDeviceInfo) { Log.d("MyApp","CONNECTED: " + polarDeviceInfo.deviceId); } @Override - public void polarDeviceConnecting(PolarDeviceInfo polarDeviceInfo) { + public void deviceConnecting(PolarDeviceInfo polarDeviceInfo) { Log.d("MyApp","CONNECTING: " + polarDeviceInfo.deviceId); } @Override - public void polarDeviceDisconnected(PolarDeviceInfo polarDeviceInfo) { + public void deviceDisconnected(PolarDeviceInfo polarDeviceInfo) { Log.d("MyApp","DISCONNECTED: " + polarDeviceInfo.deviceId); } @Override - public void ecgFeatureReady(String identifier) { - } - - @Override - public void accelerometerFeatureReady(String identifier) { - } - - @Override - public void ppgFeatureReady(String identifier) { - } - - @Override - public void ppiFeatureReady(String identifier) { - } - - @Override - public void biozFeatureReady(String identifier) { - } + public void streamingFeaturesReady(@NonNull final String identifier, + @NonNull final Set features) { + for(PolarBleApi.DeviceStreamingFeature feature : features) { + Log.d("MyApp", "Streaming feature " + feature.toString() + " is ready"); + } + } @Override public void hrFeatureReady(String identifier) { @@ -192,7 +203,7 @@ api.setApiCallback(new PolarBleApiCallback() { } @Override - public void fwInformationReceived(String identifier, String fwVersion) { + public void disInformationReceived(String identifier, UUID uuid, String value) { } @Override @@ -317,13 +328,10 @@ class MyController: UIViewController, print("HR READY") } - func ecgFeatureReady(_ identifier: String) { - } - - func accFeatureReady(_ identifier: String) { - } - - func ohrPPGFeatureReady(_ identifier: String) { + func streamingFeaturesReady(_ identifier: String, streamingFeatures: Set) { + for feature in streamingFeatures { + print("Feature \(feature) is ready.") + } } func blePowerOn() { @@ -333,10 +341,7 @@ class MyController: UIViewController, func blePowerOff() { print("BLE OFF") } - - func ohrPPIFeatureReady(_ identifier: String) { - } - + func ftpFeatureReady(_ identifier: String) { } } diff --git a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/build.gradle b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/build.gradle index fb8c2e23..d9f7d2f2 100644 --- a/demos/Android-Demos/PolarSDK-ECG-HR-Demo/build.gradle +++ b/demos/Android-Demos/PolarSDK-ECG-HR-Demo/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.1.2' } } diff --git a/examples/example-android/androidBleSdkTestApp/app/build.gradle b/examples/example-android/androidBleSdkTestApp/app/build.gradle index ba39bf85..e54c72f6 100644 --- a/examples/example-android/androidBleSdkTestApp/app/build.gradle +++ b/examples/example-android/androidBleSdkTestApp/app/build.gradle @@ -30,10 +30,10 @@ android { dependencies { implementation files('libs/polar-ble-sdk.aar') implementation files('libs/polar-protobuf-release.aar') - implementation 'com.google.protobuf:protobuf-java:3.1.0' + implementation 'com.google.protobuf:protobuf-java:3.14.0' implementation 'io.reactivex.rxjava3:rxjava:3.0.0' - implementation 'commons-io:commons-io:2.8.0' implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' + implementation 'commons-io:commons-io:2.8.0' implementation 'androidx.appcompat:appcompat:1.2.0' testImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test.ext:junit:1.1.2' 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 5cfa51a3..7bf7e496 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 @@ -3,17 +3,17 @@ import android.Manifest; import android.os.Build; import android.os.Bundle; +import android.util.Log; +import android.widget.Button; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import android.util.Log; -import android.widget.Button; - import org.reactivestreams.Publisher; import java.util.Calendar; import java.util.Date; +import java.util.Set; import java.util.UUID; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; @@ -27,11 +27,15 @@ import polar.com.sdk.api.model.PolarDeviceInfo; import polar.com.sdk.api.model.PolarEcgData; import polar.com.sdk.api.model.PolarExerciseEntry; +import polar.com.sdk.api.model.PolarGyroData; import polar.com.sdk.api.model.PolarHrData; -import polar.com.sdk.api.model.PolarOhrPPGData; +import polar.com.sdk.api.model.PolarMagnetometerData; +import polar.com.sdk.api.model.PolarOhrData; import polar.com.sdk.api.model.PolarOhrPPIData; import polar.com.sdk.api.model.PolarSensorSetting; +import static polar.com.sdk.api.model.PolarOhrData.OHR_DATA_TYPE.PPG3_AMBIENT1; + public class MainActivity extends AppCompatActivity { private static final String TAG = MainActivity.class.getSimpleName(); private static final String API_LOGGER_TAG = "API LOGGER"; @@ -39,11 +43,13 @@ public class MainActivity extends AppCompatActivity { Disposable broadcastDisposable; Disposable ecgDisposable; Disposable accDisposable; + Disposable gyrDisposable; + Disposable magDisposable; Disposable ppgDisposable; Disposable ppiDisposable; Disposable scanDisposable; - String DEVICE_ID = "0A34442D"; // or bt address like F5:A7:B8:EF:7A:D1 // TODO replace with your device id Disposable autoConnectDisposable; + String DEVICE_ID = "8C4CAD2D"; //TODO replace with your device id PolarExerciseEntry exerciseEntry; @Override @@ -60,6 +66,8 @@ protected void onCreate(Bundle savedInstanceState) { final Button autoConnect = this.findViewById(R.id.auto_connect_button); final Button ecg = this.findViewById(R.id.ecg_button); final Button acc = this.findViewById(R.id.acc_button); + final Button gyr = this.findViewById(R.id.gyr_button); + final Button mag = this.findViewById(R.id.mag_button); final Button ppg = this.findViewById(R.id.ohr_ppg_button); final Button ppi = this.findViewById(R.id.ohr_ppi_button); final Button scan = this.findViewById(R.id.scan_button); @@ -68,7 +76,7 @@ protected void onCreate(Bundle savedInstanceState) { final Button remove = this.findViewById(R.id.remove_exercise); final Button startH10Recording = this.findViewById(R.id.start_h10_recording); final Button stopH10Recording = this.findViewById(R.id.stop_h10_recording); - final Button H10RecordingStatus = this.findViewById(R.id.h10_recording_status); + final Button readH10RecordingStatus = this.findViewById(R.id.h10_recording_status); final Button setTime = this.findViewById(R.id.set_time); api.setApiLogger(s -> Log.d(API_LOGGER_TAG, s)); @@ -98,38 +106,18 @@ public void deviceDisconnected(@NonNull PolarDeviceInfo polarDeviceInfo) { Log.d(TAG, "DISCONNECTED: " + polarDeviceInfo.deviceId); ecgDisposable = null; accDisposable = null; + gyrDisposable = null; + magDisposable = null; ppgDisposable = null; ppiDisposable = null; } @Override - public void ecgFeatureReady(@NonNull String identifier) { - Log.d(TAG, "ECG READY: " + identifier); - // ecg streaming can be started now if needed - } - - @Override - public void accelerometerFeatureReady(@NonNull String identifier) { - Log.d(TAG, "ACC READY: " + identifier); - // acc streaming can be started now if needed - } - - @Override - public void ppgFeatureReady(@NonNull String identifier) { - Log.d(TAG, "PPG READY: " + identifier); - // ohr ppg can be started - } - - @Override - public void ppiFeatureReady(@NonNull String identifier) { - Log.d(TAG, "PPI READY: " + identifier); - // ohr ppi can be started - } - - @Override - public void biozFeatureReady(@NonNull String identifier) { - Log.d(TAG, "BIOZ READY: " + identifier); - // ohr ppi can be started + public void streamingFeaturesReady(@NonNull final String identifier, + @NonNull final Set features) { + for(PolarBleApi.DeviceStreamingFeature feature : features) { + Log.d(TAG, "Streaming feature " + feature.toString() + " is ready"); + } } @Override @@ -141,19 +129,17 @@ public void hrFeatureReady(@NonNull String identifier) { @Override public void disInformationReceived(@NonNull String identifier, @NonNull UUID uuid, @NonNull String value) { Log.d(TAG, "uuid: " + uuid + " value: " + value); - } @Override public void batteryLevelReceived(@NonNull String identifier, int level) { Log.d(TAG, "BATTERY LEVEL: " + level); - } @Override public void hrNotificationReceived(@NonNull String identifier, @NonNull PolarHrData data) { Log.d(TAG, "HR value: " + data.hr + " rrsMs: " + data.rrsMs + " rr: " + data.rrs + " contact: " + data.contactStatus + "," + data.contactStatusSupported); - } + } @Override public void polarFtpFeatureReady(@NonNull String s) { @@ -161,43 +147,16 @@ public void polarFtpFeatureReady(@NonNull String s) { } }); - list.setOnClickListener(v -> api.listExercises(DEVICE_ID).observeOn(AndroidSchedulers.mainThread()).subscribe( - polarExerciseEntry -> { - Log.d(TAG, "next: " + polarExerciseEntry.date + " path: " + polarExerciseEntry.path + " id: " + polarExerciseEntry.identifier); - exerciseEntry = polarExerciseEntry; - }, - throwable -> Log.e(TAG, "fetch exercises failed: " + throwable.getLocalizedMessage()), - () -> Log.d(TAG, "complete") - )); - - read.setOnClickListener(v -> { - if (exerciseEntry != null) { - api.fetchExercise(DEVICE_ID, exerciseEntry).observeOn(AndroidSchedulers.mainThread()).subscribe( - polarExerciseData -> Log.d(TAG, "exercise data count: " + polarExerciseData.hrSamples.size() + " samples: " + polarExerciseData.hrSamples), - throwable -> Log.e(TAG, "Failed to read exercise: " + throwable.getLocalizedMessage()) - ); - } - }); - - remove.setOnClickListener(v -> { - if (exerciseEntry != null) { - api.removeExercise(DEVICE_ID, exerciseEntry).observeOn(AndroidSchedulers.mainThread()).subscribe( - () -> Log.d(TAG, "ex removed ok"), - throwable -> Log.d(TAG, "ex remove failed: " + throwable.getLocalizedMessage()) - ); - } - }); - broadcast.setOnClickListener(v -> { if (broadcastDisposable == null) { - broadcastDisposable = api.startListenForPolarHrBroadcasts(null).subscribe( - polarBroadcastData -> Log.d(TAG, "HR BROADCAST " + - polarBroadcastData.polarDeviceInfo.deviceId + " HR: " + - polarBroadcastData.hr + " batt: " + - polarBroadcastData.batteryStatus), - throwable -> Log.e(TAG, "" + throwable.getLocalizedMessage()), - () -> Log.d(TAG, "complete") - ); + broadcastDisposable = api.startListenForPolarHrBroadcasts(null) + .subscribe(polarBroadcastData -> Log.d(TAG, "HR BROADCAST " + + polarBroadcastData.polarDeviceInfo.deviceId + " HR: " + + polarBroadcastData.hr + " batt: " + + polarBroadcastData.batteryStatus), + error -> Log.e(TAG, "Broadcast listener failed. Reason " + error), + () -> Log.d(TAG, "complete") + ); } else { broadcastDisposable.dispose(); broadcastDisposable = null; @@ -225,15 +184,16 @@ public void polarFtpFeatureReady(@NonNull String s) { autoConnectDisposable.dispose(); autoConnectDisposable = null; } - autoConnectDisposable = api.autoConnectToDevice(-50, "180D", null).subscribe( - () -> Log.d(TAG, "auto connect search complete"), - throwable -> Log.e(TAG, "" + throwable.toString()) - ); + autoConnectDisposable = api.autoConnectToDevice(-50, "180D", null) + .subscribe( + () -> Log.d(TAG, "auto connect search complete"), + throwable -> Log.e(TAG, "" + throwable.toString()) + ); }); ecg.setOnClickListener(v -> { if (ecgDisposable == null) { - ecgDisposable = api.requestEcgSettings(DEVICE_ID) + ecgDisposable = api.requestStreamSettings(DEVICE_ID, PolarBleApi.DeviceStreamingFeature.ECG) .toFlowable() .flatMap((Function>) polarEcgSettings -> { PolarSensorSetting sensorSetting = polarEcgSettings.maxSettings(); @@ -244,7 +204,7 @@ public void polarFtpFeatureReady(@NonNull String s) { Log.d(TAG, " yV: " + microVolts); } }, - throwable -> Log.e(TAG, "" + throwable.toString()), + throwable -> Log.e(TAG, "" + throwable), () -> Log.d(TAG, "complete") ); } else { @@ -256,7 +216,7 @@ public void polarFtpFeatureReady(@NonNull String s) { acc.setOnClickListener(v -> { if (accDisposable == null) { - accDisposable = api.requestAccSettings(DEVICE_ID) + accDisposable = api.requestStreamSettings(DEVICE_ID, PolarBleApi.DeviceStreamingFeature.ACC) .toFlowable() .flatMap((Function>) settings -> { PolarSensorSetting sensorSetting = settings.maxSettings(); @@ -264,11 +224,11 @@ public void polarFtpFeatureReady(@NonNull String s) { }).observeOn(AndroidSchedulers.mainThread()) .subscribe( polarAccelerometerData -> { - for (PolarAccelerometerData.PolarAccelerometerSample data : polarAccelerometerData.samples) { + for (PolarAccelerometerData.PolarAccelerometerDataSample data : polarAccelerometerData.samples) { Log.d(TAG, " x: " + data.x + " y: " + data.y + " z: " + data.z); } }, - throwable -> Log.e(TAG, "" + throwable.getLocalizedMessage()), + throwable -> Log.e(TAG, "" + throwable), () -> Log.d(TAG, "complete") ); } else { @@ -278,15 +238,70 @@ public void polarFtpFeatureReady(@NonNull String s) { } }); + gyr.setOnClickListener(v -> { + if (gyrDisposable == null) { + gyrDisposable = api.requestStreamSettings(DEVICE_ID, PolarBleApi.DeviceStreamingFeature.GYRO) + .toFlowable() + .flatMap((Function>) settings -> { + PolarSensorSetting sensorSetting = settings.maxSettings(); + return api.startGyroStreaming(DEVICE_ID, sensorSetting); + }) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + polarGyroData -> { + for (PolarGyroData.PolarGyroDataSample data : polarGyroData.samples) { + Log.d(TAG, " x: " + data.x + " y: " + data.y + " z: " + data.z); + } + }, + throwable -> Log.e(TAG, "" + throwable), + () -> Log.d(TAG, "complete") + ); + } else { + // NOTE dispose will stop streaming if it is "running" + gyrDisposable.dispose(); + gyrDisposable = null; + } + }); + + mag.setOnClickListener(v -> { + if (magDisposable == null) { + magDisposable = api.requestStreamSettings(DEVICE_ID, PolarBleApi.DeviceStreamingFeature.MAGNETOMETER) + .toFlowable() + .flatMap((Function>) settings -> { + PolarSensorSetting sensorSetting = settings.maxSettings(); + return api.startMagnetometerStreaming(DEVICE_ID, sensorSetting); + }) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + polarMagData -> { + for (PolarMagnetometerData.PolarMagnetometerDataSample data : polarMagData.samples) { + Log.d(TAG, " x: " + data.x + " y: " + data.y + " z: " + data.z); + } + }, + throwable -> Log.e(TAG, "" + throwable), + () -> Log.d(TAG, "complete") + ); + } else { + // NOTE dispose will stop streaming if it is "running" + magDisposable.dispose(); + magDisposable = null; + } + }); + ppg.setOnClickListener(v -> { if (ppgDisposable == null) { - ppgDisposable = api.requestPpgSettings(DEVICE_ID) + ppgDisposable = api.requestStreamSettings(DEVICE_ID, PolarBleApi.DeviceStreamingFeature.PPG) .toFlowable() - .flatMap((Function>) polarPPGSettings -> api.startOhrPPGStreaming(DEVICE_ID, polarPPGSettings.maxSettings())) + .flatMap((Function>) polarPPGSettings -> api.startOhrStreaming(DEVICE_ID, polarPPGSettings.maxSettings())) .subscribe( polarOhrPPGData -> { - for (PolarOhrPPGData.PolarOhrPPGSample data : polarOhrPPGData.samples) { - Log.d(TAG, " ppg0: " + data.ppg0 + " ppg1: " + data.ppg1 + " ppg2: " + data.ppg2 + "ambient: " + data.ambient); + if (polarOhrPPGData.type == PPG3_AMBIENT1) { + for (PolarOhrData.PolarOhrSample data : polarOhrPPGData.samples) { + Log.d(TAG, " ppg0: " + data.channelSamples.get(0) + + " ppg1: " + data.channelSamples.get(0) + + " ppg2: " + data.channelSamples.get(0) + + " ambient: " + data.channelSamples.get(0)); + } } }, throwable -> Log.e(TAG, "" + throwable.getLocalizedMessage()), @@ -305,7 +320,7 @@ public void polarFtpFeatureReady(@NonNull String s) { .subscribe( ppiData -> { for (PolarOhrPPIData.PolarOhrPPISample sample : ppiData.samples) { - Log.d(TAG, "ppi: " + sample.ppi + Log.d(TAG, " ppi: " + sample.ppi + " blocker: " + sample.blockerBit + " errorEstimate: " + sample.errorEstimate); } }, @@ -333,31 +348,71 @@ public void polarFtpFeatureReady(@NonNull String s) { } }); - startH10Recording.setOnClickListener(view -> api.startRecording(DEVICE_ID, "TEST_APP_ID", PolarBleApi.RecordingInterval.INTERVAL_1S, PolarBleApi.SampleType.HR).subscribe( - () -> Log.d(TAG, "recording started"), - throwable -> Log.e(TAG, "recording start failed: " + throwable.getLocalizedMessage()) - )); + list.setOnClickListener(v -> api.listExercises(DEVICE_ID) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + polarExerciseEntry -> { + Log.d(TAG, "next: " + polarExerciseEntry.date + " path: " + polarExerciseEntry.path + " id: " + polarExerciseEntry.identifier); + exerciseEntry = polarExerciseEntry; + }, + throwable -> Log.e(TAG, "Failed to fetch exercises: " + throwable), + () -> Log.d(TAG, "fetch exercises complete") + )); - stopH10Recording.setOnClickListener(view -> api.stopRecording(DEVICE_ID).subscribe( - () -> Log.d(TAG, "recording stopped"), - throwable -> Log.e(TAG, "recording stop failed: " + throwable.getLocalizedMessage()) - )); + read.setOnClickListener(v -> { + if (exerciseEntry != null) { + api.fetchExercise(DEVICE_ID, exerciseEntry) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + polarExerciseData -> Log.d(TAG, "exercise data count: " + polarExerciseData.hrSamples.size() + " samples: " + polarExerciseData.hrSamples), + throwable -> Log.e(TAG, "Failed to read exercise: " + throwable.getLocalizedMessage()) + ); + } + }); - H10RecordingStatus.setOnClickListener(view -> api.requestRecordingStatus(DEVICE_ID).subscribe( - pair -> Log.d(TAG, "recording on: " + pair.first + " ID: " + pair.second), - throwable -> Log.e(TAG, "recording status failed: " + throwable.getLocalizedMessage()) - )); + remove.setOnClickListener(v -> { + if (exerciseEntry != null) { + api.removeExercise(DEVICE_ID, exerciseEntry) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + () -> Log.d(TAG, "ex removed ok"), + throwable -> Log.d(TAG, "ex remove failed: " + throwable.getLocalizedMessage()) + ); + } + }); + + startH10Recording.setOnClickListener(view -> + api.startRecording(DEVICE_ID, "TEST_APP_ID", PolarBleApi.RecordingInterval.INTERVAL_1S, PolarBleApi.SampleType.HR) + .subscribe( + () -> Log.d(TAG, "recording started"), + throwable -> Log.e(TAG, "recording start failed: " + throwable.getLocalizedMessage()) + )); + + stopH10Recording.setOnClickListener(view -> + api.stopRecording(DEVICE_ID) + .subscribe( + () -> Log.d(TAG, "recording stopped"), + throwable -> Log.e(TAG, "recording stop failed: " + throwable.getLocalizedMessage()) + )); + + readH10RecordingStatus.setOnClickListener(view -> + api.requestRecordingStatus(DEVICE_ID) + .subscribe( + pair -> Log.d(TAG, "recording on: " + pair.first + " ID: " + pair.second), + throwable -> Log.e(TAG, "recording status failed: " + throwable.getLocalizedMessage()) + )); setTime.setOnClickListener(v -> { Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); - api.setLocalTime(DEVICE_ID, calendar).subscribe( - () -> Log.d(TAG, "time set to device"), - throwable -> Log.d(TAG, "set time failed: " + throwable.getLocalizedMessage())); + api.setLocalTime(DEVICE_ID, calendar) + .subscribe( + () -> Log.d(TAG, "time set to device"), + error -> Log.d(TAG, "set time failed: " + error)); }); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && savedInstanceState == null) { - this.requestPermissions(new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION}, 1); + this.requestPermissions(new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 1); } } diff --git a/examples/example-android/androidBleSdkTestApp/app/src/main/res/layout/activity_main.xml b/examples/example-android/androidBleSdkTestApp/app/src/main/res/layout/activity_main.xml index 03087e45..17b6a045 100644 --- a/examples/example-android/androidBleSdkTestApp/app/src/main/res/layout/activity_main.xml +++ b/examples/example-android/androidBleSdkTestApp/app/src/main/res/layout/activity_main.xml @@ -46,6 +46,18 @@ android:layout_height="wrap_content" android:text="acc_stream" /> + - - - + - - - - - + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - diff --git a/examples/example-ios/polarBleSdkTestApp/ViewController.swift b/examples/example-ios/polarBleSdkTestApp/ViewController.swift index f575211f..b7e79e60 100644 --- a/examples/example-ios/polarBleSdkTestApp/ViewController.swift +++ b/examples/example-ios/polarBleSdkTestApp/ViewController.swift @@ -18,12 +18,14 @@ class ViewController: UIViewController, var broadcast: Disposable? var ecgToggle: Disposable? var accToggle: Disposable? + var gyroToggle: Disposable? + var magnetometerToggle: Disposable? var ppgToggle: Disposable? var ppiToggle: Disposable? var searchToggle: Disposable? var autoConnect: Disposable? - var entry: PolarExerciseEntry? - var deviceId = "4F443C26" // TODO replace this with your device id + var exerciseEntry: PolarExerciseEntry? + var deviceId = "89647C2E" //TODO replace this with your device id override func viewDidLoad() { super.viewDidLoad() @@ -43,21 +45,6 @@ class ViewController: UIViewController, // Dispose of any resources that can be recreated. } - @IBAction func autoConnect(_ sender: Any) { - autoConnect?.dispose() - autoConnect = api.startAutoConnectToDevice(-55, service: nil, polarDeviceType: nil) - .subscribe{ e in - switch e { - case .completed: - NSLog("auto connect search complete") - case .error(let err): - NSLog("auto connect failed: \(err)") - @unknown default: - fatalError() - } - } - } - @IBAction func broadcastToggle(_ sender: Any) { if broadcast == nil { broadcast = api.startListenForPolarHrBroadcasts(nil) @@ -94,16 +81,57 @@ class ViewController: UIViewController, } } + @IBAction func autoConnect(_ sender: Any) { + autoConnect?.dispose() + autoConnect = api.startAutoConnectToDevice(-55, service: nil, polarDeviceType: nil) + .subscribe{ e in + switch e { + case .completed: + NSLog("auto connect search complete") + case .error(let err): + NSLog("auto connect failed: \(err)") + @unknown default: + fatalError() + } + } + } + + @IBAction func ecgToggle(_ sender: Any) { + if ecgToggle == nil { + ecgToggle = api.requestStreamSettings(deviceId, feature: DeviceStreamingFeature.ecg) + .asObservable() + .flatMap({ (settings) -> Observable in + return self.api.startEcgStreaming(self.deviceId, settings: settings.maxSettings()) + }) + .observe(on: MainScheduler.instance) + .subscribe{ e in + switch e { + case .next(let data): + for µv in data.samples { + NSLog(" µV: \(µv)") + } + case .error(let err): + NSLog("ECG error: \(err)") + self.ecgToggle = nil + case .completed: + break + } + } + } else { + ecgToggle?.dispose() + ecgToggle = nil + } + } + @IBAction func accToggle(_ sender: Any) { if accToggle == nil { - accToggle = api.requestAccSettings(deviceId) + accToggle = api.requestStreamSettings(deviceId, feature: DeviceStreamingFeature.acc) .asObservable() .flatMap({ (settings) -> Observable in NSLog("settings: \(settings.settings)") return self.api.startAccStreaming(self.deviceId, settings: settings.maxSettings()) }) - .observe(on: MainScheduler.instance) - .subscribe{ e in + .observe(on: MainScheduler.instance).subscribe{ e in switch e { case .next(let data): for item in data.samples { @@ -122,69 +150,81 @@ class ViewController: UIViewController, } } - @IBAction func ecgToggle(_ sender: Any) { - if ecgToggle == nil { - ecgToggle = api.requestEcgSettings(deviceId) + @IBAction func gyroToggle(_ sender: Any) { + if gyroToggle == nil { + gyroToggle = api.requestStreamSettings(deviceId, feature:DeviceStreamingFeature.gyro) .asObservable() - .flatMap({ (settings) -> Observable in - return self.api.startEcgStreaming(self.deviceId, settings: settings.maxSettings()) + .flatMap({ (settings) -> Observable in + return self.api.startGyroStreaming(self.deviceId, settings: settings.maxSettings()) }) .observe(on: MainScheduler.instance) .subscribe{ e in switch e { case .next(let data): - for µv in data.samples { - NSLog(" µV: \(µv)") + for item in data.samples { + NSLog(" x: \(item.x) y: \(item.y) z: \(item.z)") } case .error(let err): - NSLog("start ecg error: \(err)") - self.ecgToggle = nil + NSLog("Gyro error: \(err)") + self.gyroToggle = nil case .completed: break } } } else { - ecgToggle?.dispose() - ecgToggle = nil + gyroToggle?.dispose() + gyroToggle = nil } } - @IBAction func listFilesToggle(_ sender: Any) { - _ = api.fetchStoredExerciseList(deviceId) - .observe(on: MainScheduler.instance) - .subscribe{ e in - switch e { - case .completed: - NSLog("list files done") - case .error(let err): - NSLog("list files: \(err)") - case .next(let e): - NSLog("entry: \(e.date.description) id: \(e.entryId)") - self.entry = e + @IBAction func magnetometerToggle(_ sender: Any) { + if magnetometerToggle == nil { + magnetometerToggle = api.requestStreamSettings(deviceId, feature:DeviceStreamingFeature.magnetometer) + .asObservable() + .flatMap({ (settings) -> Observable in + return self.api.startMagnetometerStreaming(self.deviceId, settings: settings.maxSettings()) + }) + .observe(on: MainScheduler.instance) + .subscribe{ e in + switch e { + case .next(let data): + for item in data.samples { + NSLog(" x: \(item.x) y: \(item.y) z: \(item.z)") + } + case .error(let err): + NSLog("Magnetometer error: \(err)") + self.magnetometerToggle = nil + case .completed: + break + } } - } - + } else { + magnetometerToggle?.dispose() + magnetometerToggle = nil + } } @IBAction func ppgToggle(_ sender: Any) { if ppgToggle == nil { - ppgToggle = api.requestPpgSettings(deviceId) + ppgToggle = api.requestStreamSettings(deviceId, feature: DeviceStreamingFeature.ppg) .asObservable() - .flatMap({ (settings) -> Observable in - return self.api.startOhrPPGStreaming(self.deviceId, settings: settings.maxSettings()) + .flatMap({ (settings) -> Observable in + return self.api.startOhrStreaming(self.deviceId, settings: settings.maxSettings()) }) .observe(on: MainScheduler.instance) .subscribe{ e in switch e { - case .completed: - NSLog("ppg finished") - case .error(let err): - NSLog("start ppg error: \(err)") - self.ppgToggle = nil case .next(let data): - for item in data.samples { - NSLog(" ppg0: \(item.ppg0) ppg1: \(item.ppg1) ppg2: \(item.ppg2)") + if(data.type == OhrDataType.ppg3_ambient1) { + for item in data.samples { + NSLog(" ppg0: \(item[0]) ppg1: \(item[1]) ppg2: \(item[2]) ambient: \(item[3])") + } } + case .error(let err): + NSLog("PPG error: \(err)") + self.ppgToggle = nil + case .completed: + NSLog("ppg complete") } } } else { @@ -199,15 +239,15 @@ class ViewController: UIViewController, .observe(on: MainScheduler.instance) .subscribe{ e in switch e { - case .completed: - NSLog("ppi complete") - case .error(let err): - NSLog("start ppi error: \(err)") - self.ppiToggle = nil case .next(let data): for item in data.samples { - NSLog("PPI: \(item.ppInMs)") + NSLog(" PPI: \(item.ppInMs) sample.blockerBit: \(item.blockerBit) errorEstimate: \(item.ppErrorEstimate)") } + case .error(let err): + NSLog("PPI error: \(err)") + self.ppiToggle = nil + case .completed: + NSLog("ppi complete") } } } else { @@ -236,8 +276,24 @@ class ViewController: UIViewController, } } + @IBAction func listExercises(_ sender: Any) { + _ = api.fetchStoredExerciseList(deviceId) + .observe(on: MainScheduler.instance) + .subscribe{ e in + switch e { + case .completed: + NSLog("list exercises done") + case .error(let err): + NSLog("failed to list exercises: \(err)") + case .next(let polarExerciseEntry): + NSLog("entry: \(polarExerciseEntry.date.description) path: \(polarExerciseEntry.path) id: \(polarExerciseEntry.entryId)"); + self.exerciseEntry = polarExerciseEntry + } + } + } + @IBAction func readExercise(_ sender: Any) { - guard let e = entry else { + guard let e = exerciseEntry else { return } _ = api.fetchExercise(deviceId, entry: e) @@ -245,15 +301,15 @@ class ViewController: UIViewController, .subscribe{ e in switch e { case .failure(let err): - NSLog("read ex error: \(err)") + NSLog("failed to read exercises: \(err)") case .success(let data): - NSLog("\(data.samples)") + NSLog("exercise data count: \(data.samples.count) samples: \(data.samples)") } } } @IBAction func removeExercise(_ sender: Any) { - guard let e = entry else { + guard let e = exerciseEntry else { return } _ = api.removeExercise(deviceId, entry: e) @@ -313,6 +369,23 @@ class ViewController: UIViewController, } } + @IBAction func setTime(_ sender: Any) { + let time = Date() + let timeZone = TimeZone.current + _ = api.setLocalTime(deviceId, time: time, zone: timeZone) + .observe(on: MainScheduler.instance) + .subscribe{ e in + switch e { + case .completed: + NSLog("time set to device") + case .error(let err): + NSLog("set time failed: \(err)") + @unknown default: + fatalError() + } + } + } + // PolarBleApiObserver func deviceConnecting(_ polarDeviceInfo: PolarDeviceInfo) { NSLog("DEVICE CONNECTING: \(polarDeviceInfo)") @@ -338,25 +411,17 @@ class ViewController: UIViewController, // PolarBleApiDeviceHrObserver func hrValueReceived(_ identifier: String, data: PolarHrData) { - NSLog("(\(identifier)) HR notification: \(data.hr) rrs: \(data.rrs) rrsMs: \(data.rrsMs) c: \(data.contact) s: \(data.contactSupported)") + NSLog("(\(identifier)) HR notification: \(data.hr) rrs: \(data.rrs) rrsMs: \(data.rrsMs) contact: \(data.contact) contact supported: \(data.contactSupported)") } func hrFeatureReady(_ identifier: String) { NSLog("HR READY") } - // PolarBleApiDeviceEcgObserver - func ecgFeatureReady(_ identifier: String) { - NSLog("ECG READY \(identifier)") - } - - // PolarBleApiDeviceAccelerometerObserver - func accFeatureReady(_ identifier: String) { - NSLog("ACC READY") - } - - func ohrPPGFeatureReady(_ identifier: String) { - NSLog("OHR PPG ready") + func streamingFeaturesReady(_ identifier: String, streamingFeatures: Set) { + for feature in streamingFeatures { + NSLog("Feature \(feature) is ready.") + } } // PolarBleApiPowerStateObserver @@ -378,7 +443,7 @@ class ViewController: UIViewController, } func message(_ str: String) { - NSLog(str) + NSLog("Polar SDK log: \(str)") } /// ccc write observer diff --git a/polar-sdk-ios/PolarBleSdk.xcframework/Info.plist b/polar-sdk-ios/PolarBleSdk.xcframework/Info.plist index 5761dcf7..5f91df25 100644 --- a/polar-sdk-ios/PolarBleSdk.xcframework/Info.plist +++ b/polar-sdk-ios/PolarBleSdk.xcframework/Info.plist @@ -6,59 +6,59 @@ LibraryIdentifier - watchos-arm64_i386_x86_64-simulator + ios-arm64_x86_64-simulator LibraryPath - PolarBleSdkWatchOs.framework + PolarBleSdk.framework SupportedArchitectures arm64 - i386 x86_64 SupportedPlatform - watchos + ios SupportedPlatformVariant simulator LibraryIdentifier - ios-arm64_x86_64-simulator + watchos-arm64_i386_x86_64-simulator LibraryPath - PolarBleSdk.framework + PolarBleSdkWatchOs.framework SupportedArchitectures arm64 + i386 x86_64 SupportedPlatform - ios + watchos SupportedPlatformVariant simulator LibraryIdentifier - watchos-arm64_32_armv7k + ios-arm64 LibraryPath - PolarBleSdkWatchOs.framework + PolarBleSdk.framework SupportedArchitectures - arm64_32 - armv7k + arm64 SupportedPlatform - watchos + ios LibraryIdentifier - ios-arm64 + watchos-arm64_32_armv7k LibraryPath - PolarBleSdk.framework + PolarBleSdkWatchOs.framework SupportedArchitectures - arm64 + arm64_32 + armv7k SupportedPlatform - ios + watchos CFBundlePackageType diff --git a/polar-sdk-ios/docs/Classes.html b/polar-sdk-ios/docs/Classes.html index 30f4d719..2f2ea4c6 100644 --- a/polar-sdk-ios/docs/Classes.html +++ b/polar-sdk-ios/docs/Classes.html @@ -17,7 +17,7 @@
-

Docs (90% documented)

+

Docs (89% documented)

@@ -76,9 +76,15 @@
  • Enumerations
      +
    • + DeviceStreamingFeature +
    • Features
      • +
    • + OhrDataType +
    • RecordingInterval
      • @@ -144,9 +150,6 @@
    • PolarAccData
      • -
    • - PolarBiozData -
    • PolarDeviceInfo
      • @@ -159,11 +162,17 @@
    • PolarExerciseEntry
      • +
    • + PolarGyroData +
    • PolarHrBroadcastData
    • - PolarPpgData + PolarMagnetometerData +
      • +
    • + PolarOhrData
    • PolarPpiData @@ -488,7 +497,7 @@

      Declaration

      diff --git a/polar-sdk-ios/docs/Classes/PolarBleApiDefaultImpl.html b/polar-sdk-ios/docs/Classes/PolarBleApiDefaultImpl.html index 35cc42fb..a3dc6edd 100644 --- a/polar-sdk-ios/docs/Classes/PolarBleApiDefaultImpl.html +++ b/polar-sdk-ios/docs/Classes/PolarBleApiDefaultImpl.html @@ -17,7 +17,7 @@
      -

      Docs (90% documented)

      +

      Docs (89% documented)

      @@ -76,9 +76,15 @@

    • Enumerations
        +
      • + DeviceStreamingFeature +
      • Features
        • +
      • + OhrDataType +
      • RecordingInterval
        • @@ -144,9 +150,6 @@
      • PolarAccData
        • -
      • - PolarBiozData -
      • PolarDeviceInfo
        • @@ -159,11 +162,17 @@
      • PolarExerciseEntry
        • +
      • + PolarGyroData +
      • PolarHrBroadcastData
      • - PolarPpgData + PolarMagnetometerData +
        • +
      • + PolarOhrData
      • PolarPpiData @@ -290,7 +299,7 @@

        Return Value

        diff --git a/polar-sdk-ios/docs/Enums.html b/polar-sdk-ios/docs/Enums.html index dc20d069..7999276e 100644 --- a/polar-sdk-ios/docs/Enums.html +++ b/polar-sdk-ios/docs/Enums.html @@ -17,7 +17,7 @@
        -

        Docs (90% documented)

        +

        Docs (89% documented)

        @@ -76,9 +76,15 @@

      • Enumerations
        • +
      • +
        + + + + OhrDataType + +
        +
        +
        +
        +
        +
        +

        OHR data source enum

        + + See more +
        +
        +

        Declaration

        +
        +

        Swift

        + 
        public enum OhrDataType : Int, CaseIterable
        + +
        +
        +
        +
        +
      • @@ -302,7 +367,7 @@

        Declaration

        diff --git a/polar-sdk-ios/docs/Enums/DeviceStreamingFeature.html b/polar-sdk-ios/docs/Enums/DeviceStreamingFeature.html new file mode 100644 index 00000000..14758587 --- /dev/null +++ b/polar-sdk-ios/docs/Enums/DeviceStreamingFeature.html @@ -0,0 +1,378 @@ + + + + DeviceStreamingFeature Enumeration Reference + + + + + + + + + + + + + +
        +
        +

        Docs (89% documented)

        +

        + + +

        +

        +
        +
        +
        + +
        +
        + +
        +
        +
        +

        DeviceStreamingFeature

        +
        +
        + + 
        public enum DeviceStreamingFeature : Int, CaseIterable
        + +
        +
        +

        device streaming features

        + +
        +
        +
        +
          +
        • +
          + + + + ecg + +
          +
          +
          +
          +
          +
          +

          Undocumented

          + +
          +
          +

          Declaration

          +
          +

          Swift

          + 
          case ecg
          + +
          +
          +
          +
          +
          • +
        • +
          + + + + acc + +
          +
          +
          +
          +
          +
          +

          Undocumented

          + +
          +
          +

          Declaration

          +
          +

          Swift

          + 
          case acc
          + +
          +
          +
          +
          +
          • +
        • +
          + + + + ppg + +
          +
          +
          +
          +
          +
          +

          Undocumented

          + +
          +
          +

          Declaration

          +
          +

          Swift

          + 
          case ppg
          + +
          +
          +
          +
          +
          • +
        • +
          + + + + ppi + +
          +
          +
          +
          +
          +
          +

          Undocumented

          + +
          +
          +

          Declaration

          +
          +

          Swift

          + 
          case ppi
          + +
          +
          +
          +
          +
          • +
        • +
          + + + + gyro + +
          +
          +
          +
          +
          +
          +

          Undocumented

          + +
          +
          +

          Declaration

          +
          +

          Swift

          + 
          case gyro
          + +
          +
          +
          +
          +
          • +
        • +
          + + + + magnetometer + +
          +
          +
          +
          +
          +
          +

          Undocumented

          + +
          +
          +

          Declaration

          +
          +

          Swift

          + 
          case magnetometer
          + +
          +
          +
          +
          +
          • +
        +
        +
        +
        + +
        +
        + +
        + diff --git a/polar-sdk-ios/docs/Enums/Features.html b/polar-sdk-ios/docs/Enums/Features.html index be5c0c13..692cec66 100644 --- a/polar-sdk-ios/docs/Enums/Features.html +++ b/polar-sdk-ios/docs/Enums/Features.html @@ -17,7 +17,7 @@
        -

        Docs (90% documented)

        +

        Docs (89% documented)

        @@ -76,9 +76,15 @@
      • Enumerations
        • + diff --git a/polar-sdk-ios/docs/Enums/RecordingInterval.html b/polar-sdk-ios/docs/Enums/RecordingInterval.html index aea82730..a47e2a1e 100644 --- a/polar-sdk-ios/docs/Enums/RecordingInterval.html +++ b/polar-sdk-ios/docs/Enums/RecordingInterval.html @@ -17,7 +17,7 @@
        -

        Docs (90% documented)

        +

        Docs (89% documented)

        @@ -76,9 +76,15 @@
      • Enumerations
          +
        • + DeviceStreamingFeature +
        • Features
          • +
        • + OhrDataType +
        • RecordingInterval
          • @@ -144,9 +150,6 @@
        • PolarAccData
          • -
        • - PolarBiozData -
        • PolarDeviceInfo
          • @@ -159,11 +162,17 @@
        • PolarExerciseEntry
          • +
        • + PolarGyroData +
        • PolarHrBroadcastData
        • - PolarPpgData + PolarMagnetometerData +
          • +
        • + PolarOhrData
        • PolarPpiData @@ -251,7 +260,7 @@

          Declaration

          diff --git a/polar-sdk-ios/docs/Enums/SampleType.html b/polar-sdk-ios/docs/Enums/SampleType.html index c0979dc2..c34e52ef 100644 --- a/polar-sdk-ios/docs/Enums/SampleType.html +++ b/polar-sdk-ios/docs/Enums/SampleType.html @@ -17,7 +17,7 @@
          -

          Docs (90% documented)

          +

          Docs (89% documented)

          @@ -76,9 +76,15 @@

        • Enumerations
            +
          • + DeviceStreamingFeature +
          • Features
            • +
          • + OhrDataType +
          • RecordingInterval
            • @@ -144,9 +150,6 @@
          • PolarAccData
            • -
          • - PolarBiozData -
          • PolarDeviceInfo
            • @@ -159,11 +162,17 @@
          • PolarExerciseEntry
            • +
          • + PolarGyroData +
          • PolarHrBroadcastData
          • - PolarPpgData + PolarMagnetometerData +
            • +
          • + PolarOhrData
          • PolarPpiData @@ -251,7 +260,7 @@

            Declaration

            diff --git a/polar-sdk-ios/docs/Enums/UndefinedError.html b/polar-sdk-ios/docs/Enums/UndefinedError.html index f6546571..cb91c96d 100644 --- a/polar-sdk-ios/docs/Enums/UndefinedError.html +++ b/polar-sdk-ios/docs/Enums/UndefinedError.html @@ -17,7 +17,7 @@
            -

            Docs (90% documented)

            +

            Docs (89% documented)

            @@ -76,9 +76,15 @@

          • Enumerations
            • -
          • - -
            -
            -
            -
            -
            -

            Undocumented

            - -
            -
            -

            Declaration

            -
            -

            Swift

            - 
            func startBiozStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable<PolarBiozData>
            - -
            -
            -
            -
            -
          • @@ -1805,7 +1778,7 @@

            Declaration

            diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiCCCWriteObserver.html b/polar-sdk-ios/docs/Protocols/PolarBleApiCCCWriteObserver.html index fcb917e9..60ea3ee1 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiCCCWriteObserver.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiCCCWriteObserver.html @@ -17,7 +17,7 @@
            -

            Docs (90% documented)

            +

            Docs (89% documented)

            @@ -76,9 +76,15 @@

          • Enumerations
              +
            • + DeviceStreamingFeature +
            • Features
              • +
            • + OhrDataType +
            • RecordingInterval
              • @@ -144,9 +150,6 @@
            • PolarAccData
              • -
            • - PolarBiozData -
            • PolarDeviceInfo
              • @@ -159,11 +162,17 @@
            • PolarExerciseEntry
              • +
            • + PolarGyroData +
            • PolarHrBroadcastData
            • - PolarPpgData + PolarMagnetometerData +
              • +
            • + PolarOhrData
            • PolarPpiData @@ -224,7 +233,7 @@

              Declaration

              diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceFeaturesObserver.html b/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceFeaturesObserver.html index 348424bb..f6b47135 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceFeaturesObserver.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceFeaturesObserver.html @@ -17,7 +17,7 @@
              -

              Docs (90% documented)

              +

              Docs (89% documented)

              @@ -76,9 +76,15 @@

            • Enumerations
                +
              • + DeviceStreamingFeature +
              • Features
                • +
              • + OhrDataType +
              • RecordingInterval
                • @@ -144,9 +150,6 @@
              • PolarAccData
                • -
              • - PolarBiozData -
              • PolarDeviceInfo
                • @@ -159,11 +162,17 @@
              • PolarExerciseEntry
                • +
              • + PolarGyroData +
              • PolarHrBroadcastData
              • - PolarPpgData + PolarMagnetometerData +
                • +
              • + PolarOhrData
              • PolarPpiData @@ -241,147 +250,9 @@

                Parameters

              • -
                -
                -
                -
                -
                -

                Device ECG feature is ready. Application can now start ECG streaming.

                - -
                -
                -

                Declaration

                -
                -

                Swift

                - 
                func ecgFeatureReady(_ identifier: String)
                - -
                -
                -
                -

                Parameters

                - - - - - - - -
                - - identifier - - -
                -

                Polar device id

                -
                -
                -
                -
                -
                -
                • -
              • -
                - - - - accFeatureReady(_:) - -
                -
                -
                -
                -
                -
                -

                Device ACC feature is ready. Application can now start ACC streaming.

                - -
                -
                -

                Declaration

                -
                -

                Swift

                - 
                func accFeatureReady(_ identifier: String)
                - -
                -
                -
                -

                Parameters

                - - - - - - - -
                - - identifier - - -
                -

                Polar device id

                -
                -
                -
                -
                -
                -
                • -
              • - -
                -
                -
                -
                -
                -

                Device OHR PPG feature is ready.

                - -
                -
                -

                Declaration

                -
                -

                Swift

                - 
                func ohrPPGFeatureReady(_ identifier: String)
                - -
                -
                -
                -

                Parameters

                - - - - - - - -
                - - identifier - - -
                -

                polar device id

                -
                -
                -
                -
                -
                -
                • -
              • -
                @@ -389,14 +260,15 @@

                Parameters

                -

                Device OHR PPG feature is ready.

                +

                Device file transfer protocol is ready. +Notice all file transfer operations are preferred to be done at beginning of the connection

                Declaration

                Swift

                - 
                func ohrPPIFeatureReady(_ identifier: String)
                + 
                func ftpFeatureReady(_ identifier: String)
                @@ -425,44 +297,9 @@

                Parameters

              • - - - biozFeatureReady(_:) - - - Default implementation - -
                -
                -
                -
                -
                -
                -

                Undocumented

                - -
                -

                Default Implementation

                -
                -

                Undocumented

                - -
                -
                -

                Declaration

                -
                -

                Swift

                - 
                func biozFeatureReady(_ identifier: String)
                - -
                -
                -
                -
                -
                • -
              • -
                @@ -470,37 +307,17 @@

                Declaration

                -

                Device file transfer protocol is ready. -Notice all file transfer operations are preferred to be done at beginning of the connection

                +

                feature ready callback

                Declaration

                Swift

                - 
                func ftpFeatureReady(_ identifier: String)
                + 
                func streamingFeaturesReady(_ identifier: String, streamingFeatures: Set<DeviceStreamingFeature>)
                -
                -

                Parameters

                - - - - - - - -
                - - identifier - - -
                -

                polar device id

                -
                -
                -
                • @@ -509,7 +326,7 @@

                Parameters

                diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceHrObserver.html b/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceHrObserver.html index 5e5f53bf..045e295a 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceHrObserver.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceHrObserver.html @@ -17,7 +17,7 @@
                -

                Docs (90% documented)

                +

                Docs (89% documented)

                @@ -76,9 +76,15 @@

              • Enumerations
                  +
                • + DeviceStreamingFeature +
                • Features
                  • +
                • + OhrDataType +
                • RecordingInterval
                  • @@ -144,9 +150,6 @@
                • PolarAccData
                  • -
                • - PolarBiozData -
                • PolarDeviceInfo
                  • @@ -159,11 +162,17 @@
                • PolarExerciseEntry
                  • +
                • + PolarGyroData +
                • PolarHrBroadcastData
                • - PolarPpgData + PolarMagnetometerData +
                  • +
                • + PolarOhrData
                • PolarPpiData @@ -276,7 +285,7 @@

                  Parameters

                  diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceInfoObserver.html b/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceInfoObserver.html index 51620e83..bedce6cc 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceInfoObserver.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiDeviceInfoObserver.html @@ -17,7 +17,7 @@
                  -

                  Docs (90% documented)

                  +

                  Docs (89% documented)

                  @@ -76,9 +76,15 @@

                • Enumerations
                    +
                  • + DeviceStreamingFeature +
                  • Features
                    • +
                  • + OhrDataType +
                  • RecordingInterval
                    • @@ -144,9 +150,6 @@
                  • PolarAccData
                    • -
                  • - PolarBiozData -
                  • PolarDeviceInfo
                    • @@ -159,11 +162,17 @@
                  • PolarExerciseEntry
                    • +
                  • + PolarGyroData +
                  • PolarHrBroadcastData
                  • - PolarPpgData + PolarMagnetometerData +
                    • +
                  • + PolarOhrData
                  • PolarPpiData @@ -282,7 +291,7 @@

                    Declaration

                    diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiLogger.html b/polar-sdk-ios/docs/Protocols/PolarBleApiLogger.html index 5f7926e8..b7599dac 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiLogger.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiLogger.html @@ -17,7 +17,7 @@
                    -

                    Docs (90% documented)

                    +

                    Docs (89% documented)

                    @@ -76,9 +76,15 @@

                  • Enumerations
                      +
                    • + DeviceStreamingFeature +
                    • Features
                      • +
                    • + OhrDataType +
                    • RecordingInterval
                      • @@ -144,9 +150,6 @@
                    • PolarAccData
                      • -
                    • - PolarBiozData -
                    • PolarDeviceInfo
                      • @@ -159,11 +162,17 @@
                    • PolarExerciseEntry
                      • +
                    • + PolarGyroData +
                    • PolarHrBroadcastData
                    • - PolarPpgData + PolarMagnetometerData +
                      • +
                    • + PolarOhrData
                    • PolarPpiData @@ -243,7 +252,7 @@

                      Parameters

                      diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiObserver.html b/polar-sdk-ios/docs/Protocols/PolarBleApiObserver.html index ae5ccc10..64bf8810 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiObserver.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiObserver.html @@ -17,7 +17,7 @@
                      -

                      Docs (90% documented)

                      +

                      Docs (89% documented)

                      @@ -76,9 +76,15 @@

                    • Enumerations
                        +
                      • + DeviceStreamingFeature +
                      • Features
                        • +
                      • + OhrDataType +
                      • RecordingInterval
                        • @@ -144,9 +150,6 @@
                      • PolarAccData
                        • -
                      • - PolarBiozData -
                      • PolarDeviceInfo
                        • @@ -159,11 +162,17 @@
                      • PolarExerciseEntry
                        • +
                      • + PolarGyroData +
                      • PolarHrBroadcastData
                      • - PolarPpgData + PolarMagnetometerData +
                        • +
                      • + PolarOhrData
                      • PolarPpiData @@ -336,7 +345,7 @@

                        Parameters

                        diff --git a/polar-sdk-ios/docs/Protocols/PolarBleApiPowerStateObserver.html b/polar-sdk-ios/docs/Protocols/PolarBleApiPowerStateObserver.html index 07e76ea6..4d2f13b5 100644 --- a/polar-sdk-ios/docs/Protocols/PolarBleApiPowerStateObserver.html +++ b/polar-sdk-ios/docs/Protocols/PolarBleApiPowerStateObserver.html @@ -17,7 +17,7 @@
                        -

                        Docs (90% documented)

                        +

                        Docs (89% documented)

                        @@ -76,9 +76,15 @@

                      • Enumerations
                          +
                        • + DeviceStreamingFeature +
                        • Features
                          • +
                        • + OhrDataType +
                        • RecordingInterval
                          • @@ -144,9 +150,6 @@
                        • PolarAccData
                          • -
                        • - PolarBiozData -
                        • PolarDeviceInfo
                          • @@ -159,11 +162,17 @@
                        • PolarExerciseEntry
                          • +
                        • + PolarGyroData +
                        • PolarHrBroadcastData
                        • - PolarPpgData + PolarMagnetometerData +
                          • +
                        • + PolarOhrData
                        • PolarPpiData @@ -251,7 +260,7 @@

                          Declaration

                          diff --git a/polar-sdk-ios/docs/Structs.html b/polar-sdk-ios/docs/Structs.html index cc020318..d490505b 100644 --- a/polar-sdk-ios/docs/Structs.html +++ b/polar-sdk-ios/docs/Structs.html @@ -17,7 +17,7 @@
                          -

                          Docs (90% documented)

                          +

                          Docs (89% documented)

                          @@ -76,9 +76,15 @@

                        • Enumerations
                            +
                          • + DeviceStreamingFeature +
                          • Features
                            • +
                          • + OhrDataType +
                          • RecordingInterval
                            • @@ -144,9 +150,6 @@
                          • PolarAccData
                            • -
                          • - PolarBiozData -
                          • PolarDeviceInfo
                            • @@ -159,11 +162,17 @@
                          • PolarExerciseEntry
                            • +
                          • + PolarGyroData +
                          • PolarHrBroadcastData
                          • - PolarPpgData + PolarMagnetometerData +
                            • +
                          • + PolarOhrData
                          • PolarPpiData @@ -218,7 +227,7 @@

                            Declaration

                            diff --git a/polar-sdk-ios/docs/Structs/PolarSensorSetting.html b/polar-sdk-ios/docs/Structs/PolarSensorSetting.html index c7729785..296617d4 100644 --- a/polar-sdk-ios/docs/Structs/PolarSensorSetting.html +++ b/polar-sdk-ios/docs/Structs/PolarSensorSetting.html @@ -17,7 +17,7 @@
                            -

                            Docs (90% documented)

                            +

                            Docs (89% documented)

                            @@ -76,9 +76,15 @@

                          • Enumerations
                              +
                            • + DeviceStreamingFeature +
                            • Features
                              • +
                            • + OhrDataType +
                            • RecordingInterval
                              • @@ -144,9 +150,6 @@
                            • PolarAccData
                              • -
                            • - PolarBiozData -
                            • PolarDeviceInfo
                              • @@ -159,11 +162,17 @@
                            • PolarExerciseEntry
                              • +
                            • + PolarGyroData +
                            • PolarHrBroadcastData
                            • - PolarPpgData + PolarMagnetometerData +
                              • +
                            • + PolarOhrData
                            • PolarPpiData @@ -223,9 +232,9 @@

                              Declaration

                            • - + - settings + settings
                              @@ -240,7 +249,7 @@

                              Declaration

                              Declaration

                              Swift

                              - 
                              public let settings: [SettingType : Set<UInt16>]
                              + 
                              public let settings: [SettingType : Set<UInt32>]
                              @@ -250,9 +259,9 @@

                              Declaration

                            • - + - init(_:) + init(_:)
                              @@ -267,7 +276,7 @@

                              Declaration

                              Declaration

                              Swift

                              - 
                              public init(_ settings: [SettingType : UInt16])
                              + 
                              public init(_ settings: [SettingType : UInt32])
                              @@ -329,7 +338,7 @@

                              Return Value

                              diff --git a/polar-sdk-ios/docs/Structs/PolarSensorSetting/SettingType.html b/polar-sdk-ios/docs/Structs/PolarSensorSetting/SettingType.html index 5fc553e3..a4097a1e 100644 --- a/polar-sdk-ios/docs/Structs/PolarSensorSetting/SettingType.html +++ b/polar-sdk-ios/docs/Structs/PolarSensorSetting/SettingType.html @@ -17,7 +17,7 @@
                              -

                              Docs (90% documented)

                              +

                              Docs (89% documented)

                              @@ -76,9 +76,15 @@

                            • Enumerations
                              • +
                            • +
                              + + + + rangeMilliunit + +
                              +
                              +
                              +
                              +
                              +
                              +

                              range with min and max allowed values

                              + +
                              +
                              +

                              Declaration

                              +
                              +

                              Swift

                              + 
                              case rangeMilliunit = 3
                              + +
                              +
                              +
                              +
                              +
                              • +
                            • +
                              + + + + channels + +
                              +
                              +
                              +
                              +
                              +
                              +

                              amount of channels available

                              + +
                              +
                              +

                              Declaration

                              +
                              +

                              Swift

                              + 
                              case channels = 4
                              + +
                              +
                              +
                              +
                              +
                            • @@ -305,7 +368,7 @@

                              Declaration

                              diff --git a/polar-sdk-ios/docs/Typealiases.html b/polar-sdk-ios/docs/Typealiases.html index f16fb8e7..b4ef5bc0 100644 --- a/polar-sdk-ios/docs/Typealiases.html +++ b/polar-sdk-ios/docs/Typealiases.html @@ -17,7 +17,7 @@
                              -

                              Docs (90% documented)

                              +

                              Docs (89% documented)

                              @@ -76,9 +76,15 @@

                            • Enumerations
                                +
                              • + DeviceStreamingFeature +
                              • Features
                                • +
                              • + OhrDataType +
                              • RecordingInterval
                                • @@ -144,9 +150,6 @@
                              • PolarAccData
                                • -
                              • - PolarBiozData -
                              • PolarDeviceInfo
                                • @@ -159,11 +162,17 @@
                              • PolarExerciseEntry
                                • +
                              • + PolarGyroData +
                              • PolarHrBroadcastData
                              • - PolarPpgData + PolarMagnetometerData +
                                • +
                              • + PolarOhrData
                              • PolarPpiData @@ -310,9 +319,9 @@

                                Declaration

                              • @@ -320,9 +329,9 @@

                                Declaration

                                -

                                Polar ppg data

                                +

                                Polar gyro data

                                - Timestamp: Last sample timestamp in nanoseconds.
-- samples: PPG samples list ppg0,ppg1,ppg2,ambient signed value
+- samples: gyro samples list x,y,z in °/s signed value
                                @@ -330,7 +339,7 @@

                                Declaration

                                Declaration

                                Swift

                                - 
                                public typealias PolarPpgData = (timeStamp: UInt64, samples: [(ppg0: Int32, ppg1: Int32, ppg2: Int32, ambient: Int32)])
                                + 
                                public typealias PolarGyroData = (timeStamp: UInt64, samples: [(x: Float, y: Float, z: Float)])
                                @@ -340,9 +349,9 @@

                                Declaration

                              • @@ -350,21 +359,17 @@

                                Declaration

                                -

                                Polar ppi data - - timestamp N/A always 0 - - hr in BPM, - - ppInMs in milliseconds, - - ppErrorEstimate in milliseconds, - - blockerBit 1 = if PP measurement was invalid due to acceleration or other reason - - skinContactStatus 0 = if the device detects poor or no contact with the skin, the Sensor - - Contact Status bit (bit 1 of the PP Flags field)

                                +

                                Polar mgn data

                                +
                                - Timestamp: Last sample timestamp in nanoseconds. 
+- samples: in Gauss
+

                                Declaration

                                Swift

                                - 
                                public typealias PolarPpiData = (timeStamp: UInt64, samples: [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)])
                                + 
                                public typealias PolarMagnetometerData = (timeStamp: UInt64, samples: [(x: Float, y: Float, z: Float)])
                                @@ -374,9 +379,9 @@

                                Declaration

                              • @@ -384,14 +389,53 @@

                                Declaration

                                -

                                Undocumented

                                +

                                Polar Ohr data

                                +
                                - Timestamp: Last sample timestamp in nanoseconds.
+- channels: amount of channels
+- source: source of OHR data
+- samples: ppg(s) and ambient(s) samples list
+

                                Declaration

                                Swift

                                - 
                                public typealias PolarBiozData = (timeStamp: UInt64, samples: [Int32])
                                + 
                                public typealias PolarOhrData = (timeStamp: UInt64, type: OhrDataType, samples: [[Int32]])
                                + +
                                +
                                +
                                +
                                +
                                • +
                              • +
                                + + + + PolarPpiData + +
                                +
                                +
                                +
                                +
                                +
                                +

                                Polar ppi data + - timestamp N/A always 0 + - hr in BPM, + - ppInMs in milliseconds, + - ppErrorEstimate in milliseconds, + - blockerBit 1 = if PP measurement was invalid due to acceleration or other reason + - skinContactStatus 0 = if the device detects poor or no contact with the skin, the Sensor + - Contact Status bit (bit 1 of the PP Flags field)

                                + +
                                +
                                +

                                Declaration

                                +
                                +

                                Swift

                                + 
                                public typealias PolarPpiData = (timeStamp: UInt64, samples: [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)])
                                @@ -494,7 +538,7 @@

                                Declaration

                                • diff --git a/polar-sdk-ios/docs/badge.svg b/polar-sdk-ios/docs/badge.svg index afb57966..b28dab66 100644 --- a/polar-sdk-ios/docs/badge.svg +++ b/polar-sdk-ios/docs/badge.svg @@ -8,7 +8,7 @@ - + @@ -19,10 +19,10 @@ documentation - 90% + 89% - 90% + 89% diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes.html index 30f4d719..2f2ea4c6 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes.html @@ -17,7 +17,7 @@
                                -

                                Docs (90% documented)

                                +

                                Docs (89% documented)

                                @@ -76,9 +76,15 @@

                              • Enumerations
                                  +
                                • + DeviceStreamingFeature +
                                • Features
                                  • +
                                • + OhrDataType +
                                • RecordingInterval
                                  • @@ -144,9 +150,6 @@
                                • PolarAccData
                                  • -
                                • - PolarBiozData -
                                • PolarDeviceInfo
                                  • @@ -159,11 +162,17 @@
                                • PolarExerciseEntry
                                  • +
                                • + PolarGyroData +
                                • PolarHrBroadcastData
                                • - PolarPpgData + PolarMagnetometerData +
                                  • +
                                • + PolarOhrData
                                • PolarPpiData @@ -488,7 +497,7 @@

                                  Declaration

                                  diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes/PolarBleApiDefaultImpl.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes/PolarBleApiDefaultImpl.html index 35cc42fb..a3dc6edd 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes/PolarBleApiDefaultImpl.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Classes/PolarBleApiDefaultImpl.html @@ -17,7 +17,7 @@
                                  -

                                  Docs (90% documented)

                                  +

                                  Docs (89% documented)

                                  @@ -76,9 +76,15 @@

                                • Enumerations
                                    +
                                  • + DeviceStreamingFeature +
                                  • Features
                                    • +
                                  • + OhrDataType +
                                  • RecordingInterval
                                    • @@ -144,9 +150,6 @@
                                  • PolarAccData
                                    • -
                                  • - PolarBiozData -
                                  • PolarDeviceInfo
                                    • @@ -159,11 +162,17 @@
                                  • PolarExerciseEntry
                                    • +
                                  • + PolarGyroData +
                                  • PolarHrBroadcastData
                                  • - PolarPpgData + PolarMagnetometerData +
                                    • +
                                  • + PolarOhrData
                                  • PolarPpiData @@ -290,7 +299,7 @@

                                    Return Value

                                    diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums.html index dc20d069..7999276e 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums.html @@ -17,7 +17,7 @@
                                    -

                                    Docs (90% documented)

                                    +

                                    Docs (89% documented)

                                    @@ -76,9 +76,15 @@

                                  • Enumerations
                                    • +
                                  • +
                                    + + + + OhrDataType + +
                                    +
                                    +
                                    +
                                    +
                                    +
                                    +

                                    OHR data source enum

                                    + + See more +
                                    +
                                    +

                                    Declaration

                                    +
                                    +

                                    Swift

                                    + 
                                    public enum OhrDataType : Int, CaseIterable
                                    + +
                                    +
                                    +
                                    +
                                    +
                                  • @@ -302,7 +367,7 @@

                                    Declaration

                                    diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/DeviceStreamingFeature.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/DeviceStreamingFeature.html new file mode 100644 index 00000000..14758587 --- /dev/null +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/DeviceStreamingFeature.html @@ -0,0 +1,378 @@ + + + + DeviceStreamingFeature Enumeration Reference + + + + + + + + + + + + + +
                                    +
                                    +

                                    Docs (89% documented)

                                    +

                                    + + +

                                    +

                                    +
                                    +
                                    +
                                    + +
                                    +
                                    + +
                                    +
                                    +
                                    +

                                    DeviceStreamingFeature

                                    +
                                    +
                                    + + 
                                    public enum DeviceStreamingFeature : Int, CaseIterable
                                    + +
                                    +
                                    +

                                    device streaming features

                                    + +
                                    +
                                    +
                                    +
                                      +
                                    • +
                                      + + + + ecg + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      Undocumented

                                      + +
                                      +
                                      +

                                      Declaration

                                      +
                                      +

                                      Swift

                                      + 
                                      case ecg
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      • +
                                    • +
                                      + + + + acc + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      Undocumented

                                      + +
                                      +
                                      +

                                      Declaration

                                      +
                                      +

                                      Swift

                                      + 
                                      case acc
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      • +
                                    • +
                                      + + + + ppg + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      Undocumented

                                      + +
                                      +
                                      +

                                      Declaration

                                      +
                                      +

                                      Swift

                                      + 
                                      case ppg
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      • +
                                    • +
                                      + + + + ppi + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      Undocumented

                                      + +
                                      +
                                      +

                                      Declaration

                                      +
                                      +

                                      Swift

                                      + 
                                      case ppi
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      • +
                                    • +
                                      + + + + gyro + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      Undocumented

                                      + +
                                      +
                                      +

                                      Declaration

                                      +
                                      +

                                      Swift

                                      + 
                                      case gyro
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      • +
                                    • +
                                      + + + + magnetometer + +
                                      +
                                      +
                                      +
                                      +
                                      +
                                      +

                                      Undocumented

                                      + +
                                      +
                                      +

                                      Declaration

                                      +
                                      +

                                      Swift

                                      + 
                                      case magnetometer
                                      + +
                                      +
                                      +
                                      +
                                      +
                                      • +
                                    +
                                    +
                                    +
                                    + +
                                    +
                                    + +
                                    + diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/Features.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/Features.html index be5c0c13..692cec66 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/Features.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/Features.html @@ -17,7 +17,7 @@
                                    -

                                    Docs (90% documented)

                                    +

                                    Docs (89% documented)

                                    @@ -76,9 +76,15 @@
                                  • Enumerations
                                    • + diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/RecordingInterval.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/RecordingInterval.html index aea82730..a47e2a1e 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/RecordingInterval.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/RecordingInterval.html @@ -17,7 +17,7 @@
                                    -

                                    Docs (90% documented)

                                    +

                                    Docs (89% documented)

                                    @@ -76,9 +76,15 @@
                                  • Enumerations
                                      +
                                    • + DeviceStreamingFeature +
                                    • Features
                                      • +
                                    • + OhrDataType +
                                    • RecordingInterval
                                      • @@ -144,9 +150,6 @@
                                    • PolarAccData
                                      • -
                                    • - PolarBiozData -
                                    • PolarDeviceInfo
                                      • @@ -159,11 +162,17 @@
                                    • PolarExerciseEntry
                                      • +
                                    • + PolarGyroData +
                                    • PolarHrBroadcastData
                                    • - PolarPpgData + PolarMagnetometerData +
                                      • +
                                    • + PolarOhrData
                                    • PolarPpiData @@ -251,7 +260,7 @@

                                      Declaration

                                      diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/SampleType.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/SampleType.html index c0979dc2..c34e52ef 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/SampleType.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/SampleType.html @@ -17,7 +17,7 @@
                                      -

                                      Docs (90% documented)

                                      +

                                      Docs (89% documented)

                                      @@ -76,9 +76,15 @@

                                    • Enumerations
                                        +
                                      • + DeviceStreamingFeature +
                                      • Features
                                        • +
                                      • + OhrDataType +
                                      • RecordingInterval
                                        • @@ -144,9 +150,6 @@
                                      • PolarAccData
                                        • -
                                      • - PolarBiozData -
                                      • PolarDeviceInfo
                                        • @@ -159,11 +162,17 @@
                                      • PolarExerciseEntry
                                        • +
                                      • + PolarGyroData +
                                      • PolarHrBroadcastData
                                      • - PolarPpgData + PolarMagnetometerData +
                                        • +
                                      • + PolarOhrData
                                      • PolarPpiData @@ -251,7 +260,7 @@

                                        Declaration

                                        diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/UndefinedError.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/UndefinedError.html index f6546571..cb91c96d 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/UndefinedError.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Enums/UndefinedError.html @@ -17,7 +17,7 @@
                                        -

                                        Docs (90% documented)

                                        +

                                        Docs (89% documented)

                                        @@ -76,9 +76,15 @@

                                      • Enumerations
                                        • -
                                      • - -
                                        -
                                        -
                                        -
                                        -
                                        -

                                        Undocumented

                                        - -
                                        -
                                        -

                                        Declaration

                                        -
                                        -

                                        Swift

                                        - 
                                        func startBiozStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable<PolarBiozData>
                                        - -
                                        -
                                        -
                                        -
                                        -
                                      • @@ -1805,7 +1778,7 @@

                                        Declaration

                                        diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiCCCWriteObserver.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiCCCWriteObserver.html index fcb917e9..60ea3ee1 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiCCCWriteObserver.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiCCCWriteObserver.html @@ -17,7 +17,7 @@
                                        -

                                        Docs (90% documented)

                                        +

                                        Docs (89% documented)

                                        @@ -76,9 +76,15 @@

                                      • Enumerations
                                          +
                                        • + DeviceStreamingFeature +
                                        • Features
                                          • +
                                        • + OhrDataType +
                                        • RecordingInterval
                                          • @@ -144,9 +150,6 @@
                                        • PolarAccData
                                          • -
                                        • - PolarBiozData -
                                        • PolarDeviceInfo
                                          • @@ -159,11 +162,17 @@
                                        • PolarExerciseEntry
                                          • +
                                        • + PolarGyroData +
                                        • PolarHrBroadcastData
                                        • - PolarPpgData + PolarMagnetometerData +
                                          • +
                                        • + PolarOhrData
                                        • PolarPpiData @@ -224,7 +233,7 @@

                                          Declaration

                                          diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceFeaturesObserver.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceFeaturesObserver.html index 348424bb..f6b47135 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceFeaturesObserver.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceFeaturesObserver.html @@ -17,7 +17,7 @@
                                          -

                                          Docs (90% documented)

                                          +

                                          Docs (89% documented)

                                          @@ -76,9 +76,15 @@

                                        • Enumerations
                                            +
                                          • + DeviceStreamingFeature +
                                          • Features
                                            • +
                                          • + OhrDataType +
                                          • RecordingInterval
                                            • @@ -144,9 +150,6 @@
                                          • PolarAccData
                                            • -
                                          • - PolarBiozData -
                                          • PolarDeviceInfo
                                            • @@ -159,11 +162,17 @@
                                          • PolarExerciseEntry
                                            • +
                                          • + PolarGyroData +
                                          • PolarHrBroadcastData
                                          • - PolarPpgData + PolarMagnetometerData +
                                            • +
                                          • + PolarOhrData
                                          • PolarPpiData @@ -241,147 +250,9 @@

                                            Parameters

                                          • -
                                            -
                                            -
                                            -
                                            -
                                            -

                                            Device ECG feature is ready. Application can now start ECG streaming.

                                            - -
                                            -
                                            -

                                            Declaration

                                            -
                                            -

                                            Swift

                                            - 
                                            func ecgFeatureReady(_ identifier: String)
                                            - -
                                            -
                                            -
                                            -

                                            Parameters

                                            - - - - - - - -
                                            - - identifier - - -
                                            -

                                            Polar device id

                                            -
                                            -
                                            -
                                            -
                                            -
                                            -
                                            • -
                                          • -
                                            - - - - accFeatureReady(_:) - -
                                            -
                                            -
                                            -
                                            -
                                            -
                                            -

                                            Device ACC feature is ready. Application can now start ACC streaming.

                                            - -
                                            -
                                            -

                                            Declaration

                                            -
                                            -

                                            Swift

                                            - 
                                            func accFeatureReady(_ identifier: String)
                                            - -
                                            -
                                            -
                                            -

                                            Parameters

                                            - - - - - - - -
                                            - - identifier - - -
                                            -

                                            Polar device id

                                            -
                                            -
                                            -
                                            -
                                            -
                                            -
                                            • -
                                          • - -
                                            -
                                            -
                                            -
                                            -
                                            -

                                            Device OHR PPG feature is ready.

                                            - -
                                            -
                                            -

                                            Declaration

                                            -
                                            -

                                            Swift

                                            - 
                                            func ohrPPGFeatureReady(_ identifier: String)
                                            - -
                                            -
                                            -
                                            -

                                            Parameters

                                            - - - - - - - -
                                            - - identifier - - -
                                            -

                                            polar device id

                                            -
                                            -
                                            -
                                            -
                                            -
                                            -
                                            • -
                                          • -
                                            @@ -389,14 +260,15 @@

                                            Parameters

                                            -

                                            Device OHR PPG feature is ready.

                                            +

                                            Device file transfer protocol is ready. +Notice all file transfer operations are preferred to be done at beginning of the connection

                                            Declaration

                                            Swift

                                            - 
                                            func ohrPPIFeatureReady(_ identifier: String)
                                            + 
                                            func ftpFeatureReady(_ identifier: String)
                                            @@ -425,44 +297,9 @@

                                            Parameters

                                          • - - - biozFeatureReady(_:) - - - Default implementation - -
                                            -
                                            -
                                            -
                                            -
                                            -
                                            -

                                            Undocumented

                                            - -
                                            -

                                            Default Implementation

                                            -
                                            -

                                            Undocumented

                                            - -
                                            -
                                            -

                                            Declaration

                                            -
                                            -

                                            Swift

                                            - 
                                            func biozFeatureReady(_ identifier: String)
                                            - -
                                            -
                                            -
                                            -
                                            -
                                            • -
                                          • -
                                            @@ -470,37 +307,17 @@

                                            Declaration

                                            -

                                            Device file transfer protocol is ready. -Notice all file transfer operations are preferred to be done at beginning of the connection

                                            +

                                            feature ready callback

                                            Declaration

                                            Swift

                                            - 
                                            func ftpFeatureReady(_ identifier: String)
                                            + 
                                            func streamingFeaturesReady(_ identifier: String, streamingFeatures: Set<DeviceStreamingFeature>)
                                            -
                                            -

                                            Parameters

                                            - - - - - - - -
                                            - - identifier - - -
                                            -

                                            polar device id

                                            -
                                            -
                                            -
                                            • @@ -509,7 +326,7 @@

                                            Parameters

                                            diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceHrObserver.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceHrObserver.html index 5e5f53bf..045e295a 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceHrObserver.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceHrObserver.html @@ -17,7 +17,7 @@
                                            -

                                            Docs (90% documented)

                                            +

                                            Docs (89% documented)

                                            @@ -76,9 +76,15 @@

                                          • Enumerations
                                              +
                                            • + DeviceStreamingFeature +
                                            • Features
                                              • +
                                            • + OhrDataType +
                                            • RecordingInterval
                                              • @@ -144,9 +150,6 @@
                                            • PolarAccData
                                              • -
                                            • - PolarBiozData -
                                            • PolarDeviceInfo
                                              • @@ -159,11 +162,17 @@
                                            • PolarExerciseEntry
                                              • +
                                            • + PolarGyroData +
                                            • PolarHrBroadcastData
                                            • - PolarPpgData + PolarMagnetometerData +
                                              • +
                                            • + PolarOhrData
                                            • PolarPpiData @@ -276,7 +285,7 @@

                                              Parameters

                                              diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceInfoObserver.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceInfoObserver.html index 51620e83..bedce6cc 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceInfoObserver.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiDeviceInfoObserver.html @@ -17,7 +17,7 @@
                                              -

                                              Docs (90% documented)

                                              +

                                              Docs (89% documented)

                                              @@ -76,9 +76,15 @@

                                            • Enumerations
                                                +
                                              • + DeviceStreamingFeature +
                                              • Features
                                                • +
                                              • + OhrDataType +
                                              • RecordingInterval
                                                • @@ -144,9 +150,6 @@
                                              • PolarAccData
                                                • -
                                              • - PolarBiozData -
                                              • PolarDeviceInfo
                                                • @@ -159,11 +162,17 @@
                                              • PolarExerciseEntry
                                                • +
                                              • + PolarGyroData +
                                              • PolarHrBroadcastData
                                              • - PolarPpgData + PolarMagnetometerData +
                                                • +
                                              • + PolarOhrData
                                              • PolarPpiData @@ -282,7 +291,7 @@

                                                Declaration

                                                diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiLogger.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiLogger.html index 5f7926e8..b7599dac 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiLogger.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiLogger.html @@ -17,7 +17,7 @@
                                                -

                                                Docs (90% documented)

                                                +

                                                Docs (89% documented)

                                                @@ -76,9 +76,15 @@

                                              • Enumerations
                                                  +
                                                • + DeviceStreamingFeature +
                                                • Features
                                                  • +
                                                • + OhrDataType +
                                                • RecordingInterval
                                                  • @@ -144,9 +150,6 @@
                                                • PolarAccData
                                                  • -
                                                • - PolarBiozData -
                                                • PolarDeviceInfo
                                                  • @@ -159,11 +162,17 @@
                                                • PolarExerciseEntry
                                                  • +
                                                • + PolarGyroData +
                                                • PolarHrBroadcastData
                                                • - PolarPpgData + PolarMagnetometerData +
                                                  • +
                                                • + PolarOhrData
                                                • PolarPpiData @@ -243,7 +252,7 @@

                                                  Parameters

                                                  diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiObserver.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiObserver.html index ae5ccc10..64bf8810 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiObserver.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiObserver.html @@ -17,7 +17,7 @@
                                                  -

                                                  Docs (90% documented)

                                                  +

                                                  Docs (89% documented)

                                                  @@ -76,9 +76,15 @@

                                                • Enumerations
                                                    +
                                                  • + DeviceStreamingFeature +
                                                  • Features
                                                    • +
                                                  • + OhrDataType +
                                                  • RecordingInterval
                                                    • @@ -144,9 +150,6 @@
                                                  • PolarAccData
                                                    • -
                                                  • - PolarBiozData -
                                                  • PolarDeviceInfo
                                                    • @@ -159,11 +162,17 @@
                                                  • PolarExerciseEntry
                                                    • +
                                                  • + PolarGyroData +
                                                  • PolarHrBroadcastData
                                                  • - PolarPpgData + PolarMagnetometerData +
                                                    • +
                                                  • + PolarOhrData
                                                  • PolarPpiData @@ -336,7 +345,7 @@

                                                    Parameters

                                                    diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiPowerStateObserver.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiPowerStateObserver.html index 07e76ea6..4d2f13b5 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiPowerStateObserver.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Protocols/PolarBleApiPowerStateObserver.html @@ -17,7 +17,7 @@
                                                    -

                                                    Docs (90% documented)

                                                    +

                                                    Docs (89% documented)

                                                    @@ -76,9 +76,15 @@

                                                  • Enumerations
                                                      +
                                                    • + DeviceStreamingFeature +
                                                    • Features
                                                      • +
                                                    • + OhrDataType +
                                                    • RecordingInterval
                                                      • @@ -144,9 +150,6 @@
                                                    • PolarAccData
                                                      • -
                                                    • - PolarBiozData -
                                                    • PolarDeviceInfo
                                                      • @@ -159,11 +162,17 @@
                                                    • PolarExerciseEntry
                                                      • +
                                                    • + PolarGyroData +
                                                    • PolarHrBroadcastData
                                                    • - PolarPpgData + PolarMagnetometerData +
                                                      • +
                                                    • + PolarOhrData
                                                    • PolarPpiData @@ -251,7 +260,7 @@

                                                      Declaration

                                                      diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs.html index cc020318..d490505b 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs.html @@ -17,7 +17,7 @@
                                                      -

                                                      Docs (90% documented)

                                                      +

                                                      Docs (89% documented)

                                                      @@ -76,9 +76,15 @@

                                                    • Enumerations
                                                        +
                                                      • + DeviceStreamingFeature +
                                                      • Features
                                                        • +
                                                      • + OhrDataType +
                                                      • RecordingInterval
                                                        • @@ -144,9 +150,6 @@
                                                      • PolarAccData
                                                        • -
                                                      • - PolarBiozData -
                                                      • PolarDeviceInfo
                                                        • @@ -159,11 +162,17 @@
                                                      • PolarExerciseEntry
                                                        • +
                                                      • + PolarGyroData +
                                                      • PolarHrBroadcastData
                                                      • - PolarPpgData + PolarMagnetometerData +
                                                        • +
                                                      • + PolarOhrData
                                                      • PolarPpiData @@ -218,7 +227,7 @@

                                                        Declaration

                                                        diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting.html index c7729785..296617d4 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting.html @@ -17,7 +17,7 @@
                                                        -

                                                        Docs (90% documented)

                                                        +

                                                        Docs (89% documented)

                                                        @@ -76,9 +76,15 @@

                                                      • Enumerations
                                                          +
                                                        • + DeviceStreamingFeature +
                                                        • Features
                                                          • +
                                                        • + OhrDataType +
                                                        • RecordingInterval
                                                          • @@ -144,9 +150,6 @@
                                                        • PolarAccData
                                                          • -
                                                        • - PolarBiozData -
                                                        • PolarDeviceInfo
                                                          • @@ -159,11 +162,17 @@
                                                        • PolarExerciseEntry
                                                          • +
                                                        • + PolarGyroData +
                                                        • PolarHrBroadcastData
                                                        • - PolarPpgData + PolarMagnetometerData +
                                                          • +
                                                        • + PolarOhrData
                                                        • PolarPpiData @@ -223,9 +232,9 @@

                                                          Declaration

                                                        • - + - settings + settings
                                                          @@ -240,7 +249,7 @@

                                                          Declaration

                                                          Declaration

                                                          Swift

                                                          - 
                                                          public let settings: [SettingType : Set<UInt16>]
                                                          + 
                                                          public let settings: [SettingType : Set<UInt32>]
                                                          @@ -250,9 +259,9 @@

                                                          Declaration

                                                        • - + - init(_:) + init(_:)
                                                          @@ -267,7 +276,7 @@

                                                          Declaration

                                                          Declaration

                                                          Swift

                                                          - 
                                                          public init(_ settings: [SettingType : UInt16])
                                                          + 
                                                          public init(_ settings: [SettingType : UInt32])
                                                          @@ -329,7 +338,7 @@

                                                          Return Value

                                                          diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting/SettingType.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting/SettingType.html index 5fc553e3..a4097a1e 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting/SettingType.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Structs/PolarSensorSetting/SettingType.html @@ -17,7 +17,7 @@
                                                          -

                                                          Docs (90% documented)

                                                          +

                                                          Docs (89% documented)

                                                          @@ -76,9 +76,15 @@

                                                        • Enumerations
                                                          • +
                                                        • +
                                                          + + + + rangeMilliunit + +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          +

                                                          range with min and max allowed values

                                                          + +
                                                          +
                                                          +

                                                          Declaration

                                                          +
                                                          +

                                                          Swift

                                                          + 
                                                          case rangeMilliunit = 3
                                                          + +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          • +
                                                        • +
                                                          + + + + channels + +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          +
                                                          +

                                                          amount of channels available

                                                          + +
                                                          +
                                                          +

                                                          Declaration

                                                          +
                                                          +

                                                          Swift

                                                          + 
                                                          case channels = 4
                                                          + +
                                                          +
                                                          +
                                                          +
                                                          +
                                                        • @@ -305,7 +368,7 @@

                                                          Declaration

                                                          diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Typealiases.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Typealiases.html index f16fb8e7..b4ef5bc0 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Typealiases.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/Typealiases.html @@ -17,7 +17,7 @@
                                                          -

                                                          Docs (90% documented)

                                                          +

                                                          Docs (89% documented)

                                                          @@ -76,9 +76,15 @@

                                                        • Enumerations
                                                            +
                                                          • + DeviceStreamingFeature +
                                                          • Features
                                                            • +
                                                          • + OhrDataType +
                                                          • RecordingInterval
                                                            • @@ -144,9 +150,6 @@
                                                          • PolarAccData
                                                            • -
                                                          • - PolarBiozData -
                                                          • PolarDeviceInfo
                                                            • @@ -159,11 +162,17 @@
                                                          • PolarExerciseEntry
                                                            • +
                                                          • + PolarGyroData +
                                                          • PolarHrBroadcastData
                                                          • - PolarPpgData + PolarMagnetometerData +
                                                            • +
                                                          • + PolarOhrData
                                                          • PolarPpiData @@ -310,9 +319,9 @@

                                                            Declaration

                                                          • @@ -320,9 +329,9 @@

                                                            Declaration

                                                            -

                                                            Polar ppg data

                                                            +

                                                            Polar gyro data

                                                            - Timestamp: Last sample timestamp in nanoseconds.
-- samples: PPG samples list ppg0,ppg1,ppg2,ambient signed value
+- samples: gyro samples list x,y,z in °/s signed value
                                                            @@ -330,7 +339,7 @@

                                                            Declaration

                                                            Declaration

                                                            Swift

                                                            - 
                                                            public typealias PolarPpgData = (timeStamp: UInt64, samples: [(ppg0: Int32, ppg1: Int32, ppg2: Int32, ambient: Int32)])
                                                            + 
                                                            public typealias PolarGyroData = (timeStamp: UInt64, samples: [(x: Float, y: Float, z: Float)])
                                                            @@ -340,9 +349,9 @@

                                                            Declaration

                                                          • @@ -350,21 +359,17 @@

                                                            Declaration

                                                            -

                                                            Polar ppi data - - timestamp N/A always 0 - - hr in BPM, - - ppInMs in milliseconds, - - ppErrorEstimate in milliseconds, - - blockerBit 1 = if PP measurement was invalid due to acceleration or other reason - - skinContactStatus 0 = if the device detects poor or no contact with the skin, the Sensor - - Contact Status bit (bit 1 of the PP Flags field)

                                                            +

                                                            Polar mgn data

                                                            +
                                                            - Timestamp: Last sample timestamp in nanoseconds. 
+- samples: in Gauss
+

                                                            Declaration

                                                            Swift

                                                            - 
                                                            public typealias PolarPpiData = (timeStamp: UInt64, samples: [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)])
                                                            + 
                                                            public typealias PolarMagnetometerData = (timeStamp: UInt64, samples: [(x: Float, y: Float, z: Float)])
                                                            @@ -374,9 +379,9 @@

                                                            Declaration

                                                          • @@ -384,14 +389,53 @@

                                                            Declaration

                                                            -

                                                            Undocumented

                                                            +

                                                            Polar Ohr data

                                                            +
                                                            - Timestamp: Last sample timestamp in nanoseconds.
+- channels: amount of channels
+- source: source of OHR data
+- samples: ppg(s) and ambient(s) samples list
+

                                                            Declaration

                                                            Swift

                                                            - 
                                                            public typealias PolarBiozData = (timeStamp: UInt64, samples: [Int32])
                                                            + 
                                                            public typealias PolarOhrData = (timeStamp: UInt64, type: OhrDataType, samples: [[Int32]])
                                                            + +
                                                            +
                                                            +
                                                            +
                                                            +
                                                            • +
                                                          • +
                                                            + + + + PolarPpiData + +
                                                            +
                                                            +
                                                            +
                                                            +
                                                            +
                                                            +

                                                            Polar ppi data + - timestamp N/A always 0 + - hr in BPM, + - ppInMs in milliseconds, + - ppErrorEstimate in milliseconds, + - blockerBit 1 = if PP measurement was invalid due to acceleration or other reason + - skinContactStatus 0 = if the device detects poor or no contact with the skin, the Sensor + - Contact Status bit (bit 1 of the PP Flags field)

                                                            + +
                                                            +
                                                            +

                                                            Declaration

                                                            +
                                                            +

                                                            Swift

                                                            + 
                                                            public typealias PolarPpiData = (timeStamp: UInt64, samples: [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)])
                                                            @@ -494,7 +538,7 @@

                                                            Declaration

                                                            • diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/index.html b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/index.html index e3777763..323962d5 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/index.html +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/index.html @@ -16,7 +16,7 @@
                                                            -

                                                            Docs (90% documented)

                                                            +

                                                            Docs (89% documented)

                                                            @@ -75,9 +75,15 @@

                                                          • Enumerations
                                                              +
                                                            • + DeviceStreamingFeature +
                                                            • Features
                                                              • +
                                                            • + OhrDataType +
                                                            • RecordingInterval
                                                              • @@ -143,9 +149,6 @@
                                                            • PolarAccData
                                                              • -
                                                            • - PolarBiozData -
                                                            • PolarDeviceInfo
                                                              • @@ -158,11 +161,17 @@
                                                            • PolarExerciseEntry
                                                              • +
                                                            • + PolarGyroData +
                                                            • PolarHrBroadcastData
                                                            • - PolarPpgData + PolarMagnetometerData +
                                                              • +
                                                            • + PolarOhrData
                                                            • PolarPpiData @@ -199,7 +208,7 @@

                                                              Update dependency

                                                              diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/search.json b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/search.json index fe4f998c..444fd39c 100644 --- a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/search.json +++ b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/Documents/search.json @@ -1 +1 @@ -{"Typealiases.html#/s:11PolarBleSdk0A10DeviceInfoa":{"name":"PolarDeviceInfo","abstract":"

                                                              Polar device info

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A15HrBroadcastDataa":{"name":"PolarHrBroadcastData","abstract":"

                                                              deviceInfo: see #PolarDeviceInfo ,

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7EcgDataa":{"name":"PolarEcgData","abstract":"

                                                              Polar Ecg data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7AccDataa":{"name":"PolarAccData","abstract":"

                                                              Polar acc data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7PpgDataa":{"name":"PolarPpgData","abstract":"

                                                              Polar ppg data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7PpiDataa":{"name":"PolarPpiData","abstract":"

                                                              Polar ppi data"},"Typealiases.html#/s:11PolarBleSdk0A8BiozDataa":{"name":"PolarBiozData","abstract":"

                                                              Undocumented

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A13ExerciseEntrya":{"name":"PolarExerciseEntry","abstract":"

                                                              Polar exercise entry

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A12ExerciseDataa":{"name":"PolarExerciseData","abstract":"

                                                              Polar Exercise Data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A15RecordingStatusa":{"name":"PolarRecordingStatus","abstract":"

                                                              Polar Recording status

                                                              "},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10sampleRateyA2EmF":{"name":"sampleRate","abstract":"

                                                              sample rate in hz

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10resolutionyA2EmF":{"name":"resolution","abstract":"

                                                              resolution in bits

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO5rangeyA2EmF":{"name":"range","abstract":"

                                                              range in g’s

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO7unknownyA2EmF":{"name":"unknown","abstract":"

                                                              type is unknown

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html":{"name":"SettingType","abstract":"

                                                              settings type

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV8settingsSDyAC0E4TypeOShys6UInt16VGGvp":{"name":"settings","abstract":"

                                                              current settings available / set

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingVyACSDyAC0E4TypeOs6UInt16VGcfc":{"name":"init(_:)","abstract":"

                                                              constructor with desired settings

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV11maxSettingsACyF":{"name":"maxSettings()","abstract":"

                                                              helper to retreive max settings available

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html":{"name":"PolarSensorSetting","abstract":"

                                                              polar sensor settings class

                                                              "},"Protocols/PolarBleApiCCCWriteObserver.html#/s:11PolarBleSdk0aB19ApiCCCWriteObserverP8cccWrite_14characteristicy10Foundation4UUIDV_So6CBUUIDCtF":{"name":"cccWrite(_:characteristic:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PolarBleApiCCCWriteObserver"},"Protocols/PolarBleApiLogger.html#/s:11PolarBleSdk0aB9ApiLoggerP7messageyySSF":{"name":"message(_:)","abstract":"

                                                              log message from sdk

                                                              ","parent_name":"PolarBleApiLogger"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP14hrFeatureReadyyySSF":{"name":"hrFeatureReady(_:)","abstract":"

                                                              Device HR feature is ready. HR transmission is starting in a short while.

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15ecgFeatureReadyyySSF":{"name":"ecgFeatureReady(_:)","abstract":"

                                                              Device ECG feature is ready. Application can now start ECG streaming.

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15accFeatureReadyyySSF":{"name":"accFeatureReady(_:)","abstract":"

                                                              Device ACC feature is ready. Application can now start ACC streaming.

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP18ohrPPGFeatureReadyyySSF":{"name":"ohrPPGFeatureReady(_:)","abstract":"

                                                              Device OHR PPG feature is ready.

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP18ohrPPIFeatureReadyyySSF":{"name":"ohrPPIFeatureReady(_:)","abstract":"

                                                              Device OHR PPG feature is ready.

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP16biozFeatureReadyyySSF":{"name":"biozFeatureReady(_:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15ftpFeatureReadyyySSF":{"name":"ftpFeatureReady(_:)","abstract":"

                                                              Device file transfer protocol is ready.","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP0aF4Dataa":{"name":"PolarHrData","abstract":"

                                                              Polar hr data

                                                              ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP15hrValueReceived_4dataySS_s5UInt8V0H0_SaySiG3rrsAI0M2MsSb7contactSb0O9SupportedttF":{"name":"hrValueReceived(_:data:)","abstract":"

                                                              HR notification received. Notice when using OH1 and PPI stream is started this callback will produce 0 hr.

                                                              ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP20batteryLevelReceived_0hI0ySS_SutF":{"name":"batteryLevelReceived(_:batteryLevel:)","abstract":"

                                                              Battery level received from device.

                                                              ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP22disInformationReceived_4uuid5valueySS_So6CBUUIDCSStF":{"name":"disInformationReceived(_:uuid:value:)","abstract":"

                                                              Received DIS info.

                                                              ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE2OnyyF":{"name":"blePowerOn()","abstract":"

                                                              Ble powered on event.

                                                              ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE3OffyyF":{"name":"blePowerOff()","abstract":"

                                                              Ble powered off event, no further actions are needed from the application.

                                                              ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP16deviceConnectingyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnecting(_:)","abstract":"

                                                              Callback when connection attempt is started to device

                                                              ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP15deviceConnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnected(_:)","abstract":"

                                                              Device connnection has been established.

                                                              ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP18deviceDisconnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceDisconnected(_:)","abstract":"

                                                              Connection lost to device.","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP7cleanupyyF":{"name":"cleanup()","abstract":"

                                                              remove all known devices, which are not in use

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP11polarFilteryySbF":{"name":"polarFilter(_:)","abstract":"

                                                              Enable or disable polar filter.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP24startAutoConnectToDevice_7service05polarI4Type7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSi_So6CBUUIDCSgSSSgtF":{"name":"startAutoConnectToDevice(_:service:polarDeviceType:)","abstract":"

                                                              Start connecting to a nearby device. PolarBleApiObservers polarDeviceConnected is","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15connectToDeviceyySSKF":{"name":"connectToDevice(_:)","abstract":"

                                                              Request a connection to a Polar device. Invokes PolarBleApiObservers polarDeviceConnected.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20disconnectFromDeviceyySSKF":{"name":"disconnectFromDevice(_:)","abstract":"

                                                              Disconnect from the current Polar device.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15searchForDevice7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectabletGyF":{"name":"searchForDevice()","abstract":"

                                                              Start searching for Polar device(s)

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14isFeatureReady_7featureSbSS_AA8FeaturesOtF":{"name":"isFeatureReady(_:feature:)","abstract":"

                                                              helper to check is feature ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP12setLocalTime_4time4zone7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSS_10Foundation4DateVAO0G4ZoneVtF":{"name":"setLocalTime(_:time:zone:)","abstract":"

                                                              set local time to device, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14startRecording_10exerciseId8interval10sampleType7RxSwift17PrimitiveSequenceVyAH16CompletableTraitOs5NeverOGSS_SSAA0F8IntervalOAA06SampleK0OtF":{"name":"startRecording(_:exerciseId:interval:sampleType:)","abstract":"

                                                              request start recording, only H10 supported, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13stopRecordingy7RxSwift17PrimitiveSequenceVyAE16CompletableTraitOs5NeverOGSSF":{"name":"stopRecording(_:)","abstract":"

                                                              request stop for current recording, only H10 supported, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22requestRecordingStatusy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOSb7ongoing_SS7entryIdtGSSF":{"name":"requestRecordingStatus(_:)","abstract":"

                                                              request current recording status, only H10 supported, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP014startListenForA12HrBroadcastsy7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet0M4Info_s5UInt8V2hrSb13batteryStatustGShySSGSgF":{"name":"startListenForPolarHrBroadcasts(_:)","abstract":"

                                                              Start listening to broadcasts from one or more Polar devices

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18requestEcgSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestEcgSettings(_:)","abstract":"

                                                              request ecg settings available

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18requestAccSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestAccSettings(_:)","abstract":"

                                                              request acc settings available

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18requestPpgSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestPpgSettings(_:)","abstract":"

                                                              request ppg settings available

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP19requestBiozSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestBiozSettings(_:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startEcgStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32VG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startEcgStreaming(_:settings:)","abstract":"

                                                              Starts the ECG (Electrocardiography) stream.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startAccStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32V1x_AM1yAM1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startAccStreaming(_:settings:)","abstract":"

                                                              Start ACC (accelerometer) stream.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20startOhrPPGStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32V4ppg0_AM4ppg1AM4ppg2AM7ambienttG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startOhrPPGStreaming(_:settings:)","abstract":"

                                                              Start an OHR (optical heart rate) PPG (photoplethysmography) stream.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20startOhrPPIStreamingy7RxSwift10ObservableCys6UInt64V9timeStamp_SaySi2hr_s6UInt16V6ppInMsAM0P13ErrorEstimateSi10blockerBitSi17skinContactStatusSi0wX9SupportedtG7samplestGSSF":{"name":"startOhrPPIStreaming(_:)","abstract":"

                                                              Start PPI stream. Notice when using OH1 there is a delay before actual","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18startBiozStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32VG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startBiozStreaming(_:settings:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP23fetchStoredExerciseListy7RxSwift10ObservableCySS4path_10Foundation4DateV4dateSS7entryIdtGSSF":{"name":"fetchStoredExerciseList(_:)","abstract":"

                                                              Api for fetching stored exercises from Polar OH1/H10 device

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13fetchExercise_5entry7RxSwift17PrimitiveSequenceVyAF11SingleTraitOs6UInt32V8interval_SayALG7samplestGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"fetchExercise(_:entry:)","abstract":"

                                                              Api for fetching a single exersice from Polar OH1/H10 device

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14removeExercise_5entry7RxSwift17PrimitiveSequenceVyAF16CompletableTraitOs5NeverOGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"removeExercise(_:entry:)","abstract":"

                                                              Remove single exercise from device

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP8observerAA0abD8Observer_pSgvp":{"name":"observer","abstract":"

                                                              Common GAP (Generic access profile) observer

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18deviceInfoObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceInfoObserver","abstract":"

                                                              Device info observer for DIS (Device information servive) and BAS (Battery service) GATT (Generic attributes) client

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16deviceHrObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceHrObserver","abstract":"

                                                              Device observer for HR GATT client

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18powerStateObserverAA0abd5PowerfG0_pSgvp":{"name":"powerStateObserver","abstract":"

                                                              Bluetooth power state observer

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22deviceFeaturesObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceFeaturesObserver","abstract":"

                                                              device features ready observer

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP02isB7PoweredSbvp":{"name":"isBlePowered","abstract":"

                                                              Helper to check if Ble is currently powered

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP6loggerAA0abD6Logger_pSgvp":{"name":"logger","abstract":"

                                                              optional logger set to get traces from sdk

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP21automaticReconnectionSbvp":{"name":"automaticReconnection","abstract":"

                                                              optional disable or enable automatic reconnection, by default it is enabled

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16cccWriteObserverAA0abd8CCCWriteG0_pSgvp":{"name":"cccWriteObserver","abstract":"

                                                              optional ccc write callback

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html":{"name":"PolarBleApi","abstract":"

                                                              API.

                                                              "},"Protocols/PolarBleApiObserver.html":{"name":"PolarBleApiObserver","abstract":"

                                                              Polar Ble API connection observer.

                                                              "},"Protocols/PolarBleApiPowerStateObserver.html":{"name":"PolarBleApiPowerStateObserver","abstract":"

                                                              Bluetooth state observer.

                                                              "},"Protocols/PolarBleApiDeviceInfoObserver.html":{"name":"PolarBleApiDeviceInfoObserver","abstract":"

                                                              Device info observer.

                                                              "},"Protocols/PolarBleApiDeviceHrObserver.html":{"name":"PolarBleApiDeviceHrObserver","abstract":"

                                                              Heart rate observer

                                                              "},"Protocols/PolarBleApiDeviceFeaturesObserver.html":{"name":"PolarBleApiDeviceFeaturesObserver","abstract":"

                                                              Data client observer

                                                              "},"Protocols/PolarBleApiLogger.html":{"name":"PolarBleApiLogger","abstract":"

                                                              logger observer

                                                              "},"Protocols/PolarBleApiCCCWriteObserver.html":{"name":"PolarBleApiCCCWriteObserver","abstract":"

                                                              observer for ccc write enable

                                                              "},"Extensions/PrimitiveSequence.html#/s:7RxSwift17PrimitiveSequenceV11PolarBleSdkAA11SingleTraitORszrlE13asCompletableACyAA0kI0Os5NeverOGyF":{"name":"asCompletable()","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PrimitiveSequence"},"Extensions/PrimitiveSequence.html":{"name":"PrimitiveSequence"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO06DeviceE0yACSS_tcACmF":{"name":"DeviceError(localizedDescription:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"UndefinedError"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO20localizedDescriptionSSvp":{"name":"localizedDescription","abstract":"

                                                              Undocumented

                                                              ","parent_name":"UndefinedError"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO2hryA2CmF":{"name":"hr","abstract":"

                                                              hr feature enables hr client to receive hr and rr data from device

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO10deviceInfoyA2CmF":{"name":"deviceInfo","abstract":"

                                                              deviceInfo enables dis client to receive fw information from device

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO13batteryStatusyA2CmF":{"name":"batteryStatus","abstract":"

                                                              batteryStatus enables bas client to receive battery level info from device

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO20polarSensorStreamingyA2CmF":{"name":"polarSensorStreaming","abstract":"

                                                              polarSensorStreaming enables stream client to start acc, ppg, ecg, ppi streams

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO17polarFileTransferyA2CmF":{"name":"polarFileTransfer","abstract":"

                                                              polarFileTransfer enables file transfer client to list and read stored exercises,","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO03allD0yA2CmF":{"name":"allFeatures","abstract":"

                                                              allFeatures enables all features available

                                                              ","parent_name":"Features"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2hryA2CmF":{"name":"hr","abstract":"

                                                              recording type to use is hr in BPM

                                                              ","parent_name":"SampleType"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2rryA2CmF":{"name":"rr","abstract":"

                                                              recording type to use is rr interval

                                                              ","parent_name":"SampleType"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_1syA2CmF":{"name":"interval_1s","abstract":"

                                                              Undocumented

                                                              ","parent_name":"RecordingInterval"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_5syA2CmF":{"name":"interval_5s","abstract":"

                                                              Undocumented

                                                              ","parent_name":"RecordingInterval"},"Enums/RecordingInterval.html":{"name":"RecordingInterval","abstract":"

                                                              recording interval in seconds for H10

                                                              "},"Enums/SampleType.html":{"name":"SampleType","abstract":"

                                                              sample type for H10 recording

                                                              "},"Enums/Features.html":{"name":"Features","abstract":"

                                                              features available

                                                              "},"Enums/UndefinedError.html":{"name":"UndefinedError","abstract":"

                                                              Unknown error

                                                              "},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC19polarImplementation_8featuresAA0abD0_pSo17OS_dispatch_queueC_SitFZ":{"name":"polarImplementation(_:features:)","abstract":"

                                                              New instance of Polar Ble API implementation

                                                              ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC11versionInfoSSyFZ":{"name":"versionInfo()","abstract":"

                                                              Return current version

                                                              ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html":{"name":"PolarBleApiDefaultImpl","abstract":"

                                                              Class to provide the default implementation of the Polar Ble API

                                                              "},"Classes.html#/s:11PolarBleSdk22NotificationNotEnabledC":{"name":"NotificationNotEnabled","abstract":"

                                                              GATT characteristic notification not enabled

                                                              "},"Classes.html#/s:11PolarBleSdk15ServiceNotFoundC":{"name":"ServiceNotFound","abstract":"

                                                              GATT service not found

                                                              "},"Classes.html#/s:11PolarBleSdk18DeviceNotConnectedC":{"name":"DeviceNotConnected","abstract":"

                                                              Device state != Connected

                                                              "},"Classes.html#/s:11PolarBleSdk14DeviceNotFoundC":{"name":"DeviceNotFound","abstract":"

                                                              Device not found

                                                              "},"Classes.html#/s:11PolarBleSdk21OperationNotSupportedC":{"name":"OperationNotSupported","abstract":"

                                                              Requested operation is not supported

                                                              "},"Classes.html#/s:11PolarBleSdk19MessageEncodeFailedC":{"name":"MessageEncodeFailed","abstract":"

                                                              Google protocol buffers encode failed

                                                              "},"Classes.html#/s:11PolarBleSdk19MessageDecodeFailedC":{"name":"MessageDecodeFailed","abstract":"

                                                              Google protocol buffers decode failed

                                                              "},"Classes.html#/s:11PolarBleSdk20DateTimeFormatFailedC":{"name":"DateTimeFormatFailed","abstract":"

                                                              String to date time formatting failed

                                                              "},"Classes.html#/s:11PolarBleSdk22UnableToStartStreamingC":{"name":"UnableToStartStreaming","abstract":"

                                                              Failed to start streaming

                                                              "},"Classes.html#/s:11PolarBleSdk15InvalidArgumentC":{"name":"InvalidArgument","abstract":"

                                                              invalid argument

                                                              "},"Classes.html":{"name":"Classes","abstract":"

                                                              The following classes are available globally.

                                                              "},"Enums.html":{"name":"Enumerations","abstract":"

                                                              The following enumerations are available globally.

                                                              "},"Extensions.html":{"name":"Extensions","abstract":"

                                                              The following extensions are available globally.

                                                              "},"Protocols.html":{"name":"Protocols","abstract":"

                                                              The following protocols are available globally.

                                                              "},"Structs.html":{"name":"Structures","abstract":"

                                                              The following structures are available globally.

                                                              "},"Typealiases.html":{"name":"Type Aliases","abstract":"

                                                              The following type aliases are available globally.

                                                              "}} \ No newline at end of file +{"Typealiases.html#/s:11PolarBleSdk0A10DeviceInfoa":{"name":"PolarDeviceInfo","abstract":"

                                                              Polar device info

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A15HrBroadcastDataa":{"name":"PolarHrBroadcastData","abstract":"

                                                              deviceInfo: see #PolarDeviceInfo ,

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7EcgDataa":{"name":"PolarEcgData","abstract":"

                                                              Polar Ecg data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7AccDataa":{"name":"PolarAccData","abstract":"

                                                              Polar acc data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A8GyroDataa":{"name":"PolarGyroData","abstract":"

                                                              Polar gyro data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A16MagnetometerDataa":{"name":"PolarMagnetometerData","abstract":"

                                                              Polar mgn data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7OhrDataa":{"name":"PolarOhrData","abstract":"

                                                              Polar Ohr data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A7PpiDataa":{"name":"PolarPpiData","abstract":"

                                                              Polar ppi data"},"Typealiases.html#/s:11PolarBleSdk0A13ExerciseEntrya":{"name":"PolarExerciseEntry","abstract":"

                                                              Polar exercise entry

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A12ExerciseDataa":{"name":"PolarExerciseData","abstract":"

                                                              Polar Exercise Data

                                                              "},"Typealiases.html#/s:11PolarBleSdk0A15RecordingStatusa":{"name":"PolarRecordingStatus","abstract":"

                                                              Polar Recording status

                                                              "},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10sampleRateyA2EmF":{"name":"sampleRate","abstract":"

                                                              sample rate in hz

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10resolutionyA2EmF":{"name":"resolution","abstract":"

                                                              resolution in bits

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO5rangeyA2EmF":{"name":"range","abstract":"

                                                              range

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO14rangeMilliunityA2EmF":{"name":"rangeMilliunit","abstract":"

                                                              range with min and max allowed values

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO8channelsyA2EmF":{"name":"channels","abstract":"

                                                              amount of channels available

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO7unknownyA2EmF":{"name":"unknown","abstract":"

                                                              type is unknown

                                                              ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html":{"name":"SettingType","abstract":"

                                                              settings type

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV8settingsSDyAC0E4TypeOShys6UInt32VGGvp":{"name":"settings","abstract":"

                                                              current settings available / set

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingVyACSDyAC0E4TypeOs6UInt32VGcfc":{"name":"init(_:)","abstract":"

                                                              constructor with desired settings

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV11maxSettingsACyF":{"name":"maxSettings()","abstract":"

                                                              helper to retreive max settings available

                                                              ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html":{"name":"PolarSensorSetting","abstract":"

                                                              polar sensor settings class

                                                              "},"Protocols/PolarBleApiCCCWriteObserver.html#/s:11PolarBleSdk0aB19ApiCCCWriteObserverP8cccWrite_14characteristicy10Foundation4UUIDV_So6CBUUIDCtF":{"name":"cccWrite(_:characteristic:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PolarBleApiCCCWriteObserver"},"Protocols/PolarBleApiLogger.html#/s:11PolarBleSdk0aB9ApiLoggerP7messageyySSF":{"name":"message(_:)","abstract":"

                                                              log message from sdk

                                                              ","parent_name":"PolarBleApiLogger"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP14hrFeatureReadyyySSF":{"name":"hrFeatureReady(_:)","abstract":"

                                                              Device HR feature is ready. HR transmission is starting in a short while.

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15ftpFeatureReadyyySSF":{"name":"ftpFeatureReady(_:)","abstract":"

                                                              Device file transfer protocol is ready.","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP09streamingF5Ready_0hF0ySS_ShyAA0E16StreamingFeatureOGtF":{"name":"streamingFeaturesReady(_:streamingFeatures:)","abstract":"

                                                              feature ready callback

                                                              ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP0aF4Dataa":{"name":"PolarHrData","abstract":"

                                                              Polar hr data

                                                              ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP15hrValueReceived_4dataySS_s5UInt8V0H0_SaySiG3rrsAI0M2MsSb7contactSb0O9SupportedttF":{"name":"hrValueReceived(_:data:)","abstract":"

                                                              HR notification received. Notice when using OH1 and PPI stream is started this callback will produce 0 hr.

                                                              ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP20batteryLevelReceived_0hI0ySS_SutF":{"name":"batteryLevelReceived(_:batteryLevel:)","abstract":"

                                                              Battery level received from device.

                                                              ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP22disInformationReceived_4uuid5valueySS_So6CBUUIDCSStF":{"name":"disInformationReceived(_:uuid:value:)","abstract":"

                                                              Received DIS info.

                                                              ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE2OnyyF":{"name":"blePowerOn()","abstract":"

                                                              Ble powered on event.

                                                              ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE3OffyyF":{"name":"blePowerOff()","abstract":"

                                                              Ble powered off event, no further actions are needed from the application.

                                                              ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP16deviceConnectingyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnecting(_:)","abstract":"

                                                              Callback when connection attempt is started to device

                                                              ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP15deviceConnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnected(_:)","abstract":"

                                                              Device connnection has been established.

                                                              ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP18deviceDisconnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceDisconnected(_:)","abstract":"

                                                              Connection lost to device.","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP7cleanupyyF":{"name":"cleanup()","abstract":"

                                                              remove all known devices, which are not in use

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP11polarFilteryySbF":{"name":"polarFilter(_:)","abstract":"

                                                              Enable or disable polar filter.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP24startAutoConnectToDevice_7service05polarI4Type7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSi_So6CBUUIDCSgSSSgtF":{"name":"startAutoConnectToDevice(_:service:polarDeviceType:)","abstract":"

                                                              Start connecting to a nearby device. PolarBleApiObservers polarDeviceConnected is","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15connectToDeviceyySSKF":{"name":"connectToDevice(_:)","abstract":"

                                                              Request a connection to a Polar device. Invokes PolarBleApiObservers polarDeviceConnected.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20disconnectFromDeviceyySSKF":{"name":"disconnectFromDevice(_:)","abstract":"

                                                              Disconnect from the current Polar device.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15searchForDevice7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectabletGyF":{"name":"searchForDevice()","abstract":"

                                                              Start searching for Polar device(s)

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14isFeatureReady_7featureSbSS_AA8FeaturesOtF":{"name":"isFeatureReady(_:feature:)","abstract":"

                                                              helper to check is feature ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP12setLocalTime_4time4zone7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSS_10Foundation4DateVAO0G4ZoneVtF":{"name":"setLocalTime(_:time:zone:)","abstract":"

                                                              set local time to device, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14startRecording_10exerciseId8interval10sampleType7RxSwift17PrimitiveSequenceVyAH16CompletableTraitOs5NeverOGSS_SSAA0F8IntervalOAA06SampleK0OtF":{"name":"startRecording(_:exerciseId:interval:sampleType:)","abstract":"

                                                              request start recording, only H10 supported, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13stopRecordingy7RxSwift17PrimitiveSequenceVyAE16CompletableTraitOs5NeverOGSSF":{"name":"stopRecording(_:)","abstract":"

                                                              request stop for current recording, only H10 supported, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22requestRecordingStatusy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOSb7ongoing_SS7entryIdtGSSF":{"name":"requestRecordingStatus(_:)","abstract":"

                                                              request current recording status, only H10 supported, requires ftp to be ready

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP014startListenForA12HrBroadcastsy7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet0M4Info_s5UInt8V2hrSb13batteryStatustGShySSGSgF":{"name":"startListenForPolarHrBroadcasts(_:)","abstract":"

                                                              Start listening to broadcasts from one or more Polar devices

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP21requestStreamSettings_7feature7RxSwift17PrimitiveSequenceVyAF11SingleTraitOAA0A13SensorSettingVGSS_AA22DeviceStreamingFeatureOtF":{"name":"requestStreamSettings(_:feature:)","abstract":"

                                                              request stream settings available

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startEcgStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32VG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startEcgStreaming(_:settings:)","abstract":"

                                                              Starts the ECG (Electrocardiography) stream.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startAccStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32V1x_AM1yAM1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startAccStreaming(_:settings:)","abstract":"

                                                              Start ACC (accelerometer) stream.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18startGyroStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_SaySf1x_Sf1ySf1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startGyroStreaming(_:settings:)","abstract":"

                                                              starts gyro streaming

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP26startMagnetometerStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_SaySf1x_Sf1ySf1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startMagnetometerStreaming(_:settings:)","abstract":"

                                                              Starts mgn streaming

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startOhrStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_AA0F8DataTypeO4typeSaySays5Int32VGG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startOhrStreaming(_:settings:)","abstract":"

                                                              Start an OHR (optical heart rate) PPG (photoplethysmography) stream.

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20startOhrPPIStreamingy7RxSwift10ObservableCys6UInt64V9timeStamp_SaySi2hr_s6UInt16V6ppInMsAM0P13ErrorEstimateSi10blockerBitSi17skinContactStatusSi0wX9SupportedtG7samplestGSSF":{"name":"startOhrPPIStreaming(_:)","abstract":"

                                                              Start PPI stream. Notice when using OH1 there is a delay before actual","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP23fetchStoredExerciseListy7RxSwift10ObservableCySS4path_10Foundation4DateV4dateSS7entryIdtGSSF":{"name":"fetchStoredExerciseList(_:)","abstract":"

                                                              Api for fetching stored exercises from Polar OH1/H10 device

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13fetchExercise_5entry7RxSwift17PrimitiveSequenceVyAF11SingleTraitOs6UInt32V8interval_SayALG7samplestGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"fetchExercise(_:entry:)","abstract":"

                                                              Api for fetching a single exersice from Polar OH1/H10 device

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14removeExercise_5entry7RxSwift17PrimitiveSequenceVyAF16CompletableTraitOs5NeverOGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"removeExercise(_:entry:)","abstract":"

                                                              Remove single exercise from device

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP8observerAA0abD8Observer_pSgvp":{"name":"observer","abstract":"

                                                              Common GAP (Generic access profile) observer

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18deviceInfoObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceInfoObserver","abstract":"

                                                              Device info observer for DIS (Device information servive) and BAS (Battery service) GATT (Generic attributes) client

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16deviceHrObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceHrObserver","abstract":"

                                                              Device observer for HR GATT client

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18powerStateObserverAA0abd5PowerfG0_pSgvp":{"name":"powerStateObserver","abstract":"

                                                              Bluetooth power state observer

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22deviceFeaturesObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceFeaturesObserver","abstract":"

                                                              device features ready observer

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP02isB7PoweredSbvp":{"name":"isBlePowered","abstract":"

                                                              Helper to check if Ble is currently powered

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP6loggerAA0abD6Logger_pSgvp":{"name":"logger","abstract":"

                                                              optional logger set to get traces from sdk

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP21automaticReconnectionSbvp":{"name":"automaticReconnection","abstract":"

                                                              optional disable or enable automatic reconnection, by default it is enabled

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16cccWriteObserverAA0abd8CCCWriteG0_pSgvp":{"name":"cccWriteObserver","abstract":"

                                                              optional ccc write callback

                                                              ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html":{"name":"PolarBleApi","abstract":"

                                                              API.

                                                              "},"Protocols/PolarBleApiObserver.html":{"name":"PolarBleApiObserver","abstract":"

                                                              Polar Ble API connection observer.

                                                              "},"Protocols/PolarBleApiPowerStateObserver.html":{"name":"PolarBleApiPowerStateObserver","abstract":"

                                                              Bluetooth state observer.

                                                              "},"Protocols/PolarBleApiDeviceInfoObserver.html":{"name":"PolarBleApiDeviceInfoObserver","abstract":"

                                                              Device info observer.

                                                              "},"Protocols/PolarBleApiDeviceHrObserver.html":{"name":"PolarBleApiDeviceHrObserver","abstract":"

                                                              Heart rate observer

                                                              "},"Protocols/PolarBleApiDeviceFeaturesObserver.html":{"name":"PolarBleApiDeviceFeaturesObserver","abstract":"

                                                              Data client observer

                                                              "},"Protocols/PolarBleApiLogger.html":{"name":"PolarBleApiLogger","abstract":"

                                                              logger observer

                                                              "},"Protocols/PolarBleApiCCCWriteObserver.html":{"name":"PolarBleApiCCCWriteObserver","abstract":"

                                                              observer for ccc write enable

                                                              "},"Extensions/PrimitiveSequence.html#/s:7RxSwift17PrimitiveSequenceV11PolarBleSdkAA11SingleTraitORszrlE13asCompletableACyAA0kI0Os5NeverOGyF":{"name":"asCompletable()","abstract":"

                                                              Undocumented

                                                              ","parent_name":"PrimitiveSequence"},"Extensions/PrimitiveSequence.html":{"name":"PrimitiveSequence"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO06DeviceE0yACSS_tcACmF":{"name":"DeviceError(localizedDescription:)","abstract":"

                                                              Undocumented

                                                              ","parent_name":"UndefinedError"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO20localizedDescriptionSSvp":{"name":"localizedDescription","abstract":"

                                                              Undocumented

                                                              ","parent_name":"UndefinedError"},"Enums/OhrDataType.html#/s:11PolarBleSdk11OhrDataTypeO13ppg3_ambient1yA2CmF":{"name":"ppg3_ambient1","abstract":"

                                                              3 ppg + 1 ambient

                                                              ","parent_name":"OhrDataType"},"Enums/OhrDataType.html#/s:11PolarBleSdk11OhrDataTypeO7unknownyA2CmF":{"name":"unknown","abstract":"

                                                              Undocumented

                                                              ","parent_name":"OhrDataType"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO2hryA2CmF":{"name":"hr","abstract":"

                                                              hr feature enables hr client to receive hr and rr data from device

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO10deviceInfoyA2CmF":{"name":"deviceInfo","abstract":"

                                                              deviceInfo enables dis client to receive fw information from device

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO13batteryStatusyA2CmF":{"name":"batteryStatus","abstract":"

                                                              batteryStatus enables bas client to receive battery level info from device

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO20polarSensorStreamingyA2CmF":{"name":"polarSensorStreaming","abstract":"

                                                              polarSensorStreaming enables stream client to start acc, ppg, ecg, ppi streams

                                                              ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO17polarFileTransferyA2CmF":{"name":"polarFileTransfer","abstract":"

                                                              polarFileTransfer enables file transfer client to list and read stored exercises,","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO03allD0yA2CmF":{"name":"allFeatures","abstract":"

                                                              allFeatures enables all features available

                                                              ","parent_name":"Features"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2hryA2CmF":{"name":"hr","abstract":"

                                                              recording type to use is hr in BPM

                                                              ","parent_name":"SampleType"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2rryA2CmF":{"name":"rr","abstract":"

                                                              recording type to use is rr interval

                                                              ","parent_name":"SampleType"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_1syA2CmF":{"name":"interval_1s","abstract":"

                                                              Undocumented

                                                              ","parent_name":"RecordingInterval"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_5syA2CmF":{"name":"interval_5s","abstract":"

                                                              Undocumented

                                                              ","parent_name":"RecordingInterval"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3ecgyA2CmF":{"name":"ecg","abstract":"

                                                              Undocumented

                                                              ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3accyA2CmF":{"name":"acc","abstract":"

                                                              Undocumented

                                                              ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3ppgyA2CmF":{"name":"ppg","abstract":"

                                                              Undocumented

                                                              ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3ppiyA2CmF":{"name":"ppi","abstract":"

                                                              Undocumented

                                                              ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO4gyroyA2CmF":{"name":"gyro","abstract":"

                                                              Undocumented

                                                              ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO12magnetometeryA2CmF":{"name":"magnetometer","abstract":"

                                                              Undocumented

                                                              ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html":{"name":"DeviceStreamingFeature","abstract":"

                                                              device streaming features

                                                              "},"Enums/RecordingInterval.html":{"name":"RecordingInterval","abstract":"

                                                              recording interval in seconds for H10

                                                              "},"Enums/SampleType.html":{"name":"SampleType","abstract":"

                                                              sample type for H10 recording

                                                              "},"Enums/Features.html":{"name":"Features","abstract":"

                                                              features available

                                                              "},"Enums/OhrDataType.html":{"name":"OhrDataType","abstract":"

                                                              OHR data source enum

                                                              "},"Enums/UndefinedError.html":{"name":"UndefinedError","abstract":"

                                                              Unknown error

                                                              "},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC19polarImplementation_8featuresAA0abD0_pSo17OS_dispatch_queueC_SitFZ":{"name":"polarImplementation(_:features:)","abstract":"

                                                              New instance of Polar Ble API implementation

                                                              ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC11versionInfoSSyFZ":{"name":"versionInfo()","abstract":"

                                                              Return current version

                                                              ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html":{"name":"PolarBleApiDefaultImpl","abstract":"

                                                              Class to provide the default implementation of the Polar Ble API

                                                              "},"Classes.html#/s:11PolarBleSdk22NotificationNotEnabledC":{"name":"NotificationNotEnabled","abstract":"

                                                              GATT characteristic notification not enabled

                                                              "},"Classes.html#/s:11PolarBleSdk15ServiceNotFoundC":{"name":"ServiceNotFound","abstract":"

                                                              GATT service not found

                                                              "},"Classes.html#/s:11PolarBleSdk18DeviceNotConnectedC":{"name":"DeviceNotConnected","abstract":"

                                                              Device state != Connected

                                                              "},"Classes.html#/s:11PolarBleSdk14DeviceNotFoundC":{"name":"DeviceNotFound","abstract":"

                                                              Device not found

                                                              "},"Classes.html#/s:11PolarBleSdk21OperationNotSupportedC":{"name":"OperationNotSupported","abstract":"

                                                              Requested operation is not supported

                                                              "},"Classes.html#/s:11PolarBleSdk19MessageEncodeFailedC":{"name":"MessageEncodeFailed","abstract":"

                                                              Google protocol buffers encode failed

                                                              "},"Classes.html#/s:11PolarBleSdk19MessageDecodeFailedC":{"name":"MessageDecodeFailed","abstract":"

                                                              Google protocol buffers decode failed

                                                              "},"Classes.html#/s:11PolarBleSdk20DateTimeFormatFailedC":{"name":"DateTimeFormatFailed","abstract":"

                                                              String to date time formatting failed

                                                              "},"Classes.html#/s:11PolarBleSdk22UnableToStartStreamingC":{"name":"UnableToStartStreaming","abstract":"

                                                              Failed to start streaming

                                                              "},"Classes.html#/s:11PolarBleSdk15InvalidArgumentC":{"name":"InvalidArgument","abstract":"

                                                              invalid argument

                                                              "},"Classes.html":{"name":"Classes","abstract":"

                                                              The following classes are available globally.

                                                              "},"Enums.html":{"name":"Enumerations","abstract":"

                                                              The following enumerations are available globally.

                                                              "},"Extensions.html":{"name":"Extensions","abstract":"

                                                              The following extensions are available globally.

                                                              "},"Protocols.html":{"name":"Protocols","abstract":"

                                                              The following protocols are available globally.

                                                              "},"Structs.html":{"name":"Structures","abstract":"

                                                              The following structures are available globally.

                                                              "},"Typealiases.html":{"name":"Type Aliases","abstract":"

                                                              The following type aliases are available globally.

                                                              "}} \ No newline at end of file diff --git a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/docSet.dsidx b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/docSet.dsidx index 4d3d9e8d..fe488737 100644 Binary files a/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/docSet.dsidx and b/polar-sdk-ios/docs/docsets/.docset/Contents/Resources/docSet.dsidx differ diff --git a/polar-sdk-ios/docs/docsets/.tgz b/polar-sdk-ios/docs/docsets/.tgz index ef341a69..e160b32f 100644 Binary files a/polar-sdk-ios/docs/docsets/.tgz and b/polar-sdk-ios/docs/docsets/.tgz differ diff --git a/polar-sdk-ios/docs/index.html b/polar-sdk-ios/docs/index.html index e3777763..323962d5 100644 --- a/polar-sdk-ios/docs/index.html +++ b/polar-sdk-ios/docs/index.html @@ -16,7 +16,7 @@
                                                              -

                                                              Docs (90% documented)

                                                              +

                                                              Docs (89% documented)

                                                              @@ -75,9 +75,15 @@

                                                            • Enumerations
                                                                +
                                                              • + DeviceStreamingFeature +
                                                              • Features
                                                                • +
                                                              • + OhrDataType +
                                                              • RecordingInterval
                                                                • @@ -143,9 +149,6 @@
                                                              • PolarAccData
                                                                • -
                                                              • - PolarBiozData -
                                                              • PolarDeviceInfo
                                                                • @@ -158,11 +161,17 @@
                                                              • PolarExerciseEntry
                                                                • +
                                                              • + PolarGyroData +
                                                              • PolarHrBroadcastData
                                                              • - PolarPpgData + PolarMagnetometerData +
                                                                • +
                                                              • + PolarOhrData
                                                              • PolarPpiData @@ -199,7 +208,7 @@

                                                                Update dependency

                                                                diff --git a/polar-sdk-ios/docs/search.json b/polar-sdk-ios/docs/search.json index fe4f998c..444fd39c 100644 --- a/polar-sdk-ios/docs/search.json +++ b/polar-sdk-ios/docs/search.json @@ -1 +1 @@ -{"Typealiases.html#/s:11PolarBleSdk0A10DeviceInfoa":{"name":"PolarDeviceInfo","abstract":"

                                                                Polar device info

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A15HrBroadcastDataa":{"name":"PolarHrBroadcastData","abstract":"

                                                                deviceInfo: see #PolarDeviceInfo ,

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7EcgDataa":{"name":"PolarEcgData","abstract":"

                                                                Polar Ecg data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7AccDataa":{"name":"PolarAccData","abstract":"

                                                                Polar acc data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7PpgDataa":{"name":"PolarPpgData","abstract":"

                                                                Polar ppg data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7PpiDataa":{"name":"PolarPpiData","abstract":"

                                                                Polar ppi data"},"Typealiases.html#/s:11PolarBleSdk0A8BiozDataa":{"name":"PolarBiozData","abstract":"

                                                                Undocumented

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A13ExerciseEntrya":{"name":"PolarExerciseEntry","abstract":"

                                                                Polar exercise entry

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A12ExerciseDataa":{"name":"PolarExerciseData","abstract":"

                                                                Polar Exercise Data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A15RecordingStatusa":{"name":"PolarRecordingStatus","abstract":"

                                                                Polar Recording status

                                                                "},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10sampleRateyA2EmF":{"name":"sampleRate","abstract":"

                                                                sample rate in hz

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10resolutionyA2EmF":{"name":"resolution","abstract":"

                                                                resolution in bits

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO5rangeyA2EmF":{"name":"range","abstract":"

                                                                range in g’s

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO7unknownyA2EmF":{"name":"unknown","abstract":"

                                                                type is unknown

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html":{"name":"SettingType","abstract":"

                                                                settings type

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV8settingsSDyAC0E4TypeOShys6UInt16VGGvp":{"name":"settings","abstract":"

                                                                current settings available / set

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingVyACSDyAC0E4TypeOs6UInt16VGcfc":{"name":"init(_:)","abstract":"

                                                                constructor with desired settings

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV11maxSettingsACyF":{"name":"maxSettings()","abstract":"

                                                                helper to retreive max settings available

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html":{"name":"PolarSensorSetting","abstract":"

                                                                polar sensor settings class

                                                                "},"Protocols/PolarBleApiCCCWriteObserver.html#/s:11PolarBleSdk0aB19ApiCCCWriteObserverP8cccWrite_14characteristicy10Foundation4UUIDV_So6CBUUIDCtF":{"name":"cccWrite(_:characteristic:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PolarBleApiCCCWriteObserver"},"Protocols/PolarBleApiLogger.html#/s:11PolarBleSdk0aB9ApiLoggerP7messageyySSF":{"name":"message(_:)","abstract":"

                                                                log message from sdk

                                                                ","parent_name":"PolarBleApiLogger"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP14hrFeatureReadyyySSF":{"name":"hrFeatureReady(_:)","abstract":"

                                                                Device HR feature is ready. HR transmission is starting in a short while.

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15ecgFeatureReadyyySSF":{"name":"ecgFeatureReady(_:)","abstract":"

                                                                Device ECG feature is ready. Application can now start ECG streaming.

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15accFeatureReadyyySSF":{"name":"accFeatureReady(_:)","abstract":"

                                                                Device ACC feature is ready. Application can now start ACC streaming.

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP18ohrPPGFeatureReadyyySSF":{"name":"ohrPPGFeatureReady(_:)","abstract":"

                                                                Device OHR PPG feature is ready.

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP18ohrPPIFeatureReadyyySSF":{"name":"ohrPPIFeatureReady(_:)","abstract":"

                                                                Device OHR PPG feature is ready.

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP16biozFeatureReadyyySSF":{"name":"biozFeatureReady(_:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15ftpFeatureReadyyySSF":{"name":"ftpFeatureReady(_:)","abstract":"

                                                                Device file transfer protocol is ready.","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP0aF4Dataa":{"name":"PolarHrData","abstract":"

                                                                Polar hr data

                                                                ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP15hrValueReceived_4dataySS_s5UInt8V0H0_SaySiG3rrsAI0M2MsSb7contactSb0O9SupportedttF":{"name":"hrValueReceived(_:data:)","abstract":"

                                                                HR notification received. Notice when using OH1 and PPI stream is started this callback will produce 0 hr.

                                                                ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP20batteryLevelReceived_0hI0ySS_SutF":{"name":"batteryLevelReceived(_:batteryLevel:)","abstract":"

                                                                Battery level received from device.

                                                                ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP22disInformationReceived_4uuid5valueySS_So6CBUUIDCSStF":{"name":"disInformationReceived(_:uuid:value:)","abstract":"

                                                                Received DIS info.

                                                                ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE2OnyyF":{"name":"blePowerOn()","abstract":"

                                                                Ble powered on event.

                                                                ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE3OffyyF":{"name":"blePowerOff()","abstract":"

                                                                Ble powered off event, no further actions are needed from the application.

                                                                ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP16deviceConnectingyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnecting(_:)","abstract":"

                                                                Callback when connection attempt is started to device

                                                                ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP15deviceConnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnected(_:)","abstract":"

                                                                Device connnection has been established.

                                                                ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP18deviceDisconnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceDisconnected(_:)","abstract":"

                                                                Connection lost to device.","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP7cleanupyyF":{"name":"cleanup()","abstract":"

                                                                remove all known devices, which are not in use

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP11polarFilteryySbF":{"name":"polarFilter(_:)","abstract":"

                                                                Enable or disable polar filter.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP24startAutoConnectToDevice_7service05polarI4Type7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSi_So6CBUUIDCSgSSSgtF":{"name":"startAutoConnectToDevice(_:service:polarDeviceType:)","abstract":"

                                                                Start connecting to a nearby device. PolarBleApiObservers polarDeviceConnected is","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15connectToDeviceyySSKF":{"name":"connectToDevice(_:)","abstract":"

                                                                Request a connection to a Polar device. Invokes PolarBleApiObservers polarDeviceConnected.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20disconnectFromDeviceyySSKF":{"name":"disconnectFromDevice(_:)","abstract":"

                                                                Disconnect from the current Polar device.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15searchForDevice7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectabletGyF":{"name":"searchForDevice()","abstract":"

                                                                Start searching for Polar device(s)

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14isFeatureReady_7featureSbSS_AA8FeaturesOtF":{"name":"isFeatureReady(_:feature:)","abstract":"

                                                                helper to check is feature ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP12setLocalTime_4time4zone7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSS_10Foundation4DateVAO0G4ZoneVtF":{"name":"setLocalTime(_:time:zone:)","abstract":"

                                                                set local time to device, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14startRecording_10exerciseId8interval10sampleType7RxSwift17PrimitiveSequenceVyAH16CompletableTraitOs5NeverOGSS_SSAA0F8IntervalOAA06SampleK0OtF":{"name":"startRecording(_:exerciseId:interval:sampleType:)","abstract":"

                                                                request start recording, only H10 supported, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13stopRecordingy7RxSwift17PrimitiveSequenceVyAE16CompletableTraitOs5NeverOGSSF":{"name":"stopRecording(_:)","abstract":"

                                                                request stop for current recording, only H10 supported, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22requestRecordingStatusy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOSb7ongoing_SS7entryIdtGSSF":{"name":"requestRecordingStatus(_:)","abstract":"

                                                                request current recording status, only H10 supported, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP014startListenForA12HrBroadcastsy7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet0M4Info_s5UInt8V2hrSb13batteryStatustGShySSGSgF":{"name":"startListenForPolarHrBroadcasts(_:)","abstract":"

                                                                Start listening to broadcasts from one or more Polar devices

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18requestEcgSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestEcgSettings(_:)","abstract":"

                                                                request ecg settings available

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18requestAccSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestAccSettings(_:)","abstract":"

                                                                request acc settings available

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18requestPpgSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestPpgSettings(_:)","abstract":"

                                                                request ppg settings available

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP19requestBiozSettingsy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOAA0A13SensorSettingVGSSF":{"name":"requestBiozSettings(_:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startEcgStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32VG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startEcgStreaming(_:settings:)","abstract":"

                                                                Starts the ECG (Electrocardiography) stream.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startAccStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32V1x_AM1yAM1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startAccStreaming(_:settings:)","abstract":"

                                                                Start ACC (accelerometer) stream.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20startOhrPPGStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32V4ppg0_AM4ppg1AM4ppg2AM7ambienttG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startOhrPPGStreaming(_:settings:)","abstract":"

                                                                Start an OHR (optical heart rate) PPG (photoplethysmography) stream.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20startOhrPPIStreamingy7RxSwift10ObservableCys6UInt64V9timeStamp_SaySi2hr_s6UInt16V6ppInMsAM0P13ErrorEstimateSi10blockerBitSi17skinContactStatusSi0wX9SupportedtG7samplestGSSF":{"name":"startOhrPPIStreaming(_:)","abstract":"

                                                                Start PPI stream. Notice when using OH1 there is a delay before actual","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18startBiozStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32VG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startBiozStreaming(_:settings:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP23fetchStoredExerciseListy7RxSwift10ObservableCySS4path_10Foundation4DateV4dateSS7entryIdtGSSF":{"name":"fetchStoredExerciseList(_:)","abstract":"

                                                                Api for fetching stored exercises from Polar OH1/H10 device

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13fetchExercise_5entry7RxSwift17PrimitiveSequenceVyAF11SingleTraitOs6UInt32V8interval_SayALG7samplestGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"fetchExercise(_:entry:)","abstract":"

                                                                Api for fetching a single exersice from Polar OH1/H10 device

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14removeExercise_5entry7RxSwift17PrimitiveSequenceVyAF16CompletableTraitOs5NeverOGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"removeExercise(_:entry:)","abstract":"

                                                                Remove single exercise from device

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP8observerAA0abD8Observer_pSgvp":{"name":"observer","abstract":"

                                                                Common GAP (Generic access profile) observer

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18deviceInfoObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceInfoObserver","abstract":"

                                                                Device info observer for DIS (Device information servive) and BAS (Battery service) GATT (Generic attributes) client

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16deviceHrObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceHrObserver","abstract":"

                                                                Device observer for HR GATT client

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18powerStateObserverAA0abd5PowerfG0_pSgvp":{"name":"powerStateObserver","abstract":"

                                                                Bluetooth power state observer

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22deviceFeaturesObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceFeaturesObserver","abstract":"

                                                                device features ready observer

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP02isB7PoweredSbvp":{"name":"isBlePowered","abstract":"

                                                                Helper to check if Ble is currently powered

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP6loggerAA0abD6Logger_pSgvp":{"name":"logger","abstract":"

                                                                optional logger set to get traces from sdk

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP21automaticReconnectionSbvp":{"name":"automaticReconnection","abstract":"

                                                                optional disable or enable automatic reconnection, by default it is enabled

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16cccWriteObserverAA0abd8CCCWriteG0_pSgvp":{"name":"cccWriteObserver","abstract":"

                                                                optional ccc write callback

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html":{"name":"PolarBleApi","abstract":"

                                                                API.

                                                                "},"Protocols/PolarBleApiObserver.html":{"name":"PolarBleApiObserver","abstract":"

                                                                Polar Ble API connection observer.

                                                                "},"Protocols/PolarBleApiPowerStateObserver.html":{"name":"PolarBleApiPowerStateObserver","abstract":"

                                                                Bluetooth state observer.

                                                                "},"Protocols/PolarBleApiDeviceInfoObserver.html":{"name":"PolarBleApiDeviceInfoObserver","abstract":"

                                                                Device info observer.

                                                                "},"Protocols/PolarBleApiDeviceHrObserver.html":{"name":"PolarBleApiDeviceHrObserver","abstract":"

                                                                Heart rate observer

                                                                "},"Protocols/PolarBleApiDeviceFeaturesObserver.html":{"name":"PolarBleApiDeviceFeaturesObserver","abstract":"

                                                                Data client observer

                                                                "},"Protocols/PolarBleApiLogger.html":{"name":"PolarBleApiLogger","abstract":"

                                                                logger observer

                                                                "},"Protocols/PolarBleApiCCCWriteObserver.html":{"name":"PolarBleApiCCCWriteObserver","abstract":"

                                                                observer for ccc write enable

                                                                "},"Extensions/PrimitiveSequence.html#/s:7RxSwift17PrimitiveSequenceV11PolarBleSdkAA11SingleTraitORszrlE13asCompletableACyAA0kI0Os5NeverOGyF":{"name":"asCompletable()","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PrimitiveSequence"},"Extensions/PrimitiveSequence.html":{"name":"PrimitiveSequence"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO06DeviceE0yACSS_tcACmF":{"name":"DeviceError(localizedDescription:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"UndefinedError"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO20localizedDescriptionSSvp":{"name":"localizedDescription","abstract":"

                                                                Undocumented

                                                                ","parent_name":"UndefinedError"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO2hryA2CmF":{"name":"hr","abstract":"

                                                                hr feature enables hr client to receive hr and rr data from device

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO10deviceInfoyA2CmF":{"name":"deviceInfo","abstract":"

                                                                deviceInfo enables dis client to receive fw information from device

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO13batteryStatusyA2CmF":{"name":"batteryStatus","abstract":"

                                                                batteryStatus enables bas client to receive battery level info from device

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO20polarSensorStreamingyA2CmF":{"name":"polarSensorStreaming","abstract":"

                                                                polarSensorStreaming enables stream client to start acc, ppg, ecg, ppi streams

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO17polarFileTransferyA2CmF":{"name":"polarFileTransfer","abstract":"

                                                                polarFileTransfer enables file transfer client to list and read stored exercises,","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO03allD0yA2CmF":{"name":"allFeatures","abstract":"

                                                                allFeatures enables all features available

                                                                ","parent_name":"Features"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2hryA2CmF":{"name":"hr","abstract":"

                                                                recording type to use is hr in BPM

                                                                ","parent_name":"SampleType"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2rryA2CmF":{"name":"rr","abstract":"

                                                                recording type to use is rr interval

                                                                ","parent_name":"SampleType"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_1syA2CmF":{"name":"interval_1s","abstract":"

                                                                Undocumented

                                                                ","parent_name":"RecordingInterval"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_5syA2CmF":{"name":"interval_5s","abstract":"

                                                                Undocumented

                                                                ","parent_name":"RecordingInterval"},"Enums/RecordingInterval.html":{"name":"RecordingInterval","abstract":"

                                                                recording interval in seconds for H10

                                                                "},"Enums/SampleType.html":{"name":"SampleType","abstract":"

                                                                sample type for H10 recording

                                                                "},"Enums/Features.html":{"name":"Features","abstract":"

                                                                features available

                                                                "},"Enums/UndefinedError.html":{"name":"UndefinedError","abstract":"

                                                                Unknown error

                                                                "},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC19polarImplementation_8featuresAA0abD0_pSo17OS_dispatch_queueC_SitFZ":{"name":"polarImplementation(_:features:)","abstract":"

                                                                New instance of Polar Ble API implementation

                                                                ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC11versionInfoSSyFZ":{"name":"versionInfo()","abstract":"

                                                                Return current version

                                                                ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html":{"name":"PolarBleApiDefaultImpl","abstract":"

                                                                Class to provide the default implementation of the Polar Ble API

                                                                "},"Classes.html#/s:11PolarBleSdk22NotificationNotEnabledC":{"name":"NotificationNotEnabled","abstract":"

                                                                GATT characteristic notification not enabled

                                                                "},"Classes.html#/s:11PolarBleSdk15ServiceNotFoundC":{"name":"ServiceNotFound","abstract":"

                                                                GATT service not found

                                                                "},"Classes.html#/s:11PolarBleSdk18DeviceNotConnectedC":{"name":"DeviceNotConnected","abstract":"

                                                                Device state != Connected

                                                                "},"Classes.html#/s:11PolarBleSdk14DeviceNotFoundC":{"name":"DeviceNotFound","abstract":"

                                                                Device not found

                                                                "},"Classes.html#/s:11PolarBleSdk21OperationNotSupportedC":{"name":"OperationNotSupported","abstract":"

                                                                Requested operation is not supported

                                                                "},"Classes.html#/s:11PolarBleSdk19MessageEncodeFailedC":{"name":"MessageEncodeFailed","abstract":"

                                                                Google protocol buffers encode failed

                                                                "},"Classes.html#/s:11PolarBleSdk19MessageDecodeFailedC":{"name":"MessageDecodeFailed","abstract":"

                                                                Google protocol buffers decode failed

                                                                "},"Classes.html#/s:11PolarBleSdk20DateTimeFormatFailedC":{"name":"DateTimeFormatFailed","abstract":"

                                                                String to date time formatting failed

                                                                "},"Classes.html#/s:11PolarBleSdk22UnableToStartStreamingC":{"name":"UnableToStartStreaming","abstract":"

                                                                Failed to start streaming

                                                                "},"Classes.html#/s:11PolarBleSdk15InvalidArgumentC":{"name":"InvalidArgument","abstract":"

                                                                invalid argument

                                                                "},"Classes.html":{"name":"Classes","abstract":"

                                                                The following classes are available globally.

                                                                "},"Enums.html":{"name":"Enumerations","abstract":"

                                                                The following enumerations are available globally.

                                                                "},"Extensions.html":{"name":"Extensions","abstract":"

                                                                The following extensions are available globally.

                                                                "},"Protocols.html":{"name":"Protocols","abstract":"

                                                                The following protocols are available globally.

                                                                "},"Structs.html":{"name":"Structures","abstract":"

                                                                The following structures are available globally.

                                                                "},"Typealiases.html":{"name":"Type Aliases","abstract":"

                                                                The following type aliases are available globally.

                                                                "}} \ No newline at end of file +{"Typealiases.html#/s:11PolarBleSdk0A10DeviceInfoa":{"name":"PolarDeviceInfo","abstract":"

                                                                Polar device info

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A15HrBroadcastDataa":{"name":"PolarHrBroadcastData","abstract":"

                                                                deviceInfo: see #PolarDeviceInfo ,

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7EcgDataa":{"name":"PolarEcgData","abstract":"

                                                                Polar Ecg data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7AccDataa":{"name":"PolarAccData","abstract":"

                                                                Polar acc data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A8GyroDataa":{"name":"PolarGyroData","abstract":"

                                                                Polar gyro data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A16MagnetometerDataa":{"name":"PolarMagnetometerData","abstract":"

                                                                Polar mgn data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7OhrDataa":{"name":"PolarOhrData","abstract":"

                                                                Polar Ohr data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A7PpiDataa":{"name":"PolarPpiData","abstract":"

                                                                Polar ppi data"},"Typealiases.html#/s:11PolarBleSdk0A13ExerciseEntrya":{"name":"PolarExerciseEntry","abstract":"

                                                                Polar exercise entry

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A12ExerciseDataa":{"name":"PolarExerciseData","abstract":"

                                                                Polar Exercise Data

                                                                "},"Typealiases.html#/s:11PolarBleSdk0A15RecordingStatusa":{"name":"PolarRecordingStatus","abstract":"

                                                                Polar Recording status

                                                                "},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10sampleRateyA2EmF":{"name":"sampleRate","abstract":"

                                                                sample rate in hz

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO10resolutionyA2EmF":{"name":"resolution","abstract":"

                                                                resolution in bits

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO5rangeyA2EmF":{"name":"range","abstract":"

                                                                range

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO14rangeMilliunityA2EmF":{"name":"rangeMilliunit","abstract":"

                                                                range with min and max allowed values

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO8channelsyA2EmF":{"name":"channels","abstract":"

                                                                amount of channels available

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html#/s:11PolarBleSdk0A13SensorSettingV0E4TypeO7unknownyA2EmF":{"name":"unknown","abstract":"

                                                                type is unknown

                                                                ","parent_name":"SettingType"},"Structs/PolarSensorSetting/SettingType.html":{"name":"SettingType","abstract":"

                                                                settings type

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV8settingsSDyAC0E4TypeOShys6UInt32VGGvp":{"name":"settings","abstract":"

                                                                current settings available / set

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingVyACSDyAC0E4TypeOs6UInt32VGcfc":{"name":"init(_:)","abstract":"

                                                                constructor with desired settings

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html#/s:11PolarBleSdk0A13SensorSettingV11maxSettingsACyF":{"name":"maxSettings()","abstract":"

                                                                helper to retreive max settings available

                                                                ","parent_name":"PolarSensorSetting"},"Structs/PolarSensorSetting.html":{"name":"PolarSensorSetting","abstract":"

                                                                polar sensor settings class

                                                                "},"Protocols/PolarBleApiCCCWriteObserver.html#/s:11PolarBleSdk0aB19ApiCCCWriteObserverP8cccWrite_14characteristicy10Foundation4UUIDV_So6CBUUIDCtF":{"name":"cccWrite(_:characteristic:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PolarBleApiCCCWriteObserver"},"Protocols/PolarBleApiLogger.html#/s:11PolarBleSdk0aB9ApiLoggerP7messageyySSF":{"name":"message(_:)","abstract":"

                                                                log message from sdk

                                                                ","parent_name":"PolarBleApiLogger"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP14hrFeatureReadyyySSF":{"name":"hrFeatureReady(_:)","abstract":"

                                                                Device HR feature is ready. HR transmission is starting in a short while.

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP15ftpFeatureReadyyySSF":{"name":"ftpFeatureReady(_:)","abstract":"

                                                                Device file transfer protocol is ready.","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceFeaturesObserver.html#/s:11PolarBleSdk0aB25ApiDeviceFeaturesObserverP09streamingF5Ready_0hF0ySS_ShyAA0E16StreamingFeatureOGtF":{"name":"streamingFeaturesReady(_:streamingFeatures:)","abstract":"

                                                                feature ready callback

                                                                ","parent_name":"PolarBleApiDeviceFeaturesObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP0aF4Dataa":{"name":"PolarHrData","abstract":"

                                                                Polar hr data

                                                                ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceHrObserver.html#/s:11PolarBleSdk0aB19ApiDeviceHrObserverP15hrValueReceived_4dataySS_s5UInt8V0H0_SaySiG3rrsAI0M2MsSb7contactSb0O9SupportedttF":{"name":"hrValueReceived(_:data:)","abstract":"

                                                                HR notification received. Notice when using OH1 and PPI stream is started this callback will produce 0 hr.

                                                                ","parent_name":"PolarBleApiDeviceHrObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP20batteryLevelReceived_0hI0ySS_SutF":{"name":"batteryLevelReceived(_:batteryLevel:)","abstract":"

                                                                Battery level received from device.

                                                                ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiDeviceInfoObserver.html#/s:11PolarBleSdk0aB21ApiDeviceInfoObserverP22disInformationReceived_4uuid5valueySS_So6CBUUIDCSStF":{"name":"disInformationReceived(_:uuid:value:)","abstract":"

                                                                Received DIS info.

                                                                ","parent_name":"PolarBleApiDeviceInfoObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE2OnyyF":{"name":"blePowerOn()","abstract":"

                                                                Ble powered on event.

                                                                ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiPowerStateObserver.html#/s:11PolarBleSdk0aB21ApiPowerStateObserverP03bleE3OffyyF":{"name":"blePowerOff()","abstract":"

                                                                Ble powered off event, no further actions are needed from the application.

                                                                ","parent_name":"PolarBleApiPowerStateObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP16deviceConnectingyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnecting(_:)","abstract":"

                                                                Callback when connection attempt is started to device

                                                                ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP15deviceConnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceConnected(_:)","abstract":"

                                                                Device connnection has been established.

                                                                ","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApiObserver.html#/s:11PolarBleSdk0aB11ApiObserverP18deviceDisconnectedyySS0F2Id_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet_tF":{"name":"deviceDisconnected(_:)","abstract":"

                                                                Connection lost to device.","parent_name":"PolarBleApiObserver"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP7cleanupyyF":{"name":"cleanup()","abstract":"

                                                                remove all known devices, which are not in use

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP11polarFilteryySbF":{"name":"polarFilter(_:)","abstract":"

                                                                Enable or disable polar filter.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP24startAutoConnectToDevice_7service05polarI4Type7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSi_So6CBUUIDCSgSSSgtF":{"name":"startAutoConnectToDevice(_:service:polarDeviceType:)","abstract":"

                                                                Start connecting to a nearby device. PolarBleApiObservers polarDeviceConnected is","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15connectToDeviceyySSKF":{"name":"connectToDevice(_:)","abstract":"

                                                                Request a connection to a Polar device. Invokes PolarBleApiObservers polarDeviceConnected.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20disconnectFromDeviceyySSKF":{"name":"disconnectFromDevice(_:)","abstract":"

                                                                Disconnect from the current Polar device.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP15searchForDevice7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectabletGyF":{"name":"searchForDevice()","abstract":"

                                                                Start searching for Polar device(s)

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14isFeatureReady_7featureSbSS_AA8FeaturesOtF":{"name":"isFeatureReady(_:feature:)","abstract":"

                                                                helper to check is feature ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP12setLocalTime_4time4zone7RxSwift17PrimitiveSequenceVyAG16CompletableTraitOs5NeverOGSS_10Foundation4DateVAO0G4ZoneVtF":{"name":"setLocalTime(_:time:zone:)","abstract":"

                                                                set local time to device, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14startRecording_10exerciseId8interval10sampleType7RxSwift17PrimitiveSequenceVyAH16CompletableTraitOs5NeverOGSS_SSAA0F8IntervalOAA06SampleK0OtF":{"name":"startRecording(_:exerciseId:interval:sampleType:)","abstract":"

                                                                request start recording, only H10 supported, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13stopRecordingy7RxSwift17PrimitiveSequenceVyAE16CompletableTraitOs5NeverOGSSF":{"name":"stopRecording(_:)","abstract":"

                                                                request stop for current recording, only H10 supported, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22requestRecordingStatusy7RxSwift17PrimitiveSequenceVyAE11SingleTraitOSb7ongoing_SS7entryIdtGSSF":{"name":"requestRecordingStatus(_:)","abstract":"

                                                                request current recording status, only H10 supported, requires ftp to be ready

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP014startListenForA12HrBroadcastsy7RxSwift10ObservableCySS8deviceId_10Foundation4UUIDV7addressSi4rssiSS4nameSb11connectablet0M4Info_s5UInt8V2hrSb13batteryStatustGShySSGSgF":{"name":"startListenForPolarHrBroadcasts(_:)","abstract":"

                                                                Start listening to broadcasts from one or more Polar devices

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP21requestStreamSettings_7feature7RxSwift17PrimitiveSequenceVyAF11SingleTraitOAA0A13SensorSettingVGSS_AA22DeviceStreamingFeatureOtF":{"name":"requestStreamSettings(_:feature:)","abstract":"

                                                                request stream settings available

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startEcgStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32VG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startEcgStreaming(_:settings:)","abstract":"

                                                                Starts the ECG (Electrocardiography) stream.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startAccStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_Says5Int32V1x_AM1yAM1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startAccStreaming(_:settings:)","abstract":"

                                                                Start ACC (accelerometer) stream.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18startGyroStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_SaySf1x_Sf1ySf1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startGyroStreaming(_:settings:)","abstract":"

                                                                starts gyro streaming

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP26startMagnetometerStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_SaySf1x_Sf1ySf1ztG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startMagnetometerStreaming(_:settings:)","abstract":"

                                                                Starts mgn streaming

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP17startOhrStreaming_8settings7RxSwift10ObservableCys6UInt64V9timeStamp_AA0F8DataTypeO4typeSaySays5Int32VGG7samplestGSS_AA0A13SensorSettingVtF":{"name":"startOhrStreaming(_:settings:)","abstract":"

                                                                Start an OHR (optical heart rate) PPG (photoplethysmography) stream.

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP20startOhrPPIStreamingy7RxSwift10ObservableCys6UInt64V9timeStamp_SaySi2hr_s6UInt16V6ppInMsAM0P13ErrorEstimateSi10blockerBitSi17skinContactStatusSi0wX9SupportedtG7samplestGSSF":{"name":"startOhrPPIStreaming(_:)","abstract":"

                                                                Start PPI stream. Notice when using OH1 there is a delay before actual","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP23fetchStoredExerciseListy7RxSwift10ObservableCySS4path_10Foundation4DateV4dateSS7entryIdtGSSF":{"name":"fetchStoredExerciseList(_:)","abstract":"

                                                                Api for fetching stored exercises from Polar OH1/H10 device

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP13fetchExercise_5entry7RxSwift17PrimitiveSequenceVyAF11SingleTraitOs6UInt32V8interval_SayALG7samplestGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"fetchExercise(_:entry:)","abstract":"

                                                                Api for fetching a single exersice from Polar OH1/H10 device

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP14removeExercise_5entry7RxSwift17PrimitiveSequenceVyAF16CompletableTraitOs5NeverOGSS_SS4path_10Foundation4DateV4dateSS0G2IdttF":{"name":"removeExercise(_:entry:)","abstract":"

                                                                Remove single exercise from device

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP8observerAA0abD8Observer_pSgvp":{"name":"observer","abstract":"

                                                                Common GAP (Generic access profile) observer

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18deviceInfoObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceInfoObserver","abstract":"

                                                                Device info observer for DIS (Device information servive) and BAS (Battery service) GATT (Generic attributes) client

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16deviceHrObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceHrObserver","abstract":"

                                                                Device observer for HR GATT client

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP18powerStateObserverAA0abd5PowerfG0_pSgvp":{"name":"powerStateObserver","abstract":"

                                                                Bluetooth power state observer

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP22deviceFeaturesObserverAA0abd6DevicefG0_pSgvp":{"name":"deviceFeaturesObserver","abstract":"

                                                                device features ready observer

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP02isB7PoweredSbvp":{"name":"isBlePowered","abstract":"

                                                                Helper to check if Ble is currently powered

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP6loggerAA0abD6Logger_pSgvp":{"name":"logger","abstract":"

                                                                optional logger set to get traces from sdk

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP21automaticReconnectionSbvp":{"name":"automaticReconnection","abstract":"

                                                                optional disable or enable automatic reconnection, by default it is enabled

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html#/s:11PolarBleSdk0aB3ApiP16cccWriteObserverAA0abd8CCCWriteG0_pSgvp":{"name":"cccWriteObserver","abstract":"

                                                                optional ccc write callback

                                                                ","parent_name":"PolarBleApi"},"Protocols/PolarBleApi.html":{"name":"PolarBleApi","abstract":"

                                                                API.

                                                                "},"Protocols/PolarBleApiObserver.html":{"name":"PolarBleApiObserver","abstract":"

                                                                Polar Ble API connection observer.

                                                                "},"Protocols/PolarBleApiPowerStateObserver.html":{"name":"PolarBleApiPowerStateObserver","abstract":"

                                                                Bluetooth state observer.

                                                                "},"Protocols/PolarBleApiDeviceInfoObserver.html":{"name":"PolarBleApiDeviceInfoObserver","abstract":"

                                                                Device info observer.

                                                                "},"Protocols/PolarBleApiDeviceHrObserver.html":{"name":"PolarBleApiDeviceHrObserver","abstract":"

                                                                Heart rate observer

                                                                "},"Protocols/PolarBleApiDeviceFeaturesObserver.html":{"name":"PolarBleApiDeviceFeaturesObserver","abstract":"

                                                                Data client observer

                                                                "},"Protocols/PolarBleApiLogger.html":{"name":"PolarBleApiLogger","abstract":"

                                                                logger observer

                                                                "},"Protocols/PolarBleApiCCCWriteObserver.html":{"name":"PolarBleApiCCCWriteObserver","abstract":"

                                                                observer for ccc write enable

                                                                "},"Extensions/PrimitiveSequence.html#/s:7RxSwift17PrimitiveSequenceV11PolarBleSdkAA11SingleTraitORszrlE13asCompletableACyAA0kI0Os5NeverOGyF":{"name":"asCompletable()","abstract":"

                                                                Undocumented

                                                                ","parent_name":"PrimitiveSequence"},"Extensions/PrimitiveSequence.html":{"name":"PrimitiveSequence"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO06DeviceE0yACSS_tcACmF":{"name":"DeviceError(localizedDescription:)","abstract":"

                                                                Undocumented

                                                                ","parent_name":"UndefinedError"},"Enums/UndefinedError.html#/s:11PolarBleSdk14UndefinedErrorO20localizedDescriptionSSvp":{"name":"localizedDescription","abstract":"

                                                                Undocumented

                                                                ","parent_name":"UndefinedError"},"Enums/OhrDataType.html#/s:11PolarBleSdk11OhrDataTypeO13ppg3_ambient1yA2CmF":{"name":"ppg3_ambient1","abstract":"

                                                                3 ppg + 1 ambient

                                                                ","parent_name":"OhrDataType"},"Enums/OhrDataType.html#/s:11PolarBleSdk11OhrDataTypeO7unknownyA2CmF":{"name":"unknown","abstract":"

                                                                Undocumented

                                                                ","parent_name":"OhrDataType"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO2hryA2CmF":{"name":"hr","abstract":"

                                                                hr feature enables hr client to receive hr and rr data from device

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO10deviceInfoyA2CmF":{"name":"deviceInfo","abstract":"

                                                                deviceInfo enables dis client to receive fw information from device

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO13batteryStatusyA2CmF":{"name":"batteryStatus","abstract":"

                                                                batteryStatus enables bas client to receive battery level info from device

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO20polarSensorStreamingyA2CmF":{"name":"polarSensorStreaming","abstract":"

                                                                polarSensorStreaming enables stream client to start acc, ppg, ecg, ppi streams

                                                                ","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO17polarFileTransferyA2CmF":{"name":"polarFileTransfer","abstract":"

                                                                polarFileTransfer enables file transfer client to list and read stored exercises,","parent_name":"Features"},"Enums/Features.html#/s:11PolarBleSdk8FeaturesO03allD0yA2CmF":{"name":"allFeatures","abstract":"

                                                                allFeatures enables all features available

                                                                ","parent_name":"Features"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2hryA2CmF":{"name":"hr","abstract":"

                                                                recording type to use is hr in BPM

                                                                ","parent_name":"SampleType"},"Enums/SampleType.html#/s:11PolarBleSdk10SampleTypeO2rryA2CmF":{"name":"rr","abstract":"

                                                                recording type to use is rr interval

                                                                ","parent_name":"SampleType"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_1syA2CmF":{"name":"interval_1s","abstract":"

                                                                Undocumented

                                                                ","parent_name":"RecordingInterval"},"Enums/RecordingInterval.html#/s:11PolarBleSdk17RecordingIntervalO11interval_5syA2CmF":{"name":"interval_5s","abstract":"

                                                                Undocumented

                                                                ","parent_name":"RecordingInterval"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3ecgyA2CmF":{"name":"ecg","abstract":"

                                                                Undocumented

                                                                ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3accyA2CmF":{"name":"acc","abstract":"

                                                                Undocumented

                                                                ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3ppgyA2CmF":{"name":"ppg","abstract":"

                                                                Undocumented

                                                                ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO3ppiyA2CmF":{"name":"ppi","abstract":"

                                                                Undocumented

                                                                ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO4gyroyA2CmF":{"name":"gyro","abstract":"

                                                                Undocumented

                                                                ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html#/s:11PolarBleSdk22DeviceStreamingFeatureO12magnetometeryA2CmF":{"name":"magnetometer","abstract":"

                                                                Undocumented

                                                                ","parent_name":"DeviceStreamingFeature"},"Enums/DeviceStreamingFeature.html":{"name":"DeviceStreamingFeature","abstract":"

                                                                device streaming features

                                                                "},"Enums/RecordingInterval.html":{"name":"RecordingInterval","abstract":"

                                                                recording interval in seconds for H10

                                                                "},"Enums/SampleType.html":{"name":"SampleType","abstract":"

                                                                sample type for H10 recording

                                                                "},"Enums/Features.html":{"name":"Features","abstract":"

                                                                features available

                                                                "},"Enums/OhrDataType.html":{"name":"OhrDataType","abstract":"

                                                                OHR data source enum

                                                                "},"Enums/UndefinedError.html":{"name":"UndefinedError","abstract":"

                                                                Unknown error

                                                                "},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC19polarImplementation_8featuresAA0abD0_pSo17OS_dispatch_queueC_SitFZ":{"name":"polarImplementation(_:features:)","abstract":"

                                                                New instance of Polar Ble API implementation

                                                                ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html#/s:11PolarBleSdk0aB14ApiDefaultImplC11versionInfoSSyFZ":{"name":"versionInfo()","abstract":"

                                                                Return current version

                                                                ","parent_name":"PolarBleApiDefaultImpl"},"Classes/PolarBleApiDefaultImpl.html":{"name":"PolarBleApiDefaultImpl","abstract":"

                                                                Class to provide the default implementation of the Polar Ble API

                                                                "},"Classes.html#/s:11PolarBleSdk22NotificationNotEnabledC":{"name":"NotificationNotEnabled","abstract":"

                                                                GATT characteristic notification not enabled

                                                                "},"Classes.html#/s:11PolarBleSdk15ServiceNotFoundC":{"name":"ServiceNotFound","abstract":"

                                                                GATT service not found

                                                                "},"Classes.html#/s:11PolarBleSdk18DeviceNotConnectedC":{"name":"DeviceNotConnected","abstract":"

                                                                Device state != Connected

                                                                "},"Classes.html#/s:11PolarBleSdk14DeviceNotFoundC":{"name":"DeviceNotFound","abstract":"

                                                                Device not found

                                                                "},"Classes.html#/s:11PolarBleSdk21OperationNotSupportedC":{"name":"OperationNotSupported","abstract":"

                                                                Requested operation is not supported

                                                                "},"Classes.html#/s:11PolarBleSdk19MessageEncodeFailedC":{"name":"MessageEncodeFailed","abstract":"

                                                                Google protocol buffers encode failed

                                                                "},"Classes.html#/s:11PolarBleSdk19MessageDecodeFailedC":{"name":"MessageDecodeFailed","abstract":"

                                                                Google protocol buffers decode failed

                                                                "},"Classes.html#/s:11PolarBleSdk20DateTimeFormatFailedC":{"name":"DateTimeFormatFailed","abstract":"

                                                                String to date time formatting failed

                                                                "},"Classes.html#/s:11PolarBleSdk22UnableToStartStreamingC":{"name":"UnableToStartStreaming","abstract":"

                                                                Failed to start streaming

                                                                "},"Classes.html#/s:11PolarBleSdk15InvalidArgumentC":{"name":"InvalidArgument","abstract":"

                                                                invalid argument

                                                                "},"Classes.html":{"name":"Classes","abstract":"

                                                                The following classes are available globally.

                                                                "},"Enums.html":{"name":"Enumerations","abstract":"

                                                                The following enumerations are available globally.

                                                                "},"Extensions.html":{"name":"Extensions","abstract":"

                                                                The following extensions are available globally.

                                                                "},"Protocols.html":{"name":"Protocols","abstract":"

                                                                The following protocols are available globally.

                                                                "},"Structs.html":{"name":"Structures","abstract":"

                                                                The following structures are available globally.

                                                                "},"Typealiases.html":{"name":"Type Aliases","abstract":"

                                                                The following type aliases are available globally.

                                                                "}} \ No newline at end of file diff --git a/polar-sdk-ios/docs/undocumented.json b/polar-sdk-ios/docs/undocumented.json index 81e7ddc3..c3352d9e 100644 --- a/polar-sdk-ios/docs/undocumented.json +++ b/polar-sdk-ios/docs/undocumented.json @@ -3,55 +3,69 @@ { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", "line": 9, - "symbol": "RecordingInterval.interval_1s", + "symbol": "DeviceStreamingFeature.ecg", "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", "line": 10, - "symbol": "RecordingInterval.interval_5s", + "symbol": "DeviceStreamingFeature.acc", "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", - "line": 79, - "symbol": "PolarBiozData", - "symbol_kind": "source.lang.swift.decl.typealias", + "line": 11, + "symbol": "DeviceStreamingFeature.ppg", + "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", - "line": 217, - "symbol": "PolarBleApi.requestBiozSettings(_:)", - "symbol_kind": "source.lang.swift.decl.function.method.instance", + "line": 12, + "symbol": "DeviceStreamingFeature.ppi", + "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", - "line": 259, - "symbol": "PolarBleApi.startBiozStreaming(_:settings:)", - "symbol_kind": "source.lang.swift.decl.function.method.instance", + "line": 13, + "symbol": "DeviceStreamingFeature.gyro", + "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { - "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift", - "line": 99, - "symbol": "PolarBleApiDeviceFeaturesObserver.biozFeatureReady(_:)", - "symbol_kind": "source.lang.swift.decl.function.method.instance", + "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", + "line": 14, + "symbol": "DeviceStreamingFeature.magnetometer", + "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { - "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift", - "line": 109, - "symbol": "PolarBleApiDeviceFeaturesObserver.biozFeatureReady(_:)", - "symbol_kind": "source.lang.swift.decl.function.method.instance", + "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", + "line": 19, + "symbol": "RecordingInterval.interval_1s", + "symbol_kind": "source.lang.swift.decl.enumelement", + "warning": "undocumented" + }, + { + "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", + "line": 20, + "symbol": "RecordingInterval.interval_5s", + "symbol_kind": "source.lang.swift.decl.enumelement", + "warning": "undocumented" + }, + { + "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift", + "line": 90, + "symbol": "OhrDataType.unknown", + "symbol_kind": "source.lang.swift.decl.enumelement", "warning": "undocumented" }, { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift", - "line": 125, + "line": 98, "symbol": "PolarBleApiCCCWriteObserver.cccWrite(_:characteristic:)", "symbol_kind": "source.lang.swift.decl.function.method.instance", "warning": "undocumented" @@ -72,7 +86,7 @@ }, { "file": "/Users/joikarin/Projects/ios-communications-master/ios-communications/iOSCommunications/sdk/impl/PolarBleApiImpl.swift", - "line": 790, + "line": 846, "symbol": "PrimitiveSequence.asCompletable()", "symbol_kind": "source.lang.swift.decl.function.method.instance", "warning": "undocumented" diff --git a/sources/Android/android-communications/build.gradle b/sources/Android/android-communications/build.gradle index 3e87acfa..209ec2b8 100755 --- a/sources/Android/android-communications/build.gradle +++ b/sources/Android/android-communications/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' if (project.hasProperty("artifactoryUser") && project.hasProperty("artifactoryPassword")) { apply plugin: 'com.jfrog.artifactory' @@ -39,6 +40,7 @@ def getVersion = { -> } buildscript { + ext.kotlin_version = '1.4.21' repositories { jcenter() mavenCentral() @@ -49,6 +51,7 @@ buildscript { if (project.hasProperty("artifactoryUser") && project.hasProperty("artifactoryPassword")) { classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.18.0" } + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -76,6 +79,7 @@ android { repositories { jcenter() google() + mavenCentral() } lintOptions { abortOnError false @@ -84,6 +88,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + testOptions { + unitTests.returnDefaultValues = true + } } if (project.hasProperty("artifactoryUser") && project.hasProperty("artifactoryPassword")) { @@ -164,8 +171,11 @@ dependencies { implementation 'androidx.annotation:annotation:1.1.0' testImplementation 'junit:junit:4.13.1' testImplementation "org.mockito:mockito-core:3.2.4" - testImplementation "io.mockk:mockk:1.9.3" - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation "io.mockk:mockk:1.10.4" + testImplementation 'androidx.test:runner:1.3.0' + testImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'org.robolectric:robolectric:4.0' + implementation "androidx.core:core-ktx:1.3.2" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } + diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/BleDeviceListener.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/BleDeviceListener.java index 8d2cee4e..1638cd77 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/BleDeviceListener.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/BleDeviceListener.java @@ -52,12 +52,12 @@ protected BleDeviceListener(Set> clients) { /** * @return true if bluetooth is active */ - abstract public boolean bleActive(); + public abstract boolean bleActive(); /** * @param cb callback */ - abstract public void setBlePowerStateCallback(@Nullable BlePowerStateChangedCallback cb); + public abstract void setBlePowerStateCallback(@Nullable BlePowerStateChangedCallback cb); public interface BlePowerStateChangedCallback { /** @@ -69,19 +69,19 @@ public interface BlePowerStateChangedCallback { /** * @param filters scan filter list, android specific */ - abstract public void setScanFilters(@Nullable final List filters); + public abstract void setScanFilters(@Nullable final List filters); /** * enable to optimize memory usage or disable scan pre filter * * @param filter policy */ - abstract public void setScanPreFilter(@Nullable final BleSearchPreFilter filter); + public abstract void setScanPreFilter(@Nullable final BleSearchPreFilter filter); /** * @param enable true enables timer to avoid opportunistic scan, false disables. Default true. */ - abstract public void setOpportunisticScan(boolean enable); + public abstract void setOpportunisticScan(boolean enable); /** * Produces: onNext: When a advertisement has been detected
                                                                @@ -91,21 +91,21 @@ public interface BlePowerStateChangedCallback { * @param fetchKnownDevices, fetch known devices means bonded, already connected and already found devices
                                                                * @return Observable stream
                                                                */ - abstract public Flowable search(boolean fetchKnownDevices); + public abstract Flowable search(boolean fetchKnownDevices); - abstract public void setMtu(@IntRange(from = 70, to = 512) int mtu); + public abstract void setMtu(@IntRange(from = 70, to = 512) int mtu); /** * As java does not support destructor/RAII, Client/App should call this whenever the application is being destroyed */ - abstract public void shutDown(); + public abstract void shutDown(); /** - * aquire connection establishment + * Attempt connection establishment * * @param session device */ - abstract public void openSessionDirect(BleDeviceSession session); + public abstract void openSessionDirect(BleDeviceSession session); /** * aquire connection establishment, BleDeviceSessionStateChangedCallback callbacks are invoked @@ -113,7 +113,7 @@ public interface BlePowerStateChangedCallback { * @param session device * @param uuids needed uuids to be found from advertisement data, when reconnecting */ - abstract public void openSessionDirect(BleDeviceSession session, List uuids); + public abstract void openSessionDirect(BleDeviceSession session, List uuids); public interface BleDeviceSessionStateChangedCallback { /** @@ -129,25 +129,25 @@ public interface BleDeviceSessionStateChangedCallback { * * @param changedCallback @see BleDeviceSessionStateChangedCallback */ - abstract public void setDeviceSessionStateChangedCallback(@Nullable BleDeviceSessionStateChangedCallback changedCallback); + public abstract void setDeviceSessionStateChangedCallback(@Nullable BleDeviceSessionStateChangedCallback changedCallback); /** * aquires disconnection directly without Observable returned * * @param session device */ - abstract public void closeSessionDirect(BleDeviceSession session); + public abstract void closeSessionDirect(BleDeviceSession session); /** * @return List of current device sessions known */ - abstract public Set deviceSessions(); + public abstract Set deviceSessions(); /** * @param address bt address in format 00:11:22:33:44:55 * @return BleDeviceSession */ - abstract public BleDeviceSession sessionByAddress(final String address); + public abstract BleDeviceSession sessionByAddress(final String address); /** * Client app/lib can request to remove device from the list, @@ -155,21 +155,21 @@ public interface BleDeviceSessionStateChangedCallback { * @param deviceSession @see BleDeviceSession * @return true device was removed, false no( means device is considered to be alive ) */ - abstract public boolean removeSession(BleDeviceSession deviceSession); + public abstract boolean removeSession(BleDeviceSession deviceSession); /** * @return count of sessions removed */ - abstract public int removeAllSessions(); + public abstract int removeAllSessions(); - abstract public int removeAllSessions(Set inStates); + public abstract int removeAllSessions(Set inStates); /** * enable or disable automatic reconnection, by default true. * * @param automaticReconnection */ - abstract public void setAutomaticReconnection(boolean automaticReconnection); + public abstract void setAutomaticReconnection(boolean automaticReconnection); public static final int POWER_MODE_NORMAL = 0; public static final int POWER_MODE_LOW = 1; @@ -179,5 +179,5 @@ public interface BleDeviceSessionStateChangedCallback { public @interface PowerMode { } - abstract public void setPowerMode(@PowerMode int mode); + public abstract void setPowerMode(@PowerMode int mode); } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/BleDeviceSession.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/BleDeviceSession.java index d2df150d..5f380f1e 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/BleDeviceSession.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/BleDeviceSession.java @@ -2,13 +2,13 @@ import android.bluetooth.BluetoothDevice; +import androidx.annotation.NonNull; + import com.androidcommunications.polar.api.ble.model.advertisement.BleAdvertisementContent; import com.androidcommunications.polar.api.ble.model.advertisement.BlePolarHrAdvertisement; import com.androidcommunications.polar.api.ble.model.gatt.BleGattBase; import com.androidcommunications.polar.common.ble.BleUtils; -import org.reactivestreams.Publisher; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -16,7 +16,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; @@ -61,7 +60,7 @@ public enum DeviceSessionState { protected Set clients; // needs to be set by 'upper' class protected BleAdvertisementContent advertisementContent = new BleAdvertisementContent(); - private List connectionUuids = new ArrayList<>(); + private final List connectionUuids = new ArrayList<>(); /** * Methods @@ -180,28 +179,21 @@ public BleGattBase fetchClient(UUID uuid) { * @return Observable stream */ public Completable clientsReady(final boolean checkConnection) { - return Completable.fromPublisher(monitorServicesDiscovered(checkConnection).toFlowable().flatMapIterable(new Function, Iterable>() { - @Override - public Iterable apply(List uuids) { - return uuids; - } - }).flatMap( - new Function>() { - @Override - public Publisher apply(UUID uuid) throws Exception { - BleGattBase bleGattBase = fetchClient(uuid); - if (bleGattBase != null) { - return bleGattBase.clientReady(checkConnection).toFlowable(); - } - return Completable.fromPublisher(Flowable.empty()).toFlowable(); + return Completable.fromPublisher(monitorServicesDiscovered(checkConnection).toFlowable().flatMapIterable((Function, Iterable>) uuids -> uuids).flatMap( + uuid -> { + BleGattBase bleGattBase = fetchClient(uuid); + if (bleGattBase != null) { + return bleGattBase.clientReady(checkConnection).toFlowable(); } + return Completable.fromPublisher(Flowable.empty()).toFlowable(); })); } /** * @return advertisement content object
                                                                */ - public @NonNull BleAdvertisementContent getAdvertisementContent() { + @NonNull + public BleAdvertisementContent getAdvertisementContent() { return advertisementContent; } @@ -240,6 +232,7 @@ public String getPolarDeviceId() { /** * @return polar device type */ + @NonNull public String getPolarDeviceType() { return advertisementContent.getPolarDeviceType(); } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/advertisement/BleAdvertisementContent.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/advertisement/BleAdvertisementContent.java index d98b7961..3587e254 100644 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/advertisement/BleAdvertisementContent.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/advertisement/BleAdvertisementContent.java @@ -1,5 +1,7 @@ package com.androidcommunications.polar.api.ble.model.advertisement; +import androidx.annotation.NonNull; + import com.androidcommunications.polar.api.ble.model.polar.BlePolarDeviceIdUtility; import com.androidcommunications.polar.common.ble.BleUtils; @@ -133,6 +135,7 @@ public String getPolarDeviceId() { * * @return String that for "Polar H7 20346EAB" will contain "H7" */ + @NonNull public String getPolarDeviceType() { return polarDeviceType; } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/BleGattBase.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/BleGattBase.java index 4486040a..7f624444 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/BleGattBase.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/BleGattBase.java @@ -23,11 +23,7 @@ * contains helpers functions for asynchronously monitoring characteristic or service events */ public abstract class BleGattBase { - - private final static String TAG = BleGattBase.class.getSimpleName(); - - // descriptors, add more when needed - public static final UUID UUID_CCC = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"); + private static final String TAG = BleGattBase.class.getSimpleName(); /** * Characteristic properties @@ -74,7 +70,7 @@ public abstract class BleGattBase { public static final int ATT_UNSUPPORTED_GRP_TYPE = 0x10; public static final int ATT_INSUFFICIENT_RESOURCES = 0x11; public static final int ATT_NOTIFY_OR_INDICATE_OFF = 0xff; - //0x80-0x9F Application Errors; + //0x80-0x9F Application Errors //0xA0-0xDF Reserved for future use //0xE0-0xFF Common Profile and Service Error Codes // Defined in Core Specification Supplement Part B. @@ -88,23 +84,23 @@ public abstract class BleGattBase { // protected UUID serviceUuid; // List of all service characteristics, value is boolean if this is a automatic read/notification - private HashMap characteristics = new HashMap<>(); + private final HashMap characteristics = new HashMap<>(); // List of all service characteristics to read automatically - private HashMap characteristicsRead = new HashMap<>(); + private final HashMap characteristicsRead = new HashMap<>(); // List of all service characteristics to be enabled automatically, pair contains property and atomic boolean - private HashMap mandatoryNotificationCharacteristics = new HashMap<>(); + private final HashMap mandatoryNotificationCharacteristics = new HashMap<>(); // List of all characteristics that are available - private AtomicSet availableCharacteristics = new AtomicSet<>(); + private final AtomicSet availableCharacteristics = new AtomicSet<>(); // List of all readable characteristics that are available - protected AtomicSet availableReadableCharacteristics = new AtomicSet<>(); + private final AtomicSet availableReadableCharacteristics = new AtomicSet<>(); // List of all writable characteristics that are available - private AtomicSet availableWritableCharacteristics = new AtomicSet<>(); + private final AtomicSet availableWritableCharacteristics = new AtomicSet<>(); // transport layer interface - protected BleGattTxInterface txInterface; + protected final BleGattTxInterface txInterface; // current usable mtu size - protected AtomicInteger mtuSize = new AtomicInteger(20); + protected final AtomicInteger mtuSize = new AtomicInteger(20); // mtu size with att layer - private AtomicInteger attMtuSize = new AtomicInteger(23); + private final AtomicInteger attMtuSize = new AtomicInteger(23); // flag to set client as primary protected boolean isPrimaryService = false; protected final AtomicBoolean serviceDiscovered = new AtomicBoolean(false); @@ -144,6 +140,14 @@ public void reset() { attMtuSize.set(23); } + /** + * Callback for GATT service characteristic data processing + * + * @param characteristic characteristic UUID + * @param data data in byte array + * @param status status code of processed data + * @param notifying if true data is notification data from GATT service + */ public abstract void processServiceData(UUID characteristic, byte[] data, int status, boolean notifying); public abstract void processServiceDataWritten(UUID characteristic, int status); diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClient.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClient.java index 650ca9df..610fe9c0 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClient.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClient.java @@ -2,12 +2,14 @@ import androidx.annotation.NonNull; +import com.androidcommunications.polar.api.ble.BleLogger; import com.androidcommunications.polar.api.ble.model.gatt.BleGattBase; import com.androidcommunications.polar.api.ble.model.gatt.BleGattTxInterface; import com.androidcommunications.polar.common.ble.AtomicSet; import com.androidcommunications.polar.common.ble.RxUtils; import java.util.ArrayList; +import java.util.List; import java.util.UUID; import io.reactivex.rxjava3.core.Completable; @@ -15,34 +17,35 @@ import io.reactivex.rxjava3.core.FlowableEmitter; public class BleHrClient extends BleGattBase { + private static final String TAG = BleHrClient.class.getSimpleName(); public static class HrNotificationData { - public int hrValue; - public boolean sensorContact; - public boolean sensorContactSupported; - public boolean rrPresent; - public int energy; - public int cumulative_rr; - public ArrayList rrs = new ArrayList<>(); + public final int hrValue; + public final boolean sensorContact; + public final boolean sensorContactSupported; + public final boolean rrPresent; + public final int energy; + public final long cumulativeRR; + public final List rrs = new ArrayList<>(); public HrNotificationData(int hrValue, boolean sensorContact, int energy, - ArrayList rrs, + List rrs, boolean sensorContactSupported, - int cumulative_rr, + long cumulativeRR, boolean rrPresent) { this.hrValue = hrValue; this.sensorContact = sensorContact; this.energy = energy; this.rrs.addAll(rrs); - this.cumulative_rr = cumulative_rr; + this.cumulativeRR = cumulativeRR; this.sensorContactSupported = sensorContactSupported; this.rrPresent = rrPresent; } } - private AtomicSet> hrObserverAtomicList = new AtomicSet<>(); + private final AtomicSet> hrObserverAtomicList = new AtomicSet<>(); public static final UUID BODY_SENSOR_LOCATION = UUID.fromString("00002a38-0000-1000-8000-00805f9b34fb"); public static final UUID HR_MEASUREMENT = UUID.fromString("00002a37-0000-1000-8000-00805f9b34fb"); @@ -62,16 +65,15 @@ public void reset() { @Override public void processServiceData(UUID characteristic, byte[] data, int status, boolean notifying) { - if (status == 0) if (characteristic.equals(HR_MEASUREMENT)) { - // stupid java does not have bit fields - int cumulative_rr = 0; - int hrFormat = data[0] & 0x01; - final boolean sensorContact = ((data[0] & 0x06) >> 1) == 3; - final boolean contactSupported = !((data[0] & 0x06) == 0); + BleLogger.d(TAG, "Processing service data. Status: " + status + ". Data length: " + data.length); + if (status == 0 && characteristic.equals(HR_MEASUREMENT)) { + long cumulativeRR = 0; + final int hrFormat = data[0] & 0x01; + final boolean sensorContact = ((data[0] & 0x06) >> 1) == 0x03; + final boolean contactSupported = (data[0] & 0x04) != 0; int energyExpended = (data[0] & 0x08) >> 3; final int rrPresent = (data[0] & 0x10) >> 4; - int polar_32bit_rr = (data[0] & 0x20) >> 5; // Polar RR format - final int hrValue = (hrFormat == 1 ? data[1] + (data[2] << 8) : data[1]) & (hrFormat == 1 ? 0x0000FFFF : 0x000000FF); + final int hrValue = (hrFormat == 1 ? (data[1] & 0xFF) + (data[2] << 8) : data[1]) & (hrFormat == 1 ? 0x0000FFFF : 0x000000FF); int offset = hrFormat + 2; int energy = 0; if (energyExpended == 1) { @@ -86,23 +88,23 @@ public void processServiceData(UUID characteristic, byte[] data, int status, boo offset += 2; rrs.add(rrValue); } - } else if (polar_32bit_rr == 1 && (offset + 3) < data.length) { - cumulative_rr = ((data[offset] & 0xFF) + ((data[offset + 1] & 0xFF) << 8) + ((data[offset + 2] & 0xFF) << 16) + ((data[offset + 3] & 0xFF) << 24)); } - final int finalCumulative_rr = cumulative_rr; + final long finalCumulativeRR = cumulativeRR; final int finalEnergy = energy; - RxUtils.emitNext(hrObserverAtomicList, object -> object.onNext(new HrNotificationData(hrValue, sensorContact, finalEnergy, rrs, contactSupported, finalCumulative_rr, rrPresent == 1))); + RxUtils.emitNext(hrObserverAtomicList, object -> + object.onNext(new HrNotificationData(hrValue, sensorContact, finalEnergy, rrs, contactSupported, finalCumulativeRR, rrPresent == 1))); } } @Override public void processServiceDataWritten(UUID characteristic, int status) { + BleLogger.d(TAG, "Service data written not processed in BleHrClient"); } + @NonNull @Override - public @NonNull - String toString() { + public String toString() { // and so on return "HR gatt client"; } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePMDClient.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePMDClient.java index 00397c78..4141f401 100644 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePMDClient.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePMDClient.java @@ -2,8 +2,6 @@ import android.util.Pair; -import androidx.annotation.NonNull; - import com.androidcommunications.polar.api.ble.BleLogger; import com.androidcommunications.polar.api.ble.exceptions.BleAttributeError; import com.androidcommunications.polar.api.ble.exceptions.BleCharacteristicNotificationNotEnabled; @@ -16,12 +14,16 @@ import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; +import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import java.util.TreeMap; import java.util.UUID; @@ -29,17 +31,17 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.FlowableEmitter; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.core.SingleOnSubscribe; -import io.reactivex.rxjava3.functions.Function; import io.reactivex.rxjava3.schedulers.Schedulers; public class BlePMDClient extends BleGattBase { - private final static String TAG = BlePMDClient.class.getSimpleName(); + private static final String TAG = BlePMDClient.class.getSimpleName(); public static final UUID PMD_DATA = UUID.fromString("FB005C82-02E7-F387-1CAD-8ACD2D8DF0C8"); public static final UUID PMD_CP = UUID.fromString("FB005C81-02E7-F387-1CAD-8ACD2D8DF0C8"); @@ -49,6 +51,8 @@ public class BlePMDClient extends BleGattBase { private final LinkedBlockingQueue> pmdCpInputQueue = new LinkedBlockingQueue<>(); private final AtomicSet> ecgObservers = new AtomicSet<>(); private final AtomicSet> accObservers = new AtomicSet<>(); + private final AtomicSet> gyroObservers = new AtomicSet<>(); + private final AtomicSet> magnetometerObservers = new AtomicSet<>(); private final AtomicSet> ppgObservers = new AtomicSet<>(); private final AtomicSet> ppiObservers = new AtomicSet<>(); private final AtomicSet> autoGainAFE4404Observers = new AtomicSet<>(); @@ -60,9 +64,9 @@ public class BlePMDClient extends BleGattBase { private final AtomicSet> rdObservers = new AtomicSet<>(); private byte[] pmdFeatureData = null; private final Object mutexFeature = new Object(); - - private AtomicInteger pmdCpEnabled; - private AtomicInteger pmdDataEnabled; + private final Map currentSettings = new HashMap<>(); + private final AtomicInteger pmdCpEnabled; + private final AtomicInteger pmdDataEnabled; public enum PmdMeasurementType { ECG(0), @@ -76,7 +80,7 @@ public enum PmdMeasurementType { AMBIENT(8), UNKNOWN_TYPE(0xff); - private int numVal; + private final int numVal; PmdMeasurementType(int numVal) { this.numVal = numVal; @@ -99,8 +103,8 @@ public static PmdMeasurementType fromId(byte id) { public enum PmdEcgDataType { ECG(0), BS01(1), - MAX3000x(2); - private int numVal; + MAX3000X(2); + private final int numVal; PmdEcgDataType(int numVal) { this.numVal = numVal; @@ -111,17 +115,16 @@ public int getNumVal() { } } - - public class PmdFeature { - public boolean ecgSupported; - public boolean ppgSupported; - public boolean accSupported; - public boolean ppiSupported; - public boolean bioZSupported; - public boolean gyroSupported; - public boolean magnetometerSupported; - public boolean barometerSupported; - public boolean ambientSupported; + public static class PmdFeature { + public final boolean ecgSupported; + public final boolean ppgSupported; + public final boolean accSupported; + public final boolean ppiSupported; + public final boolean bioZSupported; + public final boolean gyroSupported; + public final boolean magnetometerSupported; + public final boolean barometerSupported; + public final boolean ambientSupported; public PmdFeature(final byte[] data) { ecgSupported = (data[1] & 0x01) != 0; @@ -172,7 +175,8 @@ public enum PmdControlPointResponseCode { ERROR_INVALID_RESOLUTION(7), ERROR_INVALID_SAMPLE_RATE(8), ERROR_INVALID_RANGE(9), - ERROR_INVALID_MTU(10); + ERROR_INVALID_MTU(10), + ERROR_INVALID_NUMBER_OF_CHANNELS(11); private int numVal; @@ -190,6 +194,7 @@ public PmdControlPointResponse(byte[] data) { opCode = PmdControlPointCommand.values()[data[1]]; measurementType = data[2]; status = PmdControlPointResponseCode.values()[data[3]]; + if (status == PmdControlPointResponseCode.SUCCESS) { more = data.length > 4 && data[4] != 0; if (data.length > 5) { @@ -203,9 +208,12 @@ public static class PmdSetting { public enum PmdSettingType { SAMPLE_RATE(0), RESOLUTION(1), - RANGE(2); + RANGE(2), + RANGE_MILLIUNIT(3), + CHANNELS(4), + FACTOR(5); - private int numVal; + private final int numVal; PmdSettingType(int numVal) { this.numVal = numVal; @@ -216,8 +224,18 @@ public int getNumVal() { } } + private static final EnumMap typeToFieldSize = new EnumMap(PmdSettingType.class) {{ + put(PmdSettingType.SAMPLE_RATE, 2); + put(PmdSettingType.RESOLUTION, 2); + put(PmdSettingType.RANGE, 2); + put(PmdSettingType.RANGE_MILLIUNIT, 4); // not has range from min to max + put(PmdSettingType.CHANNELS, 1); + put(PmdSettingType.FACTOR, 4); + }}; + // available settings public Map> settings = new TreeMap<>(); + // selected by client public Map selected; @@ -225,40 +243,62 @@ public PmdSetting() { } public PmdSetting(final byte[] data) { + EnumMap> parsedSettings = parsePmdSettingsData(data); + validateSettings(parsedSettings); + this.settings = parsedSettings; + } + + public PmdSetting(Map selected) { + PmdSetting.validateSelected(selected); + this.selected = selected; + } + + EnumMap> parsePmdSettingsData(final byte[] data) { + EnumMap> parsedSettings = new EnumMap<>(PmdSettingType.class); + if (data.length <= 1) { + return parsedSettings; + } + int offset = 0; while (offset < data.length) { PmdSettingType type = PmdSetting.PmdSettingType.values()[data[offset++]]; int count = data[offset++]; Set items = new HashSet<>(); while (count-- > 0) { - int item = (int) BleUtils.convertArrayToUnsignedLong(data, offset, 2); + int fieldSize = Objects.requireNonNull(typeToFieldSize.get(type)); + int item = BleUtils.convertArrayToUnsignedInt(data, offset, fieldSize); + offset += fieldSize; items.add(item); - offset += 2; } - settings.put(type, items); + parsedSettings.put(type, items); } + return parsedSettings; } - public PmdSetting(Map selected) { - this.selected = selected; + void updateSelectedFromStartResponse(final byte[] data) { + EnumMap> settingsFromStartResponse = parsePmdSettingsData(data); + if (settingsFromStartResponse.containsKey(PmdSettingType.FACTOR)) { + selected.put(PmdSettingType.FACTOR, settingsFromStartResponse.get(PmdSettingType.FACTOR).iterator().next()); + } } public byte[] serializeSelected() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); for (Map.Entry p : selected.entrySet()) { + if (p.getKey() == PmdSettingType.FACTOR) { + continue; + } outputStream.write((byte) p.getKey().numVal); outputStream.write((byte) 1); int v = p.getValue(); - outputStream.write((byte) v); - outputStream.write((byte) (v >> 8)); + int fieldSize = Objects.requireNonNull(typeToFieldSize.get(p.getKey())); + for (int i = 0; i < fieldSize; ++i) { + outputStream.write((byte) (v >> (i * 8))); + } } return outputStream.toByteArray(); } - public int selectedResolution() { - return selected.get(PmdSettingType.RESOLUTION); - } - public PmdSetting maxSettings() { Map set = new TreeMap<>(); for (Map.Entry> p : settings.entrySet()) { @@ -266,10 +306,119 @@ public PmdSetting maxSettings() { } return new PmdSetting(set); } + + private static void validateSettings(Map> settings) { + for (Map.Entry> setting : settings.entrySet()) { + PmdSettingType key = setting.getKey(); + for (Integer value : setting.getValue()) { + Map.Entry entry = new AbstractMap.SimpleEntry<>(key, value); + validateSetting(entry); + } + } + } + + private static void validateSelected(Map settings) { + for (Map.Entry setting : settings.entrySet()) { + validateSetting(setting); + } + } + + private static void validateSetting(Map.Entry setting) { + int fieldSize = typeToFieldSize.get(setting.getKey()); + int value = setting.getValue(); + if (fieldSize == 1 && (value < 0x0 || 0xFF < value)) { + throw new RuntimeException("PmdSetting not in valid range. Field size: " + fieldSize + " value: " + value); + } + if (fieldSize == 2 && (value < 0x0 || 0xFFFF < value)) { + throw new RuntimeException("PmdSetting not in valid range. Field size: " + fieldSize + " value: " + value); + } + if (fieldSize == 3 && (value < 0x0 || 0xFFFFFF < value)) { + throw new RuntimeException("PmdSetting not in valid range. Field size: " + fieldSize + " value: " + value); + } + } + } + + public static List> parseDeltaFrame(byte[] bytes, int channels, int bitWidth, int totalBitLength) { + int offset = 0; + List bitSet = new ArrayList<>(); + for (byte b : bytes) { + for (int i = 0; i < 8; ++i) { + bitSet.add((b & (0x01 << i)) != 0); + } + } + List> samples = new ArrayList<>(); + int mask = Integer.MAX_VALUE << (bitWidth - 1); + while (offset < totalBitLength) { + List channelSamples = new ArrayList<>(); + int channelCount = 0; + while (channelCount++ < channels) { + List bits = bitSet.subList(offset, offset + bitWidth); + int val = 0; + for (int i = 0; i < bits.size(); ++i) { + val |= ((bits.get(i) ? 0x01 : 0x00) << i); + } + if ((val & mask) != 0) { + val |= mask; + } + offset += bitWidth; + channelSamples.add(val); + } + samples.add(channelSamples); + } + return samples; } - public class EcgData { - public class EcgSample { + public static List parseDeltaFrameRefSamples(byte[] bytes, int channels, int resolution) { + List samples = new ArrayList<>(); + int offset = 0; + int channelCount = 0; + int mask = 0xFFFFFFFF << (resolution - 1); + int resolutionInBytes = (int) Math.ceil(resolution / 8.0); + while (channelCount++ < channels) { + int sample = BleUtils.convertArrayToSignedInt(bytes, offset, resolutionInBytes); + if ((sample & mask) != 0) { + sample |= mask; + } + offset += resolutionInBytes; + samples.add(sample); + } + return samples; + } + + public static List> parseDeltaFramesAll(byte[] value, + int channels, + int resolution) { + int offset = 0; + List refSamples = parseDeltaFrameRefSamples(value, channels, resolution); + offset += channels * Math.ceil(resolution / 8.0); + List> samples = new ArrayList<>(Collections.singleton(refSamples)); + BleUtils.validate(refSamples.size() == channels, "incorrect number of ref channels"); + while (offset < value.length) { + int deltaSize = value[offset++] & 0xFF; + int sampleCount = value[offset++] & 0xFF; + int bitLength = (sampleCount * deltaSize * channels); + int length = (int) Math.ceil(bitLength / 8.0); + final byte[] deltaFrame = new byte[length]; + System.arraycopy(value, offset, deltaFrame, 0, deltaFrame.length); + List> deltaSamples = parseDeltaFrame(deltaFrame, channels, deltaSize, bitLength); + for (List delta : deltaSamples) { + BleUtils.validate(delta.size() == channels, "incorrect number of delta channels"); + List lastSample = samples.get(samples.size() - 1); + List nextSamples = new ArrayList<>(); + for (int i = 0; i < channels; ++i) { + int sample = lastSample.get(i) + delta.get(i); + nextSamples.add(sample); + } + samples.addAll(Collections.singleton(nextSamples)); + } + offset += length; + } + + return samples; + } + + public static class EcgData { + public static class EcgSample { // samples in signed microvolts public PmdEcgDataType type; public long timeStamp; @@ -294,14 +443,14 @@ public EcgData(byte type, byte[] value, long timeStamp) { sample.timeStamp = timeStamp; if (type == 1) { // BS01 - sample.microVolts = ((value[offset] | (value[offset + 1] & 0x3F) << 8) & 0x3FFF); + sample.microVolts = (((value[offset] & 0xFF) | (value[offset + 1] & 0x3F) << 8) & 0x3FFF); sample.overSampling = (value[offset + 2] & 0x01) != 0; sample.skinContactBit = (byte) ((value[offset + 2] & 0x06) >> 1); sample.contactImpedance = (byte) ((value[offset + 2] & 0x18) >> 3); } else if (type == 2) { // MAX3000 - sample.microVolts = ((value[offset] | (value[offset + 1] << 8) | ((value[offset + 2] & 0x03) << 16)) & 0x3FFF); - sample.ecgDataTag = (byte) (value[offset + 2] & 0x07); - sample.paceDataTag = (byte) (value[offset + 2] & 0x38); + sample.microVolts = (((value[offset] & 0xFF) | ((value[offset + 1] & 0xFF) << 8) | ((value[offset + 2] & 0x03) << 16)) & 0x3FFFFF); + sample.ecgDataTag = (byte) ((value[offset + 2] & 0x1C) >> 2); + sample.paceDataTag = (byte) ((value[offset + 2] & 0xE0) >> 5); } else if (type == 0) { // production sample.microVolts = BleUtils.convertArrayToSignedInt(value, offset, 3); } @@ -311,8 +460,9 @@ public EcgData(byte type, byte[] value, long timeStamp) { } } - public class AccData { - public class AccSample { + public static class AccData { + public static class AccSample { + // Sample contains signed x,y,z axis values in milliG public final int x; public final int y; public final int z; @@ -342,6 +492,91 @@ public AccData(byte type, byte[] value, long timeStamp) { accSamples.add(new AccSample(x, y, z)); } } + + /** + * ACC samples from delta frame + * + * @param value bytes + * @param factor relative to absolute multiplier + * @param resolution int bits + * @param timeStamp ns + */ + public AccData(byte[] value, float factor, int resolution, long timeStamp) { + this.timeStamp = timeStamp; + float accFactor = factor * 1000; // Modify the factor to get data in milliG + ThreeAxisDeltaFramedData data = new ThreeAxisDeltaFramedData(value, accFactor, resolution, timeStamp); + for (ThreeAxisDeltaFramedData.ThreeAxisSample sample : data.axisSamples) { + this.accSamples.add(new AccSample((int) sample.x, (int) sample.y, (int) sample.z)); + } + } + } + + public static class MagData { + public static class MagSample { + // Sample contains signed x,y,z axis values in Gauss + public final float x; + public final float y; + public final float z; + + MagSample(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + } + + public final List magSamples = new ArrayList<>(); + public final long timeStamp; + + /** + * Magnetometer samples from delta frame + * + * @param value bytes + * @param factor relative to absolute multiplier + * @param resolution int bits + * @param timeStamp ns + */ + public MagData(byte[] value, float factor, int resolution, long timeStamp) { + this.timeStamp = timeStamp; + ThreeAxisDeltaFramedData data = new ThreeAxisDeltaFramedData(value, factor, resolution, timeStamp); + for (ThreeAxisDeltaFramedData.ThreeAxisSample sample : data.axisSamples) { + this.magSamples.add(new MagSample(sample.x, sample.y, sample.z)); + } + } + } + + public static class GyrData { + public static class GyrSample { + // Sample contains signed x,y,z axis values in deg/sec + public final float x; + public final float y; + public final float z; + + GyrSample(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + } + + public final List gyrSamples = new ArrayList<>(); + public final long timeStamp; + + /** + * Magnetometer samples from delta frame + * + * @param value bytes + * @param factor relative to absolute multiplier + * @param resolution int bits + * @param timeStamp ns + */ + public GyrData(byte[] value, float factor, int resolution, long timeStamp) { + this.timeStamp = timeStamp; + ThreeAxisDeltaFramedData data = new ThreeAxisDeltaFramedData(value, factor, resolution, timeStamp); + for (ThreeAxisDeltaFramedData.ThreeAxisSample sample : data.axisSamples) { + this.gyrSamples.add(new GyrSample(sample.x, sample.y, sample.z)); + } + } } public static class PpgData { @@ -353,8 +588,9 @@ public enum PpgFrameType { ADPD4000(4), AFE_OPERATION_MODE(5), SPORT_ID(6), + DELTA_FRAME(128), UNKNOWN_TYPE(0xff); - private int numVal; + private final int numVal; PpgFrameType(int numVal) { this.numVal = numVal; @@ -364,7 +600,7 @@ public int getNumVal() { return numVal; } - public static PpgFrameType fromId(byte id) { + public static PpgFrameType fromId(int id) { for (PpgFrameType type : values()) { if (type.numVal == id) { return type; @@ -374,64 +610,75 @@ public static PpgFrameType fromId(byte id) { } } - public class PpgSample { - public List ppgDataSamples; - public int ppg0; - public int ppg1; - public int ppg2; - public int ambient; - public int ambient1; - public long status; + public static class PpgSample { + public final List ppgDataSamples; + public final long status; - public PpgSample(List ppgDataSamples, int ambient, int ambient1, long status) { + public PpgSample(List ppgDataSamples) { + this.ppgDataSamples = ppgDataSamples; + this.status = 0; + } + + public PpgSample(List ppgDataSamples, long status) { this.ppgDataSamples = ppgDataSamples; - this.ambient = ambient; - this.ambient1 = ambient1; - this.ppg0 = ppgDataSamples.get(0); - this.ppg1 = ppgDataSamples.get(1); - this.ppg2 = ppgDataSamples.get(2); this.status = status; } } - public List ppgSamples = new ArrayList<>(); - public long timeStamp; - public byte type; + public final List ppgSamples = new ArrayList<>(); + public final long timeStamp; + public final int channels; - public PpgData(byte[] value, long timeStamp, byte type) { + public PpgData(byte[] value, long timeStamp, int type) { this.timeStamp = timeStamp; - this.type = type; + this.channels = type == 0 ? 4 : 18; final int step = 3; for (int i = 0; i < value.length; ) { List samples = new ArrayList<>(); - int ambient, ambient1 = 0; - int count = type == 0 ? 3 : 16; - while (count-- > 0) { + for (int ch = 0; ch < this.channels; ++ch) { samples.add(BleUtils.convertArrayToSignedInt(value, i, step)); i += step; } - ambient = BleUtils.convertArrayToSignedInt(value, i, step); - i += step; long status = 0; - if (type != 0) { - ambient1 = BleUtils.convertArrayToSignedInt(value, i, step); - i += step; + if (channels == 18) { status = BleUtils.convertArrayToUnsignedLong(value, i, 4); i += 4; } - ppgSamples.add(new PpgSample(samples, ambient, ambient1, status)); + ppgSamples.add(new PpgSample(samples, status)); } } + + /** + * PPG samples from delta frame + * + * @param value bytes + * @param factor relative to absolute multiplier + * @param resolution int bits + * @param channels number of channels in one sample + * @param timeStamp ns + */ + public PpgData(byte[] value, float factor, int resolution, int channels, long timeStamp) { + List> samples = parseDeltaFramesAll(value, channels, resolution); + for (List sample : samples) { + for (int i = 0; i < sample.size(); i++) { + int absoluteChannelValue = (int) ((float) sample.get(i) * factor); + sample.set(i, absoluteChannelValue); + } + ppgSamples.add(new PpgSample(sample)); + } + this.timeStamp = timeStamp; + this.channels = channels; + } } - public class PpiData { - public class PPSample { - public int hr; - public int ppInMs; - public int ppErrorEstimate; - public int blockerBit; - public int skinContactStatus; - public int skinContactSupported; + public static class PpiData { + public static class PPSample { + public final int hr; + public final int ppInMs; + public final int ppErrorEstimate; + public final int blockerBit; + public final int skinContactStatus; + public final int skinContactSupported; public PPSample(byte[] data) { hr = (int) ((long) data[0] & 0xFFL); @@ -443,12 +690,12 @@ public PPSample(byte[] data) { } } - public List ppSamples = new ArrayList<>(); - public long timestamp; + public final List ppSamples = new ArrayList<>(); + public final long timeStamp; - public PpiData(byte[] data, long timestamp) { + public PpiData(byte[] data, long timeStamp) { int offset = 0; - this.timestamp = timestamp; + this.timeStamp = timeStamp; while (offset < data.length) { final int finalOffset = offset; ppSamples.add(new PPSample(Arrays.copyOfRange(data, finalOffset, finalOffset + 6))); @@ -457,7 +704,7 @@ public PpiData(byte[] data, long timestamp) { } } - public class AutoGainAFE4404 { + public static class AutoGainAFE4404 { public byte I_OFFDAC; public byte TIA_GAIN; public byte ILED; @@ -473,7 +720,7 @@ public AutoGainAFE4404(final byte[] data, long timeStamp) { } } - public class AutoGainAFE4410 { + public static class AutoGainAFE4410 { public byte I_OFFDAC_1_MID; public byte I_OFFDAC_2_MID; public byte I_OFFDAC_3_MID; @@ -499,10 +746,10 @@ public AutoGainAFE4410(final byte[] data, long timeStamp) { } } - public class AutoGainADPD4000 { - public byte TIA_GAIN_CH1_TS[]; - public byte TIA_GAIN_CH2_TS[]; - public byte NUMINT_TS[]; + public static class AutoGainADPD4000 { + public byte[] TIA_GAIN_CH1_TS; + public byte[] TIA_GAIN_CH2_TS; + public byte[] NUMINT_TS; public long timeStamp; public AutoGainADPD4000(final byte[] data, long timeStamp) { @@ -513,7 +760,7 @@ public AutoGainADPD4000(final byte[] data, long timeStamp) { } } - public class BiozData { + public static class BiozData { public long timeStamp; public List samples = new ArrayList<>(); public byte status; @@ -540,6 +787,43 @@ public BiozData(final byte[] data, long timeStamp, byte type) { } } + public static class ThreeAxisDeltaFramedData { + public static class ThreeAxisSample { + public final float x; + public final float y; + public final float z; + + public ThreeAxisSample(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + } + + public final List axisSamples = new ArrayList<>(); + public final long timeStamp; + + /** + * Three axis samples from delta frame + * + * @param value bytes + * @param factor relative to absolute multiplier + * @param resolution int bits + * @param timeStamp ns + */ + public ThreeAxisDeltaFramedData(byte[] value, float factor, int resolution, long timeStamp) { + this.timeStamp = timeStamp; + List> samples = parseDeltaFramesAll(value, 3, resolution); + for (List sample : samples) { + BleUtils.validate(sample.size() == 3, "delta samples invalid length"); + float channel0 = (float) sample.get(0) * factor; + float channel1 = (float) sample.get(1) * factor; + float channel2 = (float) sample.get(2) * factor; + axisSamples.add(new ThreeAxisSample(channel0, channel1, channel2)); + } + } + } + public BlePMDClient(BleGattTxInterface txInterface) { super(txInterface, PMD_SERVICE); addCharacteristicNotification(PMD_CP); @@ -563,6 +847,8 @@ public void reset() { RxUtils.postDisconnectedAndClearList(afeOperationModeObservers); RxUtils.postDisconnectedAndClearList(sportIdObservers); RxUtils.postDisconnectedAndClearList(rdObservers); + RxUtils.postDisconnectedAndClearList(gyroObservers); + RxUtils.postDisconnectedAndClearList(magnetometerObservers); synchronized (mutexFeature) { pmdFeatureData = null; @@ -570,6 +856,23 @@ public void reset() { } } + private float fetchFactor(PmdMeasurementType type) { + BleUtils.validate(currentSettings.containsKey(type), type + " setting not stored"); + if (currentSettings.get(type).selected.containsKey(PmdSetting.PmdSettingType.FACTOR)) { + int ieee754 = currentSettings.get(type).selected.get(PmdSetting.PmdSettingType.FACTOR); + return Float.intBitsToFloat(ieee754); + } else { + BleLogger.e(TAG, "No factor found for type: " + type); + return 1.0f; + } + } + + private int fetchSetting(PmdMeasurementType type, PmdSetting.PmdSettingType setting) { + BleUtils.validate(currentSettings.containsKey(type), type.toString() + " setting not stored"); + BleUtils.validate(Objects.requireNonNull(currentSettings.get(type)).selected.containsKey(setting), type.toString() + " setting not stored"); + return currentSettings.get(type).selected.get(setting); + } + @Override public void processServiceData(UUID characteristic, final byte[] data, int status, boolean notifying) { if (characteristic.equals(PMD_CP)) { @@ -584,24 +887,27 @@ public void processServiceData(UUID characteristic, final byte[] data, int statu } } else if (characteristic.equals(PMD_DATA)) { if (status == 0) { + + BleLogger.d_hex(TAG, "pmd data: ", data); + PmdMeasurementType type = PmdMeasurementType.fromId(data[0]); final long timeStamp = BleUtils.convertArrayToUnsignedLong(data, 1, 8); - final byte frameType = data[9]; + final long frameType = BleUtils.convertArrayToUnsignedLong(data, 9, 1); final byte[] content = new byte[data.length - 10]; System.arraycopy(data, 10, content, 0, content.length); switch (type) { case ECG: if (frameType <= 2) { - RxUtils.emitNext(ecgObservers, object -> object.onNext(new EcgData(frameType, content, timeStamp))); + RxUtils.emitNext(ecgObservers, object -> object.onNext(new EcgData((byte) frameType, content, timeStamp))); } else { BleLogger.w(TAG, "Unknown ECG frame type received"); } break; case PPG: - switch (PpgData.PpgFrameType.fromId(frameType)) { + switch (PpgData.PpgFrameType.fromId((int) frameType)) { case PPG1_TYPE: case PPG0_TYPE: { - RxUtils.emitNext(ppgObservers, object -> object.onNext(new PpgData(content, timeStamp, frameType))); + RxUtils.emitNext(ppgObservers, object -> object.onNext(new PpgData(content, timeStamp, (int) frameType))); break; } case AFE4410: { @@ -630,6 +936,14 @@ public void processServiceData(UUID characteristic, final byte[] data, int statu }); break; } + case DELTA_FRAME: { + float factor = fetchFactor(PmdMeasurementType.PPG); + int resolution = fetchSetting(PmdMeasurementType.PPG, PmdSetting.PmdSettingType.RESOLUTION); + int channels = fetchSetting(PmdMeasurementType.PPG, PmdSetting.PmdSettingType.CHANNELS); + RxUtils.emitNext(ppgObservers, object -> object.onNext( + new PpgData(content, factor, resolution, channels, timeStamp))); + break; + } default: BleLogger.w(TAG, "Unknown PPG frame type received"); break; @@ -637,7 +951,12 @@ public void processServiceData(UUID characteristic, final byte[] data, int statu break; case ACC: if (frameType <= 2) { - RxUtils.emitNext(accObservers, object -> object.onNext(new AccData(frameType, content, timeStamp))); + RxUtils.emitNext(accObservers, object -> object.onNext(new AccData((byte) frameType, content, timeStamp))); + } else if (frameType == 128) { + float factor = fetchFactor(PmdMeasurementType.ACC); + int resolution = fetchSetting(PmdMeasurementType.ACC, PmdSetting.PmdSettingType.RESOLUTION); + RxUtils.emitNext(accObservers, object -> object.onNext(new AccData(content, factor, resolution, timeStamp))); + } else { BleLogger.w(TAG, "Unknown ACC frame type received"); } @@ -650,14 +969,33 @@ public void processServiceData(UUID characteristic, final byte[] data, int statu } break; case BIOZ: - if (frameType == 0 || - frameType == 1) { - RxUtils.emitNext(biozObservers, object -> object.onNext(new BiozData(content, timeStamp, frameType))); + if (frameType == 0 || frameType == 1) { + RxUtils.emitNext(biozObservers, object -> object.onNext( + new BiozData(content, timeStamp, (byte) frameType))); } else { BleLogger.w(TAG, "Unknown BIOZ frame type received"); } break; case GYRO: + if (frameType == 128) { + float factor = fetchFactor(PmdMeasurementType.GYRO); + int resolution = fetchSetting(PmdMeasurementType.GYRO, PmdSetting.PmdSettingType.RESOLUTION); + RxUtils.emitNext(gyroObservers, object -> object.onNext( + new GyrData(content, factor, resolution, timeStamp))); + } else { + BleLogger.w(TAG, "Unknown GYRO frame type received"); + } + break; + case MAGNETOMETER: + if (frameType == 128) { + float factor = fetchFactor(PmdMeasurementType.MAGNETOMETER); + int resolution = fetchSetting(PmdMeasurementType.MAGNETOMETER, PmdSetting.PmdSettingType.RESOLUTION); + RxUtils.emitNext(magnetometerObservers, object -> object.onNext( + new MagData(content, factor, resolution, timeStamp))); + } else { + BleLogger.w(TAG, "Unknown MAGNETOMETER frame type received"); + } + break; default: final byte[] rdData = new byte[data.length - 1]; System.arraycopy(data, 1, content, 0, content.length); @@ -676,20 +1014,20 @@ public void processServiceDataWritten(UUID characteristic, int status) { } @Override - public @NonNull - String toString() { + public @NonNull String toString() { return "PMD Client"; } private byte[] receiveControlPointPacket() throws Exception { Pair pair = pmdCpInputQueue.poll(30, TimeUnit.SECONDS); + if (pair != null) { if (pair.second == 0) { return pair.first; } throw new BleAttributeError("pmd cp attribute error: ", pair.second); } - throw new Exception("Pmd response failed in receive in timeline"); + throw new Exception("Pmd response failed to receive in timeline"); } private BlePMDClient.PmdControlPointResponse sendPmdCommand(byte[] packet) throws Exception { @@ -722,7 +1060,7 @@ private Single sendControlPointCommand(final PmdControl subscriber.onSuccess(response); return; } - throw new Exception("Pmd cp failed: " + response.status.numVal); + throw new Exception("Pmd cp failed: " + response.status); } throw new BleCharacteristicNotificationNotEnabled(); } catch (Throwable throwable) { @@ -740,12 +1078,8 @@ private Single sendControlPointCommand(final PmdControl * @return Single stream */ public Single querySettings(PmdMeasurementType type) { - return sendControlPointCommand(PmdControlPointCommand.GET_MEASUREMENT_SETTINGS, (byte) type.getNumVal()).map(new Function() { - @Override - public PmdSetting apply(PmdControlPointResponse pmdControlPointResponse) throws Exception { - return new PmdSetting(pmdControlPointResponse.parameters.toByteArray()); - } - }); + return sendControlPointCommand(PmdControlPointCommand.GET_MEASUREMENT_SETTINGS, (byte) type.getNumVal()) + .map(pmdControlPointResponse -> new PmdSetting(pmdControlPointResponse.parameters.toByteArray())); } /** @@ -805,7 +1139,7 @@ public Single queryAccSettings() { } /** - * query acc settings available on device + * query bioz settings available on device * * @return Single stream */ @@ -825,7 +1159,12 @@ public Completable startMeasurement(final PmdMeasurementType type, final PmdSett ByteBuffer bb = ByteBuffer.allocate(1 + set.length); bb.put((byte) type.getNumVal()); bb.put(set); - return sendControlPointCommand(PmdControlPointCommand.REQUEST_MEASUREMENT_START, bb.array()).toObservable().ignoreElements(); + currentSettings.put(type, setting); + return sendControlPointCommand(PmdControlPointCommand.REQUEST_MEASUREMENT_START, bb.array()) + .doOnSuccess(pmdControlPointResponse -> + currentSettings.get(type).updateSelectedFromStartResponse(pmdControlPointResponse.parameters.toByteArray())) + .toObservable() + .ignoreElements(); } /** @@ -896,6 +1235,14 @@ public Flowable monitorPpiNotifications(final boolean chec return RxUtils.monitorNotifications(ppiObservers, txInterface, checkConnection); } + public Flowable monitorMagnetometerNotifications(final boolean checkConnection) { + return RxUtils.monitorNotifications(magnetometerObservers, txInterface, checkConnection); + } + + public Flowable monitorGyroNotifications(final boolean checkConnection) { + return RxUtils.monitorNotifications(gyroObservers, txInterface, checkConnection); + } + public Flowable monitorAutoGainAFE4404(final boolean checkConnection) { return RxUtils.monitorNotifications(autoGainAFE4404Observers, txInterface, checkConnection); } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpClient.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpClient.java index bcd095cc..ec9261dc 100644 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpClient.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpClient.java @@ -37,8 +37,8 @@ public class BlePsFtpClient extends BleGattBase { private static final String TAG = BlePsFtpClient.class.getSimpleName(); - private AtomicInteger pftpMtuEnabled; - private AtomicInteger pftpD2HNotificationEnabled; + private final AtomicInteger pftpMtuEnabled; + private final AtomicInteger pftpD2HNotificationEnabled; private final LinkedBlockingQueue> mtuInputQueue = new LinkedBlockingQueue<>(); private final LinkedBlockingQueue> notificationInputQueue = new LinkedBlockingQueue<>(); private final AtomicInteger packetsWritten = new AtomicInteger(0); @@ -54,7 +54,7 @@ public class BlePsFtpClient extends BleGattBase { * true = uses attribute operation WRITE * false = uses attribute operation WRITE_NO_RESPONSE */ - private AtomicBoolean USE_ATTRIBUTE_LEVEL_RESPONSE = new AtomicBoolean(false); + private final AtomicBoolean USE_ATTRIBUTE_LEVEL_RESPONSE = new AtomicBoolean(false); private final Object pftpOperationMutex = new Object(); private final Object pftpNotificationMutex = new Object(); private final Object pftpWaitNotificationMutex = new Object(); @@ -386,21 +386,19 @@ public Single query(final int id, final byte[] parameters return query(id, parameters, Schedulers.newThread()); } - private void handleMtuInterrupted(boolean dataAvailable, int lastRequs) { - if (pftpMtuEnabled.get() == ATT_SUCCESS) { - if (dataAvailable) { - //wait for packets written - byte[] cancelPacket = new byte[]{0x00, 0x00, 0x00}; - try { - if (mtuWaiting.get()) { - waitPacketsWritten(packetsWritten, mtuWaiting, lastRequs); - } - txInterface.transmitMessages(BlePsFtpClient.this, BlePsFtpUtils.RFC77_PFTP_SERVICE, BlePsFtpUtils.RFC77_PFTP_MTU_CHARACTERISTIC, Collections.singletonList(cancelPacket), USE_ATTRIBUTE_LEVEL_RESPONSE.get()); - waitPacketsWritten(packetsWritten, mtuWaiting, 1); - BleLogger.d(TAG, "Stream cancel has been successfully send"); - } catch (Throwable throwable) { - BleLogger.e(TAG, "Exception while trying to cancel streaming"); + private void handleMtuInterrupted(boolean dataAvailable, int lastRequest) { + if (pftpMtuEnabled.get() == ATT_SUCCESS && dataAvailable) { + //wait for packets written + byte[] cancelPacket = new byte[]{0x00, 0x00, 0x00}; + try { + if (mtuWaiting.get()) { + waitPacketsWritten(packetsWritten, mtuWaiting, lastRequest); } + txInterface.transmitMessages(BlePsFtpClient.this, BlePsFtpUtils.RFC77_PFTP_SERVICE, BlePsFtpUtils.RFC77_PFTP_MTU_CHARACTERISTIC, Collections.singletonList(cancelPacket), USE_ATTRIBUTE_LEVEL_RESPONSE.get()); + waitPacketsWritten(packetsWritten, mtuWaiting, 1); + BleLogger.d(TAG, "Stream cancel has been successfully send"); + } catch (Throwable throwable) { + BleLogger.e(TAG, "Exception while trying to cancel streaming"); } } } @@ -597,8 +595,8 @@ private void readResponse(ByteArrayOutputStream outputStream) throws Exception { // wait for message frame if (txInterface.isConnected()) { synchronized (mtuInputQueue) { - if (mtuInputQueue.size() == 0) { - mtuInputQueue.wait(PROTOCOL_TIMEOUT * 1000); + if (mtuInputQueue.isEmpty()) { + mtuInputQueue.wait(PROTOCOL_TIMEOUT * 1000L); } } } else { diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpUtils.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpUtils.java index d79a7c70..a8e2b1e4 100644 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpUtils.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/gatt/client/psftp/BlePsFtpUtils.java @@ -24,10 +24,10 @@ public class BlePsFtpUtils { public final int RFC77_PFTP_SERVICE_16BIT = 0xFEEE; - public final static int RFC76_HEADER_SIZE = 1; - public final static int RFC76_STATUS_MORE = 0x03; - public final static int RFC76_STATUS_LAST = 0x01; - public final static int RFC76_STATUS_ERROR_OR_RESPONSE = 0x00; + public static final int RFC76_HEADER_SIZE = 1; + public static final int RFC76_STATUS_MORE = 0x03; + public static final int RFC76_STATUS_LAST = 0x01; + public static final int RFC76_STATUS_ERROR_OR_RESPONSE = 0x00; public static class Rfc76SequenceNumber { long seq = 0; @@ -58,7 +58,7 @@ public PftpOperationTimeout(String detailMessage) { * one of PbPftpError codes */ public static class PftpResponseError extends Exception { - private int error; + private final int error; public PftpResponseError(String detailMessage, int error) { super(detailMessage + " Error: " + (error & 0x0000FFFF)); @@ -109,8 +109,6 @@ public enum MessageType { NOTIFICATION } - ; - /** * Compines header(protobuf typically) and data(for write operation only, for other operations = null) * diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceCapabilitiesUtility.kt b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceCapabilitiesUtility.kt new file mode 100644 index 00000000..d798e6c7 --- /dev/null +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceCapabilitiesUtility.kt @@ -0,0 +1,44 @@ +package com.androidcommunications.polar.api.ble.model.polar + +import java.util.* + +class BlePolarDeviceCapabilitiesUtility { + + enum class FileSystemType { + UNKNOWN_FILE_SYSTEM, + H10_FILE_SYSTEM, + SAGRFC2_FILE_SYSTEM + } + + companion object { + /** + * Get type of filesystem the device supports + * + * @param deviceType device type + * @return type of the file system supported or unknown file system type + */ + @JvmStatic + fun getFileSystemType(deviceType: String): FileSystemType { + return when (deviceType.toLowerCase(Locale.getDefault())) { + "sense" -> FileSystemType.SAGRFC2_FILE_SYSTEM + "oh1" -> FileSystemType.SAGRFC2_FILE_SYSTEM + "h10" -> FileSystemType.H10_FILE_SYSTEM + else -> FileSystemType.UNKNOWN_FILE_SYSTEM + } + } + + /** + * Check if device is supporting recording start and stop over BLE + * + * @param deviceType device type + * @return true if device supports recoding + */ + @JvmStatic + fun isRecordingSupported(deviceType: String): Boolean { + return when (deviceType.toLowerCase(Locale.getDefault())) { + "h10" -> true + else -> false + } + } + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceIdUtility.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceIdUtility.java index fbc63893..cad54c51 100644 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceIdUtility.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/api/ble/model/polar/BlePolarDeviceIdUtility.java @@ -1,6 +1,11 @@ package com.androidcommunications.polar.api.ble.model.polar; -public class BlePolarDeviceIdUtility { +public final class BlePolarDeviceIdUtility { + + private BlePolarDeviceIdUtility() { + throw new IllegalStateException("Utility class"); + } + public static boolean isValidDeviceId(final String deviceId) { if (deviceId == null) return false; if (deviceId.length() == 8) { diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/BleUtils.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/BleUtils.java index e98703ef..f186b38c 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/BleUtils.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/BleUtils.java @@ -2,12 +2,16 @@ import com.androidcommunications.polar.api.ble.BleLogger; -import java.util.Arrays; import java.util.HashMap; +import java.util.Objects; -public class BleUtils { +public final class BleUtils { - public final static String TAG = BleUtils.class.getSimpleName(); + private BleUtils() { + throw new IllegalStateException("Utility class"); + } + + public static final String TAG = BleUtils.class.getSimpleName(); public enum AD_TYPE { GAP_ADTYPE_UNKNOWN(0), @@ -33,7 +37,7 @@ public enum AD_TYPE { GAP_ADTYPE_SERVICE_DATA(20), //!< Service Data GAP_ADTYPE_MANUFACTURER_SPECIFIC(0xFF); //!< Manufacturer Specific Data: first 2 octets contain the Company Identifier Code followed by the additional manufacturer specific data - private int numVal; + private final int numVal; AD_TYPE(int numVal) { this.numVal = numVal; @@ -52,7 +56,7 @@ public enum EVENT_TYPE { ADV_NONCONN_IND(3), // Non connectable undirected advertising SCAN_RSP(4); // Scan Response - private int numVal; + private final int numVal; EVENT_TYPE(int numVal) { this.numVal = numVal; @@ -84,9 +88,10 @@ public static HashMap advertisementBytes2Map(byte[] record) { break; } if (adTypeHashMap.containsKey(type) && type == AD_TYPE.GAP_ADTYPE_MANUFACTURER_SPECIFIC) { - byte[] data = new byte[adTypeHashMap.get(type).length + fieldLen - 1]; + byte[] data = new byte[Objects.requireNonNull(adTypeHashMap.get(type)).length + fieldLen - 1]; System.arraycopy(record, offset + 2, data, 0, fieldLen - 1); - System.arraycopy(adTypeHashMap.get(type), 0, data, fieldLen - 1, adTypeHashMap.get(type).length); + System.arraycopy(Objects.requireNonNull(adTypeHashMap.get(type)), 0, data, fieldLen - 1, + Objects.requireNonNull(adTypeHashMap.get(type)).length); adTypeHashMap.put(type, data); } else { byte[] data = new byte[fieldLen - 1]; @@ -101,15 +106,6 @@ public static HashMap advertisementBytes2Map(byte[] record) { return adTypeHashMap; } - public static boolean compare(HashMap from, HashMap to) { - for (AD_TYPE object : to.keySet()) { - if (!from.containsKey(object) || !Arrays.equals(from.get(object), to.get(object))) { - return false; - } - } - return true; - } - public static void validate(boolean valid, String message) { if (!valid) throw new AssertionError(message); } @@ -117,13 +113,16 @@ public static void validate(boolean valid, String message) { public static int convertArrayToSignedInt(byte[] data, int offset, int length) { int result = (int) convertArrayToUnsignedLong(data, offset, length); if ((data[offset + length - 1] & 0x80) != 0) { - if (length == 3) { - result |= 0xFF000000; - } else if (length == 2) { - result |= 0xFFFF0000; - } else { - result |= 0xFFFFFF00; - } + int mask = 0xFFFFFFFF << length * 8; + result |= mask; + } + return result; + } + + public static int convertArrayToUnsignedInt(byte[] data, int offset, int length) { + int result = 0; + for (int i = 0; i < length; ++i) { + result |= (((int) data[i + offset] & 0xFF) << i * 8); } return result; } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/RxUtils.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/RxUtils.java index 3a925922..e43405fa 100644 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/RxUtils.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/common/ble/RxUtils.java @@ -12,9 +12,12 @@ import io.reactivex.rxjava3.core.FlowableOnSubscribe; import io.reactivex.rxjava3.core.ObservableEmitter; import io.reactivex.rxjava3.core.SingleEmitter; -import io.reactivex.rxjava3.functions.Action; -public class RxUtils { +public final class RxUtils { + + private RxUtils() { + throw new IllegalStateException("Utility class"); + } public static void postDisconnectedAndClearList(AtomicSet list) { postError(list, new BleDisconnected()); @@ -70,21 +73,15 @@ public static Flowable monitorNotifications(final AtomicSet[] listener = new FlowableEmitter[1]; - return Flowable.create(new FlowableOnSubscribe() { - @Override - public void subscribe(FlowableEmitter subscriber) { - if (!checkConnection || transport.isConnected()) { - listener[0] = subscriber; - observers.add(subscriber); - } else { - subscriber.tryOnError(new BleDisconnected()); - } - } - }, BackpressureStrategy.BUFFER).doFinally(new Action() { - @Override - public void run() { - observers.remove(listener[0]); + return Flowable.create((FlowableOnSubscribe) subscriber -> { + if (!checkConnection || transport.isConnected()) { + listener[0] = subscriber; + observers.add(subscriber); + } else { + subscriber.tryOnError(new BleDisconnected()); } - }).serialize(); + }, BackpressureStrategy.BUFFER) + .doFinally(() -> observers.remove(listener[0])) + .serialize(); } } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceList.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceList.java index 6a3ac6ae..bcd82cf6 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceList.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceList.java @@ -12,7 +12,7 @@ class BDDeviceList { - private final static String TAG = BDDeviceList.class.getSimpleName(); + private static final String TAG = BDDeviceList.class.getSimpleName(); private AtomicSet sessions = new AtomicSet<>(); AtomicSet getSessions() { diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceSessionImpl.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceSessionImpl.java index f2b381b7..e1b88fa6 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceSessionImpl.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDDeviceSessionImpl.java @@ -29,6 +29,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.UUID; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; @@ -638,7 +639,7 @@ void processNextAttributeOperation(boolean remove) { attOperations.take(); } if (attOperations.size() != 0) { - AttributeOperation operation = attOperations.peek(); + AttributeOperation operation = Objects.requireNonNull(attOperations.peek()); if (BuildConfig.DEBUG) { BleLogger.d(TAG, "send next: " + operation.getCharacteristic().getUuid() + " op: " + operation.getAttributeOperation().toString()); } diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDScanCallback.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDScanCallback.java index 9c5e5256..9ba52ac6 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDScanCallback.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/BDScanCallback.java @@ -310,10 +310,8 @@ private void startScanning() { } } BleLogger.d(TAG, "timestamps left: " + scanPool.size()); - startLScan(); - } else { - startLScan(); } + startLScan(); } private BleUtils.EVENT_TYPE fetchAdvType(ScanResult result) { diff --git a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/connection/ConnectionHandler.java b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/connection/ConnectionHandler.java index a4d7a5cd..6774e897 100755 --- a/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/connection/ConnectionHandler.java +++ b/sources/Android/android-communications/src/main/java/com/androidcommunications/polar/enpoints/ble/bluedroid/host/connection/ConnectionHandler.java @@ -82,8 +82,8 @@ public void deviceConnected(final BDDeviceSessionImpl bleDeviceSession) { } public void deviceDisconnected(final BDDeviceSessionImpl bleDeviceSession) { - commandState(bleDeviceSession, ConnectionHandlerAction.DEVICE_DISCONNECTED); observer.deviceDisconnected(bleDeviceSession); + commandState(bleDeviceSession, ConnectionHandlerAction.DEVICE_DISCONNECTED); } /** @@ -200,6 +200,7 @@ private void connecting(final BDDeviceSessionImpl session, ConnectionHandlerActi updateSessionState(session, BleDeviceSession.DeviceSessionState.SESSION_OPENING); connectionInterface.connectDevice(session); } else { + // TODO set state to PARK BleLogger.w(TAG, "ble not powered exiting connecting state"); changeState(session, ConnectionHandlerState.FREE); } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApi.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApi.java index a6479d04..4d66b264 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApi.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApi.java @@ -1,10 +1,12 @@ // Copyright © 2019 Polar Electro Oy. All rights reserved. package polar.com.sdk.api; +import android.util.Pair; + import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; -import android.util.Pair; import java.util.Calendar; import java.util.Set; @@ -13,16 +15,16 @@ import io.reactivex.rxjava3.core.Completable; import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.core.Single; -import io.reactivex.rxjava3.annotations.NonNull; import polar.com.sdk.api.errors.PolarInvalidArgument; import polar.com.sdk.api.model.PolarAccelerometerData; -import polar.com.sdk.api.model.PolarBiozData; import polar.com.sdk.api.model.PolarDeviceInfo; import polar.com.sdk.api.model.PolarEcgData; import polar.com.sdk.api.model.PolarExerciseData; import polar.com.sdk.api.model.PolarExerciseEntry; +import polar.com.sdk.api.model.PolarGyroData; import polar.com.sdk.api.model.PolarHrBroadcastData; -import polar.com.sdk.api.model.PolarOhrPPGData; +import polar.com.sdk.api.model.PolarMagnetometerData; +import polar.com.sdk.api.model.PolarOhrData; import polar.com.sdk.api.model.PolarOhrPPIData; import polar.com.sdk.api.model.PolarSensorSetting; @@ -37,11 +39,21 @@ public abstract class PolarBleApi { public interface PolarBleApiLogger { /** * message from sdk logging + * * @param str formatted string message */ void message(final String str); } + public enum DeviceStreamingFeature { + ECG, + ACC, + PPG, + PPI, + GYRO, + MAGNETOMETER + } + /** * Recoding intervals for H10 recording start */ @@ -65,7 +77,7 @@ public int getValue() { */ public enum SampleType { HR, /*!< HeartRate in BPM */ - RR; /*!< RR interval in milliseconds */ + RR /*!< RR interval in milliseconds */ } /** @@ -97,6 +109,7 @@ public enum SampleType { /** * Class constructor + * * @param features set of feature(s) or PolarBleApi#ALL_FEATURES */ protected PolarBleApi(final int features) { @@ -106,6 +119,7 @@ protected PolarBleApi(final int features) { /** * set mtu to lower than default(232 is the default for polar devices, minimum for H10 is 70 and for OH1 is 140) * to minimize latency + * * @param mtu value between 64-512 to be set */ public abstract void setMtu(@IntRange(from = 70, to = 512) int mtu); @@ -121,16 +135,15 @@ protected PolarBleApi(final int features) { public abstract void cleanup(); /** - * * @param enable false disable polar filter which means in all apis identifier can be bt address too */ public abstract void setPolarFilter(boolean enable); /** * @param deviceId polar device id or bt address - * @param feature feature to be requested + * @param feature feature to be requested * @return true if feature is ready for use, FEATURE_POLAR_SENSOR_STREAMING or FEATURE_POLAR_FILE_TRANSFER - * is supported by this api function + * is supported by this api function */ public abstract boolean isFeatureReady(@NonNull final String deviceId, final int feature); @@ -156,6 +169,7 @@ protected PolarBleApi(final int features) { /** * enable or disable automatic reconnection feature + * * @param enable true = automatic reconnection is enabled, false = automatic reconnection is disabled */ public abstract void setAutomaticReconnection(boolean enable); @@ -163,69 +177,61 @@ protected PolarBleApi(final int features) { /** * set time to device affects on sensor data stream(s) timestamps * requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER + * * @param identifier polar device id or bt address - * @param calendar time to set + * @param calendar time to set * @return Completable stream */ public abstract Completable setLocalTime(@NonNull final String identifier, @NonNull Calendar calendar); /** - * request available acc settings requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier polar device id or bt address - * @return Single stream - */ - public abstract Single requestAccSettings(@NonNull final String identifier); - - /** - * request available ecg settings requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier polar device id or bt address - * @return Single stream - */ - public abstract Single requestEcgSettings(@NonNull final String identifier); - - /** - * request available ppg settings requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING + * request available settings for stream requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING + * * @param identifier polar device id or bt address * @return Single stream */ - public abstract Single requestPpgSettings(@NonNull final String identifier); - - public abstract Single requestBiozSettings(@NonNull final String identifier); + public abstract Single requestStreamSettings(@NonNull final String identifier, + @NonNull DeviceStreamingFeature feature); /** * Start connecting to a nearby Polar device. PolarBleApiCallback#polarDeviceConnected callback is * invoked when connection to a nearby device is established. - * @param rssiLimit RSSI (Received Signal Strength Indication) value is typically from -40 to -60 (dBm), depends on the used Bluetooth chipset and/or antenna tuning - * @param service in hex string format like "180D" PolarInvalidArgument invoked if not in correct format - * @param timeout min time to search nearby device default = 2s - * @param unit time unit to be used + * + * @param rssiLimit RSSI (Received Signal Strength Indication) value is typically from -40 to -60 (dBm), depends on the used Bluetooth chipset and/or antenna tuning + * @param service in hex string format like "180D" PolarInvalidArgument invoked if not in correct format + * @param timeout min time to search nearby device default = 2s + * @param unit time unit to be used * @param polarDeviceType like H10, OH1 etc... or null for any polar device * @return rx Completable, complete invoked when nearby device found, and connection attempt started. - * deviceConnecting callback invoked to inform connection attempt + * deviceConnecting callback invoked to inform connection attempt */ - public abstract Completable autoConnectToDevice(int rssiLimit, @Nullable String service, int timeout,@NonNull TimeUnit unit,@Nullable final String polarDeviceType); - public abstract Completable autoConnectToDevice(int rssiLimit, @Nullable String service, final String polarDeviceType); + public abstract Completable autoConnectToDevice(int rssiLimit, @Nullable String service, int timeout, @NonNull TimeUnit unit, @Nullable final String polarDeviceType); + + public abstract Completable autoConnectToDevice(int rssiLimit, @Nullable String service, @Nullable final String polarDeviceType); /** * Request a connection to a Polar device. Invokes PolarBleApiCallback#polarDeviceConnected callback. - * @param identifier Polar device id found printed on the sensor/device (in format "12345678") or bt address (in format "00:11:22:33:44:55") + * + * @param identifier Polar device id found printed on the sensor/device (in format "12345678") or bt address (in format "00:11:22:33:44:55") * @throws PolarInvalidArgument if identifier is invalid formatted mac address or polar device id */ public abstract void connectToDevice(@NonNull final String identifier) throws PolarInvalidArgument; /** * Request disconnecting from a Polar device. Invokes PolarBleApiCallback#polarDeviceDisconnected callback. - * @param identifier Polar device id found printed on the sensor/device or bt address + * + * @param identifier Polar device id found printed on the sensor/device or bt address * @throws PolarInvalidArgument if identifier is invalid formatted mac address or polar device id */ public abstract void disconnectFromDevice(@NonNull final String identifier) throws PolarInvalidArgument; /** * request start recording only supported by H10, requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER + * * @param identifier polar device id or bt address * @param exerciseId unique id for exercise entry - * @param interval recording interval to be used - * @param type sample type to be used + * @param interval recording interval to be used + * @param type sample type to be used * @return Completable stream */ public abstract Completable startRecording(@NonNull final String identifier, @@ -235,6 +241,7 @@ public abstract Completable startRecording(@NonNull final String identifier, /** * request stop recording only supported by H10, requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER + * * @param identifier polar device id or bt address * @return Completable stream */ @@ -242,112 +249,154 @@ public abstract Completable startRecording(@NonNull final String identifier, /** * request current recording status only supported by H10, requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER + * * @param identifier polar device id or bt address * @return Single stream Pair first recording status, second entryId if available */ - public abstract Single> requestRecordingStatus(@NonNull final String identifier); + public abstract Single> requestRecordingStatus(@NonNull final String identifier); /** * List all exercises stored in the device OH1/H10 requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER - * @param identifier Polar device id found printed on the sensor/device or bt address - * @return Flowable stream of entrys @see polar.com.sdk.api.model.PolarExerciseEntry for details + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @return Flowable stream of entries @see polar.com.sdk.api.model.PolarExerciseEntry for details */ public abstract Flowable listExercises(@NonNull final String identifier); /** * Fetch single exercise data requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER - * @param identifier Polar device id found printed on the sensor/device or bt address - * @param entry PolarExerciseEntry object - * @return Single stream @see polar.com.sdk.api.model.PolarExerciseData for details + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param entry PolarExerciseEntry object + * @return Single stream @see polar.com.sdk.api.model.PolarExerciseData for details */ public abstract Single fetchExercise(@NonNull final String identifier, @NonNull final PolarExerciseEntry entry); /** * Request to remove single exercise requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER - * @param identifier Polar device id found printed on the sensor/device or bt address - * @param entry entry to be removed + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param entry entry to be removed * @return Completable stream */ public abstract Completable removeExercise(@NonNull final String identifier, @NonNull final PolarExerciseEntry entry); /** * Start searching for device(s) - * @return Flowable stream of polarDeviceInfo(s) - * Produces: - *
                                                                - onNext for any new Polar device detected - *
                                                                - onError if scan start fails - *
                                                                - onComplete non produced unless stream is further configured + * + * @return Flowable stream of polarDeviceInfo(s) + * Produces: + *
                                                                - onNext for any new Polar device detected + *
                                                                - onError if scan start fails + *
                                                                - onComplete non produced unless stream is further configured */ public abstract Flowable searchForDevice(); /** * Starts listening to heart rate broadcast stream - * @param deviceIds set of Polar device ids. Null for a single Polar device - * @return Flowable stream of heart rate broadcasts. - * Produces: - *
                                                                - onNext when new advertisement is detected based on deviceId list as filter - *
                                                                - onError if scan start fails - *
                                                                - onComplete non produced unless stream is further configured + * + * @param deviceIds set of Polar device ids. Null for a single Polar device + * @return Flowable stream of heart rate broadcasts. + * Produces: + *
                                                                - onNext when new advertisement is detected based on deviceId list as filter + *
                                                                - onError if scan start fails + *
                                                                - onComplete non produced unless stream is further configured */ public abstract Flowable startListenForPolarHrBroadcasts(@Nullable final Set deviceIds); /** - * Start the ECG (Electrocardiography) stream. Stops the ECG stream if the connection is closed, - * error occured during start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. - * Query available settings before stream start PolarBleApi#requestEcgSettings - * @param identifier Polar device id found printed on the sensor/device or bt address - * @param sensorSetting settings to be used to start streaming - * @return Flowable stream of ECG data. - * Produces: - *
                                                                - onNext @see PolarEcgData.java for details - *
                                                                - onError @see errors package for possible errors invoked - *
                                                                - onComplete non produced unless stream is further configured + * Start the ECG (Electrocardiography) stream. ECG stream is stopped if the connection is closed, + * error occurs during start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. + * Query available settings before stream start PolarBleApi#requestStreamSettings + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param sensorSetting settings to be used to start streaming + * @return Flowable stream of ECG data. + * Produces: + *
                                                                - onNext @see PolarEcgData.java for details + *
                                                                - onError @see errors package for possible errors invoked + *
                                                                - onComplete non produced unless stream is further configured */ public abstract Flowable startEcgStreaming(@NonNull final String identifier, @NonNull PolarSensorSetting sensorSetting); /** - * Start ACC (Accelerometer) stream. Stops ACC stream if the connection is closed, - * error occured during start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. - * Query available settings before stream start PolarBleApi#requestAccSettings - * @param identifier Polar device id found printed on the sensor/device or bt address - * @param sensorSetting settings to be used to start streaming - * @return Flowable stream of Accelerometer data. - * Produces: - *
                                                                - onNext @see PolarAccelerometerData for details - *
                                                                - onError @see errors package for possible errors invoked - *
                                                                - onComplete non produced unless stream is further configured + * Start ACC (Accelerometer) stream. ACC stream is stopped if the connection is closed, error + * occurs during start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. + * Query available settings before stream start PolarBleApi#requestStreamSettings + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param sensorSetting settings to be used to start streaming + * @return Flowable stream of Accelerometer data. + * Produces: + *
                                                                - onNext @see PolarAccelerometerData for details + *
                                                                - onError @see errors package for possible errors invoked + *
                                                                - onComplete non produced unless stream is further configured */ public abstract Flowable startAccStreaming(@NonNull final String identifier, @NonNull PolarSensorSetting sensorSetting); /** - * Start OHR (Optical heart rate) PPG (Photoplethysmography) stream. Stops PPG stream if the connection is closed, - * error occured during start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. - * Query available settings before stream start PolarBleApi#requestPpgSettings - * @param identifier Polar device id found printed on the sensor/device or bt address - * @param sensorSetting settings to be used to start streaming - * @return Flowable stream of OHR PPG data. - * Produces: - *
                                                                - onNext @see PolarOhrPPGData for details - *
                                                                - onError @see errors package for possible errors invoked - *
                                                                - onComplete non produced unless the stream is further configured - */ - public abstract Flowable startOhrPPGStreaming(@NonNull final String identifier, - @NonNull PolarSensorSetting sensorSetting); - - public abstract Flowable startBiozStreaming(@NonNull final String identifier, - @NonNull PolarSensorSetting sensorSetting); + * Start OHR (Optical heart rate) PPG (Photoplethysmography) stream. PPG stream is stopped if + * the connection is closed, error occurs during start or stream is disposed. Requires feature + * PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. Query available settings before stream start + * PolarBleApi#requestStreamSettings + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param sensorSetting settings to be used to start streaming + * @return Flowable stream of OHR PPG data. + * Produces: + *
                                                                - onNext @see PolarOhrPPGData for details + *
                                                                - onError @see errors package for possible errors invoked + *
                                                                - onComplete non produced unless the stream is further configured + */ + public abstract Flowable startOhrStreaming(@NonNull final String identifier, + @NonNull PolarSensorSetting sensorSetting); /** - * Start OHR (Optical heart rate) PPI (Pulse to Pulse interval) stream. Notice that there is a delay before PPI data stream starts - * Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. When using OH1 timestamp produced by PPI stream is 0. - * @param identifier Polar device id found printed on the sensor/device or bt address - * @return Flowable stream of OHR PPI data. - * Produces: - *
                                                                - onNext @see PolarOhrPPIData for details - *
                                                                - onError @see errors package for possible errors invoked - *
                                                                - onComplete non produced unless the stream is further configured + * Start OHR (Optical heart rate) PPI (Pulse to Pulse interval) stream. PPI stream is stopped if + * the connection is closed, during start or stream is disposed. Notice that there is a + * delay before PPI data stream starts. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. + * When using OH1 timestamp produced by PPI stream is 0. + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @return Flowable stream of OHR PPI data. + * Produces: + *
                                                                - onNext @see PolarOhrPPIData for details + *
                                                                - onError @see errors package for possible errors invoked + *
                                                                - onComplete non produced unless the stream is further configured */ public abstract Flowable startOhrPPIStreaming(@NonNull final String identifier); + + /** + * Start magnetometer stream. Magnetometer stream is stopped if the connection is closed, error + * occurs during start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. + * Query available settings before stream start PolarBleApi#requestStreamSettings + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param sensorSetting settings to be used to start streaming + * @return Flowable stream of magnetometer data. + * Produces: + *
                                                                - onNext @see PolarMagnetometerData for details + *
                                                                - onError @see errors package for possible errors invoked + *
                                                                - onComplete non produced unless the stream is further configured + */ + public abstract Flowable startMagnetometerStreaming(@NonNull final String identifier, + @NonNull PolarSensorSetting sensorSetting); + + /** + * Start Gyro stream. Gyro stream is stopped if the connection is closed, error occurs during + * start or stream is disposed. Requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING. + * Query available settings before stream start PolarBleApi#requestStreamSettings + * + * @param identifier Polar device id found printed on the sensor/device or bt address + * @param sensorSetting settings to be used to start streaming + * @return Flowable stream of gyroscope data. + * Produces: + *
                                                                - onNext @see PolarGyroData for details + *
                                                                - onError @see errors package for possible errors invoked + *
                                                                - onComplete non produced unless the stream is further configured + */ + public abstract Flowable startGyroStreaming(@NonNull final String identifier, + @NonNull PolarSensorSetting sensorSetting); } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallback.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallback.java index edeb2cab..647186aa 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallback.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallback.java @@ -3,6 +3,7 @@ import androidx.annotation.NonNull; +import java.util.Set; import java.util.UUID; import polar.com.sdk.api.model.PolarDeviceInfo; @@ -14,98 +15,102 @@ public abstract class PolarBleApiCallback implements PolarBleApiCallbackProvider { /** - * @param powered true = Bluetooth power on, false = Bluetooth power off + * @param powered true = Bluetooth power on, false = Bluetooth power off */ - public void blePowerStateChanged(final boolean powered) {} + @Override + public void blePowerStateChanged(final boolean powered) { + } /** * Device is now connected + * * @param polarDeviceInfo Polar device information */ - public void deviceConnected(@NonNull final PolarDeviceInfo polarDeviceInfo) {} + @Override + public void deviceConnected(@NonNull final PolarDeviceInfo polarDeviceInfo) { + } /** * Connecting to device + * * @param polarDeviceInfo Polar device information */ - public void deviceConnecting(@NonNull final PolarDeviceInfo polarDeviceInfo) {} + @Override + public void deviceConnecting(@NonNull final PolarDeviceInfo polarDeviceInfo) { + } /** * Device is now disconnected, no further action is needed from the application * if polar.com.sdk.api.PolarBleApi#disconnectFromPolarDevice is not called. Device will be automatically reconnected + * * @param polarDeviceInfo Polar device information */ - public void deviceDisconnected(@NonNull final PolarDeviceInfo polarDeviceInfo) {} + @Override + public void deviceDisconnected(@NonNull final PolarDeviceInfo polarDeviceInfo) { + } /** - * Polar device's ECG feature is ready. Application may start ECG stream now if desired. + * Polar device's streaming features ready. Application may start any stream now if desired. * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id + * + * @param identifier Polar device id + * @param features set of features available and ready */ - public void ecgFeatureReady(@NonNull final String identifier) {} - - /** - * Polar device's ACC feature is ready. Application may start ACC stream now if desired. - * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - public void accelerometerFeatureReady(@NonNull final String identifier) {} - - /** - * Polar device's PPG feature is ready. Application may start PPG stream now if desired. - * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - public void ppgFeatureReady(@NonNull final String identifier) {} - - /** - * Polar device's PPI feature is ready. Application may start PPI stream now if desired. - * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - public void ppiFeatureReady(@NonNull final String identifier) {} - - /** - * Polar device's bioz feature is ready. - * @param identifier Polar device id - */ - public void biozFeatureReady(@NonNull final String identifier) {} + @Override + public void streamingFeaturesReady(@NonNull final String identifier, + @NonNull final Set features) { + } /** * Polar device HR client is now ready and HR transmission is starting in a moment. - * @param identifier Polar device id or bt address + * + * @param identifier Polar device id or bt address */ - public void hrFeatureReady(@NonNull final String identifier) {} + @Override + public void hrFeatureReady(@NonNull final String identifier) { + } /** * DIS information received * requires feature PolarBleApi#FEATURE_DEVICE_INFO - * @param identifier Polar device id or bt address - * @param uuid uuid of dis value - * @param value dis value for uuid + * + * @param identifier Polar device id or bt address + * @param uuid uuid of dis value + * @param value dis value for uuid */ - public void disInformationReceived(@NonNull final String identifier, @NonNull UUID uuid, @NonNull final String value) {} + @Override + public void disInformationReceived(@NonNull final String identifier, @NonNull UUID uuid, @NonNull final String value) { + } /** * Battery level received * requires feature PolarBleApi#FEATURE_BATTERY_INFO - * @param identifier Polar device id or bt address - * @param level battery level (value between 0-100%) + * + * @param identifier Polar device id or bt address + * @param level battery level (value between 0-100%) */ - public void batteryLevelReceived(@NonNull final String identifier, final int level) {} + @Override + public void batteryLevelReceived(@NonNull final String identifier, final int level) { + } /** * HR notification data received from device. Notice when using OH1 * and PPI measurement is started hr received from this callback is 0. - * @param identifier Polar device id or bt address - * @param data @see polar.com.sdk.api.model.PolarHrData.java + * + * @param identifier Polar device id or bt address + * @param data @see polar.com.sdk.api.model.PolarHrData.java */ - public void hrNotificationReceived(@NonNull final String identifier,@NonNull final PolarHrData data) {} + @Override + public void hrNotificationReceived(@NonNull final String identifier, @NonNull final PolarHrData data) { + } /** * File transfer ready * requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER - * @param identifier Polar device id + * + * @param identifier Polar device id */ - public void polarFtpFeatureReady(@NonNull final String identifier) {} + @Override + public void polarFtpFeatureReady(@NonNull final String identifier) { + } } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallbackProvider.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallbackProvider.java index d24975f3..5ccfcea9 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallbackProvider.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiCallbackProvider.java @@ -1,7 +1,9 @@ // Copyright © 2019 Polar Electro Oy. All rights reserved. package polar.com.sdk.api; + import androidx.annotation.NonNull; +import java.util.Set; import java.util.UUID; import polar.com.sdk.api.model.PolarDeviceInfo; @@ -13,18 +15,20 @@ public interface PolarBleApiCallbackProvider { /** - * @param powered true = Bluetooth power on, false = Bluetooth power off + * @param powered true = Bluetooth power on, false = Bluetooth power off */ void blePowerStateChanged(final boolean powered); /** * Device is now connected + * * @param polarDeviceInfo Polar device information */ void deviceConnected(@NonNull final PolarDeviceInfo polarDeviceInfo); /** * Connecting to device + * * @param polarDeviceInfo Polar device information */ void deviceConnecting(@NonNull final PolarDeviceInfo polarDeviceInfo); @@ -32,79 +36,61 @@ public interface PolarBleApiCallbackProvider { /** * Device is now disconnected, no further action is needed from the application * if polar.com.sdk.api.PolarBleApi#disconnectFromPolarDevice is not called. Device will be automatically reconnected + * * @param polarDeviceInfo Polar device information */ void deviceDisconnected(@NonNull final PolarDeviceInfo polarDeviceInfo); /** - * Polar device's ECG feature is ready. Application may start ECG stream now if desired. - * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - void ecgFeatureReady(@NonNull final String identifier); - - /** - * Polar device's ACC feature is ready. Application may start ACC stream now if desired. - * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - void accelerometerFeatureReady(@NonNull final String identifier); - - /** - * Polar device's PPG feature is ready. Application may start PPG stream now if desired. - * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - void ppgFeatureReady(@NonNull final String identifier); - - /** - * Polar device's PPI feature is ready. Application may start PPI stream now if desired. + * Polar device's streaming features ready. Application may start any stream now if desired. * requires feature PolarBleApi#FEATURE_POLAR_SENSOR_STREAMING - * @param identifier Polar device id - */ - void ppiFeatureReady(@NonNull final String identifier); - - /** - * Polar device's bioz feature is ready. - * @param identifier Polar device id + * + * @param identifier Polar device id + * @param features set of features available and ready */ - void biozFeatureReady(@NonNull final String identifier); + void streamingFeaturesReady(@NonNull final String identifier, + @NonNull final Set features); /** * Polar device HR client is now ready and HR transmission is starting in a moment. - * @param identifier Polar device id or bt address + * + * @param identifier Polar device id or bt address */ void hrFeatureReady(@NonNull final String identifier); /** * DIS information received * requires feature PolarBleApi#FEATURE_DEVICE_INFO - * @param identifier Polar device id or bt address - * @param uuid uuid of dis value - * @param value dis value for uuid + * + * @param identifier Polar device id or bt address + * @param uuid uuid of dis value + * @param value dis value for uuid */ void disInformationReceived(@NonNull final String identifier, @NonNull UUID uuid, @NonNull final String value); /** * Battery level received * requires feature PolarBleApi#FEATURE_BATTERY_INFO - * @param identifier Polar device id or bt address - * @param level battery level (value between 0-100%) + * + * @param identifier Polar device id or bt address + * @param level battery level (value between 0-100%) */ void batteryLevelReceived(@NonNull final String identifier, final int level); /** * HR notification data received from device. Notice when using OH1 * and PPI measurement is started hr received from this callback is 0. - * @param identifier Polar device id or bt address - * @param data @see polar.com.sdk.api.model.PolarHrData.java + * + * @param identifier Polar device id or bt address + * @param data @see polar.com.sdk.api.model.PolarHrData.java */ - void hrNotificationReceived(@NonNull final String identifier,@NonNull final PolarHrData data); + void hrNotificationReceived(@NonNull final String identifier, @NonNull final PolarHrData data); /** * File transfer ready * requires feature PolarBleApi#FEATURE_POLAR_FILE_TRANSFER - * @param identifier Polar device id + * + * @param identifier Polar device id */ void polarFtpFeatureReady(@NonNull final String identifier); } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiDefaultImpl.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiDefaultImpl.java index 023f07cb..922f2ff8 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiDefaultImpl.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/PolarBleApiDefaultImpl.java @@ -11,18 +11,19 @@ public class PolarBleApiDefaultImpl { /** * Default implementation constructor for the API. - * @param context where API implementation callbacks are run + * + * @param context where API implementation callbacks are run * @param features @see polar.com.sdk.api.PolarBleApi feature flags - * @return default Polar API implementation + * @return default Polar API implementation */ - public static PolarBleApi defaultImplementation(final Context context, int features){ - return new BDBleApiImpl(context,features); + public static PolarBleApi defaultImplementation(final Context context, int features) { + return new BDBleApiImpl(context, features); } /** - * @return SDK version number in format major.minor.patch + * @return SDK version number in format major.minor.patch */ - public static String versionInfo(){ - return "2.3.0"; + public static String versionInfo() { + return "3.0.0"; } } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarAccelerometerData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarAccelerometerData.java index 78434f6d..5908151d 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarAccelerometerData.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarAccelerometerData.java @@ -8,48 +8,44 @@ */ public class PolarAccelerometerData { - /** - * Static class containing the data of a single ACC sample. Data is received as a 16-bit short value. - */ - public static class PolarAccelerometerSample { - /** - * Accelerometer x axis value in millig. - */ - public int x; - - /** - * Accelerometer y axis value millig. - */ - public int y; - - /** - * Accelerometer z axis value millig. - */ - public int z; - - public PolarAccelerometerSample(int x, int y, int z) { + public static class PolarAccelerometerDataSample { + /** + * x axis in millig + */ + public final int x; + /** + * y axis in millig + */ + public final int y; + /** + * z axis in millig + */ + public final int z; + + public PolarAccelerometerDataSample(int x, int y, int z) { this.x = x; this.y = y; this.z = z; } - } + } - /** + /** * Acceleration samples list. Each sample contains signed x,y,z axis value in millig */ - public List samples; + public final List samples; /** * Last sample timestamp in nanoseconds. */ - public long timeStamp; + public final long timeStamp; - /** + /** * Class constructor - * @param samples list of Accelerometer data samples - * @param timeStamp in nanoseconds + * + * @param samples list of Accelerometer data samples + * @param timeStamp in nanoseconds */ - public PolarAccelerometerData(List samples, long timeStamp) { + public PolarAccelerometerData(List samples, long timeStamp) { this.samples = samples; this.timeStamp = timeStamp; } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarDeviceInfo.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarDeviceInfo.java index ffd35b22..6db0b82c 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarDeviceInfo.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarDeviceInfo.java @@ -9,27 +9,27 @@ public class PolarDeviceInfo { /** * Polar device id */ - public String deviceId; + public final String deviceId; /** * Bt mac address */ - public String address; + public final String address; /** * Received signal strength indication value in dBm. */ - public int rssi; + public final int rssi; /** * Device name. */ - public String name; + public final String name; /** * true adv type is connectable */ - public boolean isConnectable; + public final boolean isConnectable; public PolarDeviceInfo(String deviceId, String address, int rssi, String name, boolean isConnectable) { this.deviceId = deviceId; diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarEcgData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarEcgData.java index eb7905ae..2db18d96 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarEcgData.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarEcgData.java @@ -12,12 +12,12 @@ public class PolarEcgData { /** * ECG samples in microVolts. */ - public List samples; + public final List samples; /** * Last sample timestamp in nanoseconds. */ - public long timeStamp; + public final long timeStamp; public PolarEcgData(List samples, long timeStamp) { this.samples = samples; diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseData.java index aac76706..52503d40 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseData.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseData.java @@ -10,11 +10,11 @@ public class PolarExerciseData { /** * Recording interval in seconds. */ - public int recordingInterval; + public final int recordingInterval; /** * HR or RR samples. */ - public List hrSamples; + public final List hrSamples; public PolarExerciseData(int recordingInterval, List hrSamples) { this.recordingInterval = recordingInterval; diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseEntry.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseEntry.java index 22e4568f..119782c4 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseEntry.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarExerciseEntry.java @@ -10,15 +10,15 @@ public class PolarExerciseEntry { /** * Resource path in device. */ - public String path; + public final String path; /** * Date object contains the date and time of the exercise. Only valid with OH1. */ - public Date date; + public final Date date; /** * unique identifier. Only valid with H10 */ - public String identifier; + public final String identifier; public PolarExerciseEntry(String path, Date date, String identifier) { this.path = path; diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarGyroData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarGyroData.java new file mode 100644 index 00000000..ef60bedb --- /dev/null +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarGyroData.java @@ -0,0 +1,45 @@ +package polar.com.sdk.api.model; + +import java.util.List; + +/** + * Polar gyro data + */ +public class PolarGyroData { + + public static class PolarGyroDataSample { + /** + * x axis in deg/sec + */ + public final float x; + /** + * y axis in deg/sec + */ + public final float y; + /** + * z axis in deg/sec + */ + public final float z; + + public PolarGyroDataSample(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + } + + /** + * Signed 3-axis samples in deg/sec + */ + public final List samples; + + /** + * Last sample timestamp in nanoseconds + */ + public final long timeStamp; + + public PolarGyroData(List samples, long timeStamp) { + this.samples = samples; + this.timeStamp = timeStamp; + } +} diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrBroadcastData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrBroadcastData.java index 65591521..26c9d1ee 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrBroadcastData.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrBroadcastData.java @@ -9,18 +9,18 @@ public class PolarHrBroadcastData { /** * @see polar.com.sdk.api.model.PolarDeviceInfo */ - public PolarDeviceInfo polarDeviceInfo; + public final PolarDeviceInfo polarDeviceInfo; /** * Heart rate in beats per minute. */ - public int hr; + public final int hr; /** * Device battery status. * False if the battery needs to be replaced or recharged. */ - public boolean batteryStatus; + public final boolean batteryStatus; public PolarHrBroadcastData(PolarDeviceInfo deviceInfo, int hr, boolean batteryStatus) { this.polarDeviceInfo = deviceInfo; diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrData.java index 641866ee..478ac562 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrData.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarHrData.java @@ -12,33 +12,33 @@ public class PolarHrData { /** * Heart rate in BPM (beats per minute). */ - public int hr; + public final int hr; /** * R is the peak of the QRS complex in the ECG wave and RR is the interval between successive Rs. * In 1/1024 format. */ - public List rrs; + public final List rrs; /** * RRs in milliseconds. */ - public List rrsMs; + public final List rrsMs; /** * Equals true if the sensor has contact (with a measurable surface e.g. skin). */ - public boolean contactStatus; + public final boolean contactStatus; /** * Equals true if the sensor supports contact status */ - public boolean contactStatusSupported; + public final boolean contactStatusSupported; /** * Equals true if RR data is available. */ - public boolean rrAvailable; + public final boolean rrAvailable; public PolarHrData(int hr, List rrs, boolean contactStatus, boolean contactStatusSupported, boolean rrAvailable) { this.hr = hr; @@ -47,8 +47,8 @@ public PolarHrData(int hr, List rrs, boolean contactStatus, boolean con this.contactStatusSupported = contactStatusSupported; this.rrAvailable = rrAvailable; rrsMs = new ArrayList<>(); - for( int rrRaw : rrs ){ - rrsMs.add((int)(Math.round(((float) rrRaw /1024.0)*1000.0))); + for (int rrRaw : rrs) { + rrsMs.add((int) (Math.round(((float) rrRaw / 1024.0) * 1000.0))); } } } \ No newline at end of file diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarMagnetometerData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarMagnetometerData.java new file mode 100644 index 00000000..7e7227e0 --- /dev/null +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarMagnetometerData.java @@ -0,0 +1,48 @@ +package polar.com.sdk.api.model; + +import java.util.List; + +public class PolarMagnetometerData { + + public static class PolarMagnetometerDataSample { + /** + * x axis in Gauss + */ + public final float x; + /** + * y axis in Gauss + */ + public final float y; + /** + * z axis in Gauss + */ + public final float z; + + public PolarMagnetometerDataSample(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + } + + /** + * Acceleration samples list. Each sample contains signed x,y,z axis value in Gauss + */ + public final List samples; + + /** + * Last sample timestamp in nanoseconds + */ + public final long timeStamp; + + /** + * Constructor + * + * @param samples magnetometer samples + * @param timeStamp in nanoseconds + */ + public PolarMagnetometerData(List samples, long timeStamp) { + this.samples = samples; + this.timeStamp = timeStamp; + } +} diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrData.java new file mode 100644 index 00000000..0c7bfa91 --- /dev/null +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrData.java @@ -0,0 +1,63 @@ +// Copyright © 2019 Polar Electro Oy. All rights reserved. +package polar.com.sdk.api.model; + +import java.util.List; + +/** + * Polar optical sensor data + */ +public class PolarOhrData { + + /** + * Static class containing the data of a single PPG (Photoplethysmography) sample. + */ + public static class PolarOhrSample { + /** + * Integer value received from the LED in ppg(n) channel + n ambient(s). + */ + public final List channelSamples; + + public final long status; + + public PolarOhrSample(List channelSamples, long status) { + this.channelSamples = channelSamples; + this.status = status; + } + } + + public enum OHR_DATA_TYPE { + /** + * Polar ohr led data containing 3 ppg and 1 ambient channel + */ + PPG3_AMBIENT1, + UNKNOWN + } + + /** + * source type + */ + public final OHR_DATA_TYPE type; + + /** + * PPG samples list. Each sample contains signed LED in ppg0, LED in ppg1, LED in ppg2 and ambient light value + */ + public final List samples; + + /** + * Last sample timestamp in nanoseconds + */ + public final long timeStamp; + + /** + * Class constructor + * + * @param samples list of PPG data samples + * @param type data type of PGG data samples + * @param timeStamp in nanoseconds + */ + public PolarOhrData(List samples, OHR_DATA_TYPE type, long timeStamp) { + this.samples = samples; + this.timeStamp = timeStamp; + this.type = type; + } +} diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrPPIData.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrPPIData.java index 183f73a4..91459246 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrPPIData.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarOhrPPIData.java @@ -14,32 +14,32 @@ public static class PolarOhrPPISample { /** * Pulse to Pulse interval in milliseconds. */ - public int ppi; + public final int ppi; /** * Error estimate in milliseconds. */ - public int errorEstimate; + public final int errorEstimate; /** * Heart rate in beats per minute. */ - public int hr; + public final int hr; /** * True if PPI measurement is invalid due to acceleration (or other reason). */ - public boolean blockerBit; + public final boolean blockerBit; /** * False if the device detects poor or no contact with the skin. */ - public boolean skinContactStatus; + public final boolean skinContactStatus; /** * True if the Sensor Contact feature is supported. */ - public boolean skinContactSupported; + public final boolean skinContactSupported; public PolarOhrPPISample(int ppi, int errorEstimate, int hr, boolean blockerBit, boolean skinContactStatus, boolean skinContactSupported) { this.ppi = ppi; @@ -54,15 +54,14 @@ public PolarOhrPPISample(int ppi, int errorEstimate, int hr, boolean blockerBit, /** * Last sample timestamp in nanoseconds */ - public long timeStamp; - + public final long timeStamp; /** * PPI samples list. Sample with ppi in ms, errorEstimate in ms, hr in BPM, * blockerBit = True if PPI measurement is invalid due to acceleration (or other reason) , * skinContactSupported = True if the Sensor Contact feature is supported. */ - public List samples; + public final List samples; public PolarOhrPPIData(long timeStamp, List samples) { this.timeStamp = timeStamp; diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarSensorSetting.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarSensorSetting.java index 251aa428..f671af77 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarSensorSetting.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/api/model/PolarSensorSetting.java @@ -3,12 +3,11 @@ import com.androidcommunications.polar.api.ble.model.gatt.client.BlePMDClient; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; public class PolarSensorSetting { @@ -16,96 +15,121 @@ public class PolarSensorSetting { public enum SettingType { SAMPLE_RATE(0), /*!< sample rate key in hz */ RESOLUTION(1), /*!< resolution key in bits */ - RANGE(2); /*!< range key in g's */ + RANGE(2), /*!< range key*/ + RANGE_MILLIUNIT(3), /*!< range key milliunit. Note Set contains range values from min to max */ + CHANNELS(4); /*!< amount of channels */ + + private final int numVal; - private int numVal; SettingType(int numVal) { this.numVal = numVal; } + public int getNumVal() { return numVal; } } - public Map> settings; + public final Map> settings; private BlePMDClient.PmdMeasurementType type; /** * Internal Constructor with PmdSetting and Type + * * @param settings available settings - * @param type measurement type + * @param type measurement type */ - public PolarSensorSetting(Map> settings, + public PolarSensorSetting(Map> settings, BlePMDClient.PmdMeasurementType type) { this.settings = new HashMap<>(); this.type = type; - for(Map.Entry> e : settings.entrySet()){ - this.settings.put(SettingType.values()[e.getKey().getNumVal()],e.getValue()); + for (Map.Entry> e : settings.entrySet()) { + this.settings.put(SettingType.values()[e.getKey().getNumVal()], e.getValue()); } } /** * Constructor with selected settings + * * @param settings selected */ public PolarSensorSetting(Map settings) { this.settings = new HashMap<>(); - for(Map.Entry e : settings.entrySet()) { + for (Map.Entry e : settings.entrySet()) { this.settings.put(e.getKey(), new HashSet<>(Collections.singletonList(e.getValue()))); } } /** * Helper to map from PolarSensorSetting to PmdSetting + * * @return PmdSetting */ - public BlePMDClient.PmdSetting map2PmdSettings(){ - Map selected = new HashMap<>(); - for(Map.Entry> e : settings.entrySet()){ + public BlePMDClient.PmdSetting map2PmdSettings() { + Map selected = new HashMap<>(); + for (Map.Entry> e : settings.entrySet()) { selected.put(BlePMDClient.PmdSetting.PmdSettingType.values()[e.getKey().numVal], - Collections.max(e.getValue())); + Collections.max(e.getValue())); } return new BlePMDClient.PmdSetting(selected); } /** * Helper to get max settings available + * * @return PolarSensorSetting with only max settings available */ - public PolarSensorSetting maxSettings(){ - Map selected = new HashMap<>(); - for(Map.Entry> e : settings.entrySet()){ + public PolarSensorSetting maxSettings() { + Map selected = new HashMap<>(); + for (Map.Entry> e : settings.entrySet()) { selected.put(e.getKey(), Collections.max(e.getValue())); } return new PolarSensorSetting(selected); } public static class Builder { - public Map selected = new HashMap<>(); + public final Map selected = new HashMap<>(); + private final PolarSensorSetting sourceSettings; - private Builder() { + private Builder(PolarSensorSetting sourceSettings) { + this.sourceSettings = sourceSettings; } - public static Builder newBuilder() { - return new Builder(); + public static Builder newBuilder(PolarSensorSetting sourceSettings) { + return new Builder(sourceSettings); + } + + public Builder setSampleRate(int rate) { + selected.put(SettingType.SAMPLE_RATE, rate); + return this; } - public Builder setSampleRate(int rate){ - selected.put(SettingType.SAMPLE_RATE,rate); + public Builder setResolution(int resolution) { + selected.put(SettingType.RESOLUTION, resolution); return this; } - public Builder setResolution(int resolution){ - selected.put(SettingType.RESOLUTION,resolution); + public Builder setRange(int range) { + selected.put(SettingType.RANGE, range); return this; } - public Builder setRange(int range){ - selected.put(SettingType.RANGE,range); + public Builder setRangeMilliunit(int range) { + selected.put(SettingType.RANGE_MILLIUNIT, range); return this; } public PolarSensorSetting build() { + if (!selected.containsKey(SettingType.RESOLUTION) && + sourceSettings.settings.containsKey(SettingType.RESOLUTION)) { + selected.put(SettingType.RESOLUTION, + Collections.max(Objects.requireNonNull(sourceSettings.settings.get(SettingType.RESOLUTION)))); + } + if (!selected.containsKey(SettingType.CHANNELS) && + sourceSettings.settings.containsKey(SettingType.CHANNELS)) { + selected.put(SettingType.CHANNELS, + Collections.max(Objects.requireNonNull(sourceSettings.settings.get(SettingType.CHANNELS)))); + } return new PolarSensorSetting(selected); } } diff --git a/sources/Android/android-communications/src/main/java/polar/com/sdk/impl/BDBleApiImpl.java b/sources/Android/android-communications/src/main/java/polar/com/sdk/impl/BDBleApiImpl.java index 1b798a05..5eb74888 100644 --- a/sources/Android/android-communications/src/main/java/polar/com/sdk/impl/BDBleApiImpl.java +++ b/sources/Android/android-communications/src/main/java/polar/com/sdk/impl/BDBleApiImpl.java @@ -8,6 +8,7 @@ import android.os.ParcelUuid; import android.util.Pair; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.androidcommunications.polar.api.ble.BleDeviceListener; @@ -22,6 +23,7 @@ import com.androidcommunications.polar.api.ble.model.gatt.client.BlePMDClient; import com.androidcommunications.polar.api.ble.model.gatt.client.psftp.BlePsFtpClient; import com.androidcommunications.polar.api.ble.model.gatt.client.psftp.BlePsFtpUtils; +import com.androidcommunications.polar.api.ble.model.polar.BlePolarDeviceCapabilitiesUtility; import com.androidcommunications.polar.common.ble.BleUtils; import com.androidcommunications.polar.enpoints.ble.bluedroid.host.BDDeviceListenerImpl; @@ -47,7 +49,11 @@ import fi.polar.remote.representation.protobuf.ExerciseSamples; import fi.polar.remote.representation.protobuf.Types; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.core.*; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import io.reactivex.rxjava3.core.Scheduler; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.core.SingleSource; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.functions.BiFunction; import io.reactivex.rxjava3.functions.Function; @@ -61,14 +67,15 @@ import polar.com.sdk.api.errors.PolarOperationNotSupported; import polar.com.sdk.api.errors.PolarServiceNotAvailable; import polar.com.sdk.api.model.PolarAccelerometerData; -import polar.com.sdk.api.model.PolarBiozData; import polar.com.sdk.api.model.PolarDeviceInfo; import polar.com.sdk.api.model.PolarEcgData; import polar.com.sdk.api.model.PolarExerciseData; import polar.com.sdk.api.model.PolarExerciseEntry; +import polar.com.sdk.api.model.PolarGyroData; import polar.com.sdk.api.model.PolarHrBroadcastData; import polar.com.sdk.api.model.PolarHrData; -import polar.com.sdk.api.model.PolarOhrPPGData; +import polar.com.sdk.api.model.PolarMagnetometerData; +import polar.com.sdk.api.model.PolarOhrData; import polar.com.sdk.api.model.PolarOhrPPIData; import polar.com.sdk.api.model.PolarSensorSetting; import protocol.PftpRequest; @@ -84,7 +91,7 @@ public class BDBleApiImpl extends PolarBleApi implements BleDeviceListener.BleDeviceSessionStateChangedCallback, BleDeviceListener.BlePowerStateChangedCallback { - protected final static String TAG = BDBleApiImpl.class.getSimpleName(); + private static final String TAG = BDBleApiImpl.class.getSimpleName(); protected BleDeviceListener listener; protected Map connectSubscriptions = new HashMap<>(); protected Scheduler scheduler; @@ -175,17 +182,19 @@ public void setPolarFilter(boolean enable) { } @Override - public boolean isFeatureReady(final String deviceId, int feature) { + public boolean isFeatureReady(@NonNull final String deviceId, int feature) { try { switch (feature) { case FEATURE_POLAR_FILE_TRANSFER: return sessionPsFtpClientReady(deviceId) != null; case FEATURE_POLAR_SENSOR_STREAMING: return sessionPmdClientReady(deviceId) != null; + default: + return false; } } catch (Throwable ignored) { + return false; } - return false; } @Override @@ -205,7 +214,7 @@ public void setAutomaticReconnection(boolean disable) { } @Override - public Completable setLocalTime(String identifier, Calendar cal) { + public Completable setLocalTime(@NonNull String identifier, @NonNull Calendar cal) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); @@ -220,37 +229,41 @@ public Completable setLocalTime(String identifier, Calendar cal) { .setSeconds(cal.get(Calendar.SECOND)) .setMillis(cal.get(Calendar.MILLISECOND)).build(); builder.setDate(date).setTime(time).setTzOffset((int) TimeUnit.MINUTES.convert(cal.get(Calendar.ZONE_OFFSET), TimeUnit.MILLISECONDS)); - return client.query(PftpRequest.PbPFtpQuery.SET_LOCAL_TIME_VALUE, builder.build().toByteArray()).toObservable().ignoreElements(); + return client.query(PftpRequest.PbPFtpQuery.SET_LOCAL_TIME_VALUE, builder.build().toByteArray()) + .toObservable() + .ignoreElements(); } catch (Throwable error) { return Completable.error(error); } } @Override - public Single requestAccSettings(String identifier) { - return querySettings(identifier, BlePMDClient.PmdMeasurementType.ACC); - } - - @Override - public Single requestEcgSettings(String identifier) { - return querySettings(identifier, BlePMDClient.PmdMeasurementType.ECG); - } - - @Override - public Single requestPpgSettings(String identifier) { - return querySettings(identifier, BlePMDClient.PmdMeasurementType.PPG); - } - - @Override - public Single requestBiozSettings(final String identifier) { - return querySettings(identifier, BlePMDClient.PmdMeasurementType.BIOZ); + public Single requestStreamSettings(@NonNull final String identifier, + @NonNull DeviceStreamingFeature feature) { + switch (feature) { + case ECG: + return querySettings(identifier, BlePMDClient.PmdMeasurementType.ECG); + case ACC: + return querySettings(identifier, BlePMDClient.PmdMeasurementType.ACC); + case PPG: + return querySettings(identifier, BlePMDClient.PmdMeasurementType.PPG); + case PPI: + return Single.error(new PolarOperationNotSupported()); + case GYRO: + return querySettings(identifier, BlePMDClient.PmdMeasurementType.GYRO); + case MAGNETOMETER: + return querySettings(identifier, BlePMDClient.PmdMeasurementType.MAGNETOMETER); + default: + return Single.error(new PolarInvalidArgument()); + } } protected Single querySettings(final String identifier, final BlePMDClient.PmdMeasurementType type) { try { final BleDeviceSession session = sessionPmdClientReady(identifier); final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.querySettings(type).map(setting -> new PolarSensorSetting(setting.settings, type)); + return client.querySettings(type) + .map(setting -> new PolarSensorSetting(setting.settings, type)); } catch (Throwable e) { return Single.error(e); } @@ -267,7 +280,7 @@ public void foregroundEntered() { } @Override - public Completable autoConnectToDevice(final int rssiLimit, final String service, final int timeout, final TimeUnit unit, final String polarDeviceType) { + public Completable autoConnectToDevice(final int rssiLimit, final String service, final int timeout, @NonNull final TimeUnit unit, final String polarDeviceType) { final long[] start = {0}; return Completable.create(emitter -> { if (service == null || service.matches("([0-9a-fA-F]{4})")) { @@ -275,29 +288,36 @@ public Completable autoConnectToDevice(final int rssiLimit, final String service } else { emitter.tryOnError(new PolarInvalidArgument("Invalid service string format")); } - }).andThen(listener.search(false).filter(bleDeviceSession -> { - if (bleDeviceSession.getMedianRssi() >= rssiLimit && - bleDeviceSession.isConnectableAdvertisement() && - (polarDeviceType == null || polarDeviceType.equals(bleDeviceSession.getPolarDeviceType())) && - (service == null || bleDeviceSession.getAdvertisementContent().containsService(service))) { - if (start[0] == 0) { - start[0] = System.currentTimeMillis(); - } - return true; - } - return false; - }).timestamp().takeUntil(bleDeviceSessionTimed -> { - long diff = bleDeviceSessionTimed.time(TimeUnit.MILLISECONDS) - start[0]; - return (diff >= unit.toMillis(timeout)); - }).reduce(new HashSet<>(), (BiFunction, Timed, Set>) (objects, bleDeviceSessionTimed) -> { - objects.add(bleDeviceSessionTimed.value()); - return objects; - }).doOnSuccess(set -> { - List list = new ArrayList<>(set); - Collections.sort(list, (o1, o2) -> o1.getRssi() > o2.getRssi() ? -1 : 1); - listener.openSessionDirect(list.get(0)); - log("auto connect search complete"); - }).toObservable().ignoreElements()); + }).andThen(listener.search(false) + .filter(bleDeviceSession -> { + if (bleDeviceSession.getMedianRssi() >= rssiLimit && + bleDeviceSession.isConnectableAdvertisement() && + (polarDeviceType == null || polarDeviceType.equals(bleDeviceSession.getPolarDeviceType())) && + (service == null || bleDeviceSession.getAdvertisementContent().containsService(service))) { + if (start[0] == 0) { + start[0] = System.currentTimeMillis(); + } + return true; + } + return false; + }) + .timestamp() + .takeUntil(bleDeviceSessionTimed -> { + long diff = bleDeviceSessionTimed.time(TimeUnit.MILLISECONDS) - start[0]; + return (diff >= unit.toMillis(timeout)); + }) + .reduce(new HashSet<>(), (BiFunction, Timed, Set>) (objects, bleDeviceSessionTimed) -> { + objects.add(bleDeviceSessionTimed.value()); + return objects; + }) + .doOnSuccess(set -> { + List list = new ArrayList<>(set); + Collections.sort(list, (o1, o2) -> o1.getRssi() > o2.getRssi() ? -1 : 1); + listener.openSessionDirect(list.get(0)); + log("auto connect search complete"); + }) + .toObservable() + .ignoreElements()); } @Override @@ -306,7 +326,7 @@ public Completable autoConnectToDevice(final int rssiLimit, final String service } @Override - public void connectToDevice(final String identifier) throws PolarInvalidArgument { + public void connectToDevice(@NonNull final String identifier) throws PolarInvalidArgument { BleDeviceSession session = fetchSession(identifier); if (session == null || session.getSessionState() == SESSION_CLOSED) { if (connectSubscriptions.containsKey(identifier)) { @@ -316,27 +336,30 @@ public void connectToDevice(final String identifier) throws PolarInvalidArgument if (session != null) { listener.openSessionDirect(session); } else { - connectSubscriptions.put(identifier, listener.search(false).filter(bleDeviceSession -> identifier.contains(":") ? - bleDeviceSession.getAddress().equals(identifier) : - bleDeviceSession.getPolarDeviceId().equals(identifier)).take(1).observeOn(scheduler).subscribe( - bleDeviceSession -> listener.openSessionDirect(bleDeviceSession), - throwable -> logError(throwable.getMessage()), - () -> log("connect search complete") - )); + connectSubscriptions.put(identifier, + listener.search(false) + .filter(bleDeviceSession -> identifier.contains(":") ? bleDeviceSession.getAddress().equals(identifier) : bleDeviceSession.getPolarDeviceId().equals(identifier)) + .take(1) + .observeOn(scheduler) + .subscribe( + bleDeviceSession -> listener.openSessionDirect(bleDeviceSession), + throwable -> logError(throwable.getMessage()), + () -> log("connect search complete") + )); } } } @Override - public void disconnectFromDevice(String identifier) throws PolarInvalidArgument { + public void disconnectFromDevice(@NonNull String identifier) throws PolarInvalidArgument { BleDeviceSession session = fetchSession(identifier); - if (session != null) { - if (session.getSessionState() == SESSION_OPEN || - session.getSessionState() == SESSION_OPENING || - session.getSessionState() == BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK) { - listener.closeSessionDirect(session); - } + if (session != null + && (session.getSessionState() == SESSION_OPEN + || session.getSessionState() == SESSION_OPENING + || session.getSessionState() == BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK)) { + listener.closeSessionDirect(session); } + if (connectSubscriptions.containsKey(identifier)) { Objects.requireNonNull(connectSubscriptions.get(identifier)).dispose(); connectSubscriptions.remove(identifier); @@ -344,18 +367,22 @@ public void disconnectFromDevice(String identifier) throws PolarInvalidArgument } @Override - public Completable startRecording(String identifier, String exerciseId, RecordingInterval interval, SampleType type) { + public Completable startRecording(@NonNull String identifier, @NonNull String exerciseId, @NonNull RecordingInterval interval, @NonNull SampleType type) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); - if (session.getPolarDeviceType().equals("H10")) { + final boolean recordingSupported = BlePolarDeviceCapabilitiesUtility.isRecordingSupported(session.getPolarDeviceType()); + if (recordingSupported) { Types.PbSampleType t = type == SampleType.HR ? Types.PbSampleType.SAMPLE_TYPE_HEART_RATE : Types.PbSampleType.SAMPLE_TYPE_RR_INTERVAL; Types.PbDuration duration = Types.PbDuration.newBuilder().setSeconds(interval.getValue()).build(); PftpRequest.PbPFtpRequestStartRecordingParams params = PftpRequest.PbPFtpRequestStartRecordingParams.newBuilder(). setSampleDataIdentifier(exerciseId).setSampleType(t).setRecordingInterval(duration).build(); - return client.query(PftpRequest.PbPFtpQuery.REQUEST_START_RECORDING_VALUE, params.toByteArray()).toObservable().ignoreElements().onErrorResumeNext(Completable::error); + return client.query(PftpRequest.PbPFtpQuery.REQUEST_START_RECORDING_VALUE, params.toByteArray()) + .toObservable() + .ignoreElements() + .onErrorResumeNext(Completable::error); } return Completable.error(new PolarOperationNotSupported()); } catch (Throwable error) { @@ -364,11 +391,12 @@ public Completable startRecording(String identifier, String exerciseId, Recordin } @Override - public Completable stopRecording(String identifier) { + public Completable stopRecording(@NonNull String identifier) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); - if (session.getPolarDeviceType().equals("H10")) { + final boolean recordingSupported = BlePolarDeviceCapabilitiesUtility.isRecordingSupported(session.getPolarDeviceType()); + if (recordingSupported) { return client.query(PftpRequest.PbPFtpQuery.REQUEST_STOP_RECORDING_VALUE, null).toObservable().ignoreElements().onErrorResumeNext(throwable -> Completable.error(handleError(throwable))); } return Completable.error(new PolarOperationNotSupported()); @@ -378,11 +406,12 @@ public Completable stopRecording(String identifier) { } @Override - public Single> requestRecordingStatus(String identifier) { + public Single> requestRecordingStatus(@NonNull String identifier) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); - if (session.getPolarDeviceType().equals("H10")) { + final boolean recordingSupported = BlePolarDeviceCapabilitiesUtility.isRecordingSupported(session.getPolarDeviceType()); + if (recordingSupported) { return client.query(PftpRequest.PbPFtpQuery.REQUEST_RECORDING_STATUS_VALUE, null).map(byteArrayOutputStream -> { PftpResponse.PbRequestRecordingStatusResult result = PftpResponse.PbRequestRecordingStatusResult.parseFrom(byteArrayOutputStream.toByteArray()); return new Pair<>(result.getRecordingOn(), result.hasSampleDataIdentifier() ? result.getSampleDataIdentifier() : ""); @@ -395,27 +424,31 @@ public Single> requestRecordingStatus(String identifier) { } @Override - public Flowable listExercises(String identifier) { + public Flowable listExercises(@NonNull String identifier) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); - switch (session.getPolarDeviceType()) { - case "OH1": + switch (BlePolarDeviceCapabilitiesUtility.getFileSystemType(session.getPolarDeviceType())) { + case SAGRFC2_FILE_SYSTEM: return fetchRecursively(client, "/U/0/", entry -> entry.matches("^([0-9]{8})(\\/)") || entry.matches("^([0-9]{6})(\\/)") || entry.equals("E/") || entry.equals("SAMPLES.BPB") || - entry.equals("00/")).map(p -> { - String[] components = p.split("/"); - SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd HHmmss", Locale.getDefault()); - Date date = format.parse(components[3] + " " + components[5]); - return new PolarExerciseEntry(p, date, components[3] + components[5]); - }).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); - case "H10": - return fetchRecursively(client, "/", entry -> entry.endsWith("/") || entry.equals("SAMPLES.BPB")).map(p -> { - String[] components = p.split("/"); - return new PolarExerciseEntry(p, new Date(), components[1]); - }).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); + entry.equals("00/")) + .map(p -> { + String[] components = p.split("/"); + SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd HHmmss", Locale.getDefault()); + Date date = format.parse(components[3] + " " + components[5]); + return new PolarExerciseEntry(p, date, components[3] + components[5]); + }) + .onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); + case H10_FILE_SYSTEM: + return fetchRecursively(client, "/", entry -> entry.endsWith("/") || entry.equals("SAMPLES.BPB")) + .map(p -> { + String[] components = p.split("/"); + return new PolarExerciseEntry(p, new Date(), components[1]); + }) + .onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); default: return Flowable.error(new PolarOperationNotSupported()); } @@ -425,15 +458,16 @@ public Flowable listExercises(String identifier) { } @Override - public Single fetchExercise(String identifier, PolarExerciseEntry entry) { + public Single fetchExercise(@NonNull String identifier, @NonNull PolarExerciseEntry entry) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); protocol.PftpRequest.PbPFtpOperation.Builder builder = protocol.PftpRequest.PbPFtpOperation.newBuilder(); builder.setCommand(PftpRequest.PbPFtpOperation.Command.GET); builder.setPath(entry.path); - if (session.getPolarDeviceType().equals("OH1") || session.getPolarDeviceType().equals("H10")) { - + final BlePolarDeviceCapabilitiesUtility.FileSystemType fsType = BlePolarDeviceCapabilitiesUtility.getFileSystemType(session.getPolarDeviceType()); + if (fsType == BlePolarDeviceCapabilitiesUtility.FileSystemType.SAGRFC2_FILE_SYSTEM + || fsType == BlePolarDeviceCapabilitiesUtility.FileSystemType.H10_FILE_SYSTEM) { /* TODO to improve throughput (device will request parameter update from mobile): @@ -449,14 +483,16 @@ TODO to improve throughput (device will request parameter update from mobile): ); */ - return client.request(builder.build().toByteArray()).map(byteArrayOutputStream -> { - ExerciseSamples.PbExerciseSamples samples = ExerciseSamples.PbExerciseSamples.parseFrom(byteArrayOutputStream.toByteArray()); - if (samples.hasRrSamples()) { - return new PolarExerciseData(samples.getRecordingInterval().getSeconds(), samples.getRrSamples().getRrIntervalsList()); - } else { - return new PolarExerciseData(samples.getRecordingInterval().getSeconds(), samples.getHeartRateSamplesList()); - } - }).onErrorResumeNext(throwable -> Single.error(handleError(throwable))); + return client.request(builder.build().toByteArray()) + .map(byteArrayOutputStream -> { + ExerciseSamples.PbExerciseSamples samples = ExerciseSamples.PbExerciseSamples.parseFrom(byteArrayOutputStream.toByteArray()); + if (samples.hasRrSamples()) { + return new PolarExerciseData(samples.getRecordingInterval().getSeconds(), samples.getRrSamples().getRrIntervalsList()); + } else { + return new PolarExerciseData(samples.getRecordingInterval().getSeconds(), samples.getHeartRateSamplesList()); + } + }) + .onErrorResumeNext(throwable -> Single.error(handleError(throwable))); } return Single.error(new PolarOperationNotSupported()); } catch (Throwable error) { @@ -465,34 +501,42 @@ TODO to improve throughput (device will request parameter update from mobile): } @Override - public Completable removeExercise(String identifier, PolarExerciseEntry entry) { + public Completable removeExercise(@NonNull String identifier, @NonNull PolarExerciseEntry entry) { try { final BleDeviceSession session = sessionPsFtpClientReady(identifier); final BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); - if (session.getPolarDeviceType().equals("OH1")) { + final BlePolarDeviceCapabilitiesUtility.FileSystemType fsType = BlePolarDeviceCapabilitiesUtility.getFileSystemType(session.getPolarDeviceType()); + if (fsType == BlePolarDeviceCapabilitiesUtility.FileSystemType.SAGRFC2_FILE_SYSTEM) { protocol.PftpRequest.PbPFtpOperation.Builder builder = protocol.PftpRequest.PbPFtpOperation.newBuilder(); builder.setCommand(PftpRequest.PbPFtpOperation.Command.GET); final String[] components = entry.path.split("/"); final String exerciseParent = "/U/0/" + components[3] + "/E/"; builder.setPath(exerciseParent); - return client.request(builder.build().toByteArray()).flatMap((Function>) byteArrayOutputStream -> { - PftpResponse.PbPFtpDirectory directory = PftpResponse.PbPFtpDirectory.parseFrom(byteArrayOutputStream.toByteArray()); - PftpRequest.PbPFtpOperation.Builder removeBuilder = PftpRequest.PbPFtpOperation.newBuilder(); - removeBuilder.setCommand(PftpRequest.PbPFtpOperation.Command.REMOVE); - if (directory.getEntriesCount() <= 1) { - // remove entire directory - removeBuilder.setPath("/U/0/" + components[3] + "/"); - } else { - // remove only exercise - removeBuilder.setPath("/U/0/" + components[3] + "/E/" + components[5] + "/"); - } - return client.request(removeBuilder.build().toByteArray()); - }).toObservable().ignoreElements().onErrorResumeNext(throwable -> Completable.error(handleError(throwable))); - } else if (session.getPolarDeviceType().equals("H10")) { + return client.request(builder.build().toByteArray()) + .flatMap((Function>) byteArrayOutputStream -> { + PftpResponse.PbPFtpDirectory directory = PftpResponse.PbPFtpDirectory.parseFrom(byteArrayOutputStream.toByteArray()); + PftpRequest.PbPFtpOperation.Builder removeBuilder = PftpRequest.PbPFtpOperation.newBuilder(); + removeBuilder.setCommand(PftpRequest.PbPFtpOperation.Command.REMOVE); + if (directory.getEntriesCount() <= 1) { + // remove entire directory + removeBuilder.setPath("/U/0/" + components[3] + "/"); + } else { + // remove only exercise + removeBuilder.setPath("/U/0/" + components[3] + "/E/" + components[5] + "/"); + } + return client.request(removeBuilder.build().toByteArray()); + }) + .toObservable() + .ignoreElements() + .onErrorResumeNext(throwable -> Completable.error(handleError(throwable))); + } else if (fsType == BlePolarDeviceCapabilitiesUtility.FileSystemType.H10_FILE_SYSTEM) { protocol.PftpRequest.PbPFtpOperation.Builder builder = protocol.PftpRequest.PbPFtpOperation.newBuilder(); builder.setCommand(PftpRequest.PbPFtpOperation.Command.REMOVE); builder.setPath(entry.path); - return client.request(builder.build().toByteArray()).toObservable().ignoreElements().onErrorResumeNext(throwable -> Completable.error(handleError(throwable))); + return client.request(builder.build().toByteArray()) + .toObservable() + .ignoreElements() + .onErrorResumeNext(throwable -> Completable.error(handleError(throwable))); } return Completable.error(new PolarOperationNotSupported()); } catch (Throwable error) { @@ -502,119 +546,130 @@ public Completable removeExercise(String identifier, PolarExerciseEntry entry) { @Override public Flowable searchForDevice() { - return listener.search(false).distinct().map(bleDeviceSession -> new PolarDeviceInfo(bleDeviceSession.getPolarDeviceId(), - bleDeviceSession.getAddress(), - bleDeviceSession.getRssi(), - bleDeviceSession.getName(), - bleDeviceSession.isConnectableAdvertisement())); + return listener.search(false) + .distinct() + .map(bleDeviceSession -> new PolarDeviceInfo(bleDeviceSession.getPolarDeviceId(), + bleDeviceSession.getAddress(), + bleDeviceSession.getRssi(), + bleDeviceSession.getName(), + bleDeviceSession.isConnectableAdvertisement())); } @Override public Flowable startListenForPolarHrBroadcasts(final Set deviceIds) { // set filter to null, NOTE this disables reconnection in background - return listener.search(false).filter(bleDeviceSession -> (deviceIds == null || deviceIds.contains(bleDeviceSession.getPolarDeviceId())) && - bleDeviceSession.getAdvertisementContent().getPolarHrAdvertisement().isPresent()).map(bleDeviceSession -> { - BlePolarHrAdvertisement advertisement = bleDeviceSession.getBlePolarHrAdvertisement(); - return new PolarHrBroadcastData(new PolarDeviceInfo(bleDeviceSession.getPolarDeviceId(), - bleDeviceSession.getAddress(), - bleDeviceSession.getRssi(), - bleDeviceSession.getName(), - bleDeviceSession.isConnectableAdvertisement()), - advertisement.getHrForDisplay(), - advertisement.getBatteryStatus() != 0); - }); + return listener.search(false) + .filter(bleDeviceSession -> (deviceIds == null || deviceIds.contains(bleDeviceSession.getPolarDeviceId())) && + bleDeviceSession.getAdvertisementContent().getPolarHrAdvertisement().isPresent()) + .map(bleDeviceSession -> { + BlePolarHrAdvertisement advertisement = bleDeviceSession.getBlePolarHrAdvertisement(); + return new PolarHrBroadcastData(new PolarDeviceInfo(bleDeviceSession.getPolarDeviceId(), + bleDeviceSession.getAddress(), + bleDeviceSession.getRssi(), + bleDeviceSession.getName(), + bleDeviceSession.isConnectableAdvertisement()), + advertisement.getHrForDisplay(), + advertisement.getBatteryStatus() != 0); + }); } - @Override - public Flowable startEcgStreaming(String identifier, - PolarSensorSetting setting) { + private Flowable startStreaming(String identifier, + BlePMDClient.PmdMeasurementType type, + PolarSensorSetting setting, + Function> observer) { try { final BleDeviceSession session = sessionPmdClientReady(identifier); final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.startMeasurement(BlePMDClient.PmdMeasurementType.ECG, setting.map2PmdSettings()).andThen( - client.monitorEcgNotifications(true).map(ecgData -> { - List samples = new ArrayList<>(); - for (BlePMDClient.EcgData.EcgSample s : ecgData.ecgSamples) { - samples.add(s.microVolts); - } - return new PolarEcgData(samples, ecgData.timeStamp); - }).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))).doFinally(() -> stopPmdStreaming(session, client, BlePMDClient.PmdMeasurementType.ECG))); + return client.startMeasurement(type, setting.map2PmdSettings()) + .andThen(observer.apply(client) + .onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))) + .doFinally(() -> stopPmdStreaming(session, client, type))); } catch (Throwable t) { return Flowable.error(t); } } @Override - public Flowable startAccStreaming(String identifier, - PolarSensorSetting setting) { - try { - final BleDeviceSession session = sessionPmdClientReady(identifier); - final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.startMeasurement(BlePMDClient.PmdMeasurementType.ACC, setting.map2PmdSettings()).andThen( - client.monitorAccNotifications(true).map(accData -> { - List samples = new ArrayList<>(); - for (BlePMDClient.AccData.AccSample s : accData.accSamples) { - samples.add(new PolarAccelerometerData.PolarAccelerometerSample(s.x, s.y, s.z)); - } - return new PolarAccelerometerData(samples, accData.timeStamp); - }).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))).doFinally(() -> stopPmdStreaming(session, client, BlePMDClient.PmdMeasurementType.ACC))); - } catch (Throwable t) { - return Flowable.error(t); - } + public Flowable startEcgStreaming(@NonNull String identifier, + @NonNull PolarSensorSetting setting) { + return startStreaming(identifier, BlePMDClient.PmdMeasurementType.ECG, setting, client -> client.monitorEcgNotifications(true).map(ecgData -> { + List samples = new ArrayList<>(); + for (BlePMDClient.EcgData.EcgSample s : ecgData.ecgSamples) { + samples.add(s.microVolts); + } + return new PolarEcgData(samples, ecgData.timeStamp); + })); } @Override - public Flowable startOhrPPGStreaming(String identifier, - PolarSensorSetting setting) { - try { - final BleDeviceSession session = sessionPmdClientReady(identifier); - final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.startMeasurement(BlePMDClient.PmdMeasurementType.PPG, setting.map2PmdSettings()).andThen( - client.monitorPpgNotifications(true).map(ppgData -> { - List samples = new ArrayList<>(); - for (BlePMDClient.PpgData.PpgSample s : ppgData.ppgSamples) { - samples.add(new PolarOhrPPGData.PolarOhrPPGSample(s.ppg0, s.ppg1, s.ppg2, s.ambient, s.ppgDataSamples, s.ambient1, s.status)); - } - return new PolarOhrPPGData(samples, ppgData.timeStamp, ppgData.type); - }).doFinally(() -> stopPmdStreaming(session, client, BlePMDClient.PmdMeasurementType.PPG))).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); - } catch (Throwable t) { - return Flowable.error(t); - } + public Flowable startAccStreaming(@NonNull String identifier, + @NonNull PolarSensorSetting setting) { + return startStreaming(identifier, BlePMDClient.PmdMeasurementType.ACC, setting, client -> client.monitorAccNotifications(true) + .map(accData -> { + List samples = new ArrayList<>(); + for (BlePMDClient.AccData.AccSample s : accData.accSamples) { + samples.add(new PolarAccelerometerData.PolarAccelerometerDataSample(s.x, s.y, s.z)); + } + return new PolarAccelerometerData(samples, accData.timeStamp); + })); } @Override - public Flowable startOhrPPIStreaming(String identifier) { - try { - final BleDeviceSession session = sessionPmdClientReady(identifier); - final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.startMeasurement(BlePMDClient.PmdMeasurementType.PPI, new BlePMDClient.PmdSetting(new HashMap<>())).andThen( - client.monitorPpiNotifications(true).map(ppiData -> { - List samples = new ArrayList<>(); - for (BlePMDClient.PpiData.PPSample ppSample : ppiData.ppSamples) { - samples.add(new PolarOhrPPIData.PolarOhrPPISample(ppSample.ppInMs, - ppSample.ppErrorEstimate, - ppSample.hr, - ppSample.blockerBit != 0, - ppSample.skinContactStatus != 0, - ppSample.skinContactSupported != 0)); - } - return new PolarOhrPPIData(ppiData.timestamp, samples); - }).doFinally(() -> stopPmdStreaming(session, client, BlePMDClient.PmdMeasurementType.PPI))).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); - } catch (Throwable t) { - return Flowable.error(t); - } + public Flowable startOhrStreaming(@NonNull String identifier, + @NonNull PolarSensorSetting setting) { + return startStreaming(identifier, BlePMDClient.PmdMeasurementType.PPG, setting, client -> client.monitorPpgNotifications(true) + .map(ppgData -> { + List samples = new ArrayList<>(); + PolarOhrData.OHR_DATA_TYPE type = PolarOhrData.OHR_DATA_TYPE.UNKNOWN; + if (ppgData.channels == 4) { + type = PolarOhrData.OHR_DATA_TYPE.PPG3_AMBIENT1; + } + for (BlePMDClient.PpgData.PpgSample s : ppgData.ppgSamples) { + samples.add(new PolarOhrData.PolarOhrSample(s.ppgDataSamples, s.status)); + } + return new PolarOhrData(samples, type, ppgData.timeStamp); + })); } @Override - public Flowable startBiozStreaming(final String identifier, PolarSensorSetting setting) { - try { - final BleDeviceSession session = sessionPmdClientReady(identifier); - final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.startMeasurement(BlePMDClient.PmdMeasurementType.BIOZ, setting.map2PmdSettings()).andThen( - client.monitorBiozNotifications(true).map(biozData -> new PolarBiozData(biozData.timeStamp, biozData.samples, biozData.status, biozData.type)).doFinally(() -> stopPmdStreaming(session, client, BlePMDClient.PmdMeasurementType.PPG))).onErrorResumeNext(throwable -> Flowable.error(handleError(throwable))); - } catch (Throwable t) { - return Flowable.error(t); - } + public Flowable startOhrPPIStreaming(@NonNull String identifier) { + return startStreaming(identifier, BlePMDClient.PmdMeasurementType.PPI, new PolarSensorSetting(new HashMap<>()), client -> client.monitorPpiNotifications(true).map(ppiData -> { + List samples = new ArrayList<>(); + for (BlePMDClient.PpiData.PPSample ppSample : ppiData.ppSamples) { + samples.add(new PolarOhrPPIData.PolarOhrPPISample(ppSample.ppInMs, + ppSample.ppErrorEstimate, + ppSample.hr, + ppSample.blockerBit != 0, + ppSample.skinContactStatus != 0, + ppSample.skinContactSupported != 0)); + } + return new PolarOhrPPIData(ppiData.timeStamp, samples); + })); + } + + @Override + public Flowable startMagnetometerStreaming(@NonNull final String identifier, + @NonNull PolarSensorSetting setting) { + return startStreaming(identifier, BlePMDClient.PmdMeasurementType.MAGNETOMETER, setting, client -> client.monitorMagnetometerNotifications(true).map(mgn -> { + List samples = new ArrayList<>(); + for (BlePMDClient.MagData.MagSample sample : mgn.magSamples) { + samples.add(new PolarMagnetometerData.PolarMagnetometerDataSample(sample.x, sample.y, sample.z)); + } + return new PolarMagnetometerData(samples, mgn.timeStamp); + })); + } + + @Override + public Flowable startGyroStreaming(@NonNull final String identifier, + @NonNull PolarSensorSetting setting) { + return startStreaming(identifier, BlePMDClient.PmdMeasurementType.GYRO, setting, client -> client.monitorGyroNotifications(true) + .map(gyro -> { + List samples = new ArrayList<>(); + for (BlePMDClient.GyrData.GyrSample sample : gyro.gyrSamples) { + samples.add(new PolarGyroData.PolarGyroDataSample(sample.x, sample.y, sample.z)); + } + return new PolarGyroData(samples, gyro.timeStamp); + })); } protected BleDeviceSession fetchSession(final String identifier) throws PolarInvalidArgument { @@ -687,7 +742,8 @@ protected void stopPmdStreaming(BleDeviceSession session, BlePMDClient client, B if (session.getSessionState() == SESSION_OPEN) { // stop streaming client.stopMeasurement(type).subscribe( - () -> { }, + () -> { + }, throwable -> logError("failed to stop pmd stream: " + throwable.getLocalizedMessage()) ); } @@ -696,82 +752,100 @@ protected void stopPmdStreaming(BleDeviceSession session, BlePMDClient client, B @SuppressLint("CheckResult") protected void setupDevice(final BleDeviceSession session) { final String deviceId = session.getPolarDeviceId().length() != 0 ? session.getPolarDeviceId() : session.getAddress(); - session.monitorServicesDiscovered(true).observeOn(scheduler).toFlowable().flatMapIterable( - (Function, Iterable>) uuids -> uuids - ).flatMap(uuid -> { - if (session.fetchClient(uuid) != null) { - if (uuid.equals(BleHrClient.HR_SERVICE)) { - if (callback != null) { - callback.hrFeatureReady(deviceId); - } - final BleHrClient client = (BleHrClient) session.fetchClient(BleHrClient.HR_SERVICE); - client.observeHrNotifications(true).observeOn(scheduler).subscribe( - hrNotificationData -> { - if (callback != null) { - callback.hrNotificationReceived(deviceId, - new PolarHrData(hrNotificationData.hrValue, - hrNotificationData.rrs, - hrNotificationData.sensorContact, - hrNotificationData.sensorContactSupported, - hrNotificationData.rrPresent)); - } - }, - throwable -> logError(throwable.getMessage()), - () -> { - + session.monitorServicesDiscovered(true) + .observeOn(scheduler) + .toFlowable() + .flatMapIterable((Function, Iterable>) uuids -> uuids) + .flatMap(uuid -> { + if (session.fetchClient(uuid) != null) { + if (uuid.equals(BleHrClient.HR_SERVICE)) { + if (callback != null) { + callback.hrFeatureReady(deviceId); } - ); - } else if (uuid.equals(BleBattClient.BATTERY_SERVICE)) { - BleBattClient client = (BleBattClient) session.fetchClient(BleBattClient.BATTERY_SERVICE); - return client.waitBatteryLevelUpdate(true).observeOn(scheduler).doOnSuccess(integer -> { - if (callback != null) { - callback.batteryLevelReceived(deviceId, integer); - } - }).toFlowable(); - } else if (uuid.equals(BlePMDClient.PMD_SERVICE)) { - final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); - return client.waitNotificationEnabled(BlePMDClient.PMD_CP, true). - concatWith(client.waitNotificationEnabled(BlePMDClient.PMD_DATA, true)).andThen(client.readFeature(true).doOnSuccess(pmdFeature -> { - if (callback != null) { - if (pmdFeature.ecgSupported) { - callback.ecgFeatureReady(deviceId); - } - if (pmdFeature.accSupported) { - callback.accelerometerFeatureReady(deviceId); - } - if (pmdFeature.ppgSupported) { - callback.ppgFeatureReady(deviceId); - } - if (pmdFeature.ppiSupported) { - callback.ppiFeatureReady(deviceId); - } - if (pmdFeature.bioZSupported) { - callback.biozFeatureReady(deviceId); + final BleHrClient client = (BleHrClient) session.fetchClient(BleHrClient.HR_SERVICE); + client.observeHrNotifications(true) + .observeOn(scheduler) + .subscribe( + hrNotificationData -> { + if (callback != null) { + callback.hrNotificationReceived(deviceId, + new PolarHrData(hrNotificationData.hrValue, + hrNotificationData.rrs, + hrNotificationData.sensorContact, + hrNotificationData.sensorContactSupported, + hrNotificationData.rrPresent)); + } + }, + throwable -> logError(throwable.getMessage()), + () -> { + } + ); + } else if (uuid.equals(BleBattClient.BATTERY_SERVICE)) { + BleBattClient client = (BleBattClient) session.fetchClient(BleBattClient.BATTERY_SERVICE); + return client.waitBatteryLevelUpdate(true) + .observeOn(scheduler) + .doOnSuccess(integer -> { + if (callback != null) { + callback.batteryLevelReceived(deviceId, integer); + } + }) + .toFlowable(); + } else if (uuid.equals(BlePMDClient.PMD_SERVICE)) { + final BlePMDClient client = (BlePMDClient) session.fetchClient(BlePMDClient.PMD_SERVICE); + return client.waitNotificationEnabled(BlePMDClient.PMD_CP, true) + .concatWith(client.waitNotificationEnabled(BlePMDClient.PMD_DATA, true)) + .andThen(client.readFeature(true) + .doOnSuccess(pmdFeature -> { + if (callback != null) { + Set deviceStreamingFeatures = new HashSet<>(); + if (pmdFeature.ecgSupported) { + deviceStreamingFeatures.add(DeviceStreamingFeature.ECG); + } + if (pmdFeature.accSupported) { + deviceStreamingFeatures.add(DeviceStreamingFeature.ACC); + } + if (pmdFeature.ppgSupported) { + deviceStreamingFeatures.add(DeviceStreamingFeature.PPG); + } + if (pmdFeature.ppiSupported) { + deviceStreamingFeatures.add(DeviceStreamingFeature.PPI); + } + if (pmdFeature.gyroSupported) { + deviceStreamingFeatures.add(DeviceStreamingFeature.GYRO); + } + if (pmdFeature.magnetometerSupported) { + deviceStreamingFeatures.add(DeviceStreamingFeature.MAGNETOMETER); + } + callback.streamingFeaturesReady(deviceId, deviceStreamingFeatures); + } + })) + .toFlowable(); + } else if (uuid.equals(BleDisClient.DIS_SERVICE)) { + BleDisClient client = (BleDisClient) session.fetchClient(BleDisClient.DIS_SERVICE); + return client.observeDisInfo(true).observeOn(scheduler).doOnNext(pair -> { + if (callback != null) { + callback.disInformationReceived(deviceId, pair.first, pair.second); } - })).toFlowable(); - } else if (uuid.equals(BleDisClient.DIS_SERVICE)) { - BleDisClient client = (BleDisClient) session.fetchClient(BleDisClient.DIS_SERVICE); - return client.observeDisInfo(true).observeOn(scheduler).doOnNext(pair -> { - if (callback != null) { - callback.disInformationReceived(deviceId, pair.first, pair.second); - } - }); - } else if (uuid.equals(BlePsFtpUtils.RFC77_PFTP_SERVICE)) { - BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); - return client.waitPsFtpClientReady(true).observeOn(scheduler).doOnComplete(() -> { - if (callback != null && - (session.getPolarDeviceType().equals("OH1") || session.getPolarDeviceType().equals("H10"))) { - callback.polarFtpFeatureReady(deviceId); + }); + } else if (uuid.equals(BlePsFtpUtils.RFC77_PFTP_SERVICE)) { + BlePsFtpClient client = (BlePsFtpClient) session.fetchClient(BlePsFtpUtils.RFC77_PFTP_SERVICE); + return client.waitPsFtpClientReady(true) + .observeOn(scheduler) + .doOnComplete(() -> { + if (callback != null) { + callback.polarFtpFeatureReady(deviceId); + } + }).toFlowable(); } - }).toFlowable(); - } - } - return Flowable.empty(); - }).subscribe( - o -> { }, - throwable -> logError(throwable.getMessage()), - () -> log("complete")); + } + return Flowable.empty(); + }) + .subscribe( + o -> { + }, + throwable -> logError(throwable.getMessage()), + () -> log("complete")); } protected Exception handleError(Throwable throwable) { @@ -827,26 +901,29 @@ protected Flowable fetchRecursively(final BlePsFtpClient client, final S protocol.PftpRequest.PbPFtpOperation.Builder builder = protocol.PftpRequest.PbPFtpOperation.newBuilder(); builder.setCommand(PftpRequest.PbPFtpOperation.Command.GET); builder.setPath(path); - return client.request(builder.build().toByteArray()).toFlowable().flatMap((Function>) byteArrayOutputStream -> { - PftpResponse.PbPFtpDirectory dir = PftpResponse.PbPFtpDirectory.parseFrom(byteArrayOutputStream.toByteArray()); - Set entrys = new HashSet<>(); - for (int i = 0; i < dir.getEntriesCount(); ++i) { - PftpResponse.PbPFtpEntry entry = dir.getEntries(i); - if (condition.include(entry.getName())) { - BleUtils.validate(entrys.add(path + entry.getName()), "duplicate entry"); - } - } - if (entrys.size() != 0) { - return Flowable.fromIterable(entrys).flatMap((Function>) s -> { - if (s.endsWith("/")) { - return fetchRecursively(client, s, condition); - } else { - return Flowable.just(s); + return client.request(builder.build().toByteArray()) + .toFlowable() + .flatMap((Function>) byteArrayOutputStream -> { + PftpResponse.PbPFtpDirectory dir = PftpResponse.PbPFtpDirectory.parseFrom(byteArrayOutputStream.toByteArray()); + Set entries = new HashSet<>(); + for (int i = 0; i < dir.getEntriesCount(); ++i) { + PftpResponse.PbPFtpEntry entry = dir.getEntries(i); + if (condition.include(entry.getName())) { + BleUtils.validate(entries.add(path + entry.getName()), "duplicate entry"); + } + } + if (!entries.isEmpty()) { + return Flowable.fromIterable(entries) + .flatMap((Function>) s -> { + if (s.endsWith("/")) { + return fetchRecursively(client, s, condition); + } else { + return Flowable.just(s); + } + }); } + return Flowable.empty(); }); - } - return Flowable.empty(); - }); } protected void log(final String message) { diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/TestConnectionHandler.java b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/TestConnectionHandler.java new file mode 100644 index 00000000..d97a02d8 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/TestConnectionHandler.java @@ -0,0 +1,200 @@ +package com.androidcommunications.polar; + +import com.androidcommunications.polar.api.ble.model.BleDeviceSession; +import com.androidcommunications.polar.enpoints.ble.bluedroid.host.BDDeviceSessionImpl; +import com.androidcommunications.polar.enpoints.ble.bluedroid.host.connection.ConnectionHandler; +import com.androidcommunications.polar.enpoints.ble.bluedroid.host.connection.ConnectionHandlerObserver; +import com.androidcommunications.polar.enpoints.ble.bluedroid.host.connection.ConnectionInterface; +import com.androidcommunications.polar.enpoints.ble.bluedroid.host.connection.ScannerInterface; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +public class TestConnectionHandler { + + private ConnectionHandler connectionHandler; + + private ConnectionInterface connectionInterface = new ConnectionInterface() { + @Override + public void connectDevice(BDDeviceSessionImpl session) { + + } + + @Override + public void disconnectDevice(BDDeviceSessionImpl session) { + + } + + @Override + public void cancelDeviceConnection(BDDeviceSessionImpl session) { + + } + + @Override + public boolean isPowered() { + return true; + } + }; + + @Mock + private ScannerInterface scannerInterface; + + @Mock + private ConnectionHandlerObserver connectionHandlerObserver; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + connectionHandler = new ConnectionHandler(connectionInterface, scannerInterface, connectionHandlerObserver); + } + + @Test + public void testConnectionHandler_1() { + BDDeviceSessionImpl bleDeviceSession = new BDDeviceSessionImpl(); + connectionHandler.connectDevice(bleDeviceSession, true); + connectionHandler.deviceConnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + } + + + @Test + public void testConnectionHandler_2() { + BDDeviceSessionImpl bleDeviceSession = new BDDeviceSessionImpl(); + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.deviceDisconnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.advertisementHeadReceived(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.deviceConnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + } + + @Test + public void testConnectionHandler_3() { + boolean[] connectTable = new boolean[1]; + connectTable[0] = true; + BDDeviceSessionImpl bleDeviceSession = new BDDeviceSessionImpl() { + @Override + public boolean isConnectableAdvertisement() { + return connectTable[0]; + } + }; + BDDeviceSessionImpl bleDeviceSession2 = new BDDeviceSessionImpl(); + + // multi connections + connectionHandler.connectDevice(bleDeviceSession, true); + connectionHandler.connectDevice(bleDeviceSession2, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.deviceConnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.advertisementHeadReceived(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.deviceConnected(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + + // multi disconnection + connectionHandler.disconnectDevice(bleDeviceSession); + connectionHandler.disconnectDevice(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.deviceDisconnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.deviceDisconnected(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + + // multi connect / disconnect + bleDeviceSession2.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.connectDevice(bleDeviceSession, true); + connectionHandler.disconnectDevice(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.deviceConnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.deviceDisconnected(bleDeviceSession2); + + // maintaining multi connections + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + bleDeviceSession2.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.deviceDisconnected(bleDeviceSession); + connectionHandler.deviceDisconnected(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.advertisementHeadReceived(bleDeviceSession); + connectionHandler.advertisementHeadReceived(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.deviceConnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.advertisementHeadReceived(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.deviceConnected(bleDeviceSession2); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + Assert.assertEquals(bleDeviceSession2.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + + // same state tests + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.deviceConnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN); + + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + connectionHandler.disconnectDevice(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.disconnectDevice(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.disconnectDevice(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.deviceDisconnected(bleDeviceSession); + + // + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + connectTable[0] = false; + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.advertisementHeadReceived(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectTable[0] = true; + connectionHandler.advertisementHeadReceived(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPENING); + connectionHandler.deviceConnected(bleDeviceSession); + + // + connectionHandler.disconnectDevice(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSING); + connectionHandler.connectDevice(bleDeviceSession, true); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + connectionHandler.deviceDisconnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + connectionHandler.connectDevice(bleDeviceSession, false); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.setAutomaticReconnection(false); + connectionHandler.deviceDisconnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_CLOSED); + bleDeviceSession.setSessionState(BleDeviceSession.DeviceSessionState.SESSION_OPEN); + connectionHandler.setAutomaticReconnection(true); + connectionHandler.deviceDisconnected(bleDeviceSession); + Assert.assertEquals(bleDeviceSession.getSessionState(), BleDeviceSession.DeviceSessionState.SESSION_OPEN_PARK); + } +} diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClientTest.kt b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClientTest.kt new file mode 100644 index 00000000..52b3d418 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BleHrClientTest.kt @@ -0,0 +1,272 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client + +import com.androidcommunications.polar.api.ble.model.gatt.BleGattTxInterface +import com.androidcommunications.polar.api.ble.model.gatt.client.BleHrClient.HR_MEASUREMENT +import io.mockk.MockKAnnotations +import io.mockk.impl.annotations.MockK +import io.reactivex.rxjava3.subscribers.TestSubscriber +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import java.util.* + + +class BleHrClientTest { + + @MockK + private lateinit var txInterface: BleGattTxInterface + + private lateinit var bleHrClient: BleHrClient + + @Before + fun setUp() { + MockKAnnotations.init(this) + bleHrClient = BleHrClient(txInterface) + } + + @Test + fun test_HrFormatUint8() { + //Arrange + val characteristic: UUID = HR_MEASUREMENT + val status = 0 + val notifying = true + + // HEX: 00 FF + // index type data: + // 0: Flags field size 1: 0x00 + // Heart rate value format bit: 0 (uint8) + // 1: Heart Rate Measurement Value field size 1: 0xFF + val expectedHeartRate1 = 255 + val measurementFrame1 = byteArrayOf(0x00.toByte(), 0xFF.toByte()) + // HEX: 00 7F + // index type data: + // 0: Flags field size 1: 0x00 + // Heart rate value format bit: 0 (uint8) + // 1: Heart Rate Measurement Value field size 1: 0x7F + val expectedHeartRate2 = 127 + val measurementFrame2 = byteArrayOf(0x00.toByte(), 0x7F.toByte()) + + //Act + val result = bleHrClient.observeHrNotifications(false) + val testObserver = TestSubscriber() + result.subscribe(testObserver) + bleHrClient.processServiceData(characteristic, measurementFrame1, status, notifying) + bleHrClient.processServiceData(characteristic, measurementFrame2, status, notifying) + + //Assert + testObserver.assertNoErrors() + testObserver.assertValueCount(2) + val hrData1 = testObserver.values()[0] + assertEquals(expectedHeartRate1, hrData1.hrValue) + val hrData2 = testObserver.values()[1] + assertEquals(expectedHeartRate2, hrData2.hrValue) + } + + @Test + fun test_HrFormatUint16() { + //Arrange + val characteristic: UUID = HR_MEASUREMENT + val status = 0 + val notifying = true + // HEX: 01 80 80 + // index type data: + // 0: Flags field size 1: 0x01 + // Heart rate value format bit 1 (uint16) + // 1..2: Heart Rate Measurement Value field size 2: 0x80 0x80 (32896) + val expectedHeartRate1 = 32896 + val measurementFrame1 = byteArrayOf(0x01.toByte(), 0x80.toByte(), 0x80.toByte()) + // HEX: 01 7F 7F + // index type data: + // 0: Flags field size 1: 0x01 + // Heart rate value format bit 1 (uint16) + // 1..2: Heart Rate Measurement Value field size 2: 0x7F 0x7F + val expectedHeartRate2 = 32639 + val measurementFrame2 = byteArrayOf(0x01.toByte(), 0x7F.toByte(), 0x7F.toByte()) + + //Act + val result = bleHrClient.observeHrNotifications(false) + val testObserver = TestSubscriber() + result.subscribe(testObserver) + bleHrClient.processServiceData(characteristic, measurementFrame1, status, notifying) + bleHrClient.processServiceData(characteristic, measurementFrame2, status, notifying) + + //Assert + testObserver.assertNoErrors() + testObserver.assertValueCount(2) + val hrData1 = testObserver.values()[0] + assertEquals(expectedHeartRate1, hrData1.hrValue) + val hrData2 = testObserver.values()[1] + assertEquals(expectedHeartRate2, hrData2.hrValue) + } + + @Test + fun test_SensorContactSupported() { + //Arrange + val characteristic: UUID = HR_MEASUREMENT + val status = 0 + val notifying = true + // HEX: 06 00 + // index type data: + // 0: Flags field size 1: 0x06 + // Sensor Contact Status bit 1 + // Sensor Contact Support bit 1 (Supported) + val measurementFrame0 = byteArrayOf(0x06.toByte(), 0x00.toByte()) + // HEX: 04 00 + // index type data: + // 0: Flags field size 1: 0x04 + // Sensor Contact Status bit 0 + // Sensor Contact Support bit 1 (Supported) + val measurementFrame1 = byteArrayOf(0x04.toByte(), 0x00.toByte()) + + //Act + val result = bleHrClient.observeHrNotifications(false) + val testObserver = TestSubscriber() + result.subscribe(testObserver) + bleHrClient.processServiceData(characteristic, measurementFrame0, status, notifying) + bleHrClient.processServiceData(characteristic, measurementFrame1, status, notifying) + + //Assert + testObserver.assertNoErrors() + testObserver.assertValueCount(2) + val hrData0 = testObserver.values()[0] + val hrData1 = testObserver.values()[1] + assertTrue(hrData0.sensorContact) + assertTrue(hrData0.sensorContactSupported) + assertFalse(hrData1.sensorContact) + assertTrue(hrData1.sensorContactSupported) + } + + @Test + fun test_SensorContactNotSupported() { + //Arrange + val characteristic: UUID = HR_MEASUREMENT + val status = 0 + val notifying = true + + // HEX: 02 00 + // index type data: + // 0: Flags field size 1: 0x02 + // Sensor Contact Status bit 1 + // Sensor Contact Support bit 0 (Not supported) + val measurementFrame1 = byteArrayOf(0x02.toByte(), 0x00.toByte()) + + // HEX: 00 00 + // index type data: + // 0: Flags field size 1: 0x00 + // Sensor Contact Status bit 0 + // Sensor Contact Support bit 0 (Not supported) + val measurementFrame2 = byteArrayOf(0x00.toByte(), 0x00.toByte()) + + //Act + val result = bleHrClient.observeHrNotifications(false) + val testObserver = TestSubscriber() + result.subscribe(testObserver) + bleHrClient.processServiceData(characteristic, measurementFrame1, status, notifying) + bleHrClient.processServiceData(characteristic, measurementFrame2, status, notifying) + + //Assert + testObserver.assertNoErrors() + testObserver.assertValueCount(2) + val hrData1 = testObserver.values()[0] + assertFalse(hrData1.sensorContactSupported) + val hrData2 = testObserver.values()[1] + assertFalse(hrData2.sensorContactSupported) + } + + @Test + fun test_EnergyExpended() { + //Arrange + val characteristic: UUID = HR_MEASUREMENT + val status = 0 + val notifying = true + + // HEX: 09 00 00 FF FF + // index type data: + // 0: Flags field size 1: 0x09 + // Heart rate value format bit 1 (uint16) + // Energy Expended Status bit 1 (Energy Expended field is present) + // 1..2: Heart Rate Measurement Value field size 2: 0x00 0x00 + // 3..4: Energy Expended field size 2: 0xFF 0xFF + val expectedHeartRate1 = 0 + val energyExpended1 = 65535 + val measurementFrame1 = byteArrayOf(0x09.toByte(), 0x00.toByte(), 0x00.toByte(), 0xFF.toByte(), 0xFF.toByte()) + // HEX: 08 00 7F 80 + // index type data: + // 0: Flags field size 1: 0x08 + // Heart rate value format bit 0 (uint8) + // Energy Expended Status bit 1 (Energy Expended field is present) + // 1: Heart Rate Measurement Value field size 1: 0x00 + // 2..3: Energy Expended field size 2: 0x7F 0x80 + val expectedHeartRate2 = 0 + val energyExpended2 = 32895 + val measurementFrame2 = byteArrayOf(0x08.toByte(), 0x00.toByte(), 0x7F.toByte(), 0x80.toByte()) + + //Act + val result = bleHrClient.observeHrNotifications(false) + val testObserver = TestSubscriber() + result.subscribe(testObserver) + bleHrClient.processServiceData(characteristic, measurementFrame1, status, notifying) + bleHrClient.processServiceData(characteristic, measurementFrame2, status, notifying) + + //Assert + testObserver.assertNoErrors() + testObserver.assertValueCount(2) + val hrData1 = testObserver.values()[0] + assertEquals(expectedHeartRate1, hrData1.hrValue) + assertEquals(energyExpended1, hrData1.energy) + val hrData2 = testObserver.values()[1] + assertEquals(expectedHeartRate2, hrData2.hrValue) + assertEquals(energyExpended2, hrData2.energy) + } + + @Test + fun test_RRinterval() { + //Arrange + val characteristic: UUID = HR_MEASUREMENT + val status = 0 + val notifying = true + // HEX: 10 00 FF FF + // index type data: + // 0: Flags field size 1: 0x10 + // Heart rate value format bit 0 (uint8) + // RR-interval bit 1 (RR-Interval values are present) + // 1: Heart Rate Measurement Value field size 1: 0x00 + // 2..3: RR-Interval Field size 2: 0xFF 0xFF + val expectedHeartRate1 = 0 + val expectedRR1 = 65535 + val measurementFrame1 = byteArrayOf(0x10.toByte(), 0x00.toByte(), 0xFF.toByte(), 0xFF.toByte()) + // HEX: 11 00 00 FF FF 7F 80 + // index type data: + // 0: Flags field size 1: 0x11 + // Heart rate value format bit 1 (uint16) + // RR-interval bit 1 (RR-Interval values are present) + // 1..2: Heart Rate Measurement Value field size 1: 0x00 0x00 + // 3..4: RR-Interval Field size 2: 0xFF 0xFF + // 5..6: RR-Interval Field size 2: 0x7F 0x80 + val expectedHeartRate2 = 0 + val expectedRR2_0 = 65535 + val expectedRR2_1 = 32895 + val measurementFrame2 = byteArrayOf(0x11.toByte(), 0x00.toByte(), 0x00.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0x7F.toByte(), 0x80.toByte()) + + //Act + val result = bleHrClient.observeHrNotifications(false) + val testObserver = TestSubscriber() + result.subscribe(testObserver) + bleHrClient.processServiceData(characteristic, measurementFrame1, status, notifying) + bleHrClient.processServiceData(characteristic, measurementFrame2, status, notifying) + + //Assert + testObserver.assertNoErrors() + testObserver.assertValueCount(2) + val hrData1 = testObserver.values()[0] + assertEquals(expectedHeartRate1, hrData1.hrValue) + assertTrue(hrData1.rrPresent) + assertEquals(expectedRR1, hrData1.rrs[0]) + val hrData2 = testObserver.values()[1] + + assertEquals(expectedHeartRate2, hrData2.hrValue) + assertTrue(hrData2.rrPresent) + assertEquals(expectedRR2_0, hrData2.rrs[0]) + assertEquals(expectedRR2_1, hrData2.rrs[1]) + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientAccTest.kt b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientAccTest.kt new file mode 100644 index 00000000..547b94b2 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientAccTest.kt @@ -0,0 +1,101 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client + +import com.androidcommunications.polar.api.ble.model.gatt.client.BlePMDClient.AccData +import org.junit.Assert +import org.junit.Test +import kotlin.math.abs + +class BlePmdClientAccTest { + @Test + fun test_parseAccDataDelta_withResolution16() { + // Arrange + // HEX: 71 07 F0 6A 9E 8D 0A 38 BE 5C BE BA 2F 96 B3 EE 4B E5 AD FB 42 B9 EB BE 4C FE BA 2F 92 BF EE 4B E4 B1 FB 12 B9 EC BD 3C 3E BB 2F 8F D3 DE 4B E3 B5 F7 D2 B8 ED BD 30 7E 7B 2F 8B E3 CE 8B E2 BA F7 A2 B8 EE BC 20 BE 7B 2F 88 F3 CE CB E1 BD EF 52 F8 EF BC 18 FE 3B 2F 84 03 BF CB E0 C2 EF 32 B8 F0 BB 04 4E BC 2E 81 13 AF 0B E0 C6 EF F2 F7 F1 B9 FC 7D BC 2E 7D 27 9F 4B DF CA EB C2 F7 F2 B8 EC CD 7C 2E 7B 37 8F 4B DE CE E3 92 F7 F3 B8 E0 0D FD 2D 77 4B 7F CB DD D2 DF 62 37 F5 B7 D4 4D BD 2D 74 5B 6F CB DC D7 D7 32 37 F6 B5 C8 8D 7D 2D 71 6B 4F 4B DC DC D3 F2 36 F7 B4 BC DD FD 2C 6F 7B 3F 4B DB E0 CF D2 36 F8 B2 B0 2D BE 2C 6C 8F 1F CB DA E3 C7 A2 76 F9 + // index type data: + // 0-5: Reference sample size 6: 0xC9 0xFF 0x12 0x00 0x11 0x00 + // Sample 0 (aka. reference sample): + // channel 0: 71 07 => 0x0771 => 1905 + val refSample0Channel0 = 1905 + // channel 1: F0 6A => 0x6AF0 => 27376 + val refSample0Channel1 = 27376 + // channel 2: 9E 8D => 0x8D9E => -29282 + val refSample0Channel2 = -29282 + // Delta dump: 0A 38 | BE 5C BE BA 2F 96 B3 EE 4B E5 AD ... + // 6: Delta size size 1: 0x0A (10 bits) + // 7: Sample amount size 1: 0x38 (Delta block contains 56 samples) + // 8: 0xBE (binary: 1011 1110) + // 9: 0x5C (binary: 0101 11 | 00) + // 10: 0xBE (binary: 1011 | 1110) + // Sample 1 - channel 0, size 10 bits: 00 1011 1110 + // Sample 1 - channel 1, size 10 bits: 11 1001 0111 + // 11: 0xBA (binary: 10 | 11 1010) + // Sample 1 - channel 2, size 10 bits: 11 1010 1011 + val refSample1Channel0 = 190 + val refSample1Channel1 = -105 + val refSample1Channel2 = -85 + val amountOfSamples = 1 + 56 // reference sample + delta samples + val measurementFrame = byteArrayOf(0x71.toByte(), 0x07.toByte(), 0xF0.toByte(), 0x6A.toByte(), 0x9E.toByte(), 0x8D.toByte(), 0x0A.toByte(), 0x38.toByte(), 0xBE.toByte(), 0x5C.toByte(), 0xBE.toByte(), 0xBA.toByte(), 0x2F.toByte(), 0x96.toByte(), 0xB3.toByte(), 0xEE.toByte(), 0x4B.toByte(), 0xE5.toByte(), 0xAD.toByte(), 0xFB.toByte(), 0x42.toByte(), 0xB9.toByte(), 0xEB.toByte(), 0xBE.toByte(), 0x4C.toByte(), 0xFE.toByte(), 0xBA.toByte(), 0x2F.toByte(), 0x92.toByte(), 0xBF.toByte(), 0xEE.toByte(), 0x4B.toByte(), 0xE4.toByte(), 0xB1.toByte(), 0xFB.toByte(), 0x12.toByte(), 0xB9.toByte(), 0xEC.toByte(), 0xBD.toByte(), 0x3C.toByte(), 0x3E.toByte(), 0xBB.toByte(), 0x2F.toByte(), 0x8F.toByte(), 0xD3.toByte(), 0xDE.toByte(), 0x4B.toByte(), 0xE3.toByte(), 0xB5.toByte(), 0xF7.toByte(), 0xD2.toByte(), 0xB8.toByte(), 0xED.toByte(), 0xBD.toByte(), 0x30.toByte(), 0x7E.toByte(), 0x7B.toByte(), 0x2F.toByte(), 0x8B.toByte(), 0xE3.toByte(), 0xCE.toByte(), 0x8B.toByte(), 0xE2.toByte(), 0xBA.toByte(), 0xF7.toByte(), 0xA2.toByte(), 0xB8.toByte(), 0xEE.toByte(), 0xBC.toByte(), 0x20.toByte(), 0xBE.toByte(), 0x7B.toByte(), 0x2F.toByte(), 0x88.toByte(), 0xF3.toByte(), 0xCE.toByte(), 0xCB.toByte(), 0xE1.toByte(), 0xBD.toByte(), 0xEF.toByte(), 0x52.toByte(), 0xF8.toByte(), 0xEF.toByte(), 0xBC.toByte(), 0x18.toByte(), 0xFE.toByte(), 0x3B.toByte(), 0x2F.toByte(), 0x84.toByte(), 0x03.toByte(), 0xBF.toByte(), 0xCB.toByte(), 0xE0.toByte(), 0xC2.toByte(), 0xEF.toByte(), 0x32.toByte(), 0xB8.toByte(), 0xF0.toByte(), 0xBB.toByte(), 0x04.toByte(), 0x4E.toByte(), 0xBC.toByte(), 0x2E.toByte(), 0x81.toByte(), 0x13.toByte(), 0xAF.toByte(), 0x0B.toByte(), 0xE0.toByte(), 0xC6.toByte(), 0xEF.toByte(), 0xF2.toByte(), 0xF7.toByte(), 0xF1.toByte(), 0xB9.toByte(), 0xFC.toByte(), 0x7D.toByte(), 0xBC.toByte(), 0x2E.toByte(), 0x7D.toByte(), 0x27.toByte(), 0x9F.toByte(), 0x4B.toByte(), 0xDF.toByte(), 0xCA.toByte(), 0xEB.toByte(), 0xC2.toByte(), 0xF7.toByte(), 0xF2.toByte(), 0xB8.toByte(), 0xEC.toByte(), 0xCD.toByte(), 0x7C.toByte(), 0x2E.toByte(), 0x7B.toByte(), 0x37.toByte(), 0x8F.toByte(), 0x4B.toByte(), 0xDE.toByte(), 0xCE.toByte(), 0xE3.toByte(), 0x92.toByte(), 0xF7.toByte(), 0xF3.toByte(), 0xB8.toByte(), 0xE0.toByte(), 0x0D.toByte(), 0xFD.toByte(), 0x2D.toByte(), 0x77.toByte(), 0x4B.toByte(), 0x7F.toByte(), 0xCB.toByte(), 0xDD.toByte(), 0xD2.toByte(), 0xDF.toByte(), 0x62.toByte(), 0x37.toByte(), 0xF5.toByte(), 0xB7.toByte(), 0xD4.toByte(), 0x4D.toByte(), 0xBD.toByte(), 0x2D.toByte(), 0x74.toByte(), 0x5B.toByte(), 0x6F.toByte(), 0xCB.toByte(), 0xDC.toByte(), 0xD7.toByte(), 0xD7.toByte(), 0x32.toByte(), 0x37.toByte(), 0xF6.toByte(), 0xB5.toByte(), 0xC8.toByte(), 0x8D.toByte(), 0x7D.toByte(), 0x2D.toByte(), 0x71.toByte(), 0x6B.toByte(), 0x4F.toByte(), 0x4B.toByte(), 0xDC.toByte(), 0xDC.toByte(), 0xD3.toByte(), 0xF2.toByte(), 0x36.toByte(), 0xF7.toByte(), 0xB4.toByte(), 0xBC.toByte(), 0xDD.toByte(), 0xFD.toByte(), 0x2C.toByte(), 0x6F.toByte(), 0x7B.toByte(), 0x3F.toByte(), 0x4B.toByte(), 0xDB.toByte(), 0xE0.toByte(), 0xCF.toByte(), 0xD2.toByte(), 0x36.toByte(), 0xF8.toByte(), 0xB2.toByte(), 0xB0.toByte(), 0x2D.toByte(), 0xBE.toByte(), 0x2C.toByte(), 0x6C.toByte(), 0x8F.toByte(), 0x1F.toByte(), 0xCB.toByte(), 0xDA.toByte(), 0xE3.toByte(), 0xC7.toByte(), 0xA2.toByte(), 0x76.toByte(), 0xF9.toByte()) + val resolution = 16 + val range = 8 + val factor = 2.44E-4f + val timeStamp: Long = 0 + + // Act + val accData = AccData(measurementFrame, factor, resolution, timeStamp) + + // Assert + Assert.assertEquals((factor * refSample0Channel0.toFloat() * 1000f).toInt(), accData.accSamples[0].x) + Assert.assertEquals((factor * refSample0Channel1.toFloat() * 1000f).toInt(), accData.accSamples[0].y) + Assert.assertEquals((factor * refSample0Channel2.toFloat() * 1000f).toInt(), accData.accSamples[0].z) + Assert.assertEquals((factor * (refSample0Channel0 + refSample1Channel0) * 1000f).toInt(), accData.accSamples[1].x) + Assert.assertEquals((factor * (refSample0Channel1 + refSample1Channel1) * 1000f).toInt(), accData.accSamples[1].y) + Assert.assertEquals((factor * (refSample0Channel2 + refSample1Channel2) * 1000f).toInt(), accData.accSamples[1].z) + + // validate data in range + for (sample in accData.accSamples) { + Assert.assertTrue(abs(sample.x) <= range * 1000) + Assert.assertTrue(abs(sample.y) <= range * 1000) + Assert.assertTrue(abs(sample.z) <= range * 1000) + } + + // validate data size + Assert.assertEquals(amountOfSamples.toLong(), accData.accSamples.size.toLong()) + } + + @Test + fun test_parseAccData_withResolution16() { + // Arrange + // HEX: 02 7A B4 86 FF C7 87 52 08 01 F7 FF FF FF E7 03 F8 FF FE FF E5 03 F9 FF FF FF E5 03 FA FF FF FF E6 03 FA FF FE FF E6 03 F9 FF FF FF E5 03 F8 FF FF FF E6 03 F8 FF FE FF E6 03 FA FF FF FF E5 03 FA FF FF FF E7 03 FA FF FF FF E5 03 F8 FF FF FF E6 03 F7 FF FF FF E6 03 F8 FF FE FF E6 03 F9 FF FE FF E7 03 F9 FF 00 00 E6 03 F9 FF FF FF E6 03 F7 FF FE FF E5 03 F9 FF FF FF E5 03 F9 FF FF FF E5 03 FA FF 00 00 E6 03 F9 FF FE FF E6 03 F8 FF FF FF E6 03 F8 FF FF FF E5 03 F9 FF FF FF E6 03 F9 FF FF FF E5 03 FA FF FF FF E6 03 F9 FF FF FF E5 03 F9 FF FF FF E5 03 F8 FF FE FF E6 03 F9 FF FF FF E6 03 F9 FF FF FF E6 03 F9 FF 00 00 E5 03 F9 FF FE FF E6 03 F8 FF FE FF E6 03 F7 FF FE FF E6 03 + // index data: + // 0 type 01 + val type: Byte = 0x01 + // 1..2 x value F7 FF (-9) + val xValue1 = -9 + // 3..4 y value FF FF (-1) + val yValue1 = -1 + // 5..6 z value E7 03 (999) + val zValue1 = 999 + // 7..8 x value F8 FF (-8) + val xValue2 = -8 + // 9..10 y value FF FE (-2) + val yValue2 = -2 + // 11..12 z value E5 03 (997) + val zValue2 = 997 + val measurementFrame = byteArrayOf(0xF7.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE7.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE7.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF7.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE7.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0x00.toByte(), 0x00.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF7.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0x00.toByte(), 0x00.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xFA.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0x00.toByte(), 0x00.toByte(), 0xE5.toByte(), 0x03.toByte(), 0xF9.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF8.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte(), 0xF7.toByte(), 0xFF.toByte(), 0xFE.toByte(), 0xFF.toByte(), 0xE6.toByte(), 0x03.toByte()) + val timeStamp: Long = 0 + val amountOfSamples = measurementFrame.size / 2 / 3 // measurement frame size / resolution in bytes / channels + + // Act + val accData = AccData(type, measurementFrame, timeStamp) + + // Assert + Assert.assertEquals(xValue1, accData.accSamples[0].x) + Assert.assertEquals(yValue1, accData.accSamples[0].y) + Assert.assertEquals(zValue1, accData.accSamples[0].z) + Assert.assertEquals(xValue2, accData.accSamples[1].x) + Assert.assertEquals(yValue2, accData.accSamples[1].y) + Assert.assertEquals(zValue2, accData.accSamples[1].z) + + // validate data size + Assert.assertEquals(amountOfSamples, accData.accSamples.size) + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientEcgTest.kt b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientEcgTest.kt new file mode 100644 index 00000000..da1e0cb3 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientEcgTest.kt @@ -0,0 +1,108 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client + +import com.androidcommunications.polar.api.ble.model.gatt.client.BlePMDClient.EcgData +import org.junit.Assert +import org.junit.Test + +class BlePmdClientEcgTest { + @Test + fun test_Ecg_DataSample_type0() { + // Arrange + // HEX: 02 08 FF 02 80 00 + // index type data: + // 0 + val type: Byte = 0 + // 1..3 uVolts 02 80 FF (-32766) + val ecgValue1 = -32766 + // 4..6 uVolts 02 80 00 (32770) + val ecgValue2 = 32770 + val measurementFrame = byteArrayOf(0x02.toByte(), 0x80.toByte(), 0xFF.toByte(), 0x02.toByte(), 0x80.toByte(), 0x00.toByte()) + val timeStamp = Long.MAX_VALUE + + // Act + val ecgData = EcgData(type, measurementFrame, timeStamp) + + // Assert + Assert.assertEquals(timeStamp, ecgData.ecgSamples[0].timeStamp) + Assert.assertEquals(type.toLong(), ecgData.ecgSamples[0].type.numVal.toLong()) + Assert.assertEquals(ecgValue1.toLong(), ecgData.ecgSamples[0].microVolts.toLong()) + Assert.assertEquals(ecgValue2.toLong(), ecgData.ecgSamples[1].microVolts.toLong()) + Assert.assertEquals(2, ecgData.ecgSamples.size.toLong()) + } + + @Test + fun test_Ecg_DataSample_type1() { + // Arrange + // HEX: 80 02 FF 02 80 00 + // index type data: + // 0 + val type: Byte = 1 + // 1..2 uVolts 80 02 (2) + val ecgValue1 = 2 + // 3 FF + val sampleBit1 = 0xFF + val skinContact1 = (sampleBit1 and 0x06 shr 1).toByte() + val contactImpedance1 = (sampleBit1 and 0x18 shr 3).toByte() + // 4..5 uVolts 02 80 (640) + val ecgValue2 = 640 + // 6 00 + val sampleBit2 = 0x00 + val skinContact2 = (sampleBit2 and 0x06 shr 1).toByte() + val contactImpedance2 = (sampleBit2 and 0x18 shr 3).toByte() + val measurementFrame = byteArrayOf(0x02.toByte(), 0x80.toByte(), 0xFF.toByte(), 0x80.toByte(), 0x02.toByte(), 0x00.toByte()) + val timeStamp = Long.MAX_VALUE + + // Act + val ecgData = EcgData(type, measurementFrame, timeStamp) + + // Assert + Assert.assertEquals(timeStamp, ecgData.ecgSamples[0].timeStamp) + Assert.assertEquals(type.toLong(), ecgData.ecgSamples[0].type.numVal.toLong()) + Assert.assertEquals(ecgValue1.toLong(), ecgData.ecgSamples[0].microVolts.toLong()) + Assert.assertTrue(ecgData.ecgSamples[0].overSampling) + Assert.assertEquals(skinContact1.toLong(), ecgData.ecgSamples[0].skinContactBit.toLong()) + Assert.assertEquals(contactImpedance1.toLong(), ecgData.ecgSamples[0].contactImpedance.toLong()) + Assert.assertFalse(ecgData.ecgSamples[1].overSampling) + Assert.assertEquals(skinContact2.toLong(), ecgData.ecgSamples[1].skinContactBit.toLong()) + Assert.assertEquals(contactImpedance2.toLong(), ecgData.ecgSamples[1].contactImpedance.toLong()) + Assert.assertEquals(ecgValue2.toLong(), ecgData.ecgSamples[1].microVolts.toLong()) + Assert.assertEquals(2, ecgData.ecgSamples.size.toLong()) + } + + @Test + fun test_Ecg_DataSample_type2() { + // Arrange + // HEX: 80 80 FC FF FF 03 + // index type data: + // 0 + val type: Byte = 2 + // 1..3 uVolts 80 80 FC (32896) + val ecgValue1 = 32896 + // 3 FC + val sampleBit1 = 0xFC + val ecgDataTag1 = (sampleBit1 and 0x1C shr 2) + val paceDataTag1 = (sampleBit1 and 0xE0 shr 5) + // 4..6 uVolts FF FF 03 (262143) + val ecgValue2 = 262143 + // 6 00 + val sampleBit2 = 0x00 + val ecgDataTag2 = (sampleBit2 and 0x1C shr 2) + val paceDataTag2 = (sampleBit2 and 0xE0 shr 5) + val measurementFrame = byteArrayOf(0x80.toByte(), 0x80.toByte(), 0xFC.toByte(), 0xFF.toByte(), 0xFF.toByte(), 0x03.toByte()) + val timeStamp = Long.MAX_VALUE + + // Act + val ecgData = EcgData(type, measurementFrame, timeStamp) + + // Assert + Assert.assertEquals(timeStamp, ecgData.ecgSamples[0].timeStamp) + Assert.assertEquals(type.toLong(), ecgData.ecgSamples[0].type.numVal.toLong()) + Assert.assertEquals(ecgValue1.toLong(), ecgData.ecgSamples[0].microVolts.toLong()) + Assert.assertEquals(ecgDataTag1.toLong(), ecgData.ecgSamples[0].ecgDataTag.toLong()) + Assert.assertEquals(paceDataTag1.toLong(), ecgData.ecgSamples[0].paceDataTag.toLong()) + Assert.assertEquals(ecgValue2.toLong(), ecgData.ecgSamples[1].microVolts.toLong()) + Assert.assertEquals(ecgDataTag2.toLong(), ecgData.ecgSamples[1].ecgDataTag.toLong()) + Assert.assertEquals(paceDataTag2.toLong(), ecgData.ecgSamples[1].paceDataTag.toLong()) + Assert.assertEquals(2, ecgData.ecgSamples.size.toLong()) + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientParsersTest.java b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientParsersTest.java new file mode 100644 index 00000000..ed5c9c10 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientParsersTest.java @@ -0,0 +1,98 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client; + +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class BlePmdClientParsersTest { + + // Delta data dump: C9 FF 12 00 11 00 03 09 41 FE 2B 0F 9C 0B BF 15 00 4F 00 04 1E F1 EF 00 F0 C1 23 E4 ED F4 D1 F1 F1 F5 FF 22 DE 31 00 F1 FE 21 02 1F 0E 2B 1F 00 E2 20 00 0E 02 E1 1E 20 FF F1 F1 02 C5 D0 02 E0 E1 02 03 0A 31 2E FB BA 90 2B AA 0E 23 40 9E 03 04 14 E3 EF F3 0F 02 1F 01 E0 0F 04 9E 13 E2 D0 04 E2 22 E2 C2 0E 20 0F 20 02 FE 00 0F 1C 32 EE 03 0A 89 00 07 08 7C 00 CE 2F E8 3A 9E 03 04 1E 01 00 11 19 4F 00 2F 12 FD 13 FF 0E 10 00 00 F1 C0 12 E4 EF 21 00 00 01 F1 FF FF 02 10 10 2B 51 0B 4E 31 FC 2E BF 31 14 EC 0E 2F 52 EF 03 0A 06 9E 04 0E 02 A8 88 EE E0 07 9A 00 04 0A 1F 21 1E 4E 2E FE C6 C0 02 EF 03 01 02 EE 11 03 0A F8 13 00 00 F0 40 BF A5 E7 00 76 00 + // index type data: + // 0-5: Reference sample size 6: 0xC9 0xFF 0x12 0x00 0x11 0x00 + // Sample 0 (aka. reference sample): + // channel 0: C9 FF => 0xFFC9 => -55 + int refSample0Channel0 = -55; + // channel 1: 12 00 => 0x0012 => 18 + int refSample0Channel1 = 18; + // channel 2: 11 00 => 0x0011 => 17 + int refSample0Channel2 = 17; + // Delta dump: 03 09 | 41 FE 2B 0F 9C 0B BF 15 00 4F 00 + // 6: Delta size size 1: 0x03 (3 bits) + // 7: Sample amount size 1: 0x09 (Delta block contains 9 samples) + // 8: 0x41 (binary: 01 | 000 | 001) + // Sample 1 - channel 0, size 3 bits: 001 + // Sample 1 - channel 1, size 3 bits: 000 + // 9: 0xFE (binary: 1 | 111 | 111 | 0) + // Sample 1 - channel 2, size 3 bits: 001 + // Sample 2 - channel 0, size 3 bits: 111 + // Sample 2 - channel 1, size 3 bits: 111 + // 10: 0x2B (binary: 001 | 010 | 11) + // Sample 2 - channel 2, size 3 bits: 111 + int refSample1Channel0 = -54; + int refSample1Channel1 = 18; + int refSample1Channel2 = 18; + // ... + // Delta dump: 04 1E | F1 EF 00 F0 C1 23 E4 ED F4 D1 F1 F1 F5 FF 22 DE 31 00 F1 FE 21 02 1F 0E 2B 1F 00 E2 20 00 0E 02 E1 1E 20 FF F1 F1 02 C5 D0 02 E0 E1 02 + // 19: Delta size size 1: 0x04 (4 bits) + // 20: Sample amount size 1: 0x1E (Rest of the data contains 30 samples) + // ... + // Delta dump: 03 0A | 31 2E FB BA 90 2B AA 0E 23 40 9E 03 + // 66: Delta size size 1: 0x03 (3 bits) + // 67: Sample amount size 1: 0x0A (Rest of the data contains 10 samples) + // ... + // Delta dump: 04 14 | E3 EF F3 0F 02 1F 01 E0 0F 04 9E 13 E2 D0 04 E2 22 E2 C2 0E 20 0F 20 02 FE 00 0F 1C 32 EE + // 80: Delta size size 1: 0x04 (4 bits) + // 81: Sample amount size 1: 0x14 (Rest of the data contains 20 samples) + // ... + // Delta dump: 03 0A | 89 00 07 08 7C 00 CE 2F E8 3A 9E 03 + // 112: Delta size size 1: 0x03 (3 bits) + // 113: Sample amount size 1: 0x0A (Rest of the data contains 10 samples) + // ... + // Delta dump: 04 1E | 01 00 11 19 4F 00 2F 12 FD 13 FF 0E 10 00 00 F1 C0 12 E4 EF 21 00 00 01 F1 FF FF 02 10 10 2B 51 0B 4E 31 FC 2E BF 31 14 EC 0E 2F 52 EF + // 126: Delta size size 1: 0x04 (4 bits) + // 127: Sample amount size 1: 0x1E (Rest of the data contains 30 samples) + // ... + // Delta dump: 03 0A |06 9E 04 0E 02 A8 88 EE E0 07 9A 00 + // 173: Delta size size 1: 0x03 (3 bits) + // 174: Sample amount size 1: 0x0A (Rest of the data contains 10 samples) + // ... + // Delta dump: 04 0A | 1F 21 1E 4E 2E FE C6 C0 02 EF 03 01 02 EE 11 + // 187: Delta size size 1: 0x04 (4 bits) + // 188: Sample amount size 1: 0x0A (Rest of the data contains 10 samples) + // ... + // Delta dump: 03 0A | F8 13 00 00 F0 40 BF A5 E7 00 76 00 + // 204: Delta size size 1: 0x03 (3 bits) + // 205: Sample amount size 1: 0x0A (Rest of the data contains 10 samples) + int totalSamples_size = 1 + 9 + 30 + 10 + 20 + 10 + 30 + 10 + 10 + 10; + byte[] measurementFrame = {(byte) 0xC9, (byte) 0xFF, (byte) 0x12, (byte) 0x00, (byte) 0x11, (byte) 0x00, (byte) 0x03, (byte) 0x09, (byte) 0x41, (byte) 0xFE, (byte) 0x2B, (byte) 0x0F, (byte) 0x9C, (byte) 0x0B, (byte) 0xBF, (byte) 0x15, (byte) 0x00, (byte) 0x4F, (byte) 0x00, (byte) 0x04, (byte) 0x1E, (byte) 0xF1, (byte) 0xEF, (byte) 0x00, (byte) 0xF0, (byte) 0xC1, (byte) 0x23, (byte) 0xE4, (byte) 0xED, (byte) 0xF4, (byte) 0xD1, (byte) 0xF1, (byte) 0xF1, (byte) 0xF5, (byte) 0xFF, (byte) 0x22, (byte) 0xDE, (byte) 0x31, (byte) 0x00, (byte) 0xF1, (byte) 0xFE, (byte) 0x21, (byte) 0x02, (byte) 0x1F, (byte) 0x0E, (byte) 0x2B, (byte) 0x1F, (byte) 0x00, (byte) 0xE2, (byte) 0x20, (byte) 0x00, (byte) 0x0E, (byte) 0x02, (byte) 0xE1, (byte) 0x1E, (byte) 0x20, (byte) 0xFF, (byte) 0xF1, (byte) 0xF1, (byte) 0x02, (byte) 0xC5, (byte) 0xD0, (byte) 0x02, (byte) 0xE0, (byte) 0xE1, (byte) 0x02, (byte) 0x03, (byte) 0x0A, (byte) 0x31, (byte) 0x2E, (byte) 0xFB, (byte) 0xBA, (byte) 0x90, (byte) 0x2B, (byte) 0xAA, (byte) 0x0E, (byte) 0x23, (byte) 0x40, (byte) 0x9E, (byte) 0x03, (byte) 0x04, (byte) 0x14, (byte) 0xE3, (byte) 0xEF, (byte) 0xF3, (byte) 0x0F, (byte) 0x02, (byte) 0x1F, (byte) 0x01, (byte) 0xE0, (byte) 0x0F, (byte) 0x04, (byte) 0x9E, (byte) 0x13, (byte) 0xE2, (byte) 0xD0, (byte) 0x04, (byte) 0xE2, (byte) 0x22, (byte) 0xE2, (byte) 0xC2, (byte) 0x0E, (byte) 0x20, (byte) 0x0F, (byte) 0x20, (byte) 0x02, (byte) 0xFE, (byte) 0x00, (byte) 0x0F, (byte) 0x1C, (byte) 0x32, (byte) 0xEE, (byte) 0x03, (byte) 0x0A, (byte) 0x89, (byte) 0x00, (byte) 0x07, (byte) 0x08, (byte) 0x7C, (byte) 0x00, (byte) 0xCE, (byte) 0x2F, (byte) 0xE8, (byte) 0x3A, (byte) 0x9E, (byte) 0x03, (byte) 0x04, (byte) 0x1E, (byte) 0x01, (byte) 0x00, (byte) 0x11, (byte) 0x19, (byte) 0x4F, (byte) 0x00, (byte) 0x2F, (byte) 0x12, (byte) 0xFD, (byte) 0x13, (byte) 0xFF, (byte) 0x0E, (byte) 0x10, (byte) 0x00, (byte) 0x00, (byte) 0xF1, (byte) 0xC0, (byte) 0x12, (byte) 0xE4, (byte) 0xEF, (byte) 0x21, (byte) 0x00, (byte) 0x00, (byte) 0x01, (byte) 0xF1, (byte) 0xFF, (byte) 0xFF, (byte) 0x02, (byte) 0x10, (byte) 0x10, (byte) 0x2B, (byte) 0x51, (byte) 0x0B, (byte) 0x4E, (byte) 0x31, (byte) 0xFC, (byte) 0x2E, (byte) 0xBF, (byte) 0x31, (byte) 0x14, (byte) 0xEC, (byte) 0x0E, (byte) 0x2F, (byte) 0x52, (byte) 0xEF, (byte) 0x03, (byte) 0x0A, (byte) 0x06, (byte) 0x9E, (byte) 0x04, (byte) 0x0E, (byte) 0x02, (byte) 0xA8, (byte) 0x88, (byte) 0xEE, (byte) 0xE0, (byte) 0x07, (byte) 0x9A, (byte) 0x00, (byte) 0x04, (byte) 0x0A, (byte) 0x1F, (byte) 0x21, (byte) 0x1E, (byte) 0x4E, (byte) 0x2E, (byte) 0xFE, (byte) 0xC6, (byte) 0xC0, (byte) 0x02, (byte) 0xEF, (byte) 0x03, (byte) 0x01, (byte) 0x02, (byte) 0xEE, (byte) 0x11, (byte) 0x03, (byte) 0x0A, (byte) 0xF8, (byte) 0x13, (byte) 0x00, (byte) 0x00, (byte) 0xF0, (byte) 0x40, (byte) 0xBF, (byte) 0xA5, (byte) 0xE7, (byte) 0x00, (byte) 0x76, (byte) 0x00}; + int resolution = 16; + int channels = 3; + + @Test + public void test_parseDeltaFrameRefSamples() { + // Arrange && Act + List refSamples = BlePMDClient.parseDeltaFrameRefSamples(measurementFrame, channels, resolution); + // Assert + assertEquals(refSample0Channel0, (int) refSamples.get(0)); + assertEquals(refSample0Channel1, (int) refSamples.get(1)); + assertEquals(refSample0Channel2, (int) refSamples.get(2)); + } + + @Test + public void test_parseDeltaFrameAllSamples_multipleDeltas() { + // Arrange && Act + List> allSamples = BlePMDClient.parseDeltaFramesAll(measurementFrame, channels, resolution); + + // Assert + assertEquals(totalSamples_size, allSamples.size()); + assertEquals(3, allSamples.get(0).size()); + assertEquals(refSample0Channel0, (int) allSamples.get(0).get(0)); + assertEquals(refSample0Channel1, (int) allSamples.get(0).get(1)); + assertEquals(refSample0Channel2, (int) allSamples.get(0).get(2)); + assertEquals(refSample1Channel0, (int) allSamples.get(1).get(0)); + assertEquals(refSample1Channel1, (int) allSamples.get(1).get(1)); + assertEquals(refSample1Channel2, (int) allSamples.get(1).get(2)); + } +} diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPmdSettingsTest.java b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPmdSettingsTest.java new file mode 100644 index 00000000..51facd66 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPmdSettingsTest.java @@ -0,0 +1,136 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +public class BlePmdClientPmdSettingsTest { + + @Test + public void testPmdSettingsWithRange() { + //Arrange + byte[] bytes = {(byte) 0x00, (byte) 0x01, (byte) 0x34, (byte) 0x00, (byte) 0x01, (byte) 0x01, (byte) 0x10, (byte) 0x00, (byte) 0x02, (byte) 0x04, (byte) 0xF5, (byte) 0x00, (byte) 0xF4, (byte) 0x01, (byte) 0xE8, (byte) 0x03, (byte) 0xD0, (byte) 0x07, (byte) 0x04, (byte) 0x01, (byte) 0x03}; + // Parameters + // Setting Type : 00 (Sample Rate) + // array_length : 01 + // array of settings values: 34 00 (52Hz) + int sampleRate = 52; + //Setting Type : 01 (Resolution) + // array_length : 01 + // array of settings values: 10 00 (16) + int resolution = 16; + // Setting Type : 02 (Range) + // array_length : 04 + // array of settings values: F5 00 (245) + int range1 = 245; + // array of settings values: F4 01 (500) + int range2 = 500; + // array of settings values: E8 03 (1000) + int range3 = 1000; + // array of settings values: D0 07 (2000) + int range4 = 2000; + // Setting Type : 04 (Channels) + // array_length : 01 + // array of settings values: 03 (3 Channels) + int channels = 3; + int numberOfSettings = 4; + + //Act + BlePMDClient.PmdSetting pmdSetting = new BlePMDClient.PmdSetting(bytes); + + // Assert + Assert.assertEquals(numberOfSettings, pmdSetting.settings.size()); + + assertEquals(sampleRate, (int) pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.SAMPLE_RATE).iterator().next()); + assertEquals(1, pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.SAMPLE_RATE).size()); + + assertEquals(resolution, (int) pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION).iterator().next()); + assertEquals(1, pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION).size()); + + assertTrue(pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE).contains(range1)); + assertTrue(pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE).contains(range2)); + assertTrue(pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE).contains(range3)); + assertTrue(pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE).contains(range4)); + assertEquals(4, pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE).size()); + + assertEquals(channels, (int) pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.CHANNELS).iterator().next()); + assertEquals(1, pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.CHANNELS).size()); + + assertNull(pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT)); + assertNull(pmdSetting.settings.get(BlePMDClient.PmdSetting.PmdSettingType.FACTOR)); + } + + @Test + public void testPmdSettingWithRangeMilliUnit() { + //Arrange + byte[] bytes = new byte[]{(byte) BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT.getNumVal(), + (byte) 0x02, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x00, (byte) 0x00, (byte) 0x00, + (byte) BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION.getNumVal(), (byte) 0x01, (byte) 0x0E, 0x00}; + // Parameters + // Setting Type : 03 (Range milli unit) + // array_length : 02 + // array of settings values: FF FF FF FF(52Hz) + // array of settings values: FF 00 00 00(52Hz) + // Setting Type : 01 (Resolution) + // array_length : 01 + // array of settings values: 0E 00 (16) + int resolution = 14; + int numberOfSettings = 2; + + // Act + BlePMDClient.PmdSetting settings = new BlePMDClient.PmdSetting(bytes); + + // Assert + Assert.assertEquals(numberOfSettings, settings.settings.size()); + Assert.assertTrue(settings.settings.containsKey(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT)); + Assert.assertEquals(2, Objects.requireNonNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT)).size()); + Assert.assertTrue(Objects.requireNonNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT)).contains(-1)); + Assert.assertTrue(Objects.requireNonNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT)).contains(0xff)); + Assert.assertTrue(settings.settings.containsKey(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION)); + + Assert.assertEquals(1, Objects.requireNonNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION)).size()); + Assert.assertTrue(Objects.requireNonNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION)).contains(resolution)); + } + + @Test + public void testPmdSelectedSerialization() { + //Arrange + Map selected = new HashMap<>(); + int sampleRate = 0xFFFF; + selected.put(BlePMDClient.PmdSetting.PmdSettingType.SAMPLE_RATE, sampleRate); + int resolution = 0; + selected.put(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION, resolution); + int range = 15; + selected.put(BlePMDClient.PmdSetting.PmdSettingType.RANGE, range); + int rangeMilliUnit = Integer.MAX_VALUE; + selected.put(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT, rangeMilliUnit); + int channels = 4; + selected.put(BlePMDClient.PmdSetting.PmdSettingType.CHANNELS, channels); + int factor = 15; + selected.put(BlePMDClient.PmdSetting.PmdSettingType.FACTOR, factor); + int numberOfSettings = 5; + + //Act + BlePMDClient.PmdSetting settingsFromSelected = new BlePMDClient.PmdSetting(selected); + byte[] serializedSelected = settingsFromSelected.serializeSelected(); + BlePMDClient.PmdSetting settings = new BlePMDClient.PmdSetting(serializedSelected); + + //Assert + Assert.assertEquals(numberOfSettings, settings.settings.size()); + assertTrue(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.SAMPLE_RATE).contains(sampleRate)); + Assert.assertEquals(1, Objects.requireNonNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.SAMPLE_RATE)).size()); + + assertTrue(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RESOLUTION).contains(resolution)); + assertTrue(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE).contains(range)); + assertTrue(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.RANGE_MILLIUNIT).contains(rangeMilliUnit)); + assertTrue(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.CHANNELS).contains(channels)); + assertNull(settings.settings.get(BlePMDClient.PmdSetting.PmdSettingType.FACTOR)); + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPpgTest.kt b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPpgTest.kt new file mode 100644 index 00000000..3bc4cc32 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPpgTest.kt @@ -0,0 +1,110 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client + +import com.androidcommunications.polar.api.ble.model.gatt.client.BlePMDClient.PpgData +import org.junit.Assert +import org.junit.Test + +class BlePmdClientPpgTest { + @Test + fun test_PPG_DataSample_Type0() { + // Arrange + val frameType: Byte = 0 //PPG Data Sample 0 + val timeStamp: Long = 0 + val measurementFrame = byteArrayOf( + 0x01.toByte(), 0x02.toByte(), 0x03.toByte(), //PPG0 (197121) + 0x04.toByte(), 0x05.toByte(), 0x06.toByte(), //PPG1 (394500) + 0xFF.toByte(), 0xFF.toByte(), 0x7F.toByte(), //PPG2 (8388607) + 0x00.toByte(), 0x00.toByte(), 0x00.toByte(), //ambient (0) + 0xFF.toByte(), 0xFF.toByte(), 0xFF.toByte(), //PPG0 (-1) + 0x0F.toByte(), 0xEF.toByte(), 0xEF.toByte(), //PPG1 (-1052913) + 0x00.toByte(), 0x00.toByte(), 0x80.toByte(), //PPG2 (-8388608) + 0x0F.toByte(), 0xEF.toByte(), 0xEF.toByte()) //ambient (-1052913) + val ppg0_0 = 197121 + val ppg1_0 = 394500 + val ppg2_0 = 8388607 + val ambient_0 = 0 + val ppg0_1 = -1 + val ppg1_1 = -1052913 + val ppg2_1 = -8388608 + val ambient_1 = -1052913 + + // Act + val ppgData = PpgData(measurementFrame, timeStamp, frameType.toInt()) + + // Assert + Assert.assertEquals(2, ppgData.ppgSamples.size) + Assert.assertEquals(4, ppgData.channels) + + Assert.assertEquals(4, ppgData.ppgSamples[0].ppgDataSamples.size) + Assert.assertEquals(0, ppgData.ppgSamples[0].status) + Assert.assertEquals(ppg0_0, ppgData.ppgSamples[0].ppgDataSamples[0]) + Assert.assertEquals(ppg1_0, ppgData.ppgSamples[0].ppgDataSamples[1]) + Assert.assertEquals(ppg2_0, ppgData.ppgSamples[0].ppgDataSamples[2]) + Assert.assertEquals(ambient_0, ppgData.ppgSamples[0].ppgDataSamples[3]) + + Assert.assertEquals(4, ppgData.ppgSamples[1].ppgDataSamples.size) + Assert.assertEquals(0, ppgData.ppgSamples[1].status) + Assert.assertEquals(ppg0_1, ppgData.ppgSamples[1].ppgDataSamples[0]) + Assert.assertEquals(ppg1_1, ppgData.ppgSamples[1].ppgDataSamples[1]) + Assert.assertEquals(ppg2_1, ppgData.ppgSamples[1].ppgDataSamples[2]) + Assert.assertEquals(ambient_1, ppgData.ppgSamples[1].ppgDataSamples[3]) + } + + @Test + fun test_PPG_DataSample_Delta() { + // Arrange + // HEX: 2C 2D 00 C2 77 00 D3 D2 FF 3D 88 FF 0A 29 B2 F0 EE 34 11 B2 EC EE 74 11 B1 E8 FE B4 11 B1 E8 FE B4 11 B1 E0 FE 34 12 B0 DC 0E 75 12 B0 D8 0E B5 12 AF D4 1E F5 12 AF D0 1E 35 13 AE CC 2E 75 13 AE C8 2E B5 13 AD C4 3E F5 13 AD BC 3E 75 14 AD BC 3E 75 14 AC B8 4E B5 14 AC B4 4E F5 14 AB B0 5E 35 15 AA AC 6E 75 15 AA A8 6E B5 15 AA A4 6E F5 15 A9 A0 7E 35 16 A9 9C 7E 75 16 A8 98 8E B5 16 A7 94 9E F5 16 A7 90 9E 35 17 A7 8C 9E 75 17 A6 88 AE B5 17 A5 88 BE B5 17 A5 80 BE 35 18 A4 7C CE 75 18 A4 78 CE B5 18 A3 78 DE B5 18 A2 70 EE 35 19 A2 6C EE 75 19 A2 6C EE 75 19 A1 68 FE B5 19 A0 60 0E 36 1A 9F 60 1E 36 1A 9F 5C 1E 76 1A 9F 58 1E B6 1A 9D 54 3E F6 1A + // index type data: + // 0-5: Reference sample size 6: 0x2C 0x2D 0x00 0xC2 0x77 0x00 0xD3 0xD2 0xFF 0x3D 0x88 0xFF + // Sample 0 (aka. reference sample): + // channel 0: 2C 2D 00 => 0x002D2C => 11564 + val refSample0Channel0 = 11564 + // channel 1: C2 77 00 => 0x0077C2 => 30658 + val refSample0Channel1 = 30658 + // channel 2: D3 D2 FF => 0xFFD2D3 => -11565 + val refSample0Channel2 = -11565 + // channel 3: 3D 88 FF => 0xFF883D => -30659 + val refSample0Channel3 = -30659 + // Delta dump: 0A 29 | B2 F0 EE 34 11 B2 EC EE 74 11 B1 E8 FE B4 11 B1 ... + // 6: Delta size size 1: 0x0A (10 bits) + // 7: Sample amount size 1: 0x29 (Delta block contains 41 samples) + // 8: 0xB2 (binary: 1011 0010) + // 9: 0xF0 (binary: 1111 00 | 00) + // 10: 0xEE (binary: 1110 | 1110) + // Sample 1 - channel 0, size 10 bits: 00 1011 0010 + // Sample 1 - channel 1, size 10 bits: 11 1011 1100 + // 11: 0x34 (binary: 00 | 11 0100) + // Sample 1 - channel 2, size 10 bits: 11 0100 1110 + // 12: + // Sample 1 - channel 3, size 10 bits: 00 0100 0100 0x11 (binary: 0001 0001) + val refSample1Channel0 = 178 + val refSample1Channel1 = -68 + val refSample1Channel2 = -178 + val refSample1Channel3 = 68 + val amountOfSamples = 1 + 41 // reference sample + delta samples + val measurementFrame = byteArrayOf(0x2C.toByte(), 0x2D.toByte(), 0x00.toByte(), 0xC2.toByte(), 0x77.toByte(), 0x00.toByte(), 0xD3.toByte(), 0xD2.toByte(), 0xFF.toByte(), 0x3D.toByte(), 0x88.toByte(), 0xFF.toByte(), 0x0A.toByte(), 0x29.toByte(), 0xB2.toByte(), 0xF0.toByte(), 0xEE.toByte(), 0x34.toByte(), 0x11.toByte(), 0xB2.toByte(), 0xEC.toByte(), 0xEE.toByte(), 0x74.toByte(), 0x11.toByte(), 0xB1.toByte(), 0xE8.toByte(), 0xFE.toByte(), 0xB4.toByte(), 0x11.toByte(), 0xB1.toByte(), 0xE8.toByte(), 0xFE.toByte(), 0xB4.toByte(), 0x11.toByte(), 0xB1.toByte(), 0xE0.toByte(), 0xFE.toByte(), 0x34.toByte(), 0x12.toByte(), 0xB0.toByte(), 0xDC.toByte(), 0x0E.toByte(), 0x75.toByte(), 0x12.toByte(), 0xB0.toByte(), 0xD8.toByte(), 0x0E.toByte(), 0xB5.toByte(), 0x12.toByte(), 0xAF.toByte(), 0xD4.toByte(), 0x1E.toByte(), 0xF5.toByte(), 0x12.toByte(), 0xAF.toByte(), 0xD0.toByte(), 0x1E.toByte(), 0x35.toByte(), 0x13.toByte(), 0xAE.toByte(), 0xCC.toByte(), 0x2E.toByte(), 0x75.toByte(), 0x13.toByte(), 0xAE.toByte(), 0xC8.toByte(), 0x2E.toByte(), 0xB5.toByte(), 0x13.toByte(), 0xAD.toByte(), 0xC4.toByte(), 0x3E.toByte(), 0xF5.toByte(), 0x13.toByte(), 0xAD.toByte(), 0xBC.toByte(), 0x3E.toByte(), 0x75.toByte(), 0x14.toByte(), 0xAD.toByte(), 0xBC.toByte(), 0x3E.toByte(), 0x75.toByte(), 0x14.toByte(), 0xAC.toByte(), 0xB8.toByte(), 0x4E.toByte(), 0xB5.toByte(), 0x14.toByte(), 0xAC.toByte(), 0xB4.toByte(), 0x4E.toByte(), 0xF5.toByte(), 0x14.toByte(), 0xAB.toByte(), 0xB0.toByte(), 0x5E.toByte(), 0x35.toByte(), 0x15.toByte(), 0xAA.toByte(), 0xAC.toByte(), 0x6E.toByte(), 0x75.toByte(), 0x15.toByte(), 0xAA.toByte(), 0xA8.toByte(), 0x6E.toByte(), 0xB5.toByte(), 0x15.toByte(), 0xAA.toByte(), 0xA4.toByte(), 0x6E.toByte(), 0xF5.toByte(), 0x15.toByte(), 0xA9.toByte(), 0xA0.toByte(), 0x7E.toByte(), 0x35.toByte(), 0x16.toByte(), 0xA9.toByte(), 0x9C.toByte(), 0x7E.toByte(), 0x75.toByte(), 0x16.toByte(), 0xA8.toByte(), 0x98.toByte(), 0x8E.toByte(), 0xB5.toByte(), 0x16.toByte(), 0xA7.toByte(), 0x94.toByte(), 0x9E.toByte(), 0xF5.toByte(), 0x16.toByte(), 0xA7.toByte(), 0x90.toByte(), 0x9E.toByte(), 0x35.toByte(), 0x17.toByte(), 0xA7.toByte(), 0x8C.toByte(), 0x9E.toByte(), 0x75.toByte(), 0x17.toByte(), 0xA6.toByte(), 0x88.toByte(), 0xAE.toByte(), 0xB5.toByte(), 0x17.toByte(), 0xA5.toByte(), 0x88.toByte(), 0xBE.toByte(), 0xB5.toByte(), 0x17.toByte(), 0xA5.toByte(), 0x80.toByte(), 0xBE.toByte(), 0x35.toByte(), 0x18.toByte(), 0xA4.toByte(), 0x7C.toByte(), 0xCE.toByte(), 0x75.toByte(), 0x18.toByte(), 0xA4.toByte(), 0x78.toByte(), 0xCE.toByte(), 0xB5.toByte(), 0x18.toByte(), 0xA3.toByte(), 0x78.toByte(), 0xDE.toByte(), 0xB5.toByte(), 0x18.toByte(), 0xA2.toByte(), 0x70.toByte(), 0xEE.toByte(), 0x35.toByte(), 0x19.toByte(), 0xA2.toByte(), 0x6C.toByte(), 0xEE.toByte(), 0x75.toByte(), 0x19.toByte(), 0xA2.toByte(), 0x6C.toByte(), 0xEE.toByte(), 0x75.toByte(), 0x19.toByte(), 0xA1.toByte(), 0x68.toByte(), 0xFE.toByte(), 0xB5.toByte(), 0x19.toByte(), 0xA0.toByte(), 0x60.toByte(), 0x0E.toByte(), 0x36.toByte(), 0x1A.toByte(), 0x9F.toByte(), 0x60.toByte(), 0x1E.toByte(), 0x36.toByte(), 0x1A.toByte(), 0x9F.toByte(), 0x5C.toByte(), 0x1E.toByte(), 0x76.toByte(), 0x1A.toByte(), 0x9F.toByte(), 0x58.toByte(), 0x1E.toByte(), 0xB6.toByte(), 0x1A.toByte(), 0x9D.toByte(), 0x54.toByte(), 0x3E.toByte(), 0xF6.toByte(), 0x1A.toByte()) + val factor = 1.0f + val channels = 4 + val resolution = 22 + val timeStamp: Long = 0 + + // Act + val ppgData = PpgData(measurementFrame, factor, resolution, channels, timeStamp) + + // Assert + Assert.assertEquals(amountOfSamples, ppgData.ppgSamples.size) + Assert.assertEquals(4, ppgData.channels) + Assert.assertEquals(4, ppgData.ppgSamples[0].ppgDataSamples.size) + Assert.assertEquals(0, ppgData.ppgSamples[0].status) + Assert.assertEquals((factor * refSample0Channel0).toInt(), ppgData.ppgSamples[0].ppgDataSamples[0]) + Assert.assertEquals((factor * refSample0Channel1).toInt(), ppgData.ppgSamples[0].ppgDataSamples[1]) + Assert.assertEquals((factor * refSample0Channel2).toInt(), ppgData.ppgSamples[0].ppgDataSamples[2]) + Assert.assertEquals((factor * refSample0Channel3).toInt(), ppgData.ppgSamples[0].ppgDataSamples[3]) + Assert.assertEquals((factor * (refSample0Channel0 + refSample1Channel0)).toInt(), ppgData.ppgSamples[1].ppgDataSamples[0]) + Assert.assertEquals((factor * (refSample0Channel1 + refSample1Channel1)).toInt(), ppgData.ppgSamples[1].ppgDataSamples[1]) + Assert.assertEquals((factor * (refSample0Channel2 + refSample1Channel2)).toInt(), ppgData.ppgSamples[1].ppgDataSamples[2]) + Assert.assertEquals((factor * (refSample0Channel3 + refSample1Channel3)).toInt(), ppgData.ppgSamples[1].ppgDataSamples[3]) + Assert.assertEquals(4, ppgData.ppgSamples[1].ppgDataSamples.size) + Assert.assertEquals(0, ppgData.ppgSamples[1].status) + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPpiTest.kt b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPpiTest.kt new file mode 100644 index 00000000..b7951939 --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientPpiTest.kt @@ -0,0 +1,60 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client + +import com.androidcommunications.polar.api.ble.model.gatt.client.BlePMDClient.PpiData +import junit.framework.Assert.assertEquals +import org.junit.Test + +class BlePmdClientPpiTest { + @Test + fun test_PPI_DataSample() { + // Arrange + // HEX: 80 80 80 80 80 FF 00 01 00 01 00 00 + // index type data: + // 0 HR 0x80 (128) + val heartRate = 128 + // 1..2 PP 0x80 0x80 (32896) + val intervalInMs = 32896 + // 3..4 PP Error Estimate 0x80 0x80 (32896) + val errorEstimate = 32896 + // 5 PP flags 0xFF + val ppFlags = 0xFF + val blockerBit = if (ppFlags and 0x01 != 0) 0x01 else 0x00 + val skinContactStatus = if (ppFlags and 0x02 != 0) 0x01 else 0x00 + val skinContactSupported = if (ppFlags and 0x04 != 0) 0x01 else 0x00 + + // 6 HR 0x00 (0) + val heartRate2 = 0 + // 7..8 PP 0x01 0x00 (1) + val intervalInMs2 = 1 + // 9..10 PP Error Estimate 0x01 0x00 (1) + val errorEstimate2 = 1 + // 11 PP flags 0x00 + val ppFlags2 = 0x00 + val blockerBit2 = if (ppFlags2 and 0x01 != 0) 0x01 else 0x00 + val skinContactStatus2 = if (ppFlags2 and 0x02 != 0) 0x01 else 0x00 + val skinContactSupported2 = if (ppFlags2 and 0x04 != 0) 0x01 else 0x00 + + val measurementFrame = byteArrayOf(0x80.toByte(), 0x80.toByte(), 0x80.toByte(), 0x80.toByte(), 0x80.toByte(), 0xFF.toByte(), 0x00.toByte(), 0x01.toByte(), 0x00.toByte(), 0x01.toByte(), 0x00.toByte(), 0x00.toByte()) + val timeStamp: Long = Long.MAX_VALUE + + // Act + val ppiData = PpiData(measurementFrame, timeStamp) + + // Assert + assertEquals(heartRate.toLong(), ppiData.ppSamples[0].hr.toLong()) + assertEquals(intervalInMs.toLong(), ppiData.ppSamples[0].ppInMs.toLong()) + assertEquals(errorEstimate.toLong(), ppiData.ppSamples[0].ppErrorEstimate.toLong()) + assertEquals(blockerBit.toLong(), ppiData.ppSamples[0].blockerBit.toLong()) + assertEquals(skinContactStatus.toLong(), ppiData.ppSamples[0].skinContactStatus.toLong()) + assertEquals(skinContactSupported.toLong(), ppiData.ppSamples[0].skinContactSupported.toLong()) + + assertEquals(heartRate2.toLong(), ppiData.ppSamples[1].hr.toLong()) + assertEquals(intervalInMs2.toLong(), ppiData.ppSamples[1].ppInMs.toLong()) + assertEquals(errorEstimate2.toLong(), ppiData.ppSamples[1].ppErrorEstimate.toLong()) + assertEquals(blockerBit2.toLong(), ppiData.ppSamples[1].blockerBit.toLong()) + assertEquals(skinContactStatus2.toLong(), ppiData.ppSamples[1].skinContactStatus.toLong()) + assertEquals(skinContactSupported2.toLong(), ppiData.ppSamples[1].skinContactSupported.toLong()) + + assertEquals(2, ppiData.ppSamples.size) + } +} \ No newline at end of file diff --git a/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientThreeAxisTest.java b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientThreeAxisTest.java new file mode 100644 index 00000000..664d39bd --- /dev/null +++ b/sources/Android/android-communications/src/test/java/com/androidcommunications/polar/api/ble/model/gatt/client/BlePmdClientThreeAxisTest.java @@ -0,0 +1,65 @@ +package com.androidcommunications.polar.api.ble.model.gatt.client; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class BlePmdClientThreeAxisTest { + + @Test + public void test_parseThreeAxisData_withResolution16() { + // Arrange + // HEX: 71 07 F0 6A 9E 8D 0A 38 BE 5C BE BA 2F 96 B3 EE 4B E5 AD FB 42 B9 EB BE 4C FE BA 2F 92 BF EE 4B E4 B1 FB 12 B9 EC BD 3C 3E BB 2F 8F D3 DE 4B E3 B5 F7 D2 B8 ED BD 30 7E 7B 2F 8B E3 CE 8B E2 BA F7 A2 B8 EE BC 20 BE 7B 2F 88 F3 CE CB E1 BD EF 52 F8 EF BC 18 FE 3B 2F 84 03 BF CB E0 C2 EF 32 B8 F0 BB 04 4E BC 2E 81 13 AF 0B E0 C6 EF F2 F7 F1 B9 FC 7D BC 2E 7D 27 9F 4B DF CA EB C2 F7 F2 B8 EC CD 7C 2E 7B 37 8F 4B DE CE E3 92 F7 F3 B8 E0 0D FD 2D 77 4B 7F CB DD D2 DF 62 37 F5 B7 D4 4D BD 2D 74 5B 6F CB DC D7 D7 32 37 F6 B5 C8 8D 7D 2D 71 6B 4F 4B DC DC D3 F2 36 F7 B4 BC DD FD 2C 6F 7B 3F 4B DB E0 CF D2 36 F8 B2 B0 2D BE 2C 6C 8F 1F CB DA E3 C7 A2 76 F9 + // index type data: + // 0-5: Reference sample size 6: 71 07 F0 6A 9E 8D + // Sample 0 (aka. reference sample): + // channel 0: 71 07 =>0x0771 => 1905 + int refSample0Channel0 = 1905; + // channel 1: F0 6A => 0x6AF0 => 27376 + int refSample0Channel1 = 27376; + // channel 2: 9E 8D => 0x8D9E => -29282 + int refSample0Channel2 = -29282; + // Delta dump: 0A 38 BE 5C BE BA 2F 96 B3 EE 4B E5 AD FB + // 6: Delta size size 1: 0x0A (10 bits) + // 7: Sample amount size 1: 0x38 (Delta block contains 56 samples) + // 8: 0xBE (binary: 1011 1110) + // 9: 0x5C (binary: 0101 11| 00) + // Sample 1 - channel 0, size 10 bits: 00 1011 1110 => 190 + // 10: 0xBE (binary: 1011 | 1110) + // Sample 1 - channel 1, size 10 bits: 11 1001 0111 => -105 + // 11: 0xBA (binary: 10 |11 1010) + // Sample 1 - channel 2, size 10 bits: 11 1010 1011 => -85 + int refSample1Channel0 = 190; + int refSample1Channel1 = -105; + int refSample1Channel2 = -85; + int amountOfSamples = 1 + 56; // reference sample + delta samples + byte[] measurementFrame = {(byte) 0x71, (byte) 0x07, (byte) 0xF0, (byte) 0x6A, (byte) 0x9E, (byte) 0x8D, (byte) 0x0A, (byte) 0x38, (byte) 0xBE, (byte) 0x5C, (byte) 0xBE, (byte) 0xBA, (byte) 0x2F, (byte) 0x96, (byte) 0xB3, (byte) 0xEE, (byte) 0x4B, (byte) 0xE5, (byte) 0xAD, (byte) 0xFB, (byte) 0x42, (byte) 0xB9, (byte) 0xEB, (byte) 0xBE, (byte) 0x4C, (byte) 0xFE, (byte) 0xBA, (byte) 0x2F, (byte) 0x92, (byte) 0xBF, (byte) 0xEE, (byte) 0x4B, (byte) 0xE4, (byte) 0xB1, (byte) 0xFB, (byte) 0x12, (byte) 0xB9, (byte) 0xEC, (byte) 0xBD, (byte) 0x3C, (byte) 0x3E, (byte) 0xBB, (byte) 0x2F, (byte) 0x8F, (byte) 0xD3, (byte) 0xDE, (byte) 0x4B, (byte) 0xE3, (byte) 0xB5, (byte) 0xF7, (byte) 0xD2, (byte) 0xB8, (byte) 0xED, (byte) 0xBD, (byte) 0x30, (byte) 0x7E, (byte) 0x7B, (byte) 0x2F, (byte) 0x8B, (byte) 0xE3, (byte) 0xCE, (byte) 0x8B, (byte) 0xE2, (byte) 0xBA, (byte) 0xF7, (byte) 0xA2, (byte) 0xB8, (byte) 0xEE, (byte) 0xBC, (byte) 0x20, (byte) 0xBE, (byte) 0x7B, (byte) 0x2F, (byte) 0x88, (byte) 0xF3, (byte) 0xCE, (byte) 0xCB, (byte) 0xE1, (byte) 0xBD, (byte) 0xEF, (byte) 0x52, (byte) 0xF8, (byte) 0xEF, (byte) 0xBC, (byte) 0x18, (byte) 0xFE, (byte) 0x3B, (byte) 0x2F, (byte) 0x84, (byte) 0x03, (byte) 0xBF, (byte) 0xCB, (byte) 0xE0, (byte) 0xC2, (byte) 0xEF, (byte) 0x32, (byte) 0xB8, (byte) 0xF0, (byte) 0xBB, (byte) 0x04, (byte) 0x4E, (byte) 0xBC, (byte) 0x2E, (byte) 0x81, (byte) 0x13, (byte) 0xAF, (byte) 0x0B, (byte) 0xE0, (byte) 0xC6, (byte) 0xEF, (byte) 0xF2, (byte) 0xF7, (byte) 0xF1, (byte) 0xB9, (byte) 0xFC, (byte) 0x7D, (byte) 0xBC, (byte) 0x2E, (byte) 0x7D, (byte) 0x27, (byte) 0x9F, (byte) 0x4B, (byte) 0xDF, (byte) 0xCA, (byte) 0xEB, (byte) 0xC2, (byte) 0xF7, (byte) 0xF2, (byte) 0xB8, (byte) 0xEC, (byte) 0xCD, (byte) 0x7C, (byte) 0x2E, (byte) 0x7B, (byte) 0x37, (byte) 0x8F, (byte) 0x4B, (byte) 0xDE, (byte) 0xCE, (byte) 0xE3, (byte) 0x92, (byte) 0xF7, (byte) 0xF3, (byte) 0xB8, (byte) 0xE0, (byte) 0x0D, (byte) 0xFD, (byte) 0x2D, (byte) 0x77, (byte) 0x4B, (byte) 0x7F, (byte) 0xCB, (byte) 0xDD, (byte) 0xD2, (byte) 0xDF, (byte) 0x62, (byte) 0x37, (byte) 0xF5, (byte) 0xB7, (byte) 0xD4, (byte) 0x4D, (byte) 0xBD, (byte) 0x2D, (byte) 0x74, (byte) 0x5B, (byte) 0x6F, (byte) 0xCB, (byte) 0xDC, (byte) 0xD7, (byte) 0xD7, (byte) 0x32, (byte) 0x37, (byte) 0xF6, (byte) 0xB5, (byte) 0xC8, (byte) 0x8D, (byte) 0x7D, (byte) 0x2D, (byte) 0x71, (byte) 0x6B, (byte) 0x4F, (byte) 0x4B, (byte) 0xDC, (byte) 0xDC, (byte) 0xD3, (byte) 0xF2, (byte) 0x36, (byte) 0xF7, (byte) 0xB4, (byte) 0xBC, (byte) 0xDD, (byte) 0xFD, (byte) 0x2C, (byte) 0x6F, (byte) 0x7B, (byte) 0x3F, (byte) 0x4B, (byte) 0xDB, (byte) 0xE0, (byte) 0xCF, (byte) 0xD2, (byte) 0x36, (byte) 0xF8, (byte) 0xB2, (byte) 0xB0, (byte) 0x2D, (byte) 0xBE, (byte) 0x2C, (byte) 0x6C, (byte) 0x8F, (byte) 0x1F, (byte) 0xCB, (byte) 0xDA, (byte) 0xE3, (byte) 0xC7, (byte) 0xA2, (byte) 0x76, (byte) 0xF9}; + int resolution = 16; + int range = 8; + float factor = 2.44E-4f; + long timeStamp = 0; + + // Act + BlePMDClient.ThreeAxisDeltaFramedData threeAxisDeltaFramedData = new BlePMDClient.ThreeAxisDeltaFramedData(measurementFrame, factor, resolution, timeStamp); + + // Assert + assertEquals((factor * refSample0Channel0), threeAxisDeltaFramedData.axisSamples.get(0).x, 0.001); + assertEquals((factor * refSample0Channel1), threeAxisDeltaFramedData.axisSamples.get(0).y, 0.001); + assertEquals((factor * refSample0Channel2), threeAxisDeltaFramedData.axisSamples.get(0).z, 0.001); + + assertEquals((factor * (refSample0Channel0 + refSample1Channel0)), threeAxisDeltaFramedData.axisSamples.get(1).x, 0.000000001); + assertEquals((factor * (refSample0Channel1 + refSample1Channel1)), threeAxisDeltaFramedData.axisSamples.get(1).y, 0.000000001); + assertEquals((factor * (refSample0Channel2 + refSample1Channel2)), threeAxisDeltaFramedData.axisSamples.get(1).z, 0.000000001); + + // validate data in range + for (BlePMDClient.ThreeAxisDeltaFramedData.ThreeAxisSample sample : threeAxisDeltaFramedData.axisSamples) { + assertTrue(Math.abs(sample.x) <= range); + assertTrue(Math.abs(sample.y) <= range); + assertTrue(Math.abs(sample.z) <= range); + } + + // validate data size + assertEquals(amountOfSamples, threeAxisDeltaFramedData.axisSamples.size()); + } +} diff --git a/sources/iOS/ios-communications/iOSCommunications.xcodeproj/project.pbxproj b/sources/iOS/ios-communications/iOSCommunications.xcodeproj/project.pbxproj index 6955638d..ae801812 100755 --- a/sources/iOS/ios-communications/iOSCommunications.xcodeproj/project.pbxproj +++ b/sources/iOS/ios-communications/iOSCommunications.xcodeproj/project.pbxproj @@ -281,6 +281,9 @@ 6CEA10E821786B0000E16FBF /* Timestamp.pbobjc.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CEA10E421786B0000E16FBF /* Timestamp.pbobjc.h */; }; 6CEA10E921786B0000E16FBF /* Type.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CEA10E521786B0000E16FBF /* Type.pbobjc.m */; }; 6CEA10EA21786B0000E16FBF /* Timestamp.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CEA10E621786B0000E16FBF /* Timestamp.pbobjc.m */; }; + A580139725B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580139625B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift */; }; + A580139825B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580139625B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift */; }; + A580139925B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580139625B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift */; }; A5C3EC3525A9CB33003565A9 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5C3EC3425A9CB33003565A9 /* RxSwift.xcframework */; }; A5C3EC3825A9CB43003565A9 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5C3EC3425A9CB33003565A9 /* RxSwift.xcframework */; }; A5C3EC3B25A9CB4F003565A9 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5C3EC3425A9CB33003565A9 /* RxSwift.xcframework */; }; @@ -431,6 +434,7 @@ 6CEA10E421786B0000E16FBF /* Timestamp.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Timestamp.pbobjc.h; path = sdk/impl/protobuf/google/Timestamp.pbobjc.h; sourceTree = ""; }; 6CEA10E521786B0000E16FBF /* Type.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Type.pbobjc.m; path = sdk/impl/protobuf/google/Type.pbobjc.m; sourceTree = ""; }; 6CEA10E621786B0000E16FBF /* Timestamp.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Timestamp.pbobjc.m; path = sdk/impl/protobuf/google/Timestamp.pbobjc.m; sourceTree = ""; }; + A580139625B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BlePolarDeviceCapabilitiesUtility.swift; path = ble/api/model/polar/BlePolarDeviceCapabilitiesUtility.swift; sourceTree = ""; }; A5C3EC3425A9CB33003565A9 /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = dependencyFrameworks/RxSwift.xcframework; sourceTree = ""; }; /* End PBXFileReference section */ @@ -708,6 +712,7 @@ 6C8BCD411CE5D60100A4C6A8 /* polar */ = { isa = PBXGroup; children = ( + A580139625B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift */, 6C8BCD421CE5D64200A4C6A8 /* BlePolarDeviceIdUtility.swift */, ); name = polar; @@ -1200,6 +1205,7 @@ 6C8BCD3D1CE5BCEA00A4C6A8 /* BlePsFtpClient.swift in Sources */, 6C4A6A2B1CC0BA0400E3AD73 /* BleRssiFilter.swift in Sources */, 6C67C8011E169CCE00411498 /* BleHrClient.swift in Sources */, + A580139725B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift in Sources */, 6C5A44991CB291500006220D /* BleAttributeTransportProtocol.swift in Sources */, 6CD12ACA201F126500F3A417 /* BleGattException.swift in Sources */, 6C98104521622D52002820A2 /* BlePmdClient.swift in Sources */, @@ -1264,6 +1270,7 @@ 6C2409982216A7CA001C1A84 /* Structures.pbobjc.m in Sources */, 6C2409992216A7CA001C1A84 /* Types.pbobjc.m in Sources */, 6C2409462216A6F3001C1A84 /* AtomicType.swift in Sources */, + A580139925B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift in Sources */, 6C2409412216A6E3001C1A84 /* PolarSensorSetting.swift in Sources */, 6C2409422216A6E3001C1A84 /* CBScanningProtocol.swift in Sources */, 6C2409432216A6E3001C1A84 /* BlePsFtpUtility.swift in Sources */, @@ -1340,6 +1347,7 @@ 6C770B8A206B77F300F3D51D /* BleDeviceSession.swift in Sources */, 6CEA0FCC2174B17700E16FBF /* PftpRequest.pbobjc.m in Sources */, 6C770B8B206B77F300F3D51D /* BlePolarDeviceIdUtility.swift in Sources */, + A580139825B1636A00654E60 /* BlePolarDeviceCapabilitiesUtility.swift in Sources */, 6CEA0FCF2174B17700E16FBF /* Types.pbobjc.m in Sources */, 6C770B8C206B77F300F3D51D /* BleAdvertisementContent.swift in Sources */, 6CEA10D42174B31700E16FBF /* GPBMessage.m in Sources */, @@ -1663,7 +1671,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 3.0.0; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.polar.PolarBleSdkWatchOs; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -1715,7 +1723,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 3.0.0; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.polar.PolarBleSdkWatchOs; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; @@ -1767,7 +1775,7 @@ "@loader_path/Frameworks", ); MACH_O_TYPE = mh_dylib; - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 3.0.0; "OTHER_CFLAGS[arch=*]" = "-fembed-bitcode"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.polar.PolarBleSdk; @@ -1823,7 +1831,7 @@ "@loader_path/Frameworks", ); MACH_O_TYPE = mh_dylib; - MARKETING_VERSION = 2.3.1; + MARKETING_VERSION = 3.0.0; "OTHER_CFLAGS[arch=*]" = "-fembed-bitcode"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.polar.PolarBleSdk; diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/api/BleDeviceListener.swift b/sources/iOS/ios-communications/iOSCommunications/ble/api/BleDeviceListener.swift index 812a2150..6b94ec82 100755 --- a/sources/iOS/ios-communications/iOSCommunications/ble/api/BleDeviceListener.swift +++ b/sources/iOS/ios-communications/iOSCommunications/ble/api/BleDeviceListener.swift @@ -49,7 +49,7 @@ public protocol BleDeviceListener{ /// - identifiers: device identifiers to look for from corebluetooth /// - preFilter: pre filter before memory allocation, for pref reason /// - Returns: Observable stream of device advertisements - func search(_ uuids: [CBUUID]?, identifiers: [UUID]?) -> Observable + func search(_ uuids: [CBUUID]?, identifiers: [UUID]?, fetchKnownDevices: Bool) -> Observable /// Start connection request for device, callbacks are informed to monitorDeviceSessionState or /// deviceSessionStateObserver @@ -100,8 +100,8 @@ public protocol BlePowerStateObserver: AnyObject { } public extension BleDeviceListener { - func search(_ uuids: [CBUUID]? = nil, identifiers: [UUID]?=nil) -> Observable { - return search(uuids, identifiers: identifiers) + func search(_ uuids: [CBUUID]? = nil, identifiers: [UUID]?=nil, fetchKnownDevices: Bool = false) -> Observable { + return search(uuids, identifiers: identifiers, fetchKnownDevices: fetchKnownDevices) } } @@ -120,6 +120,8 @@ public extension Observable where Element: Hashable { set.insert(element) return Observable.just(element) } - } + }.do(onDispose: { + set = Set() + }) } } diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/api/BleLogger.swift b/sources/iOS/ios-communications/iOSCommunications/ble/api/BleLogger.swift index b691ed04..661d825c 100644 --- a/sources/iOS/ios-communications/iOSCommunications/ble/api/BleLogger.swift +++ b/sources/iOS/ios-communications/iOSCommunications/ble/api/BleLogger.swift @@ -59,14 +59,10 @@ public class BleLogger { public static func trace_hex(_ message: String, data: Data) { sharedInstance.queue.async(execute: { if( sharedInstance.logger != nil && (sharedInstance.logLevel & BleLogger.LOG_LEVEL_HEX) != 0 ){ - let ret = NSMutableString() - ret.append(message) - ret.append(" HEX: ") - let bytes = (data as NSData).bytes.bindMemory(to: UInt8.self, capacity: data.count) - for i in 0.. String in + return String(format: "%02X", byte) + }.joined(separator: " ")) + sharedInstance.logger?.logMessage(logStr) } }) } @@ -74,13 +70,10 @@ public class BleLogger { public static func trace_hex(_ message: String, data: [UInt8]) { sharedInstance.queue.async(execute: { if( sharedInstance.logger != nil && (sharedInstance.logLevel & BleLogger.LOG_LEVEL_HEX) != 0 ){ - let ret = NSMutableString() - ret.append(message) - ret.append(" HEX: ") - for i in 0.. String in + return String(format: "%02X", byte) + }.joined(separator: " ")) + sharedInstance.logger?.logMessage(logStr) } }) } diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/client/BlePmdClient.swift b/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/client/BlePmdClient.swift index 88e2b221..c6455a87 100644 --- a/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/client/BlePmdClient.swift +++ b/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/client/BlePmdClient.swift @@ -7,50 +7,77 @@ public struct Pmd { public struct PmdSetting { public enum PmdSettingType: UInt8, CaseIterable { case sampleRate = 0 - case resolution = 1 - case range = 2 + case resolution + case range + case rangeMilliUnit + case channels + case factor case unknown = 0xff } - public var settings = [PmdSettingType : Set]() + static let mapTypeToFieldSize = [PmdSettingType.sampleRate : 2, + PmdSettingType.resolution : 2, + PmdSettingType.range : 2, + PmdSettingType.rangeMilliUnit : 4, + PmdSettingType.channels : 1, + PmdSettingType.factor : 4] - public init(_ settings: [PmdSettingType : Set]){ - self.settings = settings + public var settings = [PmdSettingType : Set]() + public var selected = [PmdSettingType : UInt32]() + + public init(_ selected: [PmdSettingType : UInt32]){ + self.selected = selected } public init(_ data: Data){ + self.settings = Pmd.PmdSetting.parsePmdSettingsData(data) + self.selected = settings.reduce(into: [:]) { (result, arg1) in + let (key, value) = arg1 + result[Pmd.PmdSetting.PmdSettingType(rawValue: UInt8(key.rawValue)) ?? Pmd.PmdSetting.PmdSettingType.unknown]=value.max()! + } + } + + static func parsePmdSettingsData(_ data: Data) -> [PmdSettingType : Set] { var offset = 0 - while (offset < data.count){ - let type = PmdSettingType.init(rawValue: data[offset]) ?? .unknown + var settings = [PmdSettingType : Set]() + while (offset+2) < data.count { + let type = PmdSettingType(rawValue: data[offset]) ?? .unknown offset += 1 let count = Int(data[offset]) offset += 1 - settings[type] = Set(stride(from: offset, to: offset + (count*2), by: 2).map { (start) -> UInt16 in - let value = data.subdata(in: start.. UInt32 in + let value = data.subdata(in: start.. Data { - return settings.reduce(into: NSMutableData()) { (result, entry) in - result.append([UInt8(entry.key.rawValue)], length: 1) - result.append([UInt8(entry.value.count)], length: 1) - for item in entry.value { - result.append([UInt8(item),UInt8(item >> 8)], length: 2) + mutating func updatePmdSettingsFromStartResponse(_ data: Data) { + let settingsFromStartResponse = Pmd.PmdSetting.parsePmdSettingsData(data) + if let factor = settingsFromStartResponse[PmdSettingType.factor] { + selected[PmdSettingType.factor] = factor.first! + } + } + + public func serialize() -> Data { + return selected.reduce(into: NSMutableData()) { (result, entry) in + if entry.key != .factor { + result.append([UInt8(entry.key.rawValue)], length: 1) + result.append([0x01], length: 1) + let fieldSize = UInt32(Pmd.PmdSetting.mapTypeToFieldSize[entry.key] ?? 0) + for i in 0..> (i*8)) & 0xff)], length: 1) + } } } as Data } - - func selectedSampleSize() -> Int { - let resolution = settings[.resolution]?.max() ?? 8 - return Int(ceil(Double(resolution)/8.0)) - } } - + public enum BlePmdError: Error { - case controlPointRequestFailed(errorCode: Int) + case controlPointRequestFailed(errorCode: Int, description:String) } public struct PmdFeature { @@ -85,7 +112,30 @@ public struct Pmd { case errorInvalidLength = 4 case errorInvalidParameter = 5 case errorInvalidState = 6 + case errorInvalidResolution = 7 + case errorInvalidSampleRate = 8 + case errorInvalidRange = 9 + case errorInvalidMTU = 10 + case errorInvalidNumberOfChannels = 11 case unknown_error = 0xffff + + var description : String { + switch self { + case .errorInvalidLength: return "aInvalid length" + case .errorInvalidMeasurementType: return "Invalid measurement type" + case .errorInvalidOpCode: return "Invalid op code" + case .errorInvalidParameter: return "Invalid parameter" + case .errorInvalidState: return "Invalid state" + case .errorNotSupported: return "Not supported" + case .errorInvalidResolution: return "Invalid Resolution" + case .errorInvalidSampleRate: return "Invalid Sample rate" + case .errorInvalidRange: return "Invalid Range" + case .errorInvalidMTU: return "Invalid MTU" + case .errorInvalidNumberOfChannels: return "Invalid Number of channels" + case .success: return "Success" + case .unknown_error: return "unknown error" + } + } } public enum PmdMeasurementType: UInt8{ @@ -111,8 +161,8 @@ public struct Pmd { public init(_ data: Data) { response = data[0] opCode = data[1] - type = PmdMeasurementType.init(rawValue: data[2]) ?? PmdMeasurementType.unknown_type - errorCode = PmdResponseCode.init(rawValue: Int(data[3])) ?? PmdResponseCode.unknown_error + type = PmdMeasurementType(rawValue: data[2]) ?? PmdMeasurementType.unknown_type + errorCode = PmdResponseCode(rawValue: Int(data[3])) ?? PmdResponseCode.unknown_error if data.count > 4 { more = data[4] != 0 parameters.append(data.subdata(in: 5.. + (timeStamp: UInt64,samples: [(x: Float,y: Float,z: Float)]) { + let samples = parseDeltaFramesToSamples(data, channels: 3, resolution: resolution) + return (timeStamp, samples.map { (sample) -> (x: Float,y: Float,z: Float) in + assert(sample.count == 3) + let channel0 = (Float(sample[0]) * factor) + let channel1 = (Float(sample[1]) * factor) + let channel2 = (Float(sample[2]) * factor) + return (channel0,channel1,channel2) + }) + } + + public static func buildFromDeltaFrame3Axis(_ data: Data, resolution: UInt8, timeStamp: UInt64) -> (timeStamp: UInt64,samples: [(x: Int32,y: Int32,z: Int32)]) { + let samples = parseDeltaFramesToSamples(data, channels: 3, resolution: resolution) + return (timeStamp, samples.map { (sample) -> (x: Int32,y: Int32,z: Int32) in + assert(sample.count == 3) + return (sample[0],sample[1],sample[2]) + }) + } + + + public static func buildFromDeltaFramePPG(_ data: Data, resolution: UInt8, channels: UInt8, timeStamp: UInt64) -> (timeStamp: UInt64, channels: UInt8, samples: [[Int32]]) { + let samples = parseDeltaFramesToSamples(data, channels: channels, resolution: resolution) + return (timeStamp, channels, samples) + } + /// ACC - public static func buildAccSamples(_ frameType: UInt8, data: Data, timeStamp: UInt64) -> (UInt64,[(x: Int32,y: Int32,z: Int32)]) { + public static func buildAccSamples(_ frameType: UInt8, data: Data, timeStamp: UInt64) -> (timeStamp: UInt64, samples: [(x: Int32,y: Int32,z: Int32)]) { let sampleSize = Int(frameType+1) let sampleChunk = Int(sampleSize * 3) - var samples = [(Int32,Int32,Int32)]() - stride(from: 0, to: data.count, by: sampleChunk).map { (start) -> Data in + return (timeStamp, stride(from: 0, to: data.count, by: sampleChunk).map { (start) -> Data in return data.subdata(in: start.. (x: Int32,y: Int32,z: Int32) in + var offset = 0 + let x = BlePmdClient.arrayToInt(sample, offset: offset, size: sampleSize) + offset += sampleSize + let y = BlePmdClient.arrayToInt(sample, offset: offset, size: sampleSize) + offset += sampleSize + let z = BlePmdClient.arrayToInt(sample, offset: offset, size: sampleSize) + return (x,y,z) + }) } /// ECG - static func buildEcgSamples(_ type: UInt8, data: Data, timeStamp: UInt64) -> (UInt64,[Int32]) { + public static func buildEcgSamples(_ type: UInt8, data: Data, timeStamp: UInt64) -> (timeStamp: UInt64, samples: [Int32]) { let sampleSize = type == 0 ? 3 : 2 - var samples = [Int32]() - stride(from: 0, to: data.count, by: sampleSize).map { (start) -> Data in + return (timeStamp,stride(from: 0, to: data.count, by: sampleSize).map { (start) -> Data in return data.subdata(in: start.. Int32 in + return BlePmdClient.arrayToInt(content, offset: 0, size: sampleSize) + }) } /// BIOZ - static func buildBiozSamples(_ data: Data, timeStamp: UInt64) -> (UInt64,[Int32]) { - var samples = [Int32]() - stride(from: 0, to: data.count, by: 3).map { (start) -> Data in + public static func buildBiozSamples(_ data: Data, timeStamp: UInt64) -> (timeStamp: UInt64, samples: [Int32]) { + return (timeStamp, stride(from: 0, to: data.count, by: 3).map { (start) -> Data in return data.subdata(in: start.. (UInt64,[(ppg0: Int32,ppg1: Int32,ppg2: Int32,ambient: Int32)]) { + public static func buildPpgSamples(_ data: Data, timeStamp: UInt64) -> (timeStamp: UInt64, channels: UInt8, samples: [[Int32]]) { let sampleSize = 3 let sampleChunk = sampleSize * 4 - var samples = [(Int32,Int32,Int32,Int32)]() - stride(from: 0, to: data.count, by: sampleChunk).map { (start) -> Data in + return (timeStamp, 4, stride(from: 0, to: data.count, by: sampleChunk).map { (start) -> Data in return data.subdata(in: start.. [Int32] in + var offset = 0 + let ppg0 = BlePmdClient.arrayToInt(value, offset: offset, size: sampleSize) + offset += sampleSize + let ppg1 = BlePmdClient.arrayToInt(value, offset: offset, size: sampleSize) + offset += sampleSize + let ppg2 = BlePmdClient.arrayToInt(value, offset: offset, size: sampleSize) + offset += sampleSize + let ambient = BlePmdClient.arrayToInt(value, offset: offset, size: sampleSize) + offset += sampleSize + return ([ppg0,ppg1,ppg2,ambient]) + }) } /// PPI - static func buildPpiSamples(_ data: Data, timeStamp: UInt64) -> (UInt64,[(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)]) { - var samples = [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)]() + public static func buildPpiSamples(_ data: Data, timeStamp: UInt64) -> (timeStamp: UInt64, samples: [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)]) { let PPI_SAMPLE_CHUNK = 6 - stride(from: 0, to: data.count, by: PPI_SAMPLE_CHUNK).map { (start) -> Data in + return (timeStamp, stride(from: 0, to: data.count, by: PPI_SAMPLE_CHUNK).map { (start) -> Data in return data.subdata(in: start..> 1 - let skinContactSupported = (Int(data[5]) & 0x04) >> 2 - samples.append((hr: hr, ppInMs: ppInMs, ppErrorEstimate: ppErrorEstimate, blockerBit: blockerBit, skinContactStatus: skinContactStatus, skinContactSupported: skinContactSupported)) + }.map { (data) -> (hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int) in + let hr = Int(data[0]) + let ppInMs = UInt16(UInt16(data[2]) << 8 | UInt16(data[1])) + let ppErrorEstimate = UInt16(UInt16(data[4]) << 8 | UInt16(data[3])) + let blockerBit = Int(data[5]) & 0x01 + let skinContactStatus = (Int(data[5]) & 0x02) >> 1 + let skinContactSupported = (Int(data[5]) & 0x04) >> 2 + return ((hr: hr, ppInMs: ppInMs, ppErrorEstimate: ppErrorEstimate, blockerBit: blockerBit, skinContactStatus: skinContactStatus, skinContactSupported: skinContactSupported)) + }) + } + + static func parseDeltaFrameRefSamples(_ data: Data, channels: UInt8, resolution: UInt8) -> [Int32] { + let resolutionInBytes = Int(ceil(Double(resolution)/8.0)) + return Array(stride(from: 0, to: (resolutionInBytes*Int(channels)), by: resolutionInBytes).map { (start) -> Int32 in + let value = data.subdata(in: start.. [[Int32]]{ + // convert array to bits + let dataInBits = data.flatMap { (byte) -> [Bool] in + return Array(stride(from: 0, to: 8, by: 1).map { (index) -> Bool in + return (byte & (0x01 << index)) != 0 + }) + } + + let mask = Int32.max << Int32(bitWidth-1) + let channelBitsLength = bitWidth*channels + return Array(stride(from: 0, to: totalBitLength, by: UInt32.Stride(channelBitsLength)).map { (start) -> [Int32] in + return Array(stride(from: start, to: UInt32(start+UInt32(channelBitsLength)), by: UInt32.Stride(bitWidth)).map { (subStart) -> Int32 in + let deltaSampleList: ArraySlice = dataInBits[Int(subStart).. [[Int32]] { + let refSamples = parseDeltaFrameRefSamples(data, channels: channels, resolution: resolution) + var offset = Int(channels*UInt8(ceil(Double(resolution)/8.0))) + var samples = [[Int32]]() + samples.append(contentsOf: [refSamples]) + while offset < data.count { + let deltaSize = UInt32(data[offset]) + offset += 1 + let sampleCount = UInt32(data[offset]) + offset += 1 + let bitLength = (sampleCount*deltaSize*UInt32(channels)) + let length = Int(ceil(Double(bitLength)/8.0)) + let frame = data.subdata(in: offset..<(offset+length)) + let deltas = parseDeltaFrame(frame, channels: UInt32(channels), bitWidth: deltaSize, totalBitLength: bitLength) + offset += length + deltas.forEach { (delta) in + var nextSamples = [Int32]() + let last = samples.last! + for i in 0..() var features: Data? var pmdCpEnabled: AtomicInteger! var observersAcc = AtomicList>() + var observersGyro = AtomicList>() + var observersMagnetometer = AtomicList>() var observersEcg = AtomicList>() - var observersPpg = AtomicList>() + var observersPpg = AtomicList>() var observersPpi = AtomicList>() var observersBioz = AtomicList>() var observersFeature = AtomicList>() + var storedSettings = AtomicType<[Pmd.PmdMeasurementType : Pmd.PmdSetting]>(initialValue: [Pmd.PmdMeasurementType : Pmd.PmdSetting]()) public init(gattServiceTransmitter: BleAttributeTransportProtocol){ super.init(serviceUuid: BlePmdClient.PMD_SERVICE, gattServiceTransmitter: gattServiceTransmitter) @@ -236,6 +368,8 @@ public class BlePmdClient: BleGattClientBase { override public func disconnected() { super.disconnected() RxUtils.postErrorAndClearList(observersAcc, error: BleGattException.gattDisconnected) + RxUtils.postErrorAndClearList(observersGyro, error: BleGattException.gattDisconnected) + RxUtils.postErrorAndClearList(observersMagnetometer, error: BleGattException.gattDisconnected) RxUtils.postErrorAndClearList(observersEcg, error: BleGattException.gattDisconnected) RxUtils.postErrorAndClearList(observersPpg, error: BleGattException.gattDisconnected) RxUtils.postErrorAndClearList(observersPpi, error: BleGattException.gattDisconnected) @@ -245,6 +379,26 @@ public class BlePmdClient: BleGattClientBase { features = nil } + fileprivate func fetchSetting(_ type: Pmd.PmdMeasurementType, setting: Pmd.PmdSetting.PmdSettingType) -> UInt32? { + var ret: UInt32? + storedSettings.accessItem({ (settings) in + ret = settings[type]?.selected[setting] + }) + return ret + } + + fileprivate func fetchFactor(_ type: Pmd.PmdMeasurementType) -> Float { + var factor: UInt32? + storedSettings.accessItem({ (settings) in + factor = settings[type]?.selected[.factor] + }) + if let value = factor { + return Float(bitPattern: value) + } + BleLogger.error("factor not stored to settings") + return 1.0 + } + override public func processServiceData(_ chr: CBUUID, data: Data, err: Int ){ if chr.isEqual(BlePmdClient.PMD_CP) { if err == 0 { @@ -282,6 +436,21 @@ public class BlePmdClient: BleGattClientBase { let ppgSamples = Pmd.buildPpgSamples(samples, timeStamp: timeStamp) emitter.obs.onNext(ppgSamples) } + } else if frameType == 128 { + guard let resolution = fetchSetting(Pmd.PmdMeasurementType.ppg, setting: .resolution) else { + BleLogger.error("PPG resolution setting missing") + return + } + guard let channels = fetchSetting(Pmd.PmdMeasurementType.ppg, setting: .channels) else { + BleLogger.error("PPG channels setting missing") + return + } + + RxUtils.emitNext(observersPpg) { (emitter) in + let ppgSamples = Pmd.buildFromDeltaFramePPG(samples, resolution: UInt8(resolution), channels: + UInt8(channels), timeStamp: timeStamp) + emitter.obs.onNext(ppgSamples) + } } else { BleLogger.error("Unknown PPG frame received") } @@ -291,6 +460,21 @@ public class BlePmdClient: BleGattClientBase { let accSamples = Pmd.buildAccSamples(frameType, data: samples, timeStamp: timeStamp) emitter.obs.onNext(accSamples) } + } else if frameType == 128 { + // delta framed + let factor = fetchFactor(Pmd.PmdMeasurementType.acc) + guard let resolution = fetchSetting(Pmd.PmdMeasurementType.acc, setting: .resolution) else { + BleLogger.error("ACC resolution setting missing") + return + } + RxUtils.emitNext(observersAcc) { (emitter) in + let accSamples = Pmd.buildFromDeltaFrame3Axis(samples, resolution: + UInt8(resolution), factor: factor * 1000.0, timeStamp: timeStamp) + emitter.obs.onNext((accSamples.timeStamp,accSamples.samples.map { (arg0) -> (x:Int32, y: Int32, z: Int32) in + let (x, y, z) = arg0 + return (Int32(x),Int32(y),Int32(z)) + })) + } } else { BleLogger.error("Unknown ACC frame received") } @@ -312,6 +496,36 @@ public class BlePmdClient: BleGattClientBase { } else { BleLogger.error("Unknown BIOZ frame received") } + case Pmd.PmdMeasurementType.mgn.rawValue: + if frameType == 128 { + let factor = fetchFactor(Pmd.PmdMeasurementType.mgn) + guard let resolution = fetchSetting(Pmd.PmdMeasurementType.mgn, setting: .resolution) else { + BleLogger.error("Unknown MGN resolution setting missing") + return + } + RxUtils.emitNext(observersMagnetometer) { (emitter) in + let samples = Pmd.buildFromDeltaFrame3Axis(samples, resolution: + UInt8(resolution), factor: factor, timeStamp: timeStamp) + emitter.obs.onNext(samples) + } + } else { + BleLogger.error("Unknown MAGNETOMETER frame received") + } + case Pmd.PmdMeasurementType.gyro.rawValue: + if frameType == 128 { + let factor = fetchFactor(Pmd.PmdMeasurementType.gyro) + guard let resolution = fetchSetting(Pmd.PmdMeasurementType.gyro, setting: .resolution) else { + BleLogger.error("GYRO resolution setting missing") + return + } + RxUtils.emitNext(observersGyro) { (emitter) in + let samples = Pmd.buildFromDeltaFrame3Axis(samples, resolution: + UInt8(resolution), factor: factor, timeStamp: timeStamp) + emitter.obs.onNext(samples) + } + } else { + BleLogger.error("Unknown GYRO frame received") + } default: BleLogger.trace("Non handled stream type received") } @@ -321,23 +535,22 @@ public class BlePmdClient: BleGattClientBase { } } + static func arrayToUInt(_ data: Data, offset: Int, size: Int) -> UInt32 { + let result = data.subdata(in: offset..<(offset+size)) as NSData + var value: UInt32 = 0 + assert(size <= 4) + memcpy(&value,result.bytes,size) + return value + } + static func arrayToInt(_ data: Data, offset: Int, size: Int) -> Int32 { let result = data.subdata(in: offset..<(offset+size)) as NSData var value: Int32 = 0 + assert(size <= 4) memcpy(&value,result.bytes,size) - switch size { - case 3: - if (value & 0x00800000) != 0 { - value |= (Int32(0xFF) << 24) - } - case 2: - if (value & 0x00008000) != 0 { - value |= (Int32(0xFFFF) << 16) - } - default: - if (value & 0x00000080) != 0 { - value |= (Int32(0xFFFFFF) << 8) - } + let mask = (Int32.max << ((size*8)-1)) + if (value & mask) != 0 { + value |= mask } return value } @@ -346,11 +559,19 @@ public class BlePmdClient: BleGattClientBase { return RxUtils.monitor(observersAcc, transport: gattServiceTransmitter, checkConnection: true) } + public func observeGyro() -> Observable<(timeStamp: UInt64,samples: [(x: Float,y: Float,z: Float)])> { + return RxUtils.monitor(observersGyro, transport: gattServiceTransmitter, checkConnection: true) + } + + public func observeMagnetometer() -> Observable<(timeStamp: UInt64,samples: [(x: Float,y: Float,z: Float)])> { + return RxUtils.monitor(observersMagnetometer, transport: gattServiceTransmitter, checkConnection: true) + } + public func observeEcg() -> Observable<(timeStamp: UInt64,samples: [Int32])> { return RxUtils.monitor(observersEcg, transport: gattServiceTransmitter, checkConnection: true) } - public func observePpg() -> Observable<(timeStamp: UInt64,samples: [(ppg0: Int32,ppg1: Int32,ppg2: Int32,ambient: Int32)])> { + public func observePpg() -> Observable<(timeStamp: UInt64, channels: UInt8, samples: [[Int32]])> { return RxUtils.monitor(observersPpg, transport: gattServiceTransmitter, checkConnection: true) } @@ -363,6 +584,9 @@ public class BlePmdClient: BleGattClientBase { } public func startMeasurement(_ type: Pmd.PmdMeasurementType, settings: Pmd.PmdSetting) -> Completable { + storedSettings.accessItem { (settingsStored) in + settingsStored[type] = settings + } return Completable.create{ observer in do { let serialized = settings.serialize() @@ -370,9 +594,12 @@ public class BlePmdClient: BleGattClientBase { packet.append(serialized) let cpResponse = try self.sendControlPointCommand(packet as Data) if cpResponse.errorCode == .success { + self.storedSettings.accessItem { (settingsStored) in + settingsStored[type]?.updatePmdSettingsFromStartResponse(cpResponse.parameters as Data) + } observer(.completed) } else { - observer(.error(Pmd.BlePmdError.controlPointRequestFailed(errorCode: cpResponse.errorCode.rawValue))) + observer(.error(Pmd.BlePmdError.controlPointRequestFailed(errorCode: cpResponse.errorCode.rawValue, description: cpResponse.errorCode.description))) } } catch let err { observer(.error(err)) @@ -381,7 +608,7 @@ public class BlePmdClient: BleGattClientBase { } }.subscribe(on: baseSerialDispatchQueue) } - + public func stopMeasurement(_ type: Pmd.PmdMeasurementType) -> Completable { return Completable.create{ observer in do { @@ -390,7 +617,7 @@ public class BlePmdClient: BleGattClientBase { if cpResponse.errorCode == .success { observer(.completed) } else { - observer(.error(Pmd.BlePmdError.controlPointRequestFailed(errorCode: cpResponse.errorCode.rawValue))) + observer(.error(Pmd.BlePmdError.controlPointRequestFailed(errorCode: cpResponse.errorCode.rawValue, description: cpResponse.errorCode.description))) } } catch let err { observer(.error(err)) @@ -403,7 +630,7 @@ public class BlePmdClient: BleGattClientBase { public func readFeature(_ checkConnection: Bool) -> Single { var object: RxObserverSingle! return Single.create{ observer in - object = RxObserverSingle.init(obs: observer) + object = RxObserverSingle(obs: observer) if let f = self.features { // available observer(.success(Pmd.PmdFeature(f))) @@ -427,7 +654,7 @@ public class BlePmdClient: BleGattClientBase { } public func querySettings(_ setting: Pmd.PmdMeasurementType) -> Single { - return Single.create{ observer in + return Single.create{ [unowned self] observer in do { let packet = Data([0x01,setting.rawValue]) let cpResponse = try self.sendControlPointCommand(packet) @@ -435,7 +662,7 @@ public class BlePmdClient: BleGattClientBase { let query = Pmd.PmdSetting(cpResponse.parameters as Data) observer(.success(query)) } else { - observer(.failure(BleGattException.gattAttributeError(errorCode: cpResponse.errorCode.rawValue))) + observer(.failure(BleGattException.gattAttributeError(errorCode: cpResponse.errorCode.rawValue, errorDescription: cpResponse.errorCode.description))) } } catch let err { observer(.failure(err)) diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/exceptions/BleGattException.swift b/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/exceptions/BleGattException.swift index 76ea2ce2..051b2c96 100644 --- a/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/exceptions/BleGattException.swift +++ b/sources/iOS/ios-communications/iOSCommunications/ble/api/model/gatt/exceptions/BleGattException.swift @@ -10,7 +10,7 @@ public enum BleGattException: Error{ case gattCharacteristicNotifyNotEnabled case gattCharacteristicError case gattUndefinedDeviceError - case gattAttributeError(errorCode: Int) + case gattAttributeError(errorCode: Int, errorDescription: String = "") case gattOperationNotSupported case gattTransportNotAvailable } diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/api/model/polar/BlePolarDeviceCapabilitiesUtility.swift b/sources/iOS/ios-communications/iOSCommunications/ble/api/model/polar/BlePolarDeviceCapabilitiesUtility.swift new file mode 100644 index 00000000..7391b640 --- /dev/null +++ b/sources/iOS/ios-communications/iOSCommunications/ble/api/model/polar/BlePolarDeviceCapabilitiesUtility.swift @@ -0,0 +1,32 @@ + +import Foundation + +open class BlePolarDeviceCapabilitiesUtility { + enum FileSystemType { + case unknownFileSystem + case h10FileSystem + case sagRfc2FileSystem + } + + /// Get type of filesystem the device supports + /// - Parameter deviceType: device type + /// - Returns: type of the file system supported or unknown file system type + static func fileSystemType(_ deviceType: String) -> FileSystemType { + switch deviceType.lowercased() { + case "h10": + return FileSystemType.h10FileSystem + case "oh1": fallthrough + case "sense": + return FileSystemType.sagRfc2FileSystem + default: + return FileSystemType.unknownFileSystem + } + } + + /// Check if device is supporting recording start and stop over BLE + /// - Parameter deviceType: device type + /// - Returns: true if device supports recoding + static func isRecordingSupported(_ deviceType: String) -> Bool { + return deviceType == "H10" + } +} diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/common/AtomicType.swift b/sources/iOS/ios-communications/iOSCommunications/ble/common/AtomicType.swift index a02b205f..3c4eae68 100644 --- a/sources/iOS/ios-communications/iOSCommunications/ble/common/AtomicType.swift +++ b/sources/iOS/ios-communications/iOSCommunications/ble/common/AtomicType.swift @@ -11,7 +11,7 @@ public class AtomicType : NSObject{ super.init() } - /// copy of item stored(note only for primitive types, for object use accessItem) to AtomicType + /// copy of item stored(note only for primitive types or copyable, for object use accessItem) to AtomicType public func get() -> T { // sorry no proper RAII support lock.lock() @@ -22,9 +22,9 @@ public class AtomicType : NSObject{ } /// f function for atomic access for the stored item - public func accessItem(_ f: (_ item: T) -> Void) { + public func accessItem(_ f: (_ item: inout T) -> Void) { self.lock.lock() - f(item) + f(&item) self.lock.unlock() } diff --git a/sources/iOS/ios-communications/iOSCommunications/ble/endpoints/corebluetooth/central/CBDeviceListenerImpl.swift b/sources/iOS/ios-communications/iOSCommunications/ble/endpoints/corebluetooth/central/CBDeviceListenerImpl.swift index 0501e816..6d056c9d 100755 --- a/sources/iOS/ios-communications/iOSCommunications/ble/endpoints/corebluetooth/central/CBDeviceListenerImpl.swift +++ b/sources/iOS/ios-communications/iOSCommunications/ble/endpoints/corebluetooth/central/CBDeviceListenerImpl.swift @@ -274,7 +274,7 @@ extension CBDeviceListenerImpl: BleDeviceListener { } } - public func search(_ uuids: [CBUUID]?, identifiers: [UUID]?) -> Observable { + public func search(_ uuids: [CBUUID]?, identifiers: [UUID]?, fetchKnownDevices: Bool) -> Observable { var object: RxObserver! return Observable.create{ observer in object = RxObserver(obs: observer) @@ -298,6 +298,11 @@ extension CBDeviceListenerImpl: BleDeviceListener { self.centralManager(self.manager, didDiscover: device, advertisementData: advData, rssi: -20) } } + if fetchKnownDevices { + self.sessions.items.forEach { (sess) in + observer.onNext(sess) + } + } return Disposables.create { self.scanner.removeClient(object) } diff --git a/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift b/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift index c635ae71..86ee5345 100644 --- a/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift +++ b/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApi.swift @@ -4,6 +4,16 @@ import Foundation import CoreBluetooth import RxSwift +/// device streaming features +public enum DeviceStreamingFeature: Int, CaseIterable { + case ecg + case acc + case ppg + case ppi + case gyro + case magnetometer +} + /// recording interval in seconds for H10 public enum RecordingInterval: Int { case interval_1s = 1 @@ -42,6 +52,7 @@ public enum Features: Int, CaseIterable { /// - name = local name from advertisement /// - connectable = true adv type is connectable public typealias PolarDeviceInfo = (deviceId: String, address: UUID, rssi: Int, name: String, connectable: Bool) + /// deviceInfo: see #PolarDeviceInfo , /// /// - hr: in BPM @@ -60,11 +71,32 @@ public typealias PolarEcgData = (timeStamp: UInt64,samples: [Int32]) /// - samples: Acceleration samples list x,y,z in millig signed value public typealias PolarAccData = (timeStamp: UInt64,samples: [(x: Int32,y: Int32,z: Int32)]) -/// Polar ppg data +/// Polar gyro data +/// +/// - Timestamp: Last sample timestamp in nanoseconds. +/// - samples: gyro samples list x,y,z in °/s signed value +public typealias PolarGyroData = (timeStamp: UInt64,samples: [(x: Float,y: Float,z: Float)]) + +/// Polar mgn data +/// +/// - Timestamp: Last sample timestamp in nanoseconds. +/// - samples: in Gauss +public typealias PolarMagnetometerData = (timeStamp: UInt64,samples: [(x: Float,y: Float,z: Float)]) + +/// OHR data source enum +public enum OhrDataType: Int, CaseIterable { + /// 3 ppg + 1 ambient + case ppg3_ambient1 = 4 + case unknown = 18 +} + +/// Polar Ohr data /// /// - Timestamp: Last sample timestamp in nanoseconds. -/// - samples: PPG samples list ppg0,ppg1,ppg2,ambient signed value -public typealias PolarPpgData = (timeStamp: UInt64,samples: [(ppg0: Int32,ppg1: Int32,ppg2: Int32,ambient: Int32)]) +/// - channels: amount of channels +/// - source: source of OHR data +/// - samples: ppg(s) and ambient(s) samples list +public typealias PolarOhrData = (timeStamp: UInt64, type: OhrDataType, samples: [[Int32]]) /// Polar ppi data /// - timestamp N/A always 0 @@ -76,8 +108,6 @@ public typealias PolarPpgData = (timeStamp: UInt64,samples: [(ppg0: Int32,ppg1: /// - Contact Status bit (bit 1 of the PP Flags field) public typealias PolarPpiData = (timeStamp: UInt64,samples: [(hr: Int, ppInMs: UInt16, ppErrorEstimate: UInt16, blockerBit: Int, skinContactStatus: Int, skinContactSupported: Int)]) -public typealias PolarBiozData = (timeStamp: UInt64,samples: [Int32]) - /// Polar exercise entry /// /// - path: Resource location in the device, @@ -124,7 +154,7 @@ public protocol PolarBleApi { /// - Parameter identifier: Polar device id /// - Throws: InvalidArgument if identifier is invalid polar device id or invalid uuid func disconnectFromDevice(_ identifier: String) throws - + /// Start searching for Polar device(s) /// /// - Parameter onNext: Invoked once for each device @@ -187,35 +217,16 @@ public protocol PolarBleApi { /// - Returns: Observable stream func startListenForPolarHrBroadcasts(_ identifiers: Set?) -> Observable - /// request ecg settings available + /// request stream settings available /// /// - Parameters: /// - identifier: polar device id + /// - feature: selected feature from`DeviceStreamingFeature` /// - Returns: Single stream /// - success: once after settings received from device /// - onError: see `PolarErrors` for possible errors invoked - func requestEcgSettings(_ identifier: String) -> Single - - /// request acc settings available - /// - /// - Parameters: - /// - identifier: polar device id - /// - Returns: Single stream - /// - success: once after settings received from device - /// - onError: see `PolarErrors` for possible errors invoked - func requestAccSettings(_ identifier: String) -> Single - - /// request ppg settings available - /// - /// - Parameters: - /// - identifier: polar device id - /// - Returns: Single stream - /// - success: once after settings received from device - /// - onError: see `PolarErrors` for possible errors invoked - func requestPpgSettings(_ identifier: String) -> Single - - func requestBiozSettings(_ identifier: String) -> Single - + func requestStreamSettings(_ identifier: String, feature: DeviceStreamingFeature) -> Single + /// Starts the ECG (Electrocardiography) stream. /// /// - Parameters: @@ -225,7 +236,7 @@ public protocol PolarBleApi { /// - onNext: for every air packet received. see `PolarEcgData` /// - onError: see `PolarErrors` for possible errors invoked func startEcgStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable - + /// Start ACC (accelerometer) stream. /// /// - Parameters: @@ -235,16 +246,28 @@ public protocol PolarBleApi { /// - onNext: for every air packet received. see `PolarAccData` /// - onError: see `PolarErrors` for possible errors invoked func startAccStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable - + + /// starts gyro streaming + /// - Parameters: + /// - identifier: Polar device id or device address + /// - settings: selected settings to start the stream + func startGyroStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable + + /// Starts mgn streaming + /// - Parameters: + /// - identifier: Polar device id or device address + /// - settings: selected settings to start the stream + func startMagnetometerStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable + /// Start an OHR (optical heart rate) PPG (photoplethysmography) stream. /// /// - Parameters: /// - identifier: Polar device id or device address /// - settings: selected settings to start the stream /// - Returns: Observable stream - /// - onNext: for every air packet received. see `PolarPpgData` + /// - onNext: for every air packet received. see `PolarOhrData` /// - onError: see `PolarErrors` for possible errors invoked - func startOhrPPGStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable + func startOhrStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable /// Start PPI stream. Notice when using OH1 there is a delay before actual /// PPI measurement starts and timestamp produced to PolarPpiData is 0 @@ -256,8 +279,6 @@ public protocol PolarBleApi { /// - onError: see `PolarErrors` for possible errors invoked func startOhrPPIStreaming(_ identifier: String) -> Observable - func startBiozStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable - /// Api for fetching stored exercises from Polar OH1/H10 device /// /// - Parameters: @@ -292,7 +313,7 @@ public protocol PolarBleApi { /// Device info observer for DIS (Device information servive) and BAS (Battery service) GATT (Generic attributes) client var deviceInfoObserver: PolarBleApiDeviceInfoObserver? { get set } - + /// Device observer for HR GATT client var deviceHrObserver: PolarBleApiDeviceHrObserver? { get set } diff --git a/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiDefaultImpl.swift b/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiDefaultImpl.swift index a3723668..87e02ca3 100644 --- a/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiDefaultImpl.swift +++ b/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiDefaultImpl.swift @@ -11,13 +11,13 @@ public class PolarBleApiDefaultImpl { /// - Parameter features: bit mask with one or more items from enum `Features` /// - Returns: api instance public static func polarImplementation(_ queue: DispatchQueue, features: Int) -> PolarBleApi { - return PolarBleApiImpl.init(queue, features: features) + return PolarBleApiImpl(queue, features: features) } /// Return current version /// /// - Returns: version in format major.minor.patch public static func versionInfo() -> String { - return "2.3.1" + return "3.0.0" } } diff --git a/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift b/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift index 3223e86b..bd026b2f 100644 --- a/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift +++ b/sources/iOS/ios-communications/iOSCommunications/sdk/api/PolarBleApiObservers.swift @@ -73,42 +73,15 @@ public protocol PolarBleApiDeviceFeaturesObserver: class { /// /// - Parameter identifier: Polar device id func hrFeatureReady(_ identifier: String) - - /// Device ECG feature is ready. Application can now start ECG streaming. - /// - /// - Parameters: - /// - identifier: Polar device id - func ecgFeatureReady(_ identifier: String) - - /// Device ACC feature is ready. Application can now start ACC streaming. - /// - /// - Parameters: - /// - identifier: Polar device id - func accFeatureReady(_ identifier: String) - - /// Device OHR PPG feature is ready. - /// - /// - Parameter identifier: polar device id - func ohrPPGFeatureReady(_ identifier: String) - - /// Device OHR PPG feature is ready. - /// - /// - Parameter identifier: polar device id - func ohrPPIFeatureReady(_ identifier: String) - - func biozFeatureReady(_ identifier: String) - + /// Device file transfer protocol is ready. /// Notice all file transfer operations are preferred to be done at beginning of the connection /// /// - Parameter identifier: polar device id func ftpFeatureReady(_ identifier: String) -} - -public extension PolarBleApiDeviceFeaturesObserver { - func biozFeatureReady(_ identifier: String) { - // default empty - } + + /// feature ready callback + func streamingFeaturesReady(_ identifier: String, streamingFeatures: Set) } /// logger observer diff --git a/sources/iOS/ios-communications/iOSCommunications/sdk/api/model/PolarSensorSetting.swift b/sources/iOS/ios-communications/iOSCommunications/sdk/api/model/PolarSensorSetting.swift index bdc1ce7c..993b96e1 100644 --- a/sources/iOS/ios-communications/iOSCommunications/sdk/api/model/PolarSensorSetting.swift +++ b/sources/iOS/ios-communications/iOSCommunications/sdk/api/model/PolarSensorSetting.swift @@ -10,41 +10,43 @@ public struct PolarSensorSetting { case sampleRate = 0 /// resolution in bits case resolution = 1 - /// range in g's + /// range case range = 2 + /// range with min and max allowed values + case rangeMilliunit = 3 + /// amount of channels available + case channels = 4 /// type is unknown case unknown = 0xff } /// current settings available / set - public let settings: [SettingType : Set] + public let settings: [SettingType : Set] init() { - self.settings = [SettingType : Set]() + self.settings = [SettingType : Set]() } /// constructor with desired settings /// /// - Parameter settings: single key value pairs to start stream - public init(_ settings: [SettingType : UInt16]) { - self.settings = settings.mapValues({ (v) -> Set in - var set = Set() - set.insert(v) - return set + public init(_ settings: [SettingType : UInt32]) { + self.settings = settings.mapValues({ (v) -> Set in + return Set(arrayLiteral: v) }) } - init(_ settings: [Pmd.PmdSetting.PmdSettingType : Set]) { + init(_ settings: [Pmd.PmdSetting.PmdSettingType : Set]) { self.settings = settings.reduce(into: [:]) { (result, arg1) in let (key, value) = arg1 - result[SettingType.init(rawValue: Int(key.rawValue)) ?? SettingType.unknown]=value + result[SettingType(rawValue: Int(key.rawValue)) ?? SettingType.unknown]=value } } func map2PmdSetting() -> Pmd.PmdSetting { return Pmd.PmdSetting(settings.reduce(into: [:]) { (result, arg1) in let (key, value) = arg1 - result[Pmd.PmdSetting.PmdSettingType.init(rawValue: UInt8(key.rawValue)) ?? Pmd.PmdSetting.PmdSettingType.unknown]=Set(value) + result[Pmd.PmdSetting.PmdSettingType(rawValue: UInt8(key.rawValue)) ?? Pmd.PmdSetting.PmdSettingType.unknown]=value.first! }) } @@ -55,10 +57,7 @@ public struct PolarSensorSetting { let selected = settings.reduce(into: [:]) { (result, arg1) in let (key, value) = arg1 result[key] = value.max() ?? 0 - } as [SettingType : UInt16] + } as [SettingType : UInt32] return PolarSensorSetting(selected) } } - - - diff --git a/sources/iOS/ios-communications/iOSCommunications/sdk/impl/PolarBleApiImpl.swift b/sources/iOS/ios-communications/iOSCommunications/sdk/impl/PolarBleApiImpl.swift index fbb76f1c..90b3b00d 100644 --- a/sources/iOS/ios-communications/iOSCommunications/sdk/impl/PolarBleApiImpl.swift +++ b/sources/iOS/ios-communications/iOSCommunications/sdk/impl/PolarBleApiImpl.swift @@ -6,8 +6,8 @@ import RxSwift /// Default implementation @objc class PolarBleApiImpl: NSObject, - BleDeviceSessionStateObserver, - BlePowerStateObserver { + BleDeviceSessionStateObserver, + BlePowerStateObserver { weak var deviceHrObserver: PolarBleApiDeviceHrObserver? weak var deviceFeaturesObserver: PolarBleApiDeviceFeaturesObserver? @@ -70,7 +70,7 @@ import RxSwift self.listener.scanPreFilter = deviceFilter self.listener.deviceSessionStateObserver = self self.listener.powerStateObserver = self - BleLogger.setLogLevel(BleLogger.LOG_LEVEL_TRACE | BleLogger.LOG_LEVEL_ERROR) + BleLogger.setLogLevel(BleLogger.LOG_LEVEL_ALL) BleLogger.setLogger(self) #if os(iOS) NotificationCenter.default.addObserver(self, selector: #selector(foreground), name: UIApplication.willEnterForegroundNotification, object: nil) @@ -103,23 +103,23 @@ import RxSwift // from BleDeviceSessionStateObserver func stateChanged(_ session: BleDeviceSession) { let info = PolarDeviceInfo( - session.advertisementContent.polarDeviceIdUntouched.count != 0 ? session.advertisementContent.polarDeviceIdUntouched : session.address.uuidString, - session.address, Int(session.advertisementContent.rssiFilter.rssi),session.advertisementContent.name,true) + session.advertisementContent.polarDeviceIdUntouched.count != 0 ? session.advertisementContent.polarDeviceIdUntouched : session.address.uuidString, + session.address, Int(session.advertisementContent.rssiFilter.rssi),session.advertisementContent.name,true) switch session.state { - case .sessionOpen: - self.observer?.deviceConnected(info) - self.setupDevice(session) - case .sessionOpenPark where - session.previousState == .sessionOpen: fallthrough - case .sessionClosed where - session.previousState == .sessionClosing: - self.observer?.deviceDisconnected(info) - case .sessionOpening: - self.observer?.deviceConnecting(info) - case .sessionClosed: fallthrough - case .sessionOpenPark: fallthrough - case .sessionClosing: - break + case .sessionOpen: + self.observer?.deviceConnected(info) + self.setupDevice(session) + case .sessionOpenPark where + session.previousState == .sessionOpen: fallthrough + case .sessionClosed where + session.previousState == .sessionClosing: + self.observer?.deviceDisconnected(info) + case .sessionOpening: + self.observer?.deviceConnecting(info) + case .sessionClosed: fallthrough + case .sessionOpenPark: fallthrough + case .sessionClosing: + break } } @@ -141,7 +141,7 @@ import RxSwift let session = try sessionServiceReady(identifier, service: BlePmdClient.PMD_SERVICE) let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient if client.isCharacteristicNotificationEnabled(BlePmdClient.PMD_CP) && - client.isCharacteristicNotificationEnabled(BlePmdClient.PMD_MTU) { + client.isCharacteristicNotificationEnabled(BlePmdClient.PMD_MTU) { // client ready return session } @@ -200,93 +200,116 @@ import RxSwift let deviceId = session.advertisementContent.polarDeviceIdUntouched.count != 0 ? session.advertisementContent.polarDeviceIdUntouched : session.address.uuidString - _ = session.monitorServicesDiscovered(true).observe( - on: scheduler).flatMap { (uuid: CBUUID) -> Observable in - if let client = session.fetchGattClient(uuid) { - switch uuid { - case BleHrClient.HR_SERVICE: - self.deviceFeaturesObserver?.hrFeatureReady(deviceId) - let hrClient = client as! BleHrClient - self.startHrObserver(hrClient, deviceId: deviceId) - case BleBasClient.BATTERY_SERVICE: - return (client as! BleBasClient).waitBatteryLevelUpdate(true).observe(on: self.scheduler).take(1).do(onNext: { (level: Int) in - self.deviceInfoObserver?.batteryLevelReceived( - deviceId, batteryLevel: UInt(level)) - }).map { (_) -> Any in - return Any.self - } - case BleDisClient.DIS_SERVICE: - return (client as! BleDisClient).readDisInfo(true).observe(on: self.scheduler).do(onNext: { (arg0) in - self.deviceInfoObserver?.disInformationReceived(deviceId, uuid: arg0.0, value: arg0.1) - }).map { (_) -> Any in - return Any.self - } - case BlePmdClient.PMD_SERVICE: - let pmdClient = (client as! BlePmdClient) - return pmdClient.clientReady(true).andThen(pmdClient.readFeature(true).observe(on: self.scheduler).do(onSuccess: { (value: Pmd.PmdFeature) in - if value.ecgSupported { - self.deviceFeaturesObserver?.ecgFeatureReady(deviceId) - } - if value.accSupported { - self.deviceFeaturesObserver?.accFeatureReady(deviceId) - } - if value.ppgSupported { - self.deviceFeaturesObserver?.ohrPPGFeatureReady(deviceId) - } - if value.ppiSupported { - self.deviceFeaturesObserver?.ohrPPIFeatureReady(deviceId) - } - if value.bioZSupported { - self.deviceFeaturesObserver?.biozFeatureReady(deviceId) - } - })).asObservable().map { (_) -> Any in - return Any.self - } - case BlePsFtpClient.PSFTP_SERVICE: - return (client as! BlePsFtpClient).waitPsFtpReady(true).observe(on: self.scheduler).do(onCompleted: { - switch session.advertisementContent.polarDeviceType { - case "OH1": fallthrough - case "H10": - self.deviceFeaturesObserver?.ftpFeatureReady(deviceId) - default: - break - } - } ).asObservable().map { (_) -> Any in - return Any.self + _ = session.monitorServicesDiscovered(true) + .observe(on: scheduler) + .flatMap { (uuid: CBUUID) -> Observable in + if let client = session.fetchGattClient(uuid) { + switch uuid { + case BleHrClient.HR_SERVICE: + self.deviceFeaturesObserver?.hrFeatureReady(deviceId) + let hrClient = client as! BleHrClient + self.startHrObserver(hrClient, deviceId: deviceId) + case BleBasClient.BATTERY_SERVICE: + return (client as! BleBasClient).waitBatteryLevelUpdate(true) + .observe(on: self.scheduler) + .take(1) + .do(onNext: { (level: Int) in + self.deviceInfoObserver?.batteryLevelReceived( + deviceId, batteryLevel: UInt(level)) + }) + .map { (_) -> Any in + return Any.self + } + case BleDisClient.DIS_SERVICE: + return (client as! BleDisClient).readDisInfo(true) + .observe(on: self.scheduler) + .do(onNext: { (arg0) in + self.deviceInfoObserver?.disInformationReceived(deviceId, uuid: arg0.0, value: arg0.1) + }) + .map { (_) -> Any in + return Any.self + } + case BlePmdClient.PMD_SERVICE: + let pmdClient = (client as! BlePmdClient) + return pmdClient.clientReady(true) + .andThen(pmdClient.readFeature(true) + .observe(on: self.scheduler) + .do(onSuccess: { (value: Pmd.PmdFeature) in + + var featureSet = Set() + if value.ecgSupported { + featureSet.insert(.ecg) + } + if value.accSupported { + featureSet.insert(.acc) + } + if value.ppgSupported { + featureSet.insert(.ppg) + } + if value.ppiSupported { + featureSet.insert(.ppi) + } + if value.gyroSupported { + featureSet.insert(.gyro) + } + if value.magnetometerSupported { + featureSet.insert(.magnetometer) + } + self.deviceFeaturesObserver?.streamingFeaturesReady(deviceId, streamingFeatures: featureSet) + })) + .asObservable() + .map { (_) -> Any in + return Any.self + } + case BlePsFtpClient.PSFTP_SERVICE: + return (client as! BlePsFtpClient).waitPsFtpReady(true) + .observe(on: self.scheduler) + .do(onCompleted: { + switch session.advertisementContent.polarDeviceType { + case "OH1": fallthrough + case "H10": + self.deviceFeaturesObserver?.ftpFeatureReady(deviceId) + default: + break + } + }) + .asObservable() + .map { (_) -> Any in + return Any.self + } + default: + break } - default: + } + return Observable.empty() + }.subscribe { e in + switch e { + case .next(_): break + case .error(let error): + self.logMessage("\(error)") + case .completed: + self.logMessage("device setup completed") } } - return Observable.empty() - }.subscribe { e in - switch e { - case .next(_): - break - case .error(let error): - self.logMessage("\(error)") - case .completed: - self.logMessage("device setup completed") - } - } } - + private func startHrObserver(_ client: BleHrClient, deviceId: String) { _ = client.observeHrNotifications(true).observe( on: self.scheduler).subscribe{ e in - switch e { - case .completed: - break - case .next(let value): - let rrsMs = value.rrs.map({ (rr) -> Int in - return Int(round((Float(rr) / 1024.0) * 1000.0)) - }) - self.deviceHrObserver?.hrValueReceived( - deviceId, data: (hr: UInt8(value.hr), rrs: value.rrs, rrsMs: rrsMs, contact: value.sensorContact, contactSupported: value.sensorContactSupported)) - case .error(let error): - self.logMessage("\(error)") - } - } + switch e { + case .completed: + break + case .next(let value): + let rrsMs = value.rrs.map({ (rr) -> Int in + return Int(round((Float(rr) / 1024.0) * 1000.0)) + }) + self.deviceHrObserver?.hrValueReceived( + deviceId, data: (hr: UInt8(value.hr), rrs: value.rrs, rrsMs: rrsMs, contact: value.sensorContact, contactSupported: value.sensorContactSupported)) + case .error(let error): + self.logMessage("\(error)") + } + } } } @@ -312,20 +335,24 @@ extension PolarBleApiImpl: PolarBleApi { func polarFilter(_ enable: Bool) { listener.scanPreFilter = enable ? deviceFilter : nil } - + func startAutoConnectToDevice(_ rssi: Int, service: CBUUID?, polarDeviceType: String?) -> Completable { - return listener.search(serviceList, identifiers: nil).filter { (sess: BleDeviceSession) -> Bool in - return sess.advertisementContent.medianRssi >= rssi && - sess.isConnectable() && - (polarDeviceType == nil || polarDeviceType == sess.advertisementContent.polarDeviceType) && - (service == nil || sess.advertisementContent.containsService(service!)) - }.take(1).do(onNext: { (session) in + return listener.search(serviceList, identifiers: nil) + .filter { (sess: BleDeviceSession) -> Bool in + return sess.advertisementContent.medianRssi >= rssi && + sess.isConnectable() && + (polarDeviceType == nil || polarDeviceType == sess.advertisementContent.polarDeviceType) && + (service == nil || sess.advertisementContent.containsService(service!)) + }.take(1) + .do(onNext: { (session) in self.logMessage("auto connect search complete") #if os(watchOS) session.connectionType = .directConnection #endif self.listener.openSessionDirect(session) - }).asSingle().asCompletable() + }) + .asSingle() + .asCompletable() } func connectToDevice(_ identifier: String) throws { @@ -340,12 +367,13 @@ extension PolarBleApiImpl: PolarBleApi { #endif self.listener.openSessionDirect(session!) } else { - connectSubscriptions[identifier] = listener.search(serviceList, - identifiers: nil).observe(on: scheduler).filter { (sess: BleDeviceSession) -> Bool in - return - identifier.contains("-") ? - sess.address.uuidString == identifier : sess.advertisementContent.polarDeviceIdUntouched == identifier - }.take(1).subscribe{ e in + connectSubscriptions[identifier] = listener.search(serviceList, identifiers: nil) + .observe(on: scheduler) + .filter { (sess: BleDeviceSession) -> Bool in + return identifier.contains("-") ? sess.address.uuidString == identifier : sess.advertisementContent.polarDeviceIdUntouched == identifier + } + .take(1) + .subscribe{ e in switch e { case .completed: self.logMessage("connect search complete") @@ -357,7 +385,7 @@ extension PolarBleApiImpl: PolarBleApi { #endif self.listener.openSessionDirect(value) } - } + } } } } @@ -365,14 +393,14 @@ extension PolarBleApiImpl: PolarBleApi { func disconnectFromDevice(_ identifier: String) throws { if let session = try fetchSession(identifier) { if (session.state == BleDeviceSession.DeviceSessionState.sessionOpen || - session.state == BleDeviceSession.DeviceSessionState.sessionOpening || - session.state == BleDeviceSession.DeviceSessionState.sessionOpenPark){ + session.state == BleDeviceSession.DeviceSessionState.sessionOpening || + session.state == BleDeviceSession.DeviceSessionState.sessionOpenPark){ listener.closeSessionDirect(session) } } connectSubscriptions.removeValue(forKey: identifier)?.dispose() } - + func isFeatureReady(_ identifier: String, feature: Features) -> Bool { switch feature { case .polarFileTransfer: @@ -394,7 +422,7 @@ extension PolarBleApiImpl: PolarBleApi { } return false } - + func setLocalTime(_ identifier: String, time: Date, zone: TimeZone) -> Completable { do { let session = try sessionFtpClientReady(identifier) @@ -414,17 +442,18 @@ extension PolarBleApiImpl: PolarBleApi { params.time = t params.tzOffset = Int32(zone.secondsFromGMT()/60) if let data = params.data() { - return client.query(PbPFtpQuery.setLocalTime.rawValue, parameters: data as NSData).catch({ (err) -> Single in - return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }).asCompletable() + return client.query(PbPFtpQuery.setLocalTime.rawValue, parameters: data as NSData) + .catch({ (err) -> Single in + return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + }) + .asCompletable() } throw MessageEncodeFailed() } catch let err { return Completable.error(err) } } - - + func startRecording(_ identifier: String, exerciseId: String, interval: RecordingInterval, sampleType: SampleType) -> Completable { do{ guard exerciseId.count > 0 && exerciseId.count < 64 else { @@ -432,7 +461,8 @@ extension PolarBleApiImpl: PolarBleApi { } let session = try sessionFtpClientReady(identifier) let client = session.fetchGattClient(BlePsFtpClient.PSFTP_SERVICE) as! BlePsFtpClient - if session.advertisementContent.polarDeviceType == "H10" { + if BlePolarDeviceCapabilitiesUtility.isRecordingSupported( + session.advertisementContent.polarDeviceType) { let duration = PbDuration() duration.seconds = UInt32(interval.rawValue) let params = PbPFtpRequestStartRecordingParams() @@ -440,9 +470,11 @@ extension PolarBleApiImpl: PolarBleApi { params.sampleDataIdentifier = exerciseId params.sampleType = sampleType == .hr ? PbSampleType.sampleTypeHeartRate : PbSampleType.sampleTypeRrInterval if let data = params.data() { - return client.query(PbPFtpQuery.requestStartRecording.rawValue, parameters: data as NSData).catch({ (err) -> Single in - return Single.error(err) - }).asCompletable() + return client.query(PbPFtpQuery.requestStartRecording.rawValue, parameters: data as NSData) + .catch({ (err) -> Single in + return Single.error(err) + }) + .asCompletable() } throw MessageEncodeFailed() } @@ -456,10 +488,14 @@ extension PolarBleApiImpl: PolarBleApi { do{ let session = try sessionFtpClientReady(identifier) let client = session.fetchGattClient(BlePsFtpClient.PSFTP_SERVICE) as! BlePsFtpClient - if session.advertisementContent.polarDeviceType == "H10" { - return client.query(PbPFtpQuery.requestStopRecording.rawValue, parameters: nil).catch({ (err) -> Single in - return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }).asCompletable() + if BlePolarDeviceCapabilitiesUtility.isRecordingSupported( + session.advertisementContent.polarDeviceType) + { + return client.query(PbPFtpQuery.requestStopRecording.rawValue, parameters: nil) + .catch({ (err) -> Single in + return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + }) + .asCompletable() } throw OperationNotSupported() } catch let err { @@ -471,13 +507,17 @@ extension PolarBleApiImpl: PolarBleApi { do{ let session = try sessionFtpClientReady(identifier) let client = session.fetchGattClient(BlePsFtpClient.PSFTP_SERVICE) as! BlePsFtpClient - if session.advertisementContent.polarDeviceType == "H10" { - return client.query(PbPFtpQuery.requestRecordingStatus.rawValue, parameters: nil).map({ (data) -> PolarRecordingStatus in - let result = try PbRequestRecordingStatusResult.parse(from: data as Data) - return (ongoing: result.recordingOn, entryId: result.hasSampleDataIdentifier ? result.sampleDataIdentifier : "") - }).catch({ (err) -> Single in - return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) + if BlePolarDeviceCapabilitiesUtility.isRecordingSupported( + session.advertisementContent.polarDeviceType) + { + return client.query(PbPFtpQuery.requestRecordingStatus.rawValue, parameters: nil) + .map({ (data) -> PolarRecordingStatus in + let result = try PbRequestRecordingStatusResult.parse(from: data as Data) + return (ongoing: result.recordingOn, entryId: result.hasSampleDataIdentifier ? result.sampleDataIdentifier : "") + }) + .catch({ (err) -> Single in + return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + }) } throw OperationNotSupported() } catch let err { @@ -491,12 +531,13 @@ extension PolarBleApiImpl: PolarBleApi { let client = session.fetchGattClient(BlePsFtpClient.PSFTP_SERVICE) as! BlePsFtpClient let components = entry.path.split(separator: "/") let operation = PbPFtpOperation() - switch session.advertisementContent.polarDeviceType { - case "OH1": + switch BlePolarDeviceCapabilitiesUtility.fileSystemType( session.advertisementContent.polarDeviceType) { + case .sagRfc2FileSystem: operation.command = .get operation.path = "/U/0/" + components[2] + "/E/" if let data = operation.data() { - return client.request(data).flatMap { (content) -> Single in + return client.request(data) + .flatMap { (content) -> Single in do{ let dir = try PbPFtpDirectory.parse(from: content as Data) let removeOperation = PbPFtpOperation() @@ -514,18 +555,23 @@ extension PolarBleApiImpl: PolarBleApi { } catch { return Single.error(MessageDecodeFailed()) } - }.catch({ (err) -> Single in + } + .catch { (err) -> Single in return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }).asCompletable() - } + } + .asCompletable() + } throw MessageEncodeFailed() - case "H10": + case .h10FileSystem: operation.command = .remove operation.path = entry.path if let data = operation.data() { - return client.request(data).observe(on: self.scheduler).catch({ (err) -> Single in - return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }).asCompletable() + return client.request(data) + .observe(on: self.scheduler) + .catch { (err) -> Single in + return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + } + .asCompletable() } throw MessageEncodeFailed() default: @@ -537,140 +583,136 @@ extension PolarBleApiImpl: PolarBleApi { } func startListenForPolarHrBroadcasts(_ identifiers: Set?) -> Observable { - return listener.search(serviceList, identifiers: nil).filter({ (session) -> Bool in - return (identifiers == nil || identifiers!.contains(session.advertisementContent.polarDeviceIdUntouched)) && - session.advertisementContent.polarHrAdvertisementData.isPresent - }).map({ (value) -> PolarHrBroadcastData in - return (deviceInfo: (value.advertisementContent.polarDeviceIdUntouched, - address: value.address, - rssi: Int(value.advertisementContent.rssiFilter.rssi), name: value.advertisementContent.name, connectable: value.advertisementContent.isConnectable), hr: value.advertisementContent.polarHrAdvertisementData.hrValueForDisplay, - batteryStatus: value.advertisementContent.polarHrAdvertisementData.batteryStatus) - }) - } - - func requestEcgSettings(_ identifier: String) -> Single { - return querySettings(identifier, type: .ecg) - } - - func requestAccSettings(_ identifier: String) -> Single { - return querySettings(identifier, type: .acc) - } - - func requestPpgSettings(_ identifier: String) -> Single { - return querySettings(identifier, type: .ppg) + return listener.search(serviceList, identifiers: nil) + .filter({ (session) -> Bool in + return (identifiers == nil || identifiers!.contains(session.advertisementContent.polarDeviceIdUntouched)) && + session.advertisementContent.polarHrAdvertisementData.isPresent + }) + .map({ (value) -> PolarHrBroadcastData in + return (deviceInfo: (value.advertisementContent.polarDeviceIdUntouched, + address: value.address, + rssi: Int(value.advertisementContent.rssiFilter.rssi), name: value.advertisementContent.name, connectable: value.advertisementContent.isConnectable), hr: value.advertisementContent.polarHrAdvertisementData.hrValueForDisplay, + batteryStatus: value.advertisementContent.polarHrAdvertisementData.batteryStatus) + }) } - func requestBiozSettings(_ identifier: String) -> Single { - return querySettings(identifier, type: .bioz) - } - - func startEcgStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { + func requestStreamSettings(_ identifier: String, feature: DeviceStreamingFeature) -> Single { + switch feature { + case .ecg: + return querySettings(identifier, type: .ecg) + case .acc: + return querySettings(identifier, type: .acc) + case .ppg: + return querySettings(identifier, type: .ppg) + case .magnetometer: + return querySettings(identifier, type: .mgn) + case .gyro: + return querySettings(identifier, type: .gyro) + case .ppi: + return Single.error(OperationNotSupported()) + } + } + + fileprivate func startStreaming(_ identifier: String, + type: Pmd.PmdMeasurementType, + settings: PolarSensorSetting, + observer: @escaping (_ client: BlePmdClient) -> Observable) -> Observable { do{ let session = try sessionPmdClientReady(identifier) let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient - return client.startMeasurement(.ecg, settings: settings.map2PmdSetting()).andThen(client.observeEcg().do(onDispose: { - _ = client.stopMeasurement(.ecg).subscribe() - })).catch({ (err) -> Observable in - return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) + return client.startMeasurement(type, settings: settings.map2PmdSetting()) + .andThen(observer(client) + .do(onDispose: { + _ = client.stopMeasurement(type).subscribe() + })) + .catch({ (err) -> Observable in + return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + }) } catch let err { return Observable.error(err) } } + func startEcgStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { + return startStreaming(identifier, type: .ecg, settings: settings) { (client) -> Observable in + return client.observeEcg() + } + } + func startAccStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { - do{ - let session = try sessionPmdClientReady(identifier) - let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient - return client.startMeasurement(.acc, settings: settings.map2PmdSetting()).andThen(client.observeAcc().do(onDispose: { - _ = client.stopMeasurement(.acc).subscribe() - })).catch({ (err) -> Observable in - return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) - } catch let err { - return Observable.error(err) + return startStreaming(identifier, type: .acc, settings: settings) { (client) -> Observable in + return client.observeAcc() } } - func startOhrPPGStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { - do{ - let session = try sessionPmdClientReady(identifier) - let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient - return client.startMeasurement(.ppg, settings: settings.map2PmdSetting()).andThen(client.observePpg().do(onDispose: { - _ = client.stopMeasurement(.ppg).subscribe() - })).catch({ (err) -> Observable in - return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) - } catch let err { - return Observable.error(err) + func startGyroStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { + return startStreaming(identifier, type: .gyro, settings: settings) { (client) -> Observable in + return client.observeGyro() } } - func startOhrPPIStreaming(_ identifier: String) -> Observable { - do { - let session = try sessionPmdClientReady(identifier) - let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient - return client.startMeasurement(.ppi, settings: Pmd.PmdSetting([:])).andThen(client.observePpi().do(onDispose: { - _ = client.stopMeasurement(.ppi).subscribe() - })).catch({ (err) -> Observable in - return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) - } catch let err { - return Observable.error(err) + func startMagnetometerStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { + return startStreaming(identifier, type: .mgn, settings: settings) { (client) -> Observable in + return client.observeMagnetometer() } } - func startBiozStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { - do { - let session = try sessionPmdClientReady(identifier) - let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient - return client.startMeasurement(.bioz, settings: settings.map2PmdSetting()).andThen(client.observeBioz().do(onDispose: { - _ = client.stopMeasurement(.bioz).subscribe() - })).catch({ (err) -> Observable in - return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) - } catch let err { - return Observable.error(err) + func startOhrStreaming(_ identifier: String, settings: PolarSensorSetting) -> Observable { + return startStreaming(identifier, type: .ppg, settings: settings) { (client) -> Observable in + return client.observePpg() + .map { (arg0) -> (PolarOhrData) in + let (timeStamp, channels, samples) = arg0 + let type = OhrDataType(rawValue: Int(channels)) ?? OhrDataType.unknown + return (timeStamp, type, samples) + } + } + } + + func startOhrPPIStreaming(_ identifier: String) -> Observable { + return startStreaming(identifier, type: .ppi, settings: PolarSensorSetting()) { (client) -> Observable in + return client.observePpi() } } func fetchExercise(_ identifier: String, entry: PolarExerciseEntry) -> Single { do{ let session = try sessionFtpClientReady(identifier) - if session.advertisementContent.polarDeviceType == "OH1" || - session.advertisementContent.polarDeviceType == "H10" { + let fsType = BlePolarDeviceCapabilitiesUtility.fileSystemType(session.advertisementContent.polarDeviceType) + if fsType == .sagRfc2FileSystem || fsType == .h10FileSystem { let client = session.fetchGattClient(BlePsFtpClient.PSFTP_SERVICE) as! BlePsFtpClient /* - TODO to improve throughput enable these - client.sendNotification(PbPFtpHostToDevNotification.startSync.rawValue, parameters: nil).andThen(client.sendNotification(PbPFtpHostToDevNotification.initializeSession.rawValue, parameters: nil)) - - after file operation call these to device to change parameters + TODO to improve throughput enable these + client.sendNotification(PbPFtpHostToDevNotification.startSync.rawValue, parameters: nil).andThen(client.sendNotification(PbPFtpHostToDevNotification.initializeSession.rawValue, parameters: nil)) + + after file operation call these to device to change parameters - client.sendNotification(PbPFtpHostToDevNotification.terminateSession.rawValue, parameters: nil).andThen(client.sendNotification(PbPFtpHostToDevNotification.stopSync.rawValue, parameters: nil)) - */ + client.sendNotification(PbPFtpHostToDevNotification.terminateSession.rawValue, parameters: nil).andThen(client.sendNotification(PbPFtpHostToDevNotification.stopSync.rawValue, parameters: nil)) + */ let operation = PbPFtpOperation() operation.command = PbPFtpOperation_Command.get operation.path = entry.path if let header = operation.data() { - return client.request(header).map { (data) -> PolarExerciseData in - let samples = try PbExerciseSamples.parse(from: data as Data) - var exSamples = [UInt32]() - if samples.hasRrSamples && samples.rrSamples.rrIntervalsArray_Count != 0 { - for i in 0.. PolarExerciseData in + let samples = try PbExerciseSamples.parse(from: data as Data) + var exSamples = [UInt32]() + if samples.hasRrSamples && samples.rrSamples.rrIntervalsArray_Count != 0 { + for i in 0.. Single in - return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) + .catch({ (err) -> Single in + return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + }) } throw MessageEncodeFailed() } @@ -684,14 +726,16 @@ extension PolarBleApiImpl: PolarBleApi { do { let session = try sessionFtpClientReady(identifier) let client = session.fetchGattClient(BlePsFtpClient.PSFTP_SERVICE) as! BlePsFtpClient - if session.advertisementContent.polarDeviceType == "OH1" { + let fsType = BlePolarDeviceCapabilitiesUtility.fileSystemType(session.advertisementContent.polarDeviceType) + if fsType == .sagRfc2FileSystem { return fetchRecursive("/U/0/", client: client, condition: { (entry) -> Bool in return entry.matches("^([0-9]{8})(\\/)") || - entry.matches("^([0-9]{6})(\\/)") || - entry == "E/" || - entry == "SAMPLES.BPB" || - entry == "00/" - }).map({ (path) -> (path: String, date: Date, entryId: String) in + entry.matches("^([0-9]{6})(\\/)") || + entry == "E/" || + entry == "SAMPLES.BPB" || + entry == "00/" + }) + .map({ (path) -> (path: String, date: Date, entryId: String) in let components = path.split(separator: "/") let dateFormatter = DateFormatter() dateFormatter.dateFormat = "yyyyMMddHHmmss" @@ -699,16 +743,19 @@ extension PolarBleApiImpl: PolarBleApi { return (path,date: date, entryId: String(components[2] + components[4])) } throw DateTimeFormatFailed() - }).catch({ (err) -> Observable in + }) + .catch({ (err) -> Observable in return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) }) - } else if session.advertisementContent.polarDeviceType == "H10" { + } else if fsType == .h10FileSystem { return fetchRecursive("/", client: client, condition: { (entry) -> Bool in return entry.hasSuffix("/") || entry == "SAMPLES.BPB" - }).map({ (path) -> (path: String, date: Date, entryId: String) in + }) + .map({ (path) -> (path: String, date: Date, entryId: String) in let components = path.split(separator: "/") return (path,date: Date(), entryId: String(components[0])) - }).catch({ (err) -> Observable in + }) + .catch({ (err) -> Observable in return Observable.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) }) } @@ -722,23 +769,27 @@ extension PolarBleApiImpl: PolarBleApi { do{ let session = try sessionPmdClientReady(identifier) let client = session.fetchGattClient(BlePmdClient.PMD_SERVICE) as! BlePmdClient - return client.querySettings(type).map({ (setting) -> PolarSensorSetting in - return PolarSensorSetting(setting.settings) - }).catch({ (err) -> Single in - return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) - }) + return client.querySettings(type) + .map({ (setting) -> PolarSensorSetting in + return PolarSensorSetting(setting.settings) + }) + .catch({ (err) -> Single in + return Single.error(UndefinedError.DeviceError(localizedDescription: "\(err)")) + }) } catch let err { return Single.error(err) } } func searchForDevice() -> Observable { - return listener.search(nil, identifiers: nil).distinct().map({ (value) -> PolarDeviceInfo in - return (value.advertisementContent.polarDeviceIdUntouched, - address: value.address, - rssi: Int(value.advertisementContent.medianRssi), - name:value.advertisementContent.name,connectable:value.advertisementContent.isConnectable) - }) + return listener.search(nil, identifiers: nil) + .distinct() + .map({ (value) -> PolarDeviceInfo in + return (value.advertisementContent.polarDeviceIdUntouched, + address: value.address, + rssi: Int(value.advertisementContent.medianRssi), + name:value.advertisementContent.name,connectable:value.advertisementContent.isConnectable) + }) } func fetchRecursive(_ path: String, client: BlePsFtpClient, condition: @escaping (_ p: String) -> Bool) -> Observable { @@ -746,32 +797,37 @@ extension PolarBleApiImpl: PolarBleApi { operation.command = PbPFtpOperation_Command.get operation.path = path if let header = operation.data() { - return client.request(header).asObservable().observe(on: MainScheduler.instance).flatMap { (data) -> Observable in - do{ - let dir = try PbPFtpDirectory.parse(from: data as Data, extensionRegistry: nil) - let entrys = dir.entriesArray.compactMap({ (e) -> String? in - if let entry = e as? PbPFtpEntry { - if condition(entry.name) { - return path + entry.name - } + return client.request(header) + .asObservable() + .observe(on: MainScheduler.instance) + .flatMap { (data) -> Observable in + do{ + let dir = try PbPFtpDirectory.parse(from: data as Data, extensionRegistry: nil) + let entrys = dir.entriesArray + .compactMap({ (e) -> String? in + if let entry = e as? PbPFtpEntry { + if condition(entry.name) { + return path + entry.name + } + } + return nil + }) + if entrys.count != 0 { + return Observable.from(entrys) + .flatMap({ (path) -> Observable in + if path.hasSuffix("/") { + return self.fetchRecursive(path, client: client, condition: condition) + } else { + return Observable.just(path) + } + }) } - return nil - }) - if entrys.count != 0 { - return Observable.from(entrys).flatMap({ (path) -> Observable in - if path.hasSuffix("/") { - return self.fetchRecursive(path, client: client, condition: condition) - } else { - return Observable.just(path) - } - }) + return Observable.empty() + } catch let err { + return Observable.error( + UndefinedError.DeviceError(localizedDescription: "\(err)")) } - return Observable.empty() - } catch let err { - return Observable.error( - UndefinedError.DeviceError(localizedDescription: "\(err)")) } - } } return Observable.error(MessageEncodeFailed()) } @@ -788,6 +844,8 @@ extension String { extension PrimitiveSequence where Trait == SingleTrait { public func asCompletable() -> PrimitiveSequence { - return self.asObservable().flatMap { _ in Observable.empty() }.asCompletable() + return self.asObservable() + .flatMap { _ in Observable.empty() } + .asCompletable() } } diff --git a/sources/iOS/ios-communications/iOSCommunications/version.swift b/sources/iOS/ios-communications/iOSCommunications/version.swift index fbdf797f..48226951 100644 --- a/sources/iOS/ios-communications/iOSCommunications/version.swift +++ b/sources/iOS/ios-communications/iOSCommunications/version.swift @@ -1 +1 @@ -public let IOS_COMMUNICATIONS_VERSION = "14.1-13-g3c0cc83" +public let IOS_COMMUNICATIONS_VERSION = "14.1-17-gfc0aedd" diff --git a/sources/iOS/ios-communications/iOSCommunicationsTests/iOSCommunicationsTests.swift b/sources/iOS/ios-communications/iOSCommunicationsTests/iOSCommunicationsTests.swift index 0d9e971a..11859407 100644 --- a/sources/iOS/ios-communications/iOSCommunicationsTests/iOSCommunicationsTests.swift +++ b/sources/iOS/ios-communications/iOSCommunicationsTests/iOSCommunicationsTests.swift @@ -16,46 +16,457 @@ class iOSCommunicationsTests: XCTestCase { super.tearDown() } + fileprivate func assertEquals(_ lhs: Float, rhs: Float, delta: Float) + { + let diff = lhs - rhs + XCTAssert(diff <= delta && diff >= (delta * -1.0)) + } + func testPsFtpUtils(){ - - class logger: BleLoggerProtocol { - func logMessage(_ message: String) { - NSLog(message) - } - } - - BleLogger.setLogger(logger()) - let seq = BlePsFtpUtility.BlePsFtpRfc76SequenceNumber() - let bytes = [UInt8](repeating: 0, count: 60) - let stream = InputStream.init(data: Data.init(bytes: UnsafePointer(bytes), count: 60)); + let stream = InputStream.init(data: Data(count: 60)); stream.open() let requs = BlePsFtpUtility.buildRfc76MessageFrameAll(stream, mtuSize: 20, sequenceNumber: seq) stream.close() XCTAssert(requs.count == 4) - let bytes2 = [UInt8](repeating: 3, count: 2) - let frame = BlePsFtpUtility.processRfc76MessageFrame(Data(bytes: UnsafePointer(bytes2), count: 2)) + let frame = BlePsFtpUtility.processRfc76MessageFrame(Data([0x03,0x03])) XCTAssert(frame.next == 1 && frame.status == BlePsFtpUtility.RFC76_STATUS_LAST && frame.sequenceNumber == 0 && frame.payload != nil) - var bytes3 = [UInt8](repeating: 1, count: 3) - bytes3[1] = 0 - bytes3[2] = 0 - let frame2 = BlePsFtpUtility.processRfc76MessageFrame(Data(bytes: UnsafePointer(bytes3), count: 3)) + let frame2 = BlePsFtpUtility.processRfc76MessageFrame(Data([0x01,0x00,0x00])) XCTAssert(frame2.next == 1 && frame2.status == BlePsFtpUtility.RFC76_STATUS_ERROR_OR_RESPONSE && frame2.sequenceNumber == 0 && frame2.payload == nil) - var bytes4 = [UInt8](repeating: 0xF3, count: 2) - bytes4[1] = 0 - let frame3 = BlePsFtpUtility.processRfc76MessageFrame(Data(bytes: UnsafePointer(bytes4), count: 2)) + let frame3 = BlePsFtpUtility.processRfc76MessageFrame(Data([0xF3,0x00])) XCTAssert(frame3.next == 1 && frame3.status == BlePsFtpUtility.RFC76_STATUS_LAST && frame3.sequenceNumber == 0x0F && frame3.payload != nil) + } + + func testPmdDeltaFrameDecoder() { + let data = Data([0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x03,0x03,0xAA,0xAA,0xCC,0xCF,0x03,0x02,0xAA,0xAA,0xCC]) + let samples = Pmd.buildFromDeltaFrame3Axis(data, resolution: 14, timeStamp: 0) + XCTAssert(samples.samples.count == 6) + XCTAssert(samples.samples[0].x == -1) + XCTAssert(samples.samples[0].y == -1) + XCTAssert(samples.samples[0].z == -1) + XCTAssert(samples.samples[1].x == 1) + XCTAssert(samples.samples[1].y == -4) + XCTAssert(samples.samples[1].z == 1) + XCTAssert(samples.samples[2].x == -2) + XCTAssert(samples.samples[2].y == -2) + XCTAssert(samples.samples[2].z == 2) + XCTAssert(samples.samples[3].x == 1) + XCTAssert(samples.samples[3].y == -4) + XCTAssert(samples.samples[3].z == 1) + XCTAssert(samples.samples[4].x == 3) + XCTAssert(samples.samples[4].y == -7) + XCTAssert(samples.samples[4].z == 3) + XCTAssert(samples.samples[5].x == 0) + XCTAssert(samples.samples[5].y == -5) + XCTAssert(samples.samples[5].z == 4) + } + + func testPmdParseThreeAxisDataWithResolution16() { + // Arrange + // HEX: 71 07 F0 6A 9E 8D 0A 38 BE 5C BE BA 2F 96 B3 EE 4B E5 AD FB 42 B9 EB BE 4C FE BA 2F 92 BF EE 4B E4 B1 FB 12 B9 EC BD 3C 3E BB 2F 8F D3 DE 4B E3 B5 F7 D2 B8 ED BD 30 7E 7B 2F 8B E3 CE 8B E2 BA F7 A2 B8 EE BC 20 BE 7B 2F 88 F3 CE CB E1 BD EF 52 F8 EF BC 18 FE 3B 2F 84 03 BF CB E0 C2 EF 32 B8 F0 BB 04 4E BC 2E 81 13 AF 0B E0 C6 EF F2 F7 F1 B9 FC 7D BC 2E 7D 27 9F 4B DF CA EB C2 F7 F2 B8 EC CD 7C 2E 7B 37 8F 4B DE CE E3 92 F7 F3 B8 E0 0D FD 2D 77 4B 7F CB DD D2 DF 62 37 F5 B7 D4 4D BD 2D 74 5B 6F CB DC D7 D7 32 37 F6 B5 C8 8D 7D 2D 71 6B 4F 4B DC DC D3 F2 36 F7 B4 BC DD FD 2C 6F 7B 3F 4B DB E0 CF D2 36 F8 B2 B0 2D BE 2C 6C 8F 1F CB DA E3 C7 A2 76 F9 + // index type data: + // 0-5: Reference sample size 6: 71 07 F0 6A 9E 8D + // Sample 0 (aka. reference sample): + // channel 0: 71 07 =>0x0771 => 1905 + let refSample0Channel0 = Float(1905.0) + // channel 1: F0 6A => 0x6AF0 => 27376 + let refSample0Channel1 = Float(27376.0) + // channel 2: 9E 8D => 0x8D9E => -29282 + let refSample0Channel2 = Float(-29282.0) + // Delta dump: 0A 38 BE 5C BE BA 2F 96 B3 EE 4B E5 AD FB + // 6: Delta size size 1: 0x0A (10 bits) + // 7: Sample amount size 1: 0x38 (Delta block contains 56 samples) + // 8: 0xBE (binary: 1011 1110) + // 9: 0x5C (binary: 0101 11| 00) + // Sample 1 - channel 0, size 10 bits: 00 1011 1110 => 190 + // 10: 0xBE (binary: 1011 | 1110) + // Sample 1 - channel 1, size 10 bits: 11 1001 0111 => -105 + // 11: 0xBA (binary: 10 |11 1010) + // Sample 1 - channel 2, size 10 bits: 11 1010 1011 => -85 + let refSample1Channel0 = Float(190) + let refSample1Channel1 = Float(-105) + let refSample1Channel2 = Float(-85) + let amountOfSamples = 1 + 56 // reference sample + delta samples + let measurementFrame = Data([0x71, 0x07, 0xF0, 0x6A, 0x9E, 0x8D, 0x0A, 0x38, 0xBE, 0x5C, 0xBE, 0xBA, 0x2F, 0x96, 0xB3, 0xEE, 0x4B, 0xE5, 0xAD, 0xFB, 0x42, 0xB9, 0xEB, 0xBE, 0x4C, 0xFE, 0xBA, 0x2F, 0x92, 0xBF, 0xEE, 0x4B, 0xE4, 0xB1, 0xFB, 0x12, 0xB9, 0xEC, 0xBD, 0x3C, 0x3E, 0xBB, 0x2F, 0x8F, 0xD3, 0xDE, 0x4B, 0xE3, 0xB5, 0xF7, 0xD2, 0xB8, 0xED, 0xBD, 0x30, 0x7E, 0x7B, 0x2F, 0x8B, 0xE3, 0xCE, 0x8B, 0xE2, 0xBA, 0xF7, 0xA2, 0xB8, 0xEE, 0xBC, 0x20, 0xBE, 0x7B, 0x2F, 0x88, 0xF3, 0xCE, 0xCB, 0xE1, 0xBD, 0xEF, 0x52, 0xF8, 0xEF, 0xBC, 0x18, 0xFE, 0x3B, 0x2F, 0x84, 0x03, 0xBF, 0xCB, 0xE0, 0xC2, 0xEF, 0x32, 0xB8, 0xF0, 0xBB, 0x04, 0x4E, 0xBC, 0x2E, 0x81, 0x13, 0xAF, 0x0B, 0xE0, 0xC6, 0xEF, 0xF2, 0xF7, 0xF1, 0xB9, 0xFC, 0x7D, 0xBC, 0x2E, 0x7D, 0x27, 0x9F, 0x4B, 0xDF, 0xCA, 0xEB, 0xC2, 0xF7, 0xF2, 0xB8, 0xEC, 0xCD, 0x7C, 0x2E, 0x7B, 0x37, 0x8F, 0x4B, 0xDE, 0xCE, 0xE3, 0x92, 0xF7, 0xF3, 0xB8, 0xE0, 0x0D, 0xFD, 0x2D, 0x77, 0x4B, 0x7F, 0xCB, 0xDD, 0xD2, 0xDF, 0x62, 0x37, 0xF5, 0xB7, 0xD4, 0x4D, 0xBD, 0x2D, 0x74, 0x5B, 0x6F, 0xCB, 0xDC, 0xD7, 0xD7, 0x32, 0x37, 0xF6, 0xB5, 0xC8, 0x8D, 0x7D, 0x2D, 0x71, 0x6B, 0x4F, 0x4B, 0xDC, 0xDC, 0xD3, 0xF2, 0x36, 0xF7, 0xB4, 0xBC, 0xDD, 0xFD, 0x2C, 0x6F, 0x7B, 0x3F, 0x4B, 0xDB, 0xE0, 0xCF, 0xD2, 0x36, 0xF8, 0xB2, 0xB0, 0x2D, 0xBE, 0x2C, 0x6C, 0x8F, 0x1F, 0xCB, 0xDA, 0xE3, 0xC7, 0xA2, 0x76, 0xF9]); + let resolution = 16 + let range = 8 + let factor = Float(0.000244)//E-4f; + let timeStamp = 0 + + // Act + let threeAxisDeltaFramedData = Pmd.buildFromDeltaFrame3Axis(measurementFrame, resolution: UInt8(resolution), factor: Float(factor), timeStamp: UInt64(timeStamp)) + + // Assert + assertEquals((factor * refSample0Channel0), rhs: threeAxisDeltaFramedData.samples[0].x, delta: 0.001) + assertEquals((factor * refSample0Channel1), rhs: threeAxisDeltaFramedData.samples[0].y, delta: 0.001) + assertEquals((factor * refSample0Channel2), rhs: threeAxisDeltaFramedData.samples[0].z, delta: 0.001) + + assertEquals((factor * (refSample0Channel0 + refSample1Channel0)), rhs: threeAxisDeltaFramedData.samples[1].x, delta: 0.000000001) + assertEquals((factor * (refSample0Channel1 + refSample1Channel1)), rhs: threeAxisDeltaFramedData.samples[1].y, delta: 0.000000001) + assertEquals((factor * (refSample0Channel2 + refSample1Channel2)), rhs: threeAxisDeltaFramedData.samples[1].z, delta: 0.000000001) + + // validate data in range + threeAxisDeltaFramedData.samples.forEach { (arg0) in + let (x, y, z) = arg0 + XCTAssertTrue(abs(Int(x)) <= range) + XCTAssertTrue(abs(Int(y)) <= range) + XCTAssertTrue(abs(Int(z)) <= range) } + + // validate data size + XCTAssertEqual(amountOfSamples, threeAxisDeltaFramedData.samples.count) + } + + func testPPIDataSample() + { + // Arrange + // HEX: 80 80 80 80 80 FF 00 01 00 01 00 00 + // index type data: + // 0 HR 0x80 (128) + let heartRate = 128 + // 1..2 PP 0x80 0x80 (32896) + let intervalInMs = 32896 + // 3..4 PP Error Estimate 0x80 0x80 (32896) + let errorEstimate = 32896 + // 5 PP flags 0xFF + let ppFlags = 0xFF + let blockerBit = (ppFlags & 0x01 != 0) ? 0x01 : 0x00 + let skinContactStatus = (ppFlags & 0x02 != 0) ? 0x01 : 0x00 + let skinContactSupported = (ppFlags & 0x04 != 0) ? 0x01 : 0x00 + + // 6 HR 0x00 (0) + let heartRate2 = 0 + // 7..8 PP 0x01 0x00 (1) + let intervalInMs2 = 1 + // 9..10 PP Error Estimate 0x01 0x00 (1) + let errorEstimate2 = 1 + // 11 PP flags 0x00 + let ppFlags2 = 0x00 + let blockerBit2 = (ppFlags2 & 0x01 != 0) ? 0x01 : 0x00 + let skinContactStatus2 = (ppFlags2 & 0x02 != 0) ? 0x01 : 0x00 + let skinContactSupported2 = (ppFlags2 & 0x04 != 0) ? 0x01 : 0x00 + + let measurementFrame = Data([0x80, 0x80, 0x80, 0x80, 0x80, 0xFF, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00]) + let timeStamp = UInt64.max + + // Act + let ppiData = Pmd.buildPpiSamples(measurementFrame, timeStamp: timeStamp) + + // Assert + XCTAssertEqual(heartRate, ppiData.samples[0].hr) + XCTAssertEqual(intervalInMs, Int(ppiData.samples[0].ppInMs)) + XCTAssertEqual(errorEstimate, Int(ppiData.samples[0].ppErrorEstimate)) + XCTAssertEqual(blockerBit, ppiData.samples[0].blockerBit) + XCTAssertEqual(skinContactStatus, ppiData.samples[0].skinContactStatus) + XCTAssertEqual(skinContactSupported, ppiData.samples[0].skinContactSupported) + + XCTAssertEqual(heartRate2, ppiData.samples[1].hr) + XCTAssertEqual(intervalInMs2, Int(ppiData.samples[1].ppInMs)) + XCTAssertEqual(errorEstimate2, Int(ppiData.samples[1].ppErrorEstimate)) + XCTAssertEqual(blockerBit2, ppiData.samples[1].blockerBit) + XCTAssertEqual(skinContactStatus2, ppiData.samples[1].skinContactStatus) + XCTAssertEqual(skinContactSupported2, ppiData.samples[1].skinContactSupported) + + XCTAssertEqual(2, ppiData.samples.count) + } + + func testPPGDataSampleType0() { + // Arrange + let timeStamp: UInt64 = 0 + let measurementFrame = Data([ + 0x01, 0x02, 0x03, //PPG0 (197121) + 0x04, 0x05, 0x06, //PPG1 (394500) + 0xFF, 0xFF, 0x7F, //PPG2 (8388607) + 0x00, 0x00, 0x00, //ambient (0) + 0xFF, 0xFF, 0xFF, //PPG0 (-1) + 0x0F, 0xEF, 0xEF, //PPG1 (-1052913) + 0x00, 0x00, 0x80, //PPG2 (-8388608) + 0x0F, 0xEF, 0xEF]) //ambient (-1052913) + let ppg0_0: Int32 = 197121 + let ppg1_0: Int32 = 394500 + let ppg2_0: Int32 = 8388607 + let ambient_0: Int32 = 0 + let ppg0_1: Int32 = -1 + let ppg1_1: Int32 = -1052913 + let ppg2_1: Int32 = -8388608 + let ambient_1: Int32 = -1052913 + + // Act + let ppgData = Pmd.buildPpgSamples(measurementFrame, timeStamp: timeStamp) + + // Assert + XCTAssertEqual(2, ppgData.samples.count) + XCTAssertEqual(4, ppgData.channels) + + XCTAssertEqual(4, ppgData.samples[0].count) + XCTAssertEqual(ppg0_0, ppgData.samples[0][0]) + XCTAssertEqual(ppg1_0, ppgData.samples[0][1]) + XCTAssertEqual(ppg2_0, ppgData.samples[0][2]) + XCTAssertEqual(ambient_0, ppgData.samples[0][3]) + + XCTAssertEqual(4, ppgData.samples[1].count) + XCTAssertEqual(ppg0_1, ppgData.samples[1][0]) + XCTAssertEqual(ppg1_1, ppgData.samples[1][1]) + XCTAssertEqual(ppg2_1, ppgData.samples[1][2]) + XCTAssertEqual(ambient_1, ppgData.samples[1][3]) + } + + func testPPGDataSampleDelta() { + // Arrange + // HEX: 2C 2D 00 C2 77 00 D3 D2 FF 3D 88 FF 0A 29 B2 F0 EE 34 11 B2 EC EE 74 11 B1 E8 FE B4 11 B1 E8 FE B4 11 B1 E0 FE 34 12 B0 DC 0E 75 12 B0 D8 0E B5 12 AF D4 1E F5 12 AF D0 1E 35 13 AE CC 2E 75 13 AE C8 2E B5 13 AD C4 3E F5 13 AD BC 3E 75 14 AD BC 3E 75 14 AC B8 4E B5 14 AC B4 4E F5 14 AB B0 5E 35 15 AA AC 6E 75 15 AA A8 6E B5 15 AA A4 6E F5 15 A9 A0 7E 35 16 A9 9C 7E 75 16 A8 98 8E B5 16 A7 94 9E F5 16 A7 90 9E 35 17 A7 8C 9E 75 17 A6 88 AE B5 17 A5 88 BE B5 17 A5 80 BE 35 18 A4 7C CE 75 18 A4 78 CE B5 18 A3 78 DE B5 18 A2 70 EE 35 19 A2 6C EE 75 19 A2 6C EE 75 19 A1 68 FE B5 19 A0 60 0E 36 1A 9F 60 1E 36 1A 9F 5C 1E 76 1A 9F 58 1E B6 1A 9D 54 3E F6 1A + // index type data: + // 0-5: Reference sample size 6: 0x2C 0x2D 0x00 0xC2 0x77 0x00 0xD3 0xD2 0xFF 0x3D 0x88 0xFF + // Sample 0 (aka. reference sample): + // channel 0: 2C 2D 00 => 0x002D2C => 11564 + let refSample0Channel0: Float = 11564 + // channel 1: C2 77 00 => 0x0077C2 => 30658 + let refSample0Channel1: Float = 30658 + // channel 2: D3 D2 FF => 0xFFD2D3 => -11565 + let refSample0Channel2: Float = -11565 + // channel 3: 3D 88 FF => 0xFF883D => -30659 + let refSample0Channel3: Float = -30659 + // Delta dump: 0A 29 | B2 F0 EE 34 11 B2 EC EE 74 11 B1 E8 FE B4 11 B1 ... + // 6: Delta size size 1: 0x0A (10 bits) + // 7: Sample amount size 1: 0x29 (Delta block contains 41 samples) + // 8: 0xB2 (binary: 1011 0010) + // 9: 0xF0 (binary: 1111 00 | 00) + // 10: 0xEE (binary: 1110 | 1110) + // Sample 1 - channel 0, size 10 bits: 00 1011 0010 + // Sample 1 - channel 1, size 10 bits: 11 1011 1100 + // 11: 0x34 (binary: 00 | 11 0100) + // Sample 1 - channel 2, size 10 bits: 11 0100 1110 + // 12: + // Sample 1 - channel 3, size 10 bits: 00 0100 0100 0x11 (binary: 0001 0001) + let refSample1Channel0: Float = 178 + let refSample1Channel1: Float = -68 + let refSample1Channel2: Float = -178 + let refSample1Channel3: Float = 68 + let amountOfSamples = 1 + 41 // reference sample + delta samples + let measurementFrame = Data([0x2C, 0x2D, 0x00, 0xC2, 0x77, 0x00, 0xD3, 0xD2, 0xFF, 0x3D, 0x88, 0xFF, 0x0A, 0x29, 0xB2, 0xF0, 0xEE, 0x34, 0x11, 0xB2, 0xEC, 0xEE, 0x74, 0x11, 0xB1, 0xE8, 0xFE, 0xB4, 0x11, 0xB1, 0xE8, 0xFE, 0xB4, 0x11, 0xB1, 0xE0, 0xFE, 0x34, 0x12, 0xB0, 0xDC, 0x0E, 0x75, 0x12, 0xB0, 0xD8, 0x0E, 0xB5, 0x12, 0xAF, 0xD4, 0x1E, 0xF5, 0x12, 0xAF, 0xD0, 0x1E, 0x35, 0x13, 0xAE, 0xCC, 0x2E, 0x75, 0x13, 0xAE, 0xC8, 0x2E, 0xB5, 0x13, 0xAD, 0xC4, 0x3E, 0xF5, 0x13, 0xAD, 0xBC, 0x3E, 0x75, 0x14, 0xAD, 0xBC, 0x3E, 0x75, 0x14, 0xAC, 0xB8, 0x4E, 0xB5, 0x14, 0xAC, 0xB4, 0x4E, 0xF5, 0x14, 0xAB, 0xB0, 0x5E, 0x35, 0x15, 0xAA, 0xAC, 0x6E, 0x75, 0x15, 0xAA, 0xA8, 0x6E, 0xB5, 0x15, 0xAA, 0xA4, 0x6E, 0xF5, 0x15, 0xA9, 0xA0, 0x7E, 0x35, 0x16, 0xA9, 0x9C, 0x7E, 0x75, 0x16, 0xA8, 0x98, 0x8E, 0xB5, 0x16, 0xA7, 0x94, 0x9E, 0xF5, 0x16, 0xA7, 0x90, 0x9E, 0x35, 0x17, 0xA7, 0x8C, 0x9E, 0x75, 0x17, 0xA6, 0x88, 0xAE, 0xB5, 0x17, 0xA5, 0x88, 0xBE, 0xB5, 0x17, 0xA5, 0x80, 0xBE, 0x35, 0x18, 0xA4, 0x7C, 0xCE, 0x75, 0x18, 0xA4, 0x78, 0xCE, 0xB5, 0x18, 0xA3, 0x78, 0xDE, 0xB5, 0x18, 0xA2, 0x70, 0xEE, 0x35, 0x19, 0xA2, 0x6C, 0xEE, 0x75, 0x19, 0xA2, 0x6C, 0xEE, 0x75, 0x19, 0xA1, 0x68, 0xFE, 0xB5, 0x19, 0xA0, 0x60, 0x0E, 0x36, 0x1A, 0x9F, 0x60, 0x1E, 0x36, 0x1A, 0x9F, 0x5C, 0x1E, 0x76, 0x1A, 0x9F, 0x58, 0x1E, 0xB6, 0x1A, 0x9D, 0x54, 0x3E, 0xF6, 0x1A]) + let factor: Float = 1.0 + let channels = 4 + let resolution = 22 + let timeStamp: UInt64 = 0 + + // Act + let ppgData = Pmd.buildFromDeltaFramePPG(measurementFrame, resolution: UInt8(resolution), channels: UInt8(channels), timeStamp: timeStamp) + + // Assert + XCTAssertEqual(amountOfSamples, ppgData.samples.count) + XCTAssertEqual(4, ppgData.channels) + XCTAssertEqual(4, ppgData.samples[0].count) + XCTAssertEqual(Int32(factor * refSample0Channel0), ppgData.samples[0][0]) + XCTAssertEqual(Int32(factor * refSample0Channel1), ppgData.samples[0][1]) + XCTAssertEqual(Int32(factor * refSample0Channel2), ppgData.samples[0][2]) + XCTAssertEqual(Int32(factor * refSample0Channel3), ppgData.samples[0][3]) + XCTAssertEqual(Int32(factor * (refSample0Channel0 + refSample1Channel0)), ppgData.samples[1][0]) + XCTAssertEqual(Int32(factor * (refSample0Channel1 + refSample1Channel1)), ppgData.samples[1][1]) + XCTAssertEqual(Int32(factor * (refSample0Channel2 + refSample1Channel2)), ppgData.samples[1][2]) + XCTAssertEqual(Int32(factor * (refSample0Channel3 + refSample1Channel3)), ppgData.samples[1][3]) + XCTAssertEqual(4, ppgData.samples[1].count) + } + + func testEcgDataSampletype0() { + // Arrange + // HEX: 02 08 FF 02 80 00 + // index type data: + // 0 + let type: UInt8 = 0 + // 1..3 uVolts 02 80 FF (-32766) + let ecgValue1: Int32 = -32766 + // 4..6 uVolts 02 80 00 (32770) + let ecgValue2: Int32 = 32770 + let measurementFrame = Data([0x02, 0x80, 0xFF, 0x02, 0x80, 0x00]) + let timeStamp = UInt64.max + + // Act + let ecgData = Pmd.buildEcgSamples(type, data: measurementFrame, timeStamp: timeStamp) + + // Assert + XCTAssertEqual(timeStamp, ecgData.timeStamp) + XCTAssertEqual(ecgValue1, ecgData.samples[0]) + XCTAssertEqual(ecgValue2, ecgData.samples[1]) + XCTAssertEqual(2, ecgData.samples.count) + } + + func testparseAccDataWithResolution16() { + // Arrange + // HEX: 71 07 F0 6A 9E 8D 0A 38 BE 5C BE BA 2F 96 B3 EE 4B E5 AD FB 42 B9 EB BE 4C FE BA 2F 92 BF EE 4B E4 B1 FB 12 B9 EC BD 3C 3E BB 2F 8F D3 DE 4B E3 B5 F7 D2 B8 ED BD 30 7E 7B 2F 8B E3 CE 8B E2 BA F7 A2 B8 EE BC 20 BE 7B 2F 88 F3 CE CB E1 BD EF 52 F8 EF BC 18 FE 3B 2F 84 03 BF CB E0 C2 EF 32 B8 F0 BB 04 4E BC 2E 81 13 AF 0B E0 C6 EF F2 F7 F1 B9 FC 7D BC 2E 7D 27 9F 4B DF CA EB C2 F7 F2 B8 EC CD 7C 2E 7B 37 8F 4B DE CE E3 92 F7 F3 B8 E0 0D FD 2D 77 4B 7F CB DD D2 DF 62 37 F5 B7 D4 4D BD 2D 74 5B 6F CB DC D7 D7 32 37 F6 B5 C8 8D 7D 2D 71 6B 4F 4B DC DC D3 F2 36 F7 B4 BC DD FD 2C 6F 7B 3F 4B DB E0 CF D2 36 F8 B2 B0 2D BE 2C 6C 8F 1F CB DA E3 C7 A2 76 F9 + // index type data: + // 0-5: Reference sample size 6: 0xC9 0xFF 0x12 0x00 0x11 0x00 + // Sample 0 (aka. reference sample): + // channel 0: 71 07 => 0x0771 => 1905 + let refSample0Channel0: Float = 1905 + // channel 1: F0 6A => 0x6AF0 => 27376 + let refSample0Channel1: Float = 27376 + // channel 2: 9E 8D => 0x8D9E => -29282 + let refSample0Channel2: Float = -29282 + // Delta dump: 0A 38 | BE 5C BE BA 2F 96 B3 EE 4B E5 AD ... + // 6: Delta size size 1: 0x0A (10 bits) + // 7: Sample amount size 1: 0x38 (Delta block contains 56 samples) + // 8: 0xBE (binary: 1011 1110) + // 9: 0x5C (binary: 0101 11 | 00) + // 10: 0xBE (binary: 1011 | 1110) + // Sample 1 - channel 0, size 10 bits: 00 1011 1110 + // Sample 1 - channel 1, size 10 bits: 11 1001 0111 + // 11: 0xBA (binary: 10 | 11 1010) + // Sample 1 - channel 2, size 10 bits: 11 1010 1011 + let refSample1Channel0: Float = 190 + let refSample1Channel1: Float = -105 + let refSample1Channel2: Float = -85 + let amountOfSamples = 1 + 56 // reference sample + delta samples + + let measurementFrame = Data([0x71, 0x07, 0xF0, 0x6A, 0x9E, 0x8D, 0x0A, 0x38, 0xBE, 0x5C, 0xBE, 0xBA, 0x2F, 0x96, 0xB3, 0xEE, 0x4B, 0xE5, 0xAD, 0xFB, 0x42, 0xB9, 0xEB, 0xBE, 0x4C, 0xFE, 0xBA, 0x2F, 0x92, 0xBF, 0xEE, 0x4B, 0xE4, 0xB1, 0xFB, 0x12, 0xB9, 0xEC, 0xBD, 0x3C, 0x3E, 0xBB, 0x2F, 0x8F, 0xD3, 0xDE, 0x4B, 0xE3, 0xB5, 0xF7, 0xD2, 0xB8, 0xED, 0xBD, 0x30, 0x7E, 0x7B, 0x2F, 0x8B, 0xE3, 0xCE, 0x8B, 0xE2, 0xBA, 0xF7, 0xA2, 0xB8, 0xEE, 0xBC, 0x20, 0xBE, 0x7B, 0x2F, 0x88, 0xF3, 0xCE, 0xCB, 0xE1, 0xBD, 0xEF, 0x52, 0xF8, 0xEF, 0xBC, 0x18, 0xFE, 0x3B, 0x2F, 0x84, 0x03, 0xBF, 0xCB, 0xE0, 0xC2, 0xEF, 0x32, 0xB8, 0xF0, 0xBB, 0x04, 0x4E, 0xBC, 0x2E, 0x81, 0x13, 0xAF, 0x0B, 0xE0, 0xC6, 0xEF, 0xF2, 0xF7, 0xF1, 0xB9, 0xFC, 0x7D, 0xBC, 0x2E, 0x7D, 0x27, 0x9F, 0x4B, 0xDF, 0xCA, 0xEB, 0xC2, 0xF7, 0xF2, 0xB8, 0xEC, 0xCD, 0x7C, 0x2E, 0x7B, 0x37, 0x8F, 0x4B, 0xDE, 0xCE, 0xE3, 0x92, 0xF7, 0xF3, 0xB8, 0xE0, 0x0D, 0xFD, 0x2D, 0x77, 0x4B, 0x7F, 0xCB, 0xDD, 0xD2, 0xDF, 0x62, 0x37, 0xF5, 0xB7, 0xD4, 0x4D, 0xBD, 0x2D, 0x74, 0x5B, 0x6F, 0xCB, 0xDC, 0xD7, 0xD7, 0x32, 0x37, 0xF6, 0xB5, 0xC8, 0x8D, 0x7D, 0x2D, 0x71, 0x6B, 0x4F, 0x4B, 0xDC, 0xDC, 0xD3, 0xF2, 0x36, 0xF7, 0xB4, 0xBC, 0xDD, 0xFD, 0x2C, 0x6F, 0x7B, 0x3F, 0x4B, 0xDB, 0xE0, 0xCF, 0xD2, 0x36, 0xF8, 0xB2, 0xB0, 0x2D, 0xBE, 0x2C, 0x6C, 0x8F, 0x1F, 0xCB, 0xDA, 0xE3, 0xC7, 0xA2, 0x76, 0xF9]) + let resolution = 16 + let range = 8 + let factor: Float = 0.244 + let timeStamp: UInt64 = 0 + + // Act + let accData1 = Pmd.buildFromDeltaFrame3Axis(measurementFrame, resolution: UInt8(resolution), factor: factor, timeStamp: timeStamp) + let accData = (accData1.timeStamp, samples: accData1.samples.map({ (arg0) -> (x:Int32, y: Int32, z: Int32) in + let (x, y, z) = arg0 + return (Int32(x),Int32(y),Int32(z)) + })) + + // Assert + XCTAssertEqual(Int32(factor * refSample0Channel0), accData.samples[0].x) + XCTAssertEqual(Int32(factor * refSample0Channel1), accData.samples[0].y) + XCTAssertEqual(Int32(factor * refSample0Channel2), accData.samples[0].z) + + XCTAssertEqual(Int32((factor * (refSample0Channel0 + refSample1Channel0))), accData.samples[1].x) + XCTAssertEqual(Int32((factor * (refSample0Channel1 + refSample1Channel1))), accData.samples[1].y) + XCTAssertEqual(Int32((factor * (refSample0Channel2 + refSample1Channel2))), accData.samples[1].z) + + accData.samples.forEach { (arg0) in + let (x, y, z) = arg0 + XCTAssertTrue(abs(x) <= (range * 1000)) + XCTAssertTrue(abs(y) <= (range * 1000)) + XCTAssertTrue(abs(z) <= (range * 1000)) + } + + // validate data size + XCTAssertEqual(amountOfSamples, accData.samples.count) + } + + func testPmdSettingsWithRange() { + //Arrange + let bytes = Data([0x00, 0x01, 0x34, 0x00, 0x01, 0x01, 0x10, 0x00, 0x02, 0x04, 0xF5, 0x00, 0xF4, 0x01, 0xE8, 0x03, 0xD0, 0x07, 0x04, 0x01, 0x03]) + // Parameters + // Setting Type : 00 (Sample Rate) + // array_length : 01 + // array of settings values: 34 00 (52Hz) + let sampleRate: UInt32 = 52 + //Setting Type : 01 (Resolution) + // array_length : 01 + // array of settings values: 10 00 (16) + let resolution: UInt32 = 16 + // Setting Type : 02 (Range) + // array_length : 04 + // array of settings values: F5 00 (245) + let range1: UInt32 = 245 + // array of settings values: F4 01 (500) + let range2: UInt32 = 500 + // array of settings values: E8 03 (1000) + let range3: UInt32 = 1000 + // array of settings values: D0 07 (2000) + let range4: UInt32 = 2000 + // Setting Type : 04 (Channels) + // array_length : 01 + // array of settings values: 03 (3 Channels) + let channels: UInt32 = 3 + let numberOfSettings = 4 + + //Act + let pmdSetting = Pmd.PmdSetting(bytes) + + // Assert + XCTAssertEqual(numberOfSettings, pmdSetting.settings.count) + + XCTAssertEqual(sampleRate, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.sampleRate]!.first!) + + XCTAssertEqual(1, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.sampleRate]!.count) + + XCTAssertEqual(resolution, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.resolution]!.first!) + + XCTAssertEqual(1, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.resolution]!.count) + + XCTAssertTrue(pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.range]!.contains(range1)) + XCTAssertTrue(pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.range]!.contains(range2)) + XCTAssertTrue(pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.range]!.contains(range3)) + XCTAssertTrue(pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.range]!.contains(range4)) + XCTAssertEqual(4, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.range]!.count) + + XCTAssertEqual(channels, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.channels]!.first!) + + XCTAssertEqual(1, pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.channels]!.count) + + XCTAssertNil(pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit]) + XCTAssertNil(pmdSetting.settings[Pmd.PmdSetting.PmdSettingType.factor]) + } + + func testPmdSelectedSerialization() { + //Arrange + var selected = [Pmd.PmdSetting.PmdSettingType : UInt32]() + let sampleRate: UInt32 = 0xFFFF + selected[Pmd.PmdSetting.PmdSettingType.sampleRate] = sampleRate + let resolution: UInt32 = 0 + selected[Pmd.PmdSetting.PmdSettingType.resolution] = resolution + let range: UInt32 = 15 + selected[Pmd.PmdSetting.PmdSettingType.range] = range + let rangeMilliUnit = UInt32.max + selected[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit] = rangeMilliUnit + let channels: UInt32 = 4 + selected[Pmd.PmdSetting.PmdSettingType.channels] = channels + let factor: UInt32 = 15 + selected[Pmd.PmdSetting.PmdSettingType.factor] = factor + let numberOfSettings = 5 + + //Act + let settingsFromSelected = Pmd.PmdSetting.init(selected) + let serializedSelected = settingsFromSelected.serialize() + let settings = Pmd.PmdSetting(serializedSelected) + + //Assert + XCTAssertEqual(numberOfSettings, settings.settings.count) + XCTAssertTrue(settings.settings[Pmd.PmdSetting.PmdSettingType.sampleRate]!.contains(sampleRate)) + XCTAssertEqual(1, settings.settings[Pmd.PmdSetting.PmdSettingType.sampleRate]!.count) + XCTAssertTrue(settings.settings[Pmd.PmdSetting.PmdSettingType.resolution]!.contains(resolution)) + XCTAssertTrue(settings.settings[Pmd.PmdSetting.PmdSettingType.range]!.contains(range)); + XCTAssertTrue(settings.settings[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit]!.contains(rangeMilliUnit)) + XCTAssertTrue(settings.settings[Pmd.PmdSetting.PmdSettingType.channels]!.contains(channels)) + XCTAssertNil(settings.settings[Pmd.PmdSetting.PmdSettingType.factor]) + } + + func testPmdSetting() { + + let data = Data([Pmd.PmdSetting.PmdSettingType.rangeMilliUnit.rawValue, + 0x02,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00, + Pmd.PmdSetting.PmdSettingType.resolution.rawValue, + 0x01,0x0E,0x00]) + let setting = Pmd.PmdSetting(data) + XCTAssertEqual(setting.settings.count, 2) + XCTAssertNotNil(setting.settings[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit]) + XCTAssertNotNil(setting.settings[Pmd.PmdSetting.PmdSettingType.resolution]) + XCTAssertEqual(setting.settings[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit]!.count, 2) + XCTAssertEqual(setting.settings[Pmd.PmdSetting.PmdSettingType.resolution]!.count, 1) + XCTAssertTrue(setting.settings[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit]!.contains(0xffffffff)) + XCTAssertTrue(setting.settings[Pmd.PmdSetting.PmdSettingType.rangeMilliUnit]!.contains(0xff)) + XCTAssertTrue(setting.settings[Pmd.PmdSetting.PmdSettingType.resolution]!.contains(0x0E)) + + let serialized = setting.serialize() + XCTAssertEqual(serialized.count, 10) + } }