Skip to content

Commit c24cd04

Browse files
authored
Merge pull request #92 from ShimmerEngineering/DEV-282
DEV-282
2 parents 1c6df7f + 0ddddfd commit c24cd04

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ShimmerAndroidInstrumentDriver/ShimmerAndroidInstrumentDriver/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ publishing {
8282
bar(MavenPublication) {
8383
groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
8484
artifactId = 'shimmerandroidinstrumentdriver' // Replace with the name of your package
85-
version = '3.2.1_beta' // Replace with your package version
85+
version = '3.2.2_beta' // Replace with your package version
8686
artifact("$buildDir/outputs/aar/${getArtificatId()}-release.aar")
8787
}
8888
}

ShimmerAndroidInstrumentDriver/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ allprojects {
7878
implementation 'java3d:vecmath:1.3.1'
7979
implementation 'com.android.support:appcompat-v7:26.1.0'
8080
implementation 'com.github.Jasonchenlijian:FastBle:2.4.0'
81-
implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.2_beta'){
81+
implementation (group: 'com.shimmerresearch', name: 'shimmerbluetoothmanager', version:'0.11.3_beta'){
8282

8383
// excluding org.json which is provided by Android
8484
exclude group: 'io.netty'
8585
exclude group: 'com.google.protobuf'
8686
exclude group: 'org.apache.commons.math'
8787
}
8888

89-
implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.11.2_beta'){
89+
implementation (group: 'com.shimmerresearch', name: 'shimmerdriver', version:'0.11.3_beta'){
9090

9191
// excluding org.json which is provided by Android
9292
exclude group: 'io.netty'

ShimmerAndroidInstrumentDriver/shimmerServiceExample/src/main/java/com/shimmerresearch/shimmercapture/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,11 @@ public void onClick(DialogInterface dialog, int which) {
441441

442442
@Override
443443
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
444-
clone.setConfigValueUsingConfigLabel(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG, SensorLIS3MDL.GuiLabelConfig.LIS3MDL_MAG_LP, isChecked);
444+
clone.setConfigValueUsingConfigLabel(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG_ALT, SensorLIS3MDL.GuiLabelConfig.LIS3MDL_ALT_MAG_LP, isChecked);
445445
}
446446
});
447447
cbMagLPMode.setText("Enable Mag LP Mode");
448-
boolean isLowPowerMagEnabled = Boolean.valueOf(clone.getConfigGuiValueUsingConfigLabel(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG, SensorLIS3MDL.GuiLabelConfig.LIS3MDL_MAG_LP));
448+
boolean isLowPowerMagEnabled = Boolean.valueOf(clone.getConfigGuiValueUsingConfigLabel(Configuration.Shimmer3.SENSOR_ID.SHIMMER_LIS3MDL_MAG_ALT, SensorLIS3MDL.GuiLabelConfig.LIS3MDL_ALT_MAG_LP));
449449
cbMagLPMode.setChecked(isLowPowerMagEnabled);
450450

451451
CheckBox cbWRAccelLPMode = (CheckBox) checkBoxView.findViewById(R.id.cbWRAccelLPMode);

0 commit comments

Comments
 (0)