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

AndroidGCS: Use a timer when computing the update time for GCSTelemetryStats

Browse Source
This commit is contained in:
James Cotton 2012-08-05 22:07:40 -05:00
parent 6748981090
commit 8be488b92f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,7 @@ public class TelemetryMonitor extends Observable{
} }
} }
private long lastStatsTime;
/** /**
* Called periodically to update the statistics and connection status. * Called periodically to update the statistics and connection status.
* @throws IOException * @throws IOException
@ -219,13 +220,16 @@ public class TelemetryMonitor extends Observable{
// Get telemetry stats // Get telemetry stats
if (DEBUG) Log.d(TAG, "processStatsUpdates()"); if (DEBUG) Log.d(TAG, "processStatsUpdates()");
Telemetry.TelemetryStats telStats = tel.getStats(); Telemetry.TelemetryStats telStats = tel.getStats();
tel.resetStats();
if (DEBUG) Log.d(TAG, "processStatsUpdates() - stats reset"); if (DEBUG) Log.d(TAG, "processStatsUpdates() - stats reset");
// Need to compute time because this update is not regular enough
float dT = (float) (System.currentTimeMillis() - lastStatsTime) / 1000.0f;
lastStatsTime = System.currentTimeMillis();
// Update stats object // Update stats object
gcsStatsObj.getField("RxDataRate").setDouble( (float)telStats.rxBytes / ((float)currentPeriod/1000.0) ); gcsStatsObj.getField("RxDataRate").setDouble( (float)telStats.rxBytes / dT );
gcsStatsObj.getField("TxDataRate").setDouble( (float)telStats.txBytes / ((float)currentPeriod/1000.0) ); gcsStatsObj.getField("TxDataRate").setDouble( (float)telStats.txBytes / dT );
UAVObjectField field = gcsStatsObj.getField("RxFailures"); UAVObjectField field = gcsStatsObj.getField("RxFailures");
field.setDouble(field.getDouble() + telStats.rxErrors); field.setDouble(field.getDouble() + telStats.rxErrors);
field = gcsStatsObj.getField("TxFailures"); field = gcsStatsObj.getField("TxFailures");
@ -233,6 +237,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);
tel.resetStats();
if (DEBUG) Log.d(TAG, "processStatsUpdates() - stats updated"); if (DEBUG) Log.d(TAG, "processStatsUpdates() - stats updated");
// Check for a connection timeout // Check for a connection timeout