Merge pull request #1922 from neel1998/gas_sensor_logging

feat: logging added to mq135

Author: cweitat

app/src/main/java/io/pslab/activity/DataLoggerActivity.java

@@ -34,6 +34,7 @@
 import io.pslab.models.AccelerometerData;
 import io.pslab.models.BaroData;
 import io.pslab.models.CompassData;
+import io.pslab.models.GasSensorData;
 import io.pslab.models.GyroData;
 import io.pslab.models.LogicAnalyzerData;
 import io.pslab.models.LuxData;
@@ -124,6 +125,9 @@ protected void onCreate(Bundle savedInstanceState) {
             case "Logic Analyzer":
                 categoryData = LocalDataLog.with().getTypeOfSensorBlocks(getResources().getString(R.string.logical_analyzer));
                 break;
+            case "Gas Sensor":
+                categoryData = LocalDataLog.with().getTypeOfSensorBlocks(getString(R.string.gas_sensor));
+                break;
             default:
                 categoryData = LocalDataLog.with().getAllSensorBlocks();
                 getSupportActionBar().setTitle(getString(R.string.logged_data));
@@ -286,6 +290,9 @@ private RealmObject getObject(String objectType, String[] data, long time, long
             case "Logic Analyzer":
                 returnObject = new LogicAnalyzerData(time, block, data[2], Integer.valueOf(data[3]), data[4], data[5], Float.valueOf(data[6]), Float.valueOf(data[7]));
                 break;
+            case "Gas Sensor":
+                returnObject = new GasSensorData(time, block, Float.valueOf(data[2]), Double.valueOf(data[3]), Double.valueOf(data[4]));
+                break;
             default:
                 returnObject = null;
                 break;

app/src/main/java/io/pslab/activity/GasSensorActivity.java

@@ -5,13 +5,17 @@
 
 import io.pslab.R;
 import io.pslab.fragment.GasSensorDataFragment;
+import io.pslab.models.GasSensorData;
 import io.pslab.models.PSLabSensor;
 import io.pslab.models.SensorDataBlock;
+import io.pslab.others.LocalDataLog;
 import io.realm.RealmObject;
+import io.realm.RealmResults;
 
 public class GasSensorActivity extends PSLabSensor {
 
     private static final String PREF_NAME = "customDialogPreference";
+    public RealmResults<GasSensorData> recordedGasSensorData;
 
     @Override
     public int getMenu() {
@@ -61,17 +65,21 @@ public int getGuideExtraContent() {
 
     @Override
     public void recordSensorDataBlockID(SensorDataBlock block) {
-
+        realm.beginTransaction();
+        realm.copyToRealm(block);
+        realm.commitTransaction();
     }
 
     @Override
     public void recordSensorData(RealmObject sensorData) {
-
+        realm.beginTransaction();
+        realm.copyToRealm((GasSensorData) sensorData);
+        realm.commitTransaction();
     }
 
     @Override
     public void stopRecordSensorData() {
-
+        LocalDataLog.with().refresh();
     }
 
     @Override
@@ -81,6 +89,12 @@ public Fragment getSensorFragment() {
 
     @Override
     public void getDataFromDataLogger() {
-
+        if (getIntent().getExtras() != null && getIntent().getExtras().getBoolean(KEY_LOG)) {
+            viewingData = true;
+            recordedGasSensorData = LocalDataLog.with()
+                    .getBlockOfGasSensorRecords(getIntent().getExtras().getLong(DATA_BLOCK));
+            String title = titleFormat.format(recordedGasSensorData.get(0).getTime());
+            getSupportActionBar().setTitle(title);
+        }
     }
 }

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

@@ -26,6 +26,7 @@
 import io.pslab.activity.AccelerometerActivity;
 import io.pslab.activity.BarometerActivity;
 import io.pslab.activity.CompassActivity;
+import io.pslab.activity.GasSensorActivity;
 import io.pslab.activity.GyroscopeActivity;
 import io.pslab.activity.LogicalAnalyzerActivity;
 import io.pslab.activity.LuxMeterActivity;
@@ -38,6 +39,7 @@
 import io.pslab.activity.WaveGeneratorActivity;
 import io.pslab.models.AccelerometerData;
 import io.pslab.models.BaroData;
+import io.pslab.models.GasSensorData;
 import io.pslab.models.GyroData;
 import io.pslab.models.CompassData;
 import io.pslab.models.LogicAnalyzerData;
@@ -131,6 +133,10 @@ public void onBindViewHolder(@NonNull final ViewHolder holder, int position) {
                 holder.sensor.setText(R.string.logical_analyzer);
                 holder.tileIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.tile_icon_logic_analyzer));
                 break;
+            case PSLabSensor.GAS_SENSOR:
+                holder.sensor.setText(R.string.gas_sensor);
+                holder.tileIcon.setImageDrawable(context.getResources().getDrawable(R.drawable.robotic_arm));
+                break;
             default:
                 break;
         }
@@ -216,6 +222,11 @@ private void handleCardViewClick(SensorDataBlock block) {
             laIntent.putExtra(KEY_LOG, true);
             laIntent.putExtra(DATA_BLOCK, block.getBlock());
             context.startActivity(laIntent);
+        } else if (block.getSensorType().equalsIgnoreCase(context.getResources().getString(R.string.gas_sensor))) {
+            Intent gasSensorIntent = new Intent(context, GasSensorActivity.class);
+            gasSensorIntent.putExtra(KEY_LOG, true);
+            gasSensorIntent.putExtra(DATA_BLOCK, block.getBlock());
+            context.startActivity(gasSensorIntent);
         }
     }
 
@@ -257,6 +268,8 @@ public void onClick(DialogInterface dialog, int whichButton) {
                             LocalDataLog.with().clearBlockOfMultimeterRecords(block.getBlock());
                         } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.LOGIC_ANALYZER)) {
                             LocalDataLog.with().clearBlockOfLARecords(block.getBlock());
+                        } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.GAS_SENSOR)) {
+                            LocalDataLog.with().clearBlockOfGasSensorRecords(block.getBlock());
                         }
                         LocalDataLog.with().clearSensorBlock(block.getBlock());
                         dialog.dismiss();
@@ -493,6 +506,22 @@ private void populateMapData(SensorDataBlock block) {
                 }
             }
             setMapDataToIntent(array);
+        } else if (block.getSensorType().equalsIgnoreCase(PSLabSensor.GAS_SENSOR)) {
+            RealmResults<GasSensorData> data = LocalDataLog.with().getBlockOfGasSensorRecords(block.getBlock());
+            JSONArray array = new JSONArray();
+            for (GasSensorData d : data) {
+                try {
+                    JSONObject i = new JSONObject();
+                    i.put("date", CSVLogger.FILE_NAME_FORMAT.format(d.getTime()));
+                    i.put("ppmValue", d.getPpmValue());
+                    i.put("lon", d.getLon());
+                    i.put("lat", d.getLat());
+                    if (d.getLat() != 0.0 && d.getLon() != 0.0) array.put(i);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                }
+            }
+            setMapDataToIntent(array);
         }
     }