altoslib: Make cal_data private in AltosDataListener

[fw/altos] / altoslib / AltosTelemetrySatellite.java

diff --git a/altoslib/AltosTelemetrySatellite.java b/altoslib/AltosTelemetrySatellite.java
index ce12d32dd197233e1e2c4f9bada1fdc5d4bfa456..60bc4a51db41ba15cbb4ddcc1a1333094b6239bc 100644 (file)
--- a/altoslib/AltosTelemetrySatellite.java
+++ b/altoslib/AltosTelemetrySatellite.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 public class AltosTelemetrySatellite extends AltosTelemetryStandard {
        int             channels() { return uint8(5); }
@@ -44,12 +44,15 @@ public class AltosTelemetrySatellite extends AltosTelemetryStandard {
                super(bytes);
        }
 
-       public void update_state(AltosState state) {
-               super.update_state(state);
+       public void provide_data(AltosDataListener listener) {
+               super.provide_data(listener);
 
-               AltosGPS        gps = state.make_temp_gps(true);
+               AltosCalData    cal_data = listener.cal_data();
+
+               AltosGPS        gps = cal_data.make_temp_gps(tick(), true);
 
                gps.cc_gps_sat = sats();
-               state.set_temp_gps();
+               listener.set_gps(gps);
+               cal_data.reset_temp_gps();
        }
 }