Skip to content

Commit 22cd566

Browse files
JongChernJongChern
committed
update to jfrog
1 parent 267b8c3 commit 22cd566

File tree

13 files changed

+88
-17
lines changed

13 files changed

+88
-17
lines changed

‎ShimmerAndroidInstrumentDriver/.idea/gradle.xml‎

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

‎ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,17 @@ dependencies {
7474
compile files('libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')
7575
compile files('libs/AndroidBluetoothLibrary.jar')
7676
compile files('libs/androidplot-core-0.5.0-release.jar')
77-
implementation group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'
77+
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
78+
// excluding org.json which is provided by Android
79+
exclude group: 'io.netty'
80+
exclude group: 'com.google.protobuf'
81+
exclude group: 'org.apache.commons.math'
82+
}
83+
implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){
84+
// excluding org.json which is provided by Android
85+
exclude group: 'io.netty'
86+
exclude group: 'com.google.protobuf'
87+
exclude group: 'org.apache.commons.math'
88+
}
7889
compile 'com.android.support:appcompat-v7:25.3.1'
7990
}

‎ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip

‎ShimmerAndroidInstrumentDriver/bluetoothManagerExample/build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@ android {
4444

4545
dependencies {
4646
compile project(':ShimmerAndroidInstrumentDriver')
47+
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
48+
// excluding org.json which is provided by Android
49+
exclude group: 'io.netty'
50+
exclude group: 'com.google.protobuf'
51+
exclude group: 'org.apache.commons.math'
52+
}
53+
implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){
54+
// excluding org.json which is provided by Android
55+
exclude group: 'io.netty'
56+
exclude group: 'com.google.protobuf'
57+
exclude group: 'org.apache.commons.math'
58+
}
4759
compile fileTree(dir: 'libs', include: ['*.jar'])
4860
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
4961
exclude group: 'com.android.support', module: 'support-annotations'

‎ShimmerAndroidInstrumentDriver/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
mavenLocal()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.5.1'
11+
classpath 'com.android.tools.build:gradle:3.5.4'
1212
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
classpath('org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0')

‎ShimmerAndroidInstrumentDriver/efficientDataArrayExample/build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,16 @@ dependencies {
5050
androidTestImplementation 'com.android.support.test:runner:1.0.1'
5151
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
5252
compile project(path: ':ShimmerAndroidInstrumentDriver')
53+
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
54+
// excluding org.json which is provided by Android
55+
exclude group: 'io.netty'
56+
exclude group: 'com.google.protobuf'
57+
exclude group: 'org.apache.commons.math'
58+
}
59+
implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){
60+
// excluding org.json which is provided by Android
61+
exclude group: 'io.netty'
62+
exclude group: 'com.google.protobuf'
63+
exclude group: 'org.apache.commons.math'
64+
}
5365
}

‎ShimmerAndroidInstrumentDriver/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Dec 28 12:40:36 SGT 2017
1+
#Mon May 31 23:08:15 SGT 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip

‎ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/Readme.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Shimmer3DOrientationExample
22

33
This example uses the Accelerometer, Gyroscope and Magnetometer to calculate orientation. Prior to using this example, calibrating the Shimmer3 Device using 9DoF Calibration (http://www.shimmersensing.com/support/wireless-sensor-networks-download) is recommended.
4-
5-
4+
The following sensors should be calibrated
5+
- Low Noise Accel
6+
- Gyroscope at 500dps
7+
- Magnetometer
68

79
Known issues:-
810
- Magnetometer is fixed to a low data rate, and should be increased to improve accuracy and responsiveness of the orientation algorithm

‎ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ android {
3131

3232
dependencies {
3333
compile project(':ShimmerAndroidInstrumentDriver')
34+
implementation (group: 'com.shimmersensing', name: 'ShimmerBluetoothManager', version:'0.9.42beta'){
35+
// excluding org.json which is provided by Android
36+
exclude group: 'io.netty'
37+
exclude group: 'com.google.protobuf'
38+
exclude group: 'org.apache.commons.math'
39+
}
40+
implementation (group: 'com.shimmersensing', name: 'ShimmerDriver', version:'0.9.138beta'){
41+
// excluding org.json which is provided by Android
42+
exclude group: 'io.netty'
43+
exclude group: 'com.google.protobuf'
44+
exclude group: 'org.apache.commons.math'
45+
}
3446
compile 'org.apache.commons:commons-math:2.2'
3547
compile 'org.apache.commons:commons-lang3:3.4'
3648
provided files('../ShimmerAndroidInstrumentDriver/libs/ShimmerBiophysicalProcessingLibrary_Rev_0_11.jar')

‎ShimmerAndroidInstrumentDriver/shimmer3DOrientationExample/src/main/java/com/shimmerresearch/orientationexample/Shimmer3DOrientationExample.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ protected void onCreate(Bundle savedInstanceState) {
8282
fm3d = new Matrix3d();
8383
m3d = new Matrix3d();
8484
invm3d.setIdentity();
85-
mShimmerDevice1 = new Shimmer(this, mHandler,"RightArm", 51.2, 0, 0, Shimmer.SENSOR_ACCEL|Shimmer.SENSOR_GYRO|Shimmer.SENSOR_MAG, false);
86-
//mShimmerDevice1.enableOnTheFlyGyroCal(true, 102, 1.2);
87-
mShimmerDevice1.enable3DOrientation(true);
85+
Integer[] arraySensorID ={Configuration.Shimmer3.SENSOR_ID.SHIMMER_ANALOG_ACCEL,Configuration.Shimmer3.SENSOR_ID.SHIMMER_MPU9X50_GYRO,Configuration.Shimmer3.SENSOR_ID.SHIMMER_LSM303_MAG};
86+
// TODO Auto-generated method stub
87+
mShimmerDevice1 = new Shimmer(mHandler,"test",51.2,1, 4, arraySensorID, 1, 0, 1, 0);
8888
buttonReset.setOnClickListener(new OnClickListener(){
8989

9090
public void onClick(View arg0) {

0 commit comments

Comments
 (0)