rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

AndroidGCS: Move down some of the debugging output

Browse Source
This commit is contained in:
James Cotton 2012-08-08 10:07:03 -05:00
parent ddb197a15d
commit 2e554ebf8e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidgcs/src/org/openpilot/androidgcs/ObjectManagerActivity.java
View File

@ -59,7 +59,7 @@ import android.widget.TextView;
public abstract class ObjectManagerActivity extends Activity { public abstract class ObjectManagerActivity extends Activity {
private final String TAG = "ObjectManagerActivity"; private final String TAG = "ObjectManagerActivity";
private static int LOGLEVEL = 1; private static int LOGLEVEL = 0;
// private static boolean WARN = LOGLEVEL > 1; // private static boolean WARN = LOGLEVEL > 1;
private static boolean DEBUG = LOGLEVEL > 0; private static boolean DEBUG = LOGLEVEL > 0;

4
androidgcs/src/org/openpilot/androidgcs/ObjectManagerFragment.java
View File

@ -37,9 +37,9 @@ import android.util.Log;
public class ObjectManagerFragment extends Fragment { public class ObjectManagerFragment extends Fragment {
private static final String TAG = ObjectManagerFragment.class.getSimpleName(); 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 WARN = LOGLEVEL > 1;
private static boolean DEBUG = LOGLEVEL > 0; private static final boolean DEBUG = LOGLEVEL > 0;
UAVObjectManager objMngr; UAVObjectManager objMngr;

9
androidgcs/src/org/openpilot/androidgcs/SystemAlarmsFragment.java
View File

@ -39,6 +39,9 @@ import android.widget.TextView;
public class SystemAlarmsFragment extends ObjectManagerFragment { public class SystemAlarmsFragment extends ObjectManagerFragment {
private static final String TAG = SystemAlarmsFragment.class.getSimpleName(); 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
@Override @Override
@ -51,7 +54,8 @@ public class SystemAlarmsFragment extends ObjectManagerFragment {
@Override @Override
public void onOPConnected(UAVObjectManager objMngr) { public void onOPConnected(UAVObjectManager objMngr) {
super.onOPConnected(objMngr); super.onOPConnected(objMngr);
Log.d(TAG,"On connected"); if (DEBUG)
Log.d(TAG, "On connected");
UAVObject obj = objMngr.getObject("SystemAlarms"); UAVObject obj = objMngr.getObject("SystemAlarms");
if (obj != null) if (obj != null)
@ -64,7 +68,8 @@ public class SystemAlarmsFragment extends ObjectManagerFragment {
*/ */
@Override @Override
protected void objectUpdated(UAVObject obj) { protected void objectUpdated(UAVObject obj) {
Log.d(TAG, "Updated"); if (DEBUG)
Log.d(TAG, "Updated");
if (obj.getName().compareTo("SystemAlarms") == 0) { if (obj.getName().compareTo("SystemAlarms") == 0) {
TextView alarms = (TextView) getActivity().findViewById(R.id.system_alarms_fragment_field); TextView alarms = (TextView) getActivity().findViewById(R.id.system_alarms_fragment_field);
UAVObjectField a = obj.getField("Alarm"); UAVObjectField a = obj.getField("Alarm");