From 8730ef0a94693272dd0d4a0f9a5e913e56a67499 Mon Sep 17 00:00:00 2001 From: Kunal Date: Wed, 15 May 2019 22:58:24 +0530 Subject: [PATCH] Accelerometer Configurations fixed --- .../io/pslab/activity/SettingsActivity.java | 2 +- .../adapters/SensorLoggerListAdapter.java | 6 +-- .../fragment/AccelerometerDataFragment.java | 3 -- .../AccelerometerSettingsFragment.java | 12 ++--- .../java/io/pslab/models/PSLabSensor.java | 2 +- .../layout/fragment_accelerometer_data.xml | 1 - app/src/main/res/menu/data_log_menu.xml | 6 +++ app/src/main/res/values/strings.xml | 16 +++++++ .../main/res/xml/accelerometer_settings.xml | 48 +++++++++++++++++++ 9 files changed, 81 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/xml/accelerometer_settings.xml diff --git a/app/src/main/java/io/pslab/activity/SettingsActivity.java b/app/src/main/java/io/pslab/activity/SettingsActivity.java index dd3f8c5a4..a051140b3 100644 --- a/app/src/main/java/io/pslab/activity/SettingsActivity.java +++ b/app/src/main/java/io/pslab/activity/SettingsActivity.java @@ -65,7 +65,7 @@ protected void onCreate(Bundle savedInstanceState) { case PSLabSensor.GYROSCOPE_CONFIGURATIONS: fragment = new GyroscopeSettingsFragment(); break; - case PSLabSensor.ACCELEROMETER: + case PSLabSensor.ACCELEROMETER_CONFIGURATIONS: fragment = new AccelerometerSettingsFragment(); break; default: diff --git a/app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java b/app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java index 7f4c837b7..9abfa71f8 100644 --- a/app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java +++ b/app/src/main/java/io/pslab/adapters/SensorLoggerListAdapter.java @@ -85,7 +85,7 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) { holder.sensor.setText(context.getResources().getString(R.string.compass)); holder.tileIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.tile_icon_compass_log)); break; - case PSLabSensor.ACCELEROMETER: + case PSLabSensor.ACCELEROMETER_CONFIGURATIONS: holder.sensor.setText(context.getResources().getString(R.string.accelerometer)); holder.tileIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.tile_icon_accelerometer)); break; @@ -166,7 +166,7 @@ public void onClick(DialogInterface dialog, int whichButton) { LocalDataLog.with().clearBlockOfBaroRecords(block.getBlock()); } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.COMPASS)) { LocalDataLog.with().clearBlockOfCompassRecords(block.getBlock()); - } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER)) { + } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER_CONFIGURATIONS)) { LocalDataLog.with().clearBlockOfAccelerometerRecords(block.getBlock()); } LocalDataLog.with().clearSensorBlock(block.getBlock()); @@ -255,7 +255,7 @@ private void populateMapData(SensorDataBlock block) { } } setMapDataToIntent(array); - } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER)) { + } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.ACCELEROMETER_CONFIGURATIONS)) { RealmResults data = LocalDataLog.with().getBlockOfAccelerometerRecords(block.getBlock()); JSONArray array = new JSONArray(); for (AccelerometerData d : data) { diff --git a/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java b/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java index 8e440ac18..3d0ac06e9 100644 --- a/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java +++ b/app/src/main/java/io/pslab/fragment/AccelerometerDataFragment.java @@ -833,20 +833,17 @@ private void initiateAccelerometerSensor(int type) { ScienceLab scienceLab; switch (s) { case INBUILT_SENSOR: - //z_accel_max_text.setText(getResources().getStringArray(R.array.lux_sensors)[0]); sensorManager = (SensorManager) getContext().getSystemService(SENSOR_SERVICE); sensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); if (sensor == null) { Toast.makeText(getContext(), getResources().getString(R.string.no_accelerometer_sensor), Toast.LENGTH_LONG).show(); } else { float max = sensor.getMaximumRange(); - //z_tv_label_left_yaxis_hmc.setMaxSpeed(max); sensorManager.registerListener(accelerometerSensorEventListener, sensor, SensorManager.SENSOR_DELAY_FASTEST); } break; case BH1750_SENSOR: - //z_accel_max_text.setText(getResources().getStringArray(R.array.lux_sensors)[1]); scienceLab = ScienceLabCommon.scienceLab; if (scienceLab.isConnected()) { ArrayList data; diff --git a/app/src/main/java/io/pslab/fragment/AccelerometerSettingsFragment.java b/app/src/main/java/io/pslab/fragment/AccelerometerSettingsFragment.java index 27f9cc5f4..a02d6171f 100644 --- a/app/src/main/java/io/pslab/fragment/AccelerometerSettingsFragment.java +++ b/app/src/main/java/io/pslab/fragment/AccelerometerSettingsFragment.java @@ -18,10 +18,10 @@ public class AccelerometerSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { public static final String KEY_INCLUDE_LOCATION = "include_location_sensor_data"; - public static final String KEY_UPDATE_PERIOD = "setting_lux_update_period"; - public static final String KEY_HIGH_LIMIT = "setting_lux_high_limit"; - public static final String KEY_ACCELEROMETER_SENSOR_TYPE = "setting_lux_sensor_type"; - public static final String KEY_ACCELEROMETER_SENSOR_GAIN = "setting_lux_sensor_gain"; + public static final String KEY_UPDATE_PERIOD = "setting_accelerometer_update_period"; + public static final String KEY_HIGH_LIMIT = "setting_accelerometer_high_limit"; + public static final String KEY_ACCELEROMETER_SENSOR_TYPE = "setting_accelerometer_sensor_type"; + public static final String KEY_ACCELEROMETER_SENSOR_GAIN = "setting_accelerometer_sensor_gain"; private PSLabPermission psLabPermission; @@ -34,7 +34,7 @@ public class AccelerometerSettingsFragment extends PreferenceFragmentCompat impl @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - setPreferencesFromResource(R.xml.lux_meter_settings, rootKey); + setPreferencesFromResource(R.xml.accelerometer_settings, rootKey); updatePeriodPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_UPDATE_PERIOD); higLimitPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_HIGH_LIMIT); sensorGainPref = (EditTextPreference) getPreferenceScreen().findPreference(KEY_ACCELEROMETER_SENSOR_GAIN); @@ -55,7 +55,7 @@ public void onResume() { super.onResume(); locationPreference.setChecked(sharedPref.getBoolean(KEY_INCLUDE_LOCATION, true)); updatePeriodPref.setSummary(updatePeriodPref.getText() + " ms"); - higLimitPref.setSummary(higLimitPref.getText() + " Lx"); + higLimitPref.setSummary(higLimitPref.getText() + " m/s²"); sensorTypePreference.setSummary(sensorTypePreference.getEntry()); sensorGainPref.setSummary(sensorGainPref.getText()); getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); diff --git a/app/src/main/java/io/pslab/models/PSLabSensor.java b/app/src/main/java/io/pslab/models/PSLabSensor.java index bdab463f1..18fe6a457 100644 --- a/app/src/main/java/io/pslab/models/PSLabSensor.java +++ b/app/src/main/java/io/pslab/models/PSLabSensor.java @@ -100,7 +100,7 @@ public abstract class PSLabSensor extends AppCompatActivity { public static final String GYROSCOPE_CONFIGURATIONS = "Gyroscope Configurations"; public static final String COMPASS = "Compass"; public static final String COMPASS_CONFIGURATIONS = "Compass Configurations"; - public static final String ACCELEROMETER = "Accelerometer"; + public static final String ACCELEROMETER_CONFIGURATIONS = "Accelerometer Configurations"; public static final String ACCELEROMETER_DATA_FORMAT = "%.2f"; @BindView(R.id.sensor_toolbar) diff --git a/app/src/main/res/layout/fragment_accelerometer_data.xml b/app/src/main/res/layout/fragment_accelerometer_data.xml index a3d3a7bf2..6c8b35293 100644 --- a/app/src/main/res/layout/fragment_accelerometer_data.xml +++ b/app/src/main/res/layout/fragment_accelerometer_data.xml @@ -11,7 +11,6 @@ android:id="@+id/first_chart" android:layout_width="match_parent" android:layout_height="@dimen/accel_card_height" - android:layout_below="@+id/top_app_bar_layout" android:layout_marginEnd="@dimen/card_margin" android:layout_marginLeft="@dimen/card_margin" android:layout_marginRight="@dimen/card_margin" diff --git a/app/src/main/res/menu/data_log_menu.xml b/app/src/main/res/menu/data_log_menu.xml index fde5bb98a..27e4e8854 100644 --- a/app/src/main/res/menu/data_log_menu.xml +++ b/app/src/main/res/menu/data_log_menu.xml @@ -26,6 +26,12 @@ android:icon="@drawable/menu_icon_map" android:title="@string/view_map" app:showAsAction="never" /> + Device does not have a Lux sensor Active Sensor setting_baro_sensor_type + setting_accelerometer_sensor_type Include the location data in the logged file include_location_sensor_data Include Location Data + Please provide time interval at which data will be updated Please provide time interval at which data will be updated (100 ms to 1000 ms) Please provide time interval at which data will be updated (100 ms to 2000 ms) setting_baro_update_period setting_lux_update_period + setting_accelerometer_update_period 1.10 1 + 10 + Please provide maximum limit of acceleration value to be recorded Please provide maximum limit of atm value to be recorded Please provide maximum limit of Lux value to be recorded (10 Lx to 10000 Lx) Entered Update Period is not within the limits! Entered High Limit is not within the limits! setting_baro_high_limit setting_lux_high_limit + setting_accelerometer_high_limit setting_lux_sensor_type No file was selected setting_lux_sensor_gain + setting_accelerometer_sensor_gain Please set gain of the sensor Sensor Gain @@ -719,6 +726,15 @@ 0 1 + + Built-In + MPU6050 + + + 0 + 1 + + Delete All Data Are You Sure? Barometer diff --git a/app/src/main/res/xml/accelerometer_settings.xml b/app/src/main/res/xml/accelerometer_settings.xml new file mode 100644 index 000000000..65f1d48bc --- /dev/null +++ b/app/src/main/res/xml/accelerometer_settings.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + \ No newline at end of file