Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TelemetryState.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index d023128f30bed382373bb85128a8a4c07984bea5..f9191a32ebdcd9010d0eea39e354fdeadb7d56a8 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -18,7 +18,7 @@
 package org.altusmetrum.AltosDroid;
 
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_8.*;
 import android.location.Location;
 
 public class TelemetryState {
@@ -32,6 +32,7 @@ public class TelemetryState {
        AltosConfigData config;
        Location        location;
        int             crc_errors;
+       double          receiver_battery;
        double          frequency;
        int             telemetry_rate;
 
@@ -45,6 +46,7 @@ public class TelemetryState {
                states = new HashMap<Integer,AltosState>();
                location = null;
                crc_errors = 0;
+               receiver_battery = AltosLib.MISSING;
                frequency = AltosPreferences.frequency(0);
                telemetry_rate = AltosPreferences.telemetry_rate(0);
        }