diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java b/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java index d01aa3a86..34e63c932 100644 --- a/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java +++ b/androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java @@ -59,7 +59,7 @@ import android.widget.TextView; public abstract class ObjectManagerActivity extends Activity { private final String TAG = "ObjectManagerActivity"; - private static int LOGLEVEL = 1; + private static int LOGLEVEL = 0; // private static boolean WARN = LOGLEVEL > 1; private static boolean DEBUG = LOGLEVEL > 0; diff --git a/androidgcs/src/org/openpilot/androidgcs/ObjectManagerFragment.java b/androidgcs/src/org/openpilot/androidgcs/ObjectManagerFragment.java index 3c6735d52..768f178c2 100644 --- a/androidgcs/src/org/openpilot/androidgcs/ObjectManagerFragment.java +++ b/androidgcs/src/org/openpilot/androidgcs/ObjectManagerFragment.java @@ -37,9 +37,9 @@ import android.util.Log; public class ObjectManagerFragment extends Fragment { private static final String TAG = ObjectManagerFragment.class.getSimpleName(); - private static int LOGLEVEL = 1; + private static final int LOGLEVEL = 0; // private static boolean WARN = LOGLEVEL > 1; - private static boolean DEBUG = LOGLEVEL > 0; + private static final boolean DEBUG = LOGLEVEL > 0; UAVObjectManager objMngr; diff --git a/androidgcs/src/org/openpilot/androidgcs/SystemAlarmsFragment.java b/androidgcs/src/org/openpilot/androidgcs/SystemAlarmsFragment.java index b8eef51b9..a7d0ce67e 100644 --- a/androidgcs/src/org/openpilot/androidgcs/SystemAlarmsFragment.java +++ b/androidgcs/src/org/openpilot/androidgcs/SystemAlarmsFragment.java @@ -39,6 +39,9 @@ import android.widget.TextView; public class SystemAlarmsFragment extends ObjectManagerFragment { private static final String TAG = SystemAlarmsFragment.class.getSimpleName(); + private static final int LOGLEVEL = 0; + // private static boolean WARN = LOGLEVEL > 1; + private static final boolean DEBUG = LOGLEVEL > 0; //@Override @Override @@ -51,7 +54,8 @@ public class SystemAlarmsFragment extends ObjectManagerFragment { @Override public void onOPConnected(UAVObjectManager objMngr) { super.onOPConnected(objMngr); - Log.d(TAG,"On connected"); + if (DEBUG) + Log.d(TAG, "On connected"); UAVObject obj = objMngr.getObject("SystemAlarms"); if (obj != null) @@ -64,7 +68,8 @@ public class SystemAlarmsFragment extends ObjectManagerFragment { */ @Override protected void objectUpdated(UAVObject obj) { - Log.d(TAG, "Updated"); + if (DEBUG) + Log.d(TAG, "Updated"); if (obj.getName().compareTo("SystemAlarms") == 0) { TextView alarms = (TextView) getActivity().findViewById(R.id.system_alarms_fragment_field); UAVObjectField a = obj.getField("Alarm");