Imported code for v2.5.9 release

polyglotprogramminginc · Mar 18, 2015 · b1dd30d · b1dd30d
1 parent d079622
commit b1dd30d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # MetaWear Android App #
 
 ## Version ##
-2.5.8
+2.5.9
 
 ## About ##
 This app provides examples of how to use the MetaWear API and a simple app for interacting with the board.  It uses the sample BluetoothLeGatt app on the Android developer page and the Nordic nRF Toolbox app as references.

diff --git a/app/app.iml b/app/app.iml
@@ -81,15 +81,16 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="graphview-4.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="metawear-1.6.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-20.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="nrf-logger-v1.2" level="project" />
+    <orderEntry type="library" exported="" name="metawear-1.6.21" level="project" />
   </component>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 18
         targetSdkVersion 21
         versionCode 8
-        versionName "2.5.8"
+        versionName "2.5.9"
     }
 
     buildTypes {
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.mbientlab:metawear:1.6.0'
+    compile 'com.mbientlab:metawear:1.6.21'
     compile 'com.jjoe64:graphview:4.0.0'
     compile files('libs/nrf-logger-v1.2.jar')
 }
diff --git a/app/src/main/java/com/mbientlab/metawear/app/LoggingFragment.java b/app/src/main/java/com/mbientlab/metawear/app/LoggingFragment.java
@@ -260,7 +260,7 @@ public File[] saveDataToFile() throws IOException {
 
                 @Override
                 public String getDescription() {
-                    return "Logs the accelerometer axis data sampling at 100Hz";
+                    return "Logs the accelerometer axis data sampling at 50Hz";
                 }
 
                 @Override
@@ -289,7 +289,7 @@ public void setupLogger() {
                     loggingController.addTrigger(LoggingTrigger.ACCELEROMETER_Z_AXIS);
 
                     accelController.enableXYZSampling().withFullScaleRange(FullScaleRange.FSR_8G)
-                        .withOutputDataRate(OutputDataRate.ODR_100_HZ)
+                        .withOutputDataRate(OutputDataRate.ODR_50_HZ)
                         .withSilentMode();
                     accelController.startComponents();
                 }