From f23ff832d7558bd79b1a0034594006d50607ea48 Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Thu, 5 Jan 2017 19:05:04 +0100
Subject: [PATCH 1/7] UNTESTED - Placeholder. Button on launcher and sensor
 preference items.

---
 .../platypus/android/server/Controller.java   |  1 +
 .../android/server/LauncherFragment.java      | 37 ++++++++++
 app/src/main/res/layout/fragment_launcher.xml |  9 +++
 .../main/res/values/strings_preferences.xml   | 72 +++++++++++++++++++
 app/src/main/res/xml/preferences.xml          | 26 +++++++
 5 files changed, 145 insertions(+)

diff --git a/app/src/main/java/com/platypus/android/server/Controller.java b/app/src/main/java/com/platypus/android/server/Controller.java
index 0d4d9fa..03f7202 100644
--- a/app/src/main/java/com/platypus/android/server/Controller.java
+++ b/app/src/main/java/com/platypus/android/server/Controller.java
@@ -57,6 +57,7 @@ public void onReceive(Context context, Intent intent) {
     private ParcelFileDescriptor mUsbDescriptor = null;
     private FileInputStream mUsbInputStream = null;
     private FileOutputStream mUsbOutputStream = null;
+
     /**
      * Listen for disconnection events for accessory and close connection if we were using it.
      */
diff --git a/app/src/main/java/com/platypus/android/server/LauncherFragment.java b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
index d37dd6a..1179c81 100644
--- a/app/src/main/java/com/platypus/android/server/LauncherFragment.java
+++ b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
@@ -24,6 +24,8 @@
 
 import com.platypus.android.server.gui.SwipeOnlySwitch;
 
+import org.json.JSONObject;
+
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -48,6 +50,7 @@ public class LauncherFragment extends Fragment
     protected TextView mIpAddressText;
     protected Switch mLaunchSwitch;
     protected Button mSetHomeButton;
+    protected Button mSetSensorsButton;
     protected ImageView mVehicleImage;
     protected LocationManager mLocationManager;
     /**
@@ -97,6 +100,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mIpAddressText = (TextView) view.findViewById(R.id.ip_address_text);
         mLaunchSwitch = (SwipeOnlySwitch) view.findViewById(R.id.launcher_launch_switch);
         mSetHomeButton = (Button) view.findViewById(R.id.launcher_home_button);
+        mSetSensorsButton = (Button) view.findViewById(R.id.launcher_sensors_button);
         mVehicleImage = (ImageView) view.findViewById(R.id.launcher_vehicle_image);
 
         // Add listener for starting/stopping vehicle service.
@@ -105,6 +109,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         // Add listener for home button click.
         mSetHomeButton.setOnLongClickListener(new SetHomeListener());
 
+        // Add listener for sensors update button click
+        mSetSensorsButton.setOnLongClickListener(new UpdateSensorsListener());
+
         return view;
     }
 
@@ -245,6 +252,36 @@ public void updateServerAddress() {
         mIpAddressText.setText(getLocalIpAddress() + ":" + port);
     }
 
+    ///////////////////////////////////////////////////////////////////////////////////////
+    /**
+     * Listens for long-click events on "Update Sensors" button and updates sensor types
+     */
+    class UpdateSensorsListener implements View.OnLongClickListener {
+        @Override
+        public boolean onLongClick(View v) {
+            JSONObject sensor_JSON = updateSensorsJSON();
+            // TODO: SEND THE JSON OBJECT TO ARDUINO
+            return true;
+        }
+    }
+    JSONObject updateSensorsJSON()
+    {
+        SharedPreferences sharedPreferences =
+                PreferenceManager.getDefaultSharedPreferences(getActivity());
+
+        JSONObject sensor_JSON = new JSONObject();
+        switch (sharedPreferences.getString("pref_sensor_1_type_values", "NONE"))
+        {
+            // TODO: SET UP JSON OBJECT
+            case "NONE":
+                break;
+            default:
+                break;
+        }
+        return sensor_JSON;
+    }
+    ///////////////////////////////////////////////////////////////////////////////////////
+
     /**
      * Listens for long-click events on "Set Home" button and updates home location.
      */
diff --git a/app/src/main/res/layout/fragment_launcher.xml b/app/src/main/res/layout/fragment_launcher.xml
index d018b06..a6d6177 100644
--- a/app/src/main/res/layout/fragment_launcher.xml
+++ b/app/src/main/res/layout/fragment_launcher.xml
@@ -93,4 +93,13 @@
             android:singleLine="true"
             android:text="@string/launcher_swipe_right_text_content" />
     </RelativeLayout>
+
+    <Button
+        android:text="PRESS AND HOLD TO UPDATE SENSOR TYPES"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:id="@+id/launcher_sensors_button"
+        android:layout_alignParentEnd="true" />
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index 7ffde51..9b625be 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -52,4 +52,76 @@
         <item>DIFFERENTIAL</item>
         <item>VECTORED</item>
     </string-array>
+    <string-array name="pref_sensor_1_type_entries">
+        <item>None</item>
+        <item>Atlas DO</item>
+        <item>Atlas pH</item>
+        <item>ES2</item>
+        <item>Lowrance</item>
+        <item>Adafruit GPS</item>
+        <item>AHRS+</item>
+        <item>BlueBox</item>
+        <item>Winch</item>
+        <item>Sampler</item>
+    </string-array>
+    <string-array name="pref_sensor_1_type_values">
+        <item>NONE</item>
+        <item>ATLAS_DO</item>
+        <item>ATLAS_PH</item>
+        <item>ES2</item>
+        <item>LOWRANCE</item>
+        <item>ADAFRUIT_GPS</item>
+        <item>AHRS_PLUS</item>
+        <item>BLUEBOX</item>
+        <item>WINCH</item>
+        <item>SAMPLER</item>
+    </string-array>
+    <string-array name="pref_sensor_2_type_entries">
+        <item>None</item>
+        <item>Atlas DO</item>
+        <item>Atlas pH</item>
+        <item>ES2</item>
+        <item>Lowrance</item>
+        <item>Adafruit GPS</item>
+        <item>AHRS+</item>
+        <item>BlueBox</item>
+        <item>Winch</item>
+        <item>Sampler</item>
+    </string-array>
+    <string-array name="pref_sensor_2_type_values">
+        <item>NONE</item>
+        <item>ATLAS_DO</item>
+        <item>ATLAS_PH</item>
+        <item>ES2</item>
+        <item>LOWRANCE</item>
+        <item>ADAFRUIT_GPS</item>
+        <item>AHRS_PLUS</item>
+        <item>BLUEBOX</item>
+        <item>WINCH</item>
+        <item>SAMPLER</item>
+    </string-array>
+    <string-array name="pref_sensor_3_type_entries">
+        <item>None</item>
+        <item>Atlas DO</item>
+        <item>Atlas pH</item>
+        <item>ES2</item>
+        <item>Lowrance</item>
+        <item>Adafruit GPS</item>
+        <item>AHRS+</item>
+        <item>BlueBox</item>
+        <item>Winch</item>
+        <item>Sampler</item>
+    </string-array>
+    <string-array name="pref_sensor_3_type_values">
+        <item>NONE</item>
+        <item>ATLAS_DO</item>
+        <item>ATLAS_PH</item>
+        <item>ES2</item>
+        <item>LOWRANCE</item>
+        <item>ADAFRUIT_GPS</item>
+        <item>AHRS_PLUS</item>
+        <item>BLUEBOX</item>
+        <item>WINCH</item>
+        <item>SAMPLER</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 8c37e18..63c8751 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -85,5 +85,31 @@
             android:key="pref_vehicle_type"
             android:title="@string/pref_vehicle_type_title"
             android:summary="@string/pref_vehicle_type_summary" />
+        <ListPreference
+            android:key="pref_sensor_type"
+            android:title="Sensor 1 Type"
+            android:dialogTitle="Sensor 1 Type"
+            android:defaultValue="ATLAS_DO"
+            android:entries="@array/pref_sensor_1_type_entries"
+            android:entryValues="@array/pref_sensor_1_type_values"
+            android:summary="Set the type of sensor in socket 1" />
+        <ListPreference
+            android:key="pref_sensor_type"
+            android:title="Sensor 2 Type"
+            android:dialogTitle="Sensor 2 Type"
+            android:defaultValue="ATLAS_PH"
+            android:entries="@array/pref_sensor_2_type_entries"
+            android:entryValues="@array/pref_sensor_2_type_values"
+            android:summary="Set the type of sensor in socket 2" />
+        <ListPreference
+            android:key="pref_sensor_type"
+            android:title="Sensor 3 Type"
+            android:dialogTitle="Sensor 3 Type"
+            android:defaultValue="ES2"
+            android:entries="@array/pref_sensor_3_type_entries"
+            android:entryValues="@array/pref_sensor_3_type_values"
+            android:summary="Set the type of sensor in socket 3" />
     </PreferenceCategory>
+
+
 </PreferenceScreen>

From 4a809b26d320160bbf548d84942693ccbde3304d Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Fri, 6 Jan 2017 14:08:53 +0100
Subject: [PATCH 2/7] LauncherFragment now sends sensor JSON on vehicle service
 start and on button press.

Ready for testing, but probably buggy.
Required binding the VehicleService to the LauncherFragment.
This unfortunately cluttered up the LauncherFragment considerably.
This needs to be tested, as my emulator seemed to run hot while the service was on.
I'm not sure if that means extra junk work is being done somehow, or if
  I just need to test it on a phone.
---
 .../android/server/LauncherFragment.java      | 110 +++++++++++++++---
 .../android/server/VehicleService.java        |  36 +++++-
 .../main/res/values/strings_preferences.xml   |  12 +-
 app/src/main/res/xml/preferences.xml          |   6 +-
 4 files changed, 140 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/platypus/android/server/LauncherFragment.java b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
index 1179c81..ca1814a 100644
--- a/app/src/main/java/com/platypus/android/server/LauncherFragment.java
+++ b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
@@ -2,14 +2,17 @@
 
 import android.app.ActivityManager;
 import android.app.Fragment;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -24,6 +27,7 @@
 
 import com.platypus.android.server.gui.SwipeOnlySwitch;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.InetAddress;
@@ -44,6 +48,26 @@ public class LauncherFragment extends Fragment
 
     private static final String TAG = LauncherFragment.class.getSimpleName();
 
+    // bind the VehicleService so we can send sensor type JSON commands
+    // https://developer.android.com/guide/components/bound-services.html
+    VehicleService mService;
+    boolean mBound = false;
+    private ServiceConnection mConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            System.out.println("LauncherFragment: onServiceConnected() called...");
+            VehicleService.LocalBinder binder = (VehicleService.LocalBinder) service;
+            mService = binder.getService();
+            mBound = true;
+            sendSensorsJSON();
+        }
+        @Override
+        public void onServiceDisconnected(ComponentName arg0) {
+            System.out.println("LauncherFragment: onServiceDisconnected() called...");
+            mBound= false;
+        }
+    };
+
     final Handler mHandler = new Handler();
 
     protected TextView mHomeText;
