rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Lower all the debugging levels again

Browse Source
This commit is contained in:
James Cotton 2012-05-10 16:38:49 -05:00
parent 02f9452193
commit 574c2000b6
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ public class OPTelemetryService extends Service {
// Logging settings // Logging settings
private final String TAG = "OPTelemetryService"; private final String TAG = "OPTelemetryService";
public static int LOGLEVEL = 2; public static int LOGLEVEL = 0;
public static boolean WARN = LOGLEVEL > 1; public static boolean WARN = LOGLEVEL > 1;
public static boolean DEBUG = LOGLEVEL > 0; public static boolean DEBUG = LOGLEVEL > 0;

2
androidgcs/src/org/openpilot/uavtalk/Telemetry.java
View File

@ -17,7 +17,7 @@ import android.util.Log;
public class Telemetry { public class Telemetry {
private final String TAG = "Telemetry"; private final String TAG = "Telemetry";
public static int LOGLEVEL = 2; public static int LOGLEVEL = 0;
public static boolean WARN = LOGLEVEL > 1; public static boolean WARN = LOGLEVEL > 1;
public static boolean DEBUG = LOGLEVEL > 0; public static boolean DEBUG = LOGLEVEL > 0;

10
androidgcs/src/org/openpilot/uavtalk/TelemetryMonitor.java
View File

@ -13,7 +13,7 @@ import android.util.Log;
public class TelemetryMonitor extends Observable{ public class TelemetryMonitor extends Observable{
private static final String TAG = "TelemetryMonitor"; private static final String TAG = "TelemetryMonitor";
public static int LOGLEVEL = 2; public static int LOGLEVEL = 0;
public static boolean WARN = LOGLEVEL > 1; public static boolean WARN = LOGLEVEL > 1;
public static boolean DEBUG = LOGLEVEL > 0; public static boolean DEBUG = LOGLEVEL > 0;
@ -204,6 +204,8 @@ public class TelemetryMonitor extends Observable{
Telemetry.TelemetryStats telStats = tel.getStats(); Telemetry.TelemetryStats telStats = tel.getStats();
tel.resetStats(); tel.resetStats();
if (DEBUG) Log.d(TAG, "processStatsUpdates() - stats reset");
// Update stats object // Update stats object
gcsStatsObj.getField("RxDataRate").setDouble( (float)telStats.rxBytes / ((float)currentPeriod/1000.0) ); gcsStatsObj.getField("RxDataRate").setDouble( (float)telStats.rxBytes / ((float)currentPeriod/1000.0) );
gcsStatsObj.getField("TxDataRate").setDouble( (float)telStats.txBytes / ((float)currentPeriod/1000.0) ); gcsStatsObj.getField("TxDataRate").setDouble( (float)telStats.txBytes / ((float)currentPeriod/1000.0) );
@ -214,6 +216,8 @@ public class TelemetryMonitor extends Observable{
field = gcsStatsObj.getField("TxRetries"); field = gcsStatsObj.getField("TxRetries");
field.setDouble(field.getDouble() + telStats.txRetries); field.setDouble(field.getDouble() + telStats.txRetries);
if (DEBUG) Log.d(TAG, "processStatsUpdates() - stats updated");
// Check for a connection timeout // Check for a connection timeout
boolean connectionTimeout; boolean connectionTimeout;
if ( telStats.rxObjects > 0 ) if ( telStats.rxObjects > 0 )
@ -296,8 +300,10 @@ public class TelemetryMonitor extends Observable{
objects_updated = false; objects_updated = false;
setChanged(); setChanged();
} }
notifyObservers();
if (DEBUG) Log.d(TAG, "processStatsUpdates() - before notify");
notifyObservers();
if (DEBUG) Log.d(TAG, "processStatsUpdates() - after notify");
} }
private void setPeriod(int ms) { private void setPeriod(int ms) {

10
androidgcs/src/org/openpilot/uavtalk/UAVTalk.java
View File

@ -12,7 +12,7 @@ import android.util.Log;
public class UAVTalk extends Observable { public class UAVTalk extends Observable {
static final String TAG = "UAVTalk"; static final String TAG = "UAVTalk";
public static int LOGLEVEL = 2; public static int LOGLEVEL = 0;
public static boolean WARN = LOGLEVEL > 1; public static boolean WARN = LOGLEVEL > 1;
public static boolean DEBUG = LOGLEVEL > 0; public static boolean DEBUG = LOGLEVEL > 0;
@ -504,8 +504,7 @@ public class UAVTalk extends Observable {
case TYPE_OBJ_ACK: case TYPE_OBJ_ACK:
// All instances, not allowed for OBJ_ACK messages // All instances, not allowed for OBJ_ACK messages
if (!allInstances) { if (!allInstances) {
System.out.println("Received object ack: " + objId + " " + if (DEBUG) Log.d(TAG,"Received object ack: " + objId + " " + objMngr.getObject(objId).getName());
objMngr.getObject(objId).getName());
// Get object and update its data // Get object and update its data
obj = updateObject(objId, instId, data); obj = updateObject(objId, instId, data);
// Transmit ACK // Transmit ACK
@ -521,7 +520,7 @@ public class UAVTalk extends Observable {
case TYPE_OBJ_REQ: case TYPE_OBJ_REQ:
// Get object, if all instances are requested get instance 0 of the // Get object, if all instances are requested get instance 0 of the
// object // object
System.out.println("Received object request: " + objId + " " + if (DEBUG) Log.d(TAG,"Received object request: " + objId + " " +
objMngr.getObject(objId).getName()); objMngr.getObject(objId).getName());
if (allInstances) { if (allInstances) {
obj = objMngr.getObject(objId); obj = objMngr.getObject(objId);
@ -538,8 +537,7 @@ public class UAVTalk extends Observable {
case TYPE_ACK: case TYPE_ACK:
// All instances, not allowed for ACK messages // All instances, not allowed for ACK messages
if (!allInstances) { if (!allInstances) {
System.out.println("Received ack: " + objId + " " + if (DEBUG) Log.d(TAG,"Received ack: " + objId + " " + objMngr.getObject(objId).getName());
objMngr.getObject(objId).getName());
// Get object // Get object
obj = objMngr.getObject(objId, instId); obj = objMngr.getObject(objId, instId);
// Check if an ack is pending // Check if an ack is pending