Add support for Air Pressure sensor module

Author: minoskt

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
 ### Next
-  - Added support for Humidity sensor module.
+  - Added support for Air Pressure sensor module
+  - Added support for Humidity sensor module
   - Updated Google Play Services to 7.8.0
   - Added support for Android Studio 1.3.1
   - Updated gradle to 1.3.0

README.md

@@ -25,6 +25,7 @@ The following sensor modules are currently supported in SensingKit-Android, (lis
 - Audio Level
 - Bluetooth
 - Humidity
+- Air Pressure
 
 ## Configuring the Library
 

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SKSensorModuleManager.java

@@ -33,7 +33,7 @@ public class SKSensorModuleManager {
     @SuppressWarnings("unused")
     private static final String TAG = "SKSensorModuleManager";
 
-    private static final int TOTAL_SENSOR_MODULES = 18;
+    private static final int TOTAL_SENSOR_MODULES = 19;
 
     private static SKSensorModuleManager sSensorModuleManager;
     private final Context mApplicationContext;
@@ -198,6 +198,10 @@ protected SKAbstractSensorModule createSensorModule(SKSensorModuleType moduleTyp
                 sensorModule = new SKHumidity(mApplicationContext);
                 break;
 
+            case AIR_PRESSURE:
+                sensorModule = new SKAirPressure(mApplicationContext);
+                break;
+
             // Don't forget the break; here
 
             default:

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/SKSensorModuleType.java

@@ -39,5 +39,6 @@ public enum SKSensorModuleType {
     AUDIO_RECORDER,
     AUDIO_LEVEL,
     BLUETOOTH,
-    HUMIDITY
+    HUMIDITY,
+    AIR_PRESSURE
 }

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/data/SKAirPressureData.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015. Queen Mary University of London
+ * Kleomenis Katevas, k.katevas@qmul.ac.uk
+ *
+ * This file is part of SensingKit-Android library.
+ * For more information, please visit http://www.sensingkit.org
+ *
+ * SensingKit-Android is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SensingKit-Android is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SensingKit-Android.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sensingkit.sensingkitlib.data;
+
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+
+import java.util.Locale;
+
+public class SKAirPressureData extends SKAbstractData {
+
+    @SuppressWarnings("unused")
+    private static final String TAG = "SKAirPressureData";
+
+    protected final float pressure;
+
+    public SKAirPressureData(long timestamp, float pressure) {
+
+        super(SKSensorModuleType.AIR_PRESSURE, timestamp);
+
+        this.pressure = pressure;
+    }
+
+    @Override
+    public String getDataInCSV() {
+        return String.format(Locale.US, "%d,%f", this.timestamp, this.pressure);
+    }
+
+    @SuppressWarnings("unused")
+    public float getLight() {
+        return this.pressure;
+    }
+
+}

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SKAbstractNativeSensorModule.java

@@ -142,6 +142,9 @@ private static int getSensorType(SKSensorModuleType sensorType) throws SKExcepti
             case HUMIDITY:
                 return Sensor.TYPE_RELATIVE_HUMIDITY;
 
+            case AIR_PRESSURE:
+                return Sensor.TYPE_PRESSURE;
+
             case LOCATION:
             case ACTIVITY:
             case BATTERY:

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SKAirPressure.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015. Queen Mary University of London
+ * Kleomenis Katevas, k.katevas@qmul.ac.uk
+ *
+ * This file is part of SensingKit-Android library.
+ * For more information, please visit http://www.sensingkit.org
+ *
+ * SensingKit-Android is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * SensingKit-Android is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with SensingKit-Android.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sensingkit.sensingkitlib.modules;
+
+import android.content.Context;
+import android.hardware.SensorEvent;
+
+import org.sensingkit.sensingkitlib.SKException;
+import org.sensingkit.sensingkitlib.SKSensorModuleType;
+import org.sensingkit.sensingkitlib.data.SKAbstractData;
+import org.sensingkit.sensingkitlib.data.SKAirPressureData;
+
+public class SKAirPressure extends SKAbstractNativeSensorModule {
+
+    @SuppressWarnings("unused")
+    private static final String TAG = "SKAirPressure";
+
+    public SKAirPressure(final Context context) throws SKException {
+        super(context, SKSensorModuleType.AIR_PRESSURE);
+    }
+
+    @Override
+    protected SKAbstractData buildData(SensorEvent event)
+    {
+        return new SKAirPressureData(System.currentTimeMillis(), event.values[0]);
+    }
+
+    @Override
+    protected boolean shouldPostSensorData(SKAbstractData data) {
+
+        // Always post sensor data
+        return true;
+    }
+}

SensingKitLib/src/main/java/org/sensingkit/sensingkitlib/modules/SKSensorModuleUtilities.java

@@ -88,6 +88,9 @@ public static String getSensorModuleInString(SKSensorModuleType moduleType) thro
             case HUMIDITY:
                 return "Humidity";
 
+            case AIR_PRESSURE:
+                return "Air Pressure";
+
             default:
                 throw new SKException(TAG, "Unknown SensorModule", SKExceptionErrorCode.UNKNOWN_ERROR);
         }