@@ -63,10 +87,14 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
             mLaunchSwitch.setEnabled(false);
             if (!isVehicleServiceRunning()) {
                 // If the service is not running, start it.
-                getActivity().startService(new Intent(getActivity(), VehicleService.class));
+                System.out.println("LauncherFragment: slider listener called...");
+                Intent intent = new Intent(getActivity(), VehicleService.class);
+                getActivity().startService(intent);
+                getActivity().bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
                 Log.i(TAG, "Vehicle service started.");
             } else {
                 // If the service is running, stop it.
+                getActivity().unbindService(mConnection);
                 getActivity().stopService(new Intent(getActivity(), VehicleService.class));
                 Log.i(TAG, "Vehicle service stopped.");
             }
@@ -259,26 +287,82 @@ public void updateServerAddress() {
     class UpdateSensorsListener implements View.OnLongClickListener {
         @Override
         public boolean onLongClick(View v) {
-            JSONObject sensor_JSON = updateSensorsJSON();
-            // TODO: SEND THE JSON OBJECT TO ARDUINO
+            sendSensorsJSON();
             return true;
         }
     }
-    JSONObject updateSensorsJSON()
+    void sendSensorsJSON()
+    {
+        System.out.println("LauncherFragment: sendSensorsJSON() called...");
+
+        if (mBound)
+        {
+            JSONObject sensors_JSON = generateSensorsJSON();
+            System.out.println("    sensor JSON: ");
+            System.out.println(sensors_JSON.toString());
+            // TODO: SEND THE JSON OBJECT TO ARDUINO
+            mService.send(sensors_JSON);
+        }
+        else
+        {
+            System.out.println("    mBound = false, sending nothing");
+        }
+    }
+    JSONObject generateSensorsJSON()
+    {
+        JSONObject sensors_JSON = new JSONObject();
+        for (int i = 1; i < 4; i++)
+        {
+            insertSensorJSON(i, sensors_JSON);
+        }
+        return sensors_JSON;
+    }
+    void insertSensorJSON(int sensorID, JSONObject sensors_JSON)
     {
         SharedPreferences sharedPreferences =
                 PreferenceManager.getDefaultSharedPreferences(getActivity());
-
-        JSONObject sensor_JSON = new JSONObject();
-        switch (sharedPreferences.getString("pref_sensor_1_type_values", "NONE"))
+        String sensor_array_name = "pref_sensor_" + Integer.toString(sensorID) + "_type";
+        try
         {
-            // TODO: SET UP JSON OBJECT
-            case "NONE":
-                break;
-            default:
-                break;
+            switch (sharedPreferences.getString(sensor_array_name, "NONE"))
+            {
+                case "NONE":
+                    break;
+                case "ATLAS_DO":
+                    sensors_JSON.put(String.format("i%d", sensorID), "AtlasDO");
+                    break;
+                case "ATLAS_PH":
+                    sensors_JSON.put(String.format("i%d", sensorID), "AtlasPH");
+                    break;
+                case "ES2":
+                    sensors_JSON.put(String.format("i%d", sensorID), "ES2");
+                    break;
+                case "HDS":
+                    sensors_JSON.put(String.format("i%d", sensorID), "HDS");
+                    break;
+                case "ADAFRUIT_GPS":
+                    sensors_JSON.put(String.format("i%d", sensorID), "AdaGPS");
+                    break;
+                case "AHRS_PLUS":
+                    sensors_JSON.put(String.format("i%d", sensorID), "AHRSp");
+                    break;
+                case "BLUEBOX":
+                    sensors_JSON.put(String.format("i%d", sensorID), "BlueBox");
+                    break;
+                case "WINCH":
+                    sensors_JSON.put(String.format("i%d", sensorID), "Winch");
+                    break;
+                case "SAMPLER":
+                    sensors_JSON.put(String.format("i%d", sensorID), "Sampler");
+                    break;
+                default:
+                    break;
+            }
+        }
+        catch (JSONException e)
+        {
+            Log.w(TAG, "Failed to serialize sensor type.", e);
         }
-        return sensor_JSON;
     }
     ///////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/app/src/main/java/com/platypus/android/server/VehicleService.java b/app/src/main/java/com/platypus/android/server/VehicleService.java
index 1009539..5edafaf 100644
--- a/app/src/main/java/com/platypus/android/server/VehicleService.java
+++ b/app/src/main/java/com/platypus/android/server/VehicleService.java
@@ -17,6 +17,7 @@
 import android.location.LocationManager;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
+import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Debug;
@@ -41,7 +42,9 @@
 import org.jscience.geography.coordinates.LatLong;
 import org.jscience.geography.coordinates.UTM;
 import org.jscience.geography.coordinates.crs.ReferenceEllipsoid;
+import org.json.JSONObject;
 
+import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.measure.unit.NonSI;
@@ -75,6 +78,36 @@ public class VehicleService extends Service {
 
     // Reference to vehicle controller;
     private Controller mController;
+    public void send(JSONObject jsonObject)
+    {
+        System.out.println("VehicleService.send() called...");
+        try
+        {
+            if (mController.isConnected())
+            {
+                System.out.println("    sending this JSON: ");
+                System.out.println(jsonObject.toString());
+                mController.send(jsonObject);
+            }
+            else
+            {
+                System.out.println("    mController is NOT connected");
+            }
+        }
+        catch (IOException e)
+        {
+            Log.w(TAG, "Failed to send command.", e);
+        }
+    }
+
+
+    public class LocalBinder extends Binder {
+        VehicleService getService() {
+            System.out.println("VehicleService: binding in process...");
+            return VehicleService.this;
+        }
+    }
+    private final IBinder mBinder = new LocalBinder();
 
     // Objects implementing actual functionality
     private VehicleServerImpl _vehicleServerImpl;
@@ -507,10 +540,9 @@ public void onFailure(@NonNull Exception e) {
         super.onDestroy();
     }
 
-    @Nullable
     @Override
     public IBinder onBind(Intent intent) {
-        return null;
+        return mBinder;
     }
 
     public void sendNotification(CharSequence text) {
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index 9b625be..799b6e8 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -57,7 +57,7 @@
         <item>Atlas DO</item>
         <item>Atlas pH</item>
         <item>ES2</item>
-        <item>Lowrance</item>
+        <item>Lowrance HDS</item>
         <item>Adafruit GPS</item>
         <item>AHRS+</item>
         <item>BlueBox</item>
@@ -69,7 +69,7 @@
         <item>ATLAS_DO</item>
         <item>ATLAS_PH</item>
         <item>ES2</item>
-        <item>LOWRANCE</item>
+        <item>HDS</item>
         <item>ADAFRUIT_GPS</item>
         <item>AHRS_PLUS</item>
         <item>BLUEBOX</item>
@@ -81,7 +81,7 @@
         <item>Atlas DO</item>
         <item>Atlas pH</item>
         <item>ES2</item>
-        <item>Lowrance</item>
+        <item>Lowrance HDS</item>
         <item>Adafruit GPS</item>
         <item>AHRS+</item>
         <item>BlueBox</item>
@@ -93,7 +93,7 @@
         <item>ATLAS_DO</item>
         <item>ATLAS_PH</item>
         <item>ES2</item>
-        <item>LOWRANCE</item>
+        <item>HDS</item>
         <item>ADAFRUIT_GPS</item>
         <item>AHRS_PLUS</item>
         <item>BLUEBOX</item>
@@ -105,7 +105,7 @@
         <item>Atlas DO</item>
         <item>Atlas pH</item>
         <item>ES2</item>
-        <item>Lowrance</item>
+        <item>Lowrance HDS</item>
         <item>Adafruit GPS</item>
         <item>AHRS+</item>
         <item>BlueBox</item>
@@ -117,7 +117,7 @@
         <item>ATLAS_DO</item>
         <item>ATLAS_PH</item>
         <item>ES2</item>
-        <item>LOWRANCE</item>
+        <item>HDS</item>
         <item>ADAFRUIT_GPS</item>
         <item>AHRS_PLUS</item>
         <item>BLUEBOX</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 63c8751..dd39d94 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -86,7 +86,7 @@
             android:title="@string/pref_vehicle_type_title"
             android:summary="@string/pref_vehicle_type_summary" />
         <ListPreference
-            android:key="pref_sensor_type"
+            android:key="pref_sensor_1_type"
             android:title="Sensor 1 Type"
             android:dialogTitle="Sensor 1 Type"
             android:defaultValue="ATLAS_DO"
@@ -94,7 +94,7 @@
             android:entryValues="@array/pref_sensor_1_type_values"
             android:summary="Set the type of sensor in socket 1" />
         <ListPreference
-            android:key="pref_sensor_type"
+            android:key="pref_sensor_2_type"
             android:title="Sensor 2 Type"
             android:dialogTitle="Sensor 2 Type"
             android:defaultValue="ATLAS_PH"
@@ -102,7 +102,7 @@
             android:entryValues="@array/pref_sensor_2_type_values"
             android:summary="Set the type of sensor in socket 2" />
         <ListPreference
-            android:key="pref_sensor_type"
+            android:key="pref_sensor_3_type"
             android:title="Sensor 3 Type"
             android:dialogTitle="Sensor 3 Type"
             android:defaultValue="ES2"

From c6bc5664e34d97c01fc9001b6a8ad46ea9563aba Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Mon, 9 Jan 2017 17:55:18 +0100
Subject: [PATCH 3/7] Simple update, now sends JSON for "None" sensor too.

---
 .../main/java/com/platypus/android/server/LauncherFragment.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/platypus/android/server/LauncherFragment.java b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
index ca1814a..a8b2e3d 100644
--- a/app/src/main/java/com/platypus/android/server/LauncherFragment.java
+++ b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
@@ -327,6 +327,7 @@ void insertSensorJSON(int sensorID, JSONObject sensors_JSON)
             switch (sharedPreferences.getString(sensor_array_name, "NONE"))
             {
                 case "NONE":
+                    sensors_JSON.put(String.format("i%d", sensorID), "None");
                     break;
                 case "ATLAS_DO":
                     sensors_JSON.put(String.format("i%d", sensorID), "AtlasDO");

From 69b0f7566dc633066076a894a8d020c96ca47b71 Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Fri, 10 Feb 2017 13:04:12 +0100
Subject: [PATCH 4/7] Cleaned up an old TODO and some clutter.

---
 .../java/com/platypus/android/server/LauncherFragment.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/com/platypus/android/server/LauncherFragment.java b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
index a8b2e3d..e42eaae 100644
--- a/app/src/main/java/com/platypus/android/server/LauncherFragment.java
+++ b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
@@ -279,8 +279,7 @@ public void updateServerAddress() {
         String port = sharedPreferences.getString("pref_server_port", "11411");
         mIpAddressText.setText(getLocalIpAddress() + ":" + port);
     }
-
-    ///////////////////////////////////////////////////////////////////////////////////////
+    
     /**
      * Listens for long-click events on "Update Sensors" button and updates sensor types
      */
@@ -300,7 +299,6 @@ void sendSensorsJSON()
             JSONObject sensors_JSON = generateSensorsJSON();
             System.out.println("    sensor JSON: ");
             System.out.println(sensors_JSON.toString());
-            // TODO: SEND THE JSON OBJECT TO ARDUINO
             mService.send(sensors_JSON);
         }
         else
@@ -365,7 +363,6 @@ void insertSensorJSON(int sensorID, JSONObject sensors_JSON)
             Log.w(TAG, "Failed to serialize sensor type.", e);
         }
     }
-    ///////////////////////////////////////////////////////////////////////////////////////
 
     /**
      * Listens for long-click events on "Set Home" button and updates home location.

From cf03c010ccba8301620091bade005d5f4549b541 Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Wed, 1 Mar 2017 19:08:34 +0100
Subject: [PATCH 5/7] Added runtime sensor absence warning. Not tested.

---
 .../android/server/VehicleServerImpl.java     | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java b/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
index a35c832..4b42ec9 100644
--- a/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
+++ b/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
@@ -1,8 +1,12 @@
 package com.platypus.android.server;
 
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.preference.PreferenceManager;
+import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 import com.platypus.crw.AbstractVehicleServer;
@@ -105,6 +109,44 @@ public class VehicleServerImpl extends AbstractVehicleServer {
     // Last known temperature and EC values for sensor compensation
     private double _lastTemp = 20.0; // Deg C
     private double _lastEC = 0.0; // uS/cm
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //Define Notification Manager
+    NotificationManager notificationManager;
+    //Define sound URI
+    Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+
+    boolean[] received_expected_sensor_type = {false, false, false};
+    private final Timer _sensorTypeTimer = new Timer();
+    private TimerTask expect_sensor_type_task = new TimerTask() {
+        @Override
+        public void run() {
+            for (int i = 0; i < 3; i++)
+            {
+                if (!received_expected_sensor_type[i])
+                {
+                    String sensor_array_name = "pref_sensor_" + Integer.toString(i) + "_type";
+                    String expected_type = mPrefs.getString(sensor_array_name, "NONE");
+                    if (expected_type.equals("NONE"))
+                    {
+                        continue;
+                    }
+                    String message = "Have not received expected sensor type s" + i + " = " + expected_type;
+                    Log.w(TAG, message);
+                    NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(_context)
+                            .setSmallIcon(R.drawable.camera_icon) //just some random icon placeholder
+                            .setContentTitle("Sensor Warning")
+                            .setContentText(message)
+                            .setSound(soundUri); //This sets the sound to play
+                    notificationManager.notify(0, mBuilder.build());
+                }
+            }
+        }
+    };
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
     /**
      * Internal update function called at regular intervals to process command
      * and control events.
@@ -224,6 +266,11 @@ protected VehicleServerImpl(Context context, VehicleLogger logger, Controller co
         // Connect to the Shared Preferences for this process.
         mPrefs = PreferenceManager.getDefaultSharedPreferences(_context);
 
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        notificationManager = (NotificationManager) _context.getSystemService(Context.NOTIFICATION_SERVICE);
+        _sensorTypeTimer.scheduleAtFixedRate(expect_sensor_type_task, 0, 3000);
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
         // Load PID values from SharedPreferences.
         // Use hard-coded defaults if not specified.
         r_PID[0] = mPrefs.getFloat("gain_rP", 1.0f);
@@ -404,9 +451,52 @@ protected void onCommand(JSONObject cmd) {
                 } else if (name.startsWith("s")) {
                     int sensor = name.charAt(1) - 48;
 
+                    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                    // check sensor type expected in the preferences
+                    String sensor_array_name = "pref_sensor_" + Integer.toString(sensor) + "_type";
+                    String expected_type = mPrefs.getString(sensor_array_name, "NONE");
+                    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
                     // Hacks to send sensor information
                     if (value.has("type")) {
                         String type = value.getString("type");
+
+                        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                        // check if received type matches expected type
+                        if (! type.equals(expected_type))
+                        {
+                            String message = "Expected sensor type = " + expected_type + "  but received type = " + type;
+                            Log.w(TAG, message);
+                            NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(_context)
+                                    .setSmallIcon(R.drawable.camera_icon) //just some random icon placeholder
+                                    .setContentTitle("Sensor Warning")
+                                    .setContentText(message)
+                                    .setSound(soundUri); //This sets the sound to play
+                            notificationManager.notify(0, mBuilder.build());
+                        }
+                        else
+                        {
+                            received_expected_sensor_type[sensor-1] = true;
+                        }
+
+                        /*
+                        //Define Notification Manager
+                        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                        //Define sound URI
+                        Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+
+                        NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getApplicationContext())
+                                .setSmallIcon(icon)
+                                .setContentTitle(title)
+                                .setContentText(message)
+                                .setSound(soundUri); //This sets the sound to play
+
+                        //Display notification
+                        notificationManager.notify(0, mBuilder.build());
+                        */
+                        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
                         SensorData reading = new SensorData();
 
                         if (type.equalsIgnoreCase("es2")) {

From 439998b9afaf4e87e32050972fe7044e419e381a Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Fri, 3 Mar 2017 12:49:42 +0100
Subject: [PATCH 6/7] Added functional sensor type warning notifications.

---
 .../android/server/LauncherFragment.java      |  1 +
 .../android/server/VehicleServerImpl.java     | 79 +++++++++++--------
 2 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/platypus/android/server/LauncherFragment.java b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
index e42eaae..3c81ca7 100644
--- a/app/src/main/java/com/platypus/android/server/LauncherFragment.java
+++ b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
@@ -300,6 +300,7 @@ void sendSensorsJSON()
             System.out.println("    sensor JSON: ");
             System.out.println(sensors_JSON.toString());
             mService.send(sensors_JSON);
+            mService.getServer().reset_expected_sensors(); // reset sensor type checks
         }
         else
         {
diff --git a/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java b/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
index 4b42ec9..77b74df 100644
--- a/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
+++ b/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
@@ -24,7 +24,9 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledFuture;
@@ -111,12 +113,22 @@ public class VehicleServerImpl extends AbstractVehicleServer {
     private double _lastEC = 0.0; // uS/cm
 
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    SharedPreferences sharedPreferences;
+
     //Define Notification Manager
     NotificationManager notificationManager;
     //Define sound URI
     Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
 
     boolean[] received_expected_sensor_type = {false, false, false};
+    public void reset_expected_sensors()
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            received_expected_sensor_type[i] = false;
+        }
+    }
+
     private final Timer _sensorTypeTimer = new Timer();
     private TimerTask expect_sensor_type_task = new TimerTask() {
         @Override
@@ -125,13 +137,13 @@ public void run() {
             {
                 if (!received_expected_sensor_type[i])
                 {
-                    String sensor_array_name = "pref_sensor_" + Integer.toString(i) + "_type";
+                    String sensor_array_name = "pref_sensor_" + Integer.toString(i+1) + "_type";
                     String expected_type = mPrefs.getString(sensor_array_name, "NONE");
                     if (expected_type.equals("NONE"))
                     {
                         continue;
                     }
-                    String message = "Have not received expected sensor type s" + i + " = " + expected_type;
+                    String message = "s" + (i+1) + " expects " + expected_type + " not received yet";
                     Log.w(TAG, message);
                     NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(_context)
                             .setSmallIcon(R.drawable.camera_icon) //just some random icon placeholder
@@ -140,6 +152,11 @@ public void run() {
                             .setSound(soundUri); //This sets the sound to play
                     notificationManager.notify(0, mBuilder.build());
                 }
+                try {
+                    Thread.sleep(1000);                 //1000 milliseconds is one second.
+                } catch(InterruptedException ex) {
+                    Thread.currentThread().interrupt();
+                }
             }
         }
     };
@@ -268,7 +285,7 @@ protected VehicleServerImpl(Context context, VehicleLogger logger, Controller co
 
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         notificationManager = (NotificationManager) _context.getSystemService(Context.NOTIFICATION_SERVICE);
-        _sensorTypeTimer.scheduleAtFixedRate(expect_sensor_type_task, 0, 3000);
+        _sensorTypeTimer.scheduleAtFixedRate(expect_sensor_type_task, 0, 100);
         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         // Load PID values from SharedPreferences.
@@ -454,7 +471,7 @@ protected void onCommand(JSONObject cmd) {
                     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                     // check sensor type expected in the preferences
                     String sensor_array_name = "pref_sensor_" + Integer.toString(sensor) + "_type";
-                    String expected_type = mPrefs.getString(sensor_array_name, "NONE");
+                    String expected_type = mPrefs.getString(sensor_array_name, "ASDF");
                     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
                     // Hacks to send sensor information
@@ -463,38 +480,30 @@ protected void onCommand(JSONObject cmd) {
 
                         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                         // check if received type matches expected type
-                        if (! type.equals(expected_type))
-                        {
-                            String message = "Expected sensor type = " + expected_type + "  but received type = " + type;
-                            Log.w(TAG, message);
-                            NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(_context)
-                                    .setSmallIcon(R.drawable.camera_icon) //just some random icon placeholder
-                                    .setContentTitle("Sensor Warning")
-                                    .setContentText(message)
-                                    .setSound(soundUri); //This sets the sound to play
-                            notificationManager.notify(0, mBuilder.build());
-                        }
-                        else
-                        {
-                            received_expected_sensor_type[sensor-1] = true;
+                        if (!type.equalsIgnoreCase("battery")) {
+                            if (type.equalsIgnoreCase(expected_type)) {
+                                received_expected_sensor_type[sensor - 1] = true;
+                                /*
+                                String message = "s" + sensor + ": expected = " + expected_type + " received = " + type;
+                                Log.w(TAG, message);
+                                NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(_context)
+                                        .setSmallIcon(R.drawable.camera_icon) //just some random icon placeholder
+                                        .setContentTitle("Sensor Success")
+                                        .setContentText(message)
+                                        .setSound(soundUri); //This sets the sound to play
+                                notificationManager.notify(0, mBuilder.build());
+                                */
+                            } else {
+                                String message = "s" + sensor + ": expected = " + expected_type + " received = " + type;
+                                Log.w(TAG, message);
+                                NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(_context)
+                                        .setSmallIcon(R.drawable.camera_icon) //just some random icon placeholder
+                                        .setContentTitle("Sensor Warning")
+                                        .setContentText(message)
+                                        .setSound(soundUri); //This sets the sound to play
+                                notificationManager.notify(0, mBuilder.build());
+                            }
                         }
-
-                        /*
-                        //Define Notification Manager
-                        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-                        //Define sound URI
-                        Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-
-                        NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(getApplicationContext())
-                                .setSmallIcon(icon)
-                                .setContentTitle(title)
-                                .setContentText(message)
-                                .setSound(soundUri); //This sets the sound to play
-
-                        //Display notification
-                        notificationManager.notify(0, mBuilder.build());
-                        */
                         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
                         SensorData reading = new SensorData();

From 271aa5c97eb5898183bf8ec60c84cc0e02f04c43 Mon Sep 17 00:00:00 2001
From: jjblum <jason.j.blum@gmail.com>
Date: Fri, 3 Mar 2017 17:04:27 +0100
Subject: [PATCH 7/7] Clean up. Sensor type sleeps for empty sensor slots too
 now.

---
 .../android/server/LauncherFragment.java      | 14 ++++-----
 .../android/server/VehicleServerImpl.java     | 26 ++++-------------
 .../android/server/VehicleService.java        | 29 ++++++++++++-------
 app/src/main/res/xml/preferences.xml          |  6 ++--
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/com/platypus/android/server/LauncherFragment.java b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
index 3c81ca7..a779aab 100644
--- a/app/src/main/java/com/platypus/android/server/LauncherFragment.java
+++ b/app/src/main/java/com/platypus/android/server/LauncherFragment.java
@@ -55,7 +55,7 @@ public class LauncherFragment extends Fragment
     private ServiceConnection mConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName className, IBinder service) {
-            System.out.println("LauncherFragment: onServiceConnected() called...");
+            Log.d(TAG, "LauncherFragment: onServiceConnected() called...");
             VehicleService.LocalBinder binder = (VehicleService.LocalBinder) service;
             mService = binder.getService();
             mBound = true;
@@ -63,7 +63,7 @@ public void onServiceConnected(ComponentName className, IBinder service) {
         }
         @Override
         public void onServiceDisconnected(ComponentName arg0) {
-            System.out.println("LauncherFragment: onServiceDisconnected() called...");
+            Log.d(TAG, "LauncherFragment: onServiceDisconnected() called...");
             mBound= false;
         }
     };
@@ -87,7 +87,7 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
             mLaunchSwitch.setEnabled(false);
             if (!isVehicleServiceRunning()) {
                 // If the service is not running, start it.
-                System.out.println("LauncherFragment: slider listener called...");
+                Log.d(TAG, "LauncherFragment: slider listener called...");
                 Intent intent = new Intent(getActivity(), VehicleService.class);
                 getActivity().startService(intent);
                 getActivity().bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
@@ -292,19 +292,19 @@ public boolean onLongClick(View v) {
     }
     void sendSensorsJSON()
     {
-        System.out.println("LauncherFragment: sendSensorsJSON() called...");
+        Log.d(TAG, "LauncherFragment: sendSensorsJSON() called...");
 
         if (mBound)
         {
             JSONObject sensors_JSON = generateSensorsJSON();
-            System.out.println("    sensor JSON: ");
-            System.out.println(sensors_JSON.toString());
+            Log.d(TAG, "    sensor JSON: ");
+            Log.d(TAG, sensors_JSON.toString());
             mService.send(sensors_JSON);
             mService.getServer().reset_expected_sensors(); // reset sensor type checks
         }
         else
         {
-            System.out.println("    mBound = false, sending nothing");
+            Log.w(TAG, "    mBound = false, sending nothing");
         }
     }
     JSONObject generateSensorsJSON()
diff --git a/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java b/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
index 77b74df..225d4dd 100644
--- a/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
+++ b/app/src/main/java/com/platypus/android/server/VehicleServerImpl.java
@@ -24,9 +24,7 @@
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledFuture;
@@ -112,9 +110,6 @@ public class VehicleServerImpl extends AbstractVehicleServer {
     private double _lastTemp = 20.0; // Deg C
     private double _lastEC = 0.0; // uS/cm
 
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    SharedPreferences sharedPreferences;
-
     //Define Notification Manager
     NotificationManager notificationManager;
     //Define sound URI
@@ -135,6 +130,11 @@ public void reset_expected_sensors()
         public void run() {
             for (int i = 0; i < 3; i++)
             {
+                try {
+                    Thread.sleep(1000); // sleep for all sensor slots, even if empty
+                } catch(InterruptedException ex) {
+                    Thread.currentThread().interrupt();
+                }
                 if (!received_expected_sensor_type[i])
                 {
                     String sensor_array_name = "pref_sensor_" + Integer.toString(i+1) + "_type";
@@ -152,17 +152,9 @@ public void run() {
                             .setSound(soundUri); //This sets the sound to play
                     notificationManager.notify(0, mBuilder.build());
                 }
-                try {
-                    Thread.sleep(1000);                 //1000 milliseconds is one second.
-                } catch(InterruptedException ex) {
-                    Thread.currentThread().interrupt();
-                }
             }
         }
     };
-    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
 
     /**
      * Internal update function called at regular intervals to process command
@@ -283,10 +275,8 @@ protected VehicleServerImpl(Context context, VehicleLogger logger, Controller co
         // Connect to the Shared Preferences for this process.
         mPrefs = PreferenceManager.getDefaultSharedPreferences(_context);
 
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         notificationManager = (NotificationManager) _context.getSystemService(Context.NOTIFICATION_SERVICE);
         _sensorTypeTimer.scheduleAtFixedRate(expect_sensor_type_task, 0, 100);
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
         // Load PID values from SharedPreferences.
         // Use hard-coded defaults if not specified.
@@ -468,17 +458,14 @@ protected void onCommand(JSONObject cmd) {
                 } else if (name.startsWith("s")) {
                     int sensor = name.charAt(1) - 48;
 
-                    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                     // check sensor type expected in the preferences
                     String sensor_array_name = "pref_sensor_" + Integer.toString(sensor) + "_type";
-                    String expected_type = mPrefs.getString(sensor_array_name, "ASDF");
-                    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                    String expected_type = mPrefs.getString(sensor_array_name, "NONE");
 
                     // Hacks to send sensor information
                     if (value.has("type")) {
                         String type = value.getString("type");
 
-                        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                         // check if received type matches expected type
                         if (!type.equalsIgnoreCase("battery")) {
                             if (type.equalsIgnoreCase(expected_type)) {
@@ -504,7 +491,6 @@ protected void onCommand(JSONObject cmd) {
                                 notificationManager.notify(0, mBuilder.build());
                             }
                         }
-                        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
                         SensorData reading = new SensorData();
 
diff --git a/app/src/main/java/com/platypus/android/server/VehicleService.java b/app/src/main/java/com/platypus/android/server/VehicleService.java
index 5edafaf..9e2a5b4 100644
--- a/app/src/main/java/com/platypus/android/server/VehicleService.java
+++ b/app/src/main/java/com/platypus/android/server/VehicleService.java
@@ -80,30 +80,37 @@ public class VehicleService extends Service {
     private Controller mController;
     public void send(JSONObject jsonObject)
     {
-        System.out.println("VehicleService.send() called...");
-        try
+        Log.d(TAG, "VehicleService.send() called...");
+        if (mController != null)
         {
-            if (mController.isConnected())
+            try
             {
-                System.out.println("    sending this JSON: ");
-                System.out.println(jsonObject.toString());
-                mController.send(jsonObject);
+                if (mController.isConnected())
+                {
+                    Log.d(TAG, "    sending this JSON: ");
+                    Log.d(TAG, jsonObject.toString());
+                    mController.send(jsonObject);
+                }
+                else
+                {
+                    Log.w(TAG, "    mController is NOT connected");
+                }
             }
-            else
+            catch (IOException e)
             {
-                System.out.println("    mController is NOT connected");
+                Log.w(TAG, "Failed to send command.", e);
             }
         }
-        catch (IOException e)
+        else
         {
-            Log.w(TAG, "Failed to send command.", e);
+            Log.w(TAG, "    mController is null");
         }
     }
 
 
     public class LocalBinder extends Binder {
         VehicleService getService() {
-            System.out.println("VehicleService: binding in process...");
+            Log.d(TAG, "VehicleService: binding in process...");
             return VehicleService.this;
         }
     }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index dd39d94..827a41d 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -89,7 +89,7 @@
             android:key="pref_sensor_1_type"
             android:title="Sensor 1 Type"
             android:dialogTitle="Sensor 1 Type"
-            android:defaultValue="ATLAS_DO"
+            android:defaultValue="NONE"
             android:entries="@array/pref_sensor_1_type_entries"
             android:entryValues="@array/pref_sensor_1_type_values"
             android:summary="Set the type of sensor in socket 1" />
@@ -97,7 +97,7 @@
             android:key="pref_sensor_2_type"
             android:title="Sensor 2 Type"
             android:dialogTitle="Sensor 2 Type"
-            android:defaultValue="ATLAS_PH"
+            android:defaultValue="NONE"
             android:entries="@array/pref_sensor_2_type_entries"
             android:entryValues="@array/pref_sensor_2_type_values"
             android:summary="Set the type of sensor in socket 2" />
@@ -105,7 +105,7 @@
             android:key="pref_sensor_3_type"
             android:title="Sensor 3 Type"
             android:dialogTitle="Sensor 3 Type"
-            android:defaultValue="ES2"
+            android:defaultValue="NONE"
             android:entries="@array/pref_sensor_3_type_entries"
             android:entryValues="@array/pref_sensor_3_type_values"
             android:summary="Set the type of sensor in socket 3" />