Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<activity android:name=".activity.AccelerometerActivity" />
<activity android:name=".activity.DataLoggerActivity" />
<activity
android:name=".activity.Barometer_activity"
android:name=".activity.BarometerActivity"
android:configChanges="keyboardHidden|screenSize|orientation" />
<activity
android:name=".activity.CompassActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.pslab.activity;

import android.annotation.SuppressLint;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.hardware.Sensor;
Expand All @@ -11,6 +12,7 @@
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetBehavior;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.GestureDetector;
Expand Down Expand Up @@ -47,15 +49,15 @@
import butterknife.ButterKnife;
import butterknife.Unbinder;

public class Barometer_activity extends AppCompatActivity {
public class BarometerActivity extends AppCompatActivity {
BottomSheetBehavior bottomSheetBehavior;
GestureDetector gestureDetector;
private static final String PREF_NAME = "customDialogPreference";

private static int sensorType = 0;
private static int highLimit = 1000;
private static int updatePeriod = 100;
private Barometer_activity.SensorDataFetch sensorDataFetch;
private BarometerActivity.SensorDataFetch sensorDataFetch;

@BindView(R.id.barometer_max)
TextView statMax;
Expand Down Expand Up @@ -101,8 +103,8 @@ public class Barometer_activity extends AppCompatActivity {
@BindView(R.id.custom_dialog_desc)
TextView bottomSheetDesc;

public static Barometer_activity newInstance() {
return new Barometer_activity();
public static BarometerActivity newInstance() {
return new BarometerActivity();
}

@SuppressLint("ResourceType")
Expand All @@ -112,14 +114,33 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_barometer_main);
ButterKnife.bind(this);
setUpBottomSheet();
Barometer_activity.newInstance();
BarometerActivity.newInstance();

currentMin = 10000;
entries = new ArrayList<>();
switch (sensorType) {
case 0:
sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
sensor = sensorManager != null ? sensorManager.getDefaultSensor(Sensor.TYPE_PRESSURE) : null;
if (sensor == null) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if (!isFinishing()) {
new AlertDialog.Builder(BarometerActivity.this)
.setTitle(R.string.barometer_alert_title)
.setMessage(R.string.barometer_alert_description)
.setCancelable(false)
.setPositiveButton("ok", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
}).show();
}
}
});
}
break;
case 1:
scienceLab = ScienceLabCommon.scienceLab;
Expand Down Expand Up @@ -228,9 +249,9 @@ public void run() {
}

public static void setParameters(int sensorType, int highLimit, int updatePeriod) {
Barometer_activity.sensorType = sensorType;
Barometer_activity.highLimit = highLimit;
Barometer_activity.updatePeriod = updatePeriod;
BarometerActivity.sensorType = sensorType;
BarometerActivity.highLimit = highLimit;
BarometerActivity.updatePeriod = updatePeriod;
}


Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/pslab/fragment/InstrumentsFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import io.pslab.activity.WaveGeneratorActivity;
import io.pslab.adapters.ApplicationAdapter;
import io.pslab.items.ApplicationItem;
import io.pslab.activity.Barometer_activity;
import io.pslab.activity.BarometerActivity;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -93,7 +93,7 @@ public void onItemClick(ApplicationItem item) {
startActivity(intent);
break;
case "Barometer":
intent = new Intent(context, Barometer_activity.class);
intent = new Intent(context, BarometerActivity.class);
startActivity(intent);
break;
case "Compass":
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,8 @@
GND. You can use any of the PSLab device GND pins.\n</string>

<string name="barometer">Barometer</string>
<string name="barometer_alert_title">No barometer sensor in device</string>
<string name="barometer_alert_description">Connect a BMP180 sensor using I2C pins on PSLab to use this instrument</string>
<string name="barometer_description">Measures the atmospheric pressure</string>
<string name="barometer_intro">\u2022 The Barometer can be used to measure Atmospheric pressure. This instrument
is compatible with either the built in pressure sensor on any android device or the BMP-180 pressure sensor.\n\n
Expand Down