Skip to content

Commit 981f8d4

Browse files
philips77philips77
committed
Android Wear support added to UART profile
1 parent a0837c8 commit 981f8d4

File tree

111 files changed

+4757
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+4757
-147
lines changed

‎.idea/gradle.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,12 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.0/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.8.0/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.8.0/jars" />
7678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android.support.v18/scanner/0.1.1/jars" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/no.nordicsemi.android/log/2.0.0/jars" />
7780
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7881
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -92,15 +95,18 @@
9295
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9396
<orderEntry type="sourceFolder" forTests="false" />
9497
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
95-
<orderEntry type="library" exported="" name="design-23.0.0" level="project" />
96-
<orderEntry type="library" exported="" name="nrf-logger-v2.0" level="project" />
98+
<orderEntry type="library" exported="" name="design-23.0.1" level="project" />
99+
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
97100
<orderEntry type="library" exported="" name="stax-1.2.0" level="project" />
101+
<orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
98102
<orderEntry type="library" exported="" name="scanner-0.1.1" level="project" />
99103
<orderEntry type="library" exported="" name="achartengine-1.1.0" level="project" />
100104
<orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
101-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
102-
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
103-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
105+
<orderEntry type="library" exported="" name="log-2.0.0" level="project" />
106+
<orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
107+
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
108+
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
109+
<orderEntry type="module" module-name="common" exported="" />
104110
<orderEntry type="module" module-name="dfu" exported="" />
105111
</component>
106112
</module>

‎app/build.gradle

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion '23.0.0'
5+
buildToolsVersion '23.0.1'
6+
67
defaultConfig {
78
applicationId "no.nordicsemi.android.nrftoolbox"
89
minSdkVersion 18
910
targetSdkVersion 23
10-
versionCode 37
11-
versionName "1.15.0"
11+
versionCode 39
12+
versionName "1.16.0"
1213
}
1314
buildTypes {
1415
release {
@@ -20,14 +21,17 @@ android {
2021

2122
dependencies {
2223
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile 'com.android.support:appcompat-v7:23.0.0'
24-
compile 'com.android.support:design:23.0.0'
24+
compile 'com.google.android.gms:play-services-wearable:7.8.0'
25+
compile 'com.android.support:appcompat-v7:23.0.1'
26+
compile 'com.android.support:design:23.0.1'
2527
compile 'no.nordicsemi.android.support.v18:scanner:0.1.1'
28+
compile 'no.nordicsemi.android:log:2.0.0'
2629
compile('org.simpleframework:simple-xml:2.7.1') {
2730
exclude group: 'stax', module: 'stax-api'
2831
exclude group: 'xpp3', module: 'xpp3'
2932
}
30-
compile project(':dfu')
3133
compile files('libs/achartengine-1.1.0.jar')
32-
compile files('libs/nrf-logger-v2.0.jar')
34+
compile project(':dfu')
35+
compile project(':common')
36+
wearApp project(':wear')
3337
}

‎app/libs/nrf-logger-v2.0.jar

-28.4 KB
Binary file not shown.

‎app/sources/nrf-logger-v2.0-source.jar

-20 KB
Binary file not shown.

‎app/src/main/AndroidManifest.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@
3737
<application
3838
android:fullBackupContent="true"
3939
android:allowBackup="true"
40-
android:icon="@drawable/ic_launcher"
40+
android:icon="@mipmap/ic_launcher"
4141
android:label="@string/app_name"
4242
android:theme="@style/AppTheme" >
43+
44+
<meta-data
45+
android:name="com.google.android.gms.version"
46+
android:value="@integer/google_play_services_version" />
47+
4348
<activity
4449
android:name="no.nordicsemi.android.nrftoolbox.SplashscreenActivity"
4550
android:label="@string/app_name"
@@ -226,6 +231,11 @@
226231
<service
227232
android:name="no.nordicsemi.android.nrftoolbox.uart.UARTService"
228233
android:label="@string/uart_feature_title" />
234+
<service android:name=".wearable.MainWearableListenerService">
235+
<intent-filter>
236+
<action android:name="com.google.android.gms.wearable.BIND_LISTENER" />
237+
</intent-filter>
238+
</service>
229239

230240
<provider android:name="no.nordicsemi.android.nrftoolbox.uart.UARTLocalLogContentProvider"
231241
android:authorities="no.nordicsemi.android.nrftoolbox.uart.log"

‎app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import java.util.UUID;
3333

3434
import no.nordicsemi.android.log.Logger;
35+
import no.nordicsemi.android.nrftoolbox.profile.BleManager;
3536
import no.nordicsemi.android.nrftoolbox.parser.BloodPressureMeasurementParser;
3637
import no.nordicsemi.android.nrftoolbox.parser.IntermediateCuffPressureParser;
37-
import no.nordicsemi.android.nrftoolbox.profile.BleManager;
3838

3939
public class BPMManager extends BleManager<BPMManagerCallbacks> {
4040
/** Blood Pressure service UUID */

‎app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
import java.util.UUID;
3737

3838
import no.nordicsemi.android.nrftoolbox.R;
39+
import no.nordicsemi.android.nrftoolbox.profile.BleProfileService;
3940
import no.nordicsemi.android.nrftoolbox.csc.settings.SettingsActivity;
4041
import no.nordicsemi.android.nrftoolbox.csc.settings.SettingsFragment;
41-
import no.nordicsemi.android.nrftoolbox.profile.BleProfileService;
4242
import no.nordicsemi.android.nrftoolbox.profile.BleProfileServiceReadyActivity;
4343

4444
public class CSCActivity extends BleProfileServiceReadyActivity<CSCService.CSCBinder> {

‎app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import java.util.UUID;
3333

3434
import no.nordicsemi.android.log.Logger;
35-
import no.nordicsemi.android.nrftoolbox.parser.CSCMeasurementParser;
3635
import no.nordicsemi.android.nrftoolbox.profile.BleManager;
36+
import no.nordicsemi.android.nrftoolbox.parser.CSCMeasurementParser;
3737

3838
public class CSCManager extends BleManager<CSCManagerCallbacks> {
3939
/** Cycling Speed and Cadence service UUID */

0 commit comments

Comments
 (0)