From 80b4370d55157fbdf62c74f3379c691b517c2902 Mon Sep 17 00:00:00 2001
From: neel1998 <neellovepainting@gmail.com>
Date: Tue, 25 Jun 2019 23:26:34 +0530
Subject: [PATCH] bug fixes in gyroscope

---
 .../pslab/fragment/GyroscopeDataFragment.java | 44 ++++++++++---------
 .../fragment/GyroscopeSettingsFragment.java   |  6 +--
 app/src/main/res/values/strings.xml           |  3 ++
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/io/pslab/fragment/GyroscopeDataFragment.java b/app/src/main/java/io/pslab/fragment/GyroscopeDataFragment.java
index 16e203046..59075aa6e 100644
--- a/app/src/main/java/io/pslab/fragment/GyroscopeDataFragment.java
+++ b/app/src/main/java/io/pslab/fragment/GyroscopeDataFragment.java
@@ -120,20 +120,10 @@ public void onResume() {
             resetInstrumentData();
             playRecordedData();
         } else if (gyroSensor.viewingData) {
-            if (sensorManager != null) {
-                recordedGyroArray = new ArrayList<>();
-                resetInstrumentData();
-                plotAllRecordedData();
-            }
-            else {
-                gyroscopeViewFragments.clear();
-                rootView.findViewById(R.id.gyroscope_x_axis_fragment).setVisibility(View.INVISIBLE);
-                rootView.findViewById(R.id.gyroscope_y_axis_fragment).setVisibility(View.INVISIBLE);
-                rootView.findViewById(R.id.gyroscope_z_axis_fragment).setVisibility(View.INVISIBLE);
-                noSensorText.setText(getResources().getString(R.string.no_data_recorded_gyro));
-                noSensorText.setAllCaps(true);
-                gyroLinearLayout.addView(noSensorText);
-            }
+            recordedGyroArray = new ArrayList<>();
+            resetInstrumentData();
+            plotAllRecordedData();
+
         } else if (!gyroSensor.isRecording) {
             updateGraphs();
             initiateGyroSensor();
@@ -150,8 +140,7 @@ public void onDestroyView() {
         }
         if (sensorManager != null) {
             sensorManager.unregisterListener(gyroScopeSensorEventListener);
-        }
-        else {
+        } else {
             gyroLinearLayout.removeView(noSensorText);
         }
     }
@@ -484,13 +473,26 @@ private void resetInstrumentData() {
     private void initiateGyroSensor() {
         resetInstrumentData();
         sensorManager = (SensorManager) getContext().getSystemService(SENSOR_SERVICE);
-        sensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
-        if (sensor == null) {
-            Toast.makeText(getContext(), getResources().getString(R.string.no_gyroscope_sensor), Toast.LENGTH_LONG).show();
+        if (sensorManager == null) {
+            noSensorLayoutUpdate();
         } else {
-            sensorManager.registerListener(gyroScopeSensorEventListener,
-                    sensor, SensorManager.SENSOR_DELAY_FASTEST);
+            sensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE);
+            if (sensor == null) {
+                Toast.makeText(getContext(), getResources().getString(R.string.no_gyroscope_sensor), Toast.LENGTH_LONG).show();
+            } else {
+                sensorManager.registerListener(gyroScopeSensorEventListener,
+                        sensor, SensorManager.SENSOR_DELAY_FASTEST);
+            }
         }
+    }
 
+    private void noSensorLayoutUpdate() {
+        gyroscopeViewFragments.clear();
+        rootView.findViewById(R.id.gyroscope_x_axis_fragment).setVisibility(View.GONE);
+        rootView.findViewById(R.id.gyroscope_y_axis_fragment).setVisibility(View.GONE);
+        rootView.findViewById(R.id.gyroscope_z_axis_fragment).setVisibility(View.GONE);
+        noSensorText.setText(getResources().getString(R.string.no_data_recorded_gyro));
+        noSensorText.setAllCaps(true);
+        gyroLinearLayout.addView(noSensorText);
     }
 }
diff --git a/app/src/main/java/io/pslab/fragment/GyroscopeSettingsFragment.java b/app/src/main/java/io/pslab/fragment/GyroscopeSettingsFragment.java
index 6b49a194d..32c908ede 100644
--- a/app/src/main/java/io/pslab/fragment/GyroscopeSettingsFragment.java
+++ b/app/src/main/java/io/pslab/fragment/GyroscopeSettingsFragment.java
@@ -15,9 +15,9 @@
 public class GyroscopeSettingsFragment 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_GYROSCOPE_SENSOR_GAIN = "setting_lux_sensor_gain";
+    public static final String KEY_UPDATE_PERIOD = "setting_gyro_update_period";
+    public static final String KEY_HIGH_LIMIT = "setting_gyro_high_limit";
+    public static final String KEY_GYROSCOPE_SENSOR_GAIN = "setting_gyro_sensor_gain";
 
     private PSLabPermission psLabPermission;
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 858d96729..384ff5315 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -607,6 +607,7 @@
     <string name="time_string_baro">Please provide time interval at which data will be updated (100 ms to 2000 ms)</string>
     <string name="setting_baro_update">setting_baro_update_period</string>
     <string name="setting_lux_update">setting_lux_update_period</string>
+    <string name="setting_gyro_update">setting_gyro_update_period</string>
     <string name="setting_accelerometer_update">setting_accelerometer_update_period</string>
     <string name="default_value_baro">1.10</string>
     <string name="default_value_lux">1</string>
@@ -619,10 +620,12 @@
     <string name="high_limit_msg">Entered High Limit is not within the limits!</string>
     <string name="high_limit_baro">setting_baro_high_limit</string>
     <string name="high_limit_lux">setting_lux_high_limit</string>
+    <string name="high_limit_gyro">setting_gyro_high_limit</string>
     <string name="high_limit_acceleration">setting_accelerometer_high_limit</string>
     <string name="setting_lux_type">setting_lux_sensor_type</string>
     <string name="no_file_selected">No file was selected</string>
     <string name="setting_lux_sensor_gain">setting_lux_sensor_gain</string>
+    <string name="setting_gyro_sensor_gain">setting_gyro_sensor_gain</string>
     <string name="setting_accelerometer_sensor_gain">setting_accelerometer_sensor_gain</string>
     <string name="set_gain_sensor">Please set gain of the sensor</string>
     <string name="sensor_gain">Sensor Gain</string>