Skip to content

Commit 8730ef0

Browse files
author
Kunal
committed
Accelerometer Configurations fixed
1 parent 3071c59 commit 8730ef0

File tree

9 files changed

+81
-15
lines changed

9 files changed

+81
-15
lines changed

‎app/src/main/java/io/pslab/activity/SettingsActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected void onCreate(Bundle savedInstanceState) {
6565
case PSLabSensor.GYROSCOPE_CONFIGURATIONS:
6666
fragment = new GyroscopeSettingsFragment();
6767
break;
68-
case PSLabSensor.ACCELEROMETER:
68+
case PSLabSensor.ACCELEROMETER_CONFIGURATIONS:
6969
fragment = new AccelerometerSettingsFragment();
7070
break;
7171
default:

‎app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
8585
holder.sensor.setText(context.getResources().getString(R.string.compass));
8686
holder.tileIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.tile_icon_compass_log));
8787
break;
88-
case PSLabSensor.ACCELEROMETER:
88+
case PSLabSensor.ACCELEROMETER_CONFIGURATIONS:
8989
holder.sensor.setText(context.getResources().getString(R.string.accelerometer));
9090
holder.tileIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.tile_icon_accelerometer));
9191
break;
@@ -166,7 +166,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
166166
LocalDataLog.with().clearBlockOfBaroRecords(block.getBlock());
167167
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.COMPASS)) {
168168
LocalDataLog.with().clearBlockOfCompassRecords(block.getBlock());
169-
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER)) {
169+
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER_CONFIGURATIONS)) {
170170
LocalDataLog.with().clearBlockOfAccelerometerRecords(block.getBlock());
171171
}
172172
LocalDataLog.with().clearSensorBlock(block.getBlock());
@@ -255,7 +255,7 @@ private void populateMapData(SensorDataBlock block) {
255255
}
256256
}
257257
setMapDataToIntent(array);
258-
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER)) {
258+
} else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER_CONFIGURATIONS)) {
259259
RealmResults<AccelerometerData> data = LocalDataLog.with().getBlockOfAccelerometerRecords(block.getBlock());
260260
JSONArray array = new JSONArray();
261261
for (AccelerometerData d : data) {

‎app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -833,20 +833,17 @@ private void initiateAccelerometerSensor(int type) {
833833
ScienceLab scienceLab;
834834
switch (s) {
835835
case INBUILT_SENSOR:
836-
//z_accel_max_text.setText(getResources().getStringArray(R.array.lux_sensors)[0]);
837836
sensorManager = (SensorManager) getContext().getSystemService(SENSOR_SERVICE);
838837
sensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
839838
if (sensor == null) {
840839
Toast.makeText(getContext(), getResources().getString(R.string.no_accelerometer_sensor), Toast.LENGTH_LONG).show();
841840
} else {
842841
float max = sensor.getMaximumRange();
843-
//z_tv_label_left_yaxis_hmc.setMaxSpeed(max);
844842
sensorManager.registerListener(accelerometerSensorEventListener,
845843
sensor, SensorManager.SENSOR_DELAY_FASTEST);
846844
}
847845
break;
848846
case BH1750_SENSOR:
849-
//z_accel_max_text.setText(getResources().getStringArray(R.array.lux_sensors)[1]);
850847
scienceLab = ScienceLabCommon.scienceLab;
851848
if (scienceLab.isConnected()) {
852849
ArrayList<Integer> data;

‎app/src/main/java/io/pslab/fragment/AccelerometerSettingsFragment.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
public class AccelerometerSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
1919

2020
public static final String KEY_INCLUDE_LOCATION = "include_location_sensor_data";
21-
public static final String KEY_UPDATE_PERIOD = "setting_lux_update_period";
22-
public static final String KEY_HIGH_LIMIT = "setting_lux_high_limit";
23-
public static final String KEY_ACCELEROMETER_SENSOR_TYPE = "setting_lux_sensor_type";
24-
public static final String KEY_ACCELEROMETER_SENSOR_GAIN = "setting_lux_sensor_gain";
21+
public static final String KEY_UPDATE_PERIOD = "setting_accelerometer_update_period";
22+
public static final String KEY_HIGH_LIMIT = "setting_accelerometer_high_limit";
23+
public static final String KEY_ACCELEROMETER_SENSOR_TYPE = "setting_accelerometer_sensor_type";
24+
public static final String KEY_ACCELEROMETER_SENSOR_GAIN = "setting_accelerometer_sensor_gain";
2525

2626
private PSLabPermission psLabPermission;
2727

@@ -34,7 +34,7 @@ public class AccelerometerSettingsFragment extends PreferenceFragmentCompat impl
3434

3535
@Override
3636
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
37-
setPreferencesFromResource(R.xml.lux_meter_settings, rootKey);
37+
setPreferencesFromResource(R.xml.accelerometer_settings, rootKey);
3838
updatePeriodPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_UPDATE_PERIOD);
3939
higLimitPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_HIGH_LIMIT);
4040
sensorGainPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_ACCELEROMETER_SENSOR_GAIN);
@@ -55,7 +55,7 @@ public void onResume() {
5555
super.onResume();
5656
locationPreference.setChecked(sharedPref.getBoolean(KEY_INCLUDE_LOCATION, true));
5757
updatePeriodPref.setSummary(updatePeriodPref.getText() + " ms");
58-
higLimitPref.setSummary(higLimitPref.getText() + " Lx");
58+
higLimitPref.setSummary(higLimitPref.getText() + " m/s²");
5959
sensorTypePreference.setSummary(sensorTypePreference.getEntry());
6060
sensorGainPref.setSummary(sensorGainPref.getText());
6161
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);

‎app/src/main/java/io/pslab/models/PSLabSensor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public abstract class PSLabSensor extends AppCompatActivity {
100100
public static final String GYROSCOPE_CONFIGURATIONS = "Gyroscope Configurations";
101101
public static final String COMPASS = "Compass";
102102
public static final String COMPASS_CONFIGURATIONS = "Compass Configurations";
103-
public static final String ACCELEROMETER = "Accelerometer";
103+
public static final String ACCELEROMETER_CONFIGURATIONS = "Accelerometer Configurations";
104104
public static final String ACCELEROMETER_DATA_FORMAT = "%.2f";
105105

106106
@BindView(R.id.sensor_toolbar)

‎app/src/main/res/layout/fragment_accelerometer_data.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
android:id="@+id/first_chart"
1212
android:layout_width="match_parent"
1313
android:layout_height="@dimen/accel_card_height"
14-
android:layout_below="@+id/top_app_bar_layout"
1514
android:layout_marginEnd="@dimen/card_margin"
1615
android:layout_marginLeft="@dimen/card_margin"
1716
android:layout_marginRight="@dimen/card_margin"

‎app/src/main/res/menu/data_log_menu.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
android:icon="@drawable/menu_icon_map"
2727
android:title="@string/view_map"
2828
app:showAsAction="never" />
29+
<item
30+
android:id="@+id/save_graph"
31+
android:icon="@drawable/menu_icon_save"
32+
android:orderInCategory="4"
33+
android:title="@string/save_graph"
34+
app:showAsAction="ifRoom" />
2935
<item
3036
android:id="@+id/settings"
3137
android:title="@string/accelerometer_configurations"

‎app/src/main/res/values/strings.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,24 +582,31 @@
582582
<string name="no_lux_sensor">Device does not have a Lux sensor</string>
583583
<string name="active_sensor">Active Sensor</string>
584584
<string name="setting_baro">setting_baro_sensor_type</string>
585+
<string name="setting_accelerometer">setting_accelerometer_sensor_type</string>
585586
<string name="include_location">Include the location data in the logged file</string>
586587
<string name="location_sensor">include_location_sensor_data</string>
587588
<string name="include_cap">Include Location Data</string>
589+
<string name="time_string_accelerometer">Please provide time interval at which data will be updated</string>
588590
<string name="time_string_lux">Please provide time interval at which data will be updated (100 ms to 1000 ms)</string>
589591
<string name="time_string_baro">Please provide time interval at which data will be updated (100 ms to 2000 ms)</string>
590592
<string name="setting_baro_update">setting_baro_update_period</string>
591593
<string name="setting_lux_update">setting_lux_update_period</string>
594+
<string name="setting_accelerometer_update">setting_accelerometer_update_period</string>
592595
<string name="default_value_baro">1.10</string>
593596
<string name="default_value_lux">1</string>
597+
<string name="default_value_acceleration">10</string>
598+
<string name="dialogue_msg_acceleration">Please provide maximum limit of acceleration value to be recorded</string>
594599
<string name="dialogue_msg_atm">Please provide maximum limit of atm value to be recorded</string>
595600
<string name="dialogue_msg_lux">Please provide maximum limit of Lux value to be recorded (10 Lx to 10000 Lx)</string>
596601
<string name="update_period_msg">Entered Update Period is not within the limits!</string>
597602
<string name="high_limit_msg">Entered High Limit is not within the limits!</string>
598603
<string name="high_limit_baro">setting_baro_high_limit</string>
599604
<string name="high_limit_lux">setting_lux_high_limit</string>
605+
<string name="high_limit_acceleration">setting_accelerometer_high_limit</string>
600606
<string name="setting_lux_type">setting_lux_sensor_type</string>
601607
<string name="no_file_selected">No file was selected</string>
602608
<string name="setting_lux_sensor_gain">setting_lux_sensor_gain</string>
609+
<string name="setting_accelerometer_sensor_gain">setting_accelerometer_sensor_gain</string>
603610
<string name="set_gain_sensor">Please set gain of the sensor</string>
604611
<string name="sensor_gain">Sensor Gain</string>
605612
<string-array name="lux_sensors">
@@ -719,6 +726,15 @@
719726
<item>0</item>
720727
<item>1</item>
721728
</string-array>
729+
<string-array name="accelerometer_sensors">
730+
<item>Built-In</item>
731+
<item>MPU6050</item>
732+
</string-array>
733+
<string-array name="accelerometer_sensor_list_values">
734+
<item>0</item>
735+
<item>1</item>
736+
</string-array>
737+
722738
<string name="delete_all">Delete All Data</string>
723739
<string name="delete_all_message">Are You Sure?</string>
724740
<string name="baro_meter">Barometer</string>

‎app/src/main/res/xml/accelerometer_settings.xml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto">
4+
<EditTextPreference
5+
android:defaultValue="@string/lux_default_1000"
6+
android:dialogMessage="@string/time_string_accelerometer"
7+
android:dialogTitle="@string/update_period"
8+
android:inputType="numberDecimal"
9+
android:key="@string/setting_accelerometer_update"
10+
android:summary="@string/lux_summary"
11+
android:title="@string/update_period"
12+
app:iconSpaceReserved="false" />
13+
14+
<EditTextPreference
15+
android:defaultValue="@string/default_value_acceleration"
16+
android:dialogMessage="@string/dialogue_msg_acceleration"
17+
android:dialogTitle="@string/high_limit"
18+
android:inputType="numberDecimal"
19+
android:key="@string/high_limit_acceleration"
20+
android:summary="@string/default_value_acceleration"
21+
android:title="@string/high_limit"
22+
app:iconSpaceReserved="false" />
23+
24+
<ListPreference
25+
android:defaultValue="@string/lux_default_0"
26+
android:entries="@array/accelerometer_sensors"
27+
android:entryValues="@array/accelerometer_sensor_list_values"
28+
android:key="@string/setting_accelerometer"
29+
android:title="@string/active_sensor"
30+
app:iconSpaceReserved="false" />
31+
32+
<EditTextPreference
33+
android:defaultValue="@string/default_value_lux"
34+
android:dialogMessage="@string/set_gain_sensor"
35+
android:dialogTitle="@string/sensor_gain"
36+
android:inputType="numberDecimal"
37+
android:key="@string/setting_accelerometer_sensor_gain"
38+
android:summary="@string/default_value_lux"
39+
android:title="@string/sensor_gain"
40+
app:iconSpaceReserved="false" />
41+
42+
<CheckBoxPreference
43+
android:defaultValue="true"
44+
android:key="@string/location_sensor"
45+
android:summary="@string/include_location"
46+
android:title="@string/include_cap"
47+
app:iconSpaceReserved="false" />
48+
</PreferenceScreen>

0 commit comments

Comments
 (0)