altoslib: Remove debug printf for gyro adjust

[fw/altos] / altoslib / AltosTelemetryLegacy.java

diff --git a/altoslib/AltosTelemetryLegacy.java b/altoslib/AltosTelemetryLegacy.java
index 394d023c1a116c3a467c7e01a211b3b42dc27fee..027f601e1aa553fa022ae12636e55ee9ac8d7f58 100644 (file)
--- a/altoslib/AltosTelemetryLegacy.java
+++ b/altoslib/AltosTelemetryLegacy.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;
 
 import java.text.*;
 
@@ -548,24 +548,25 @@ public class AltosTelemetryLegacy extends AltosTelemetry {
                }
        }
 
-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-               cal_data.set_tick(tick);
-               listener.set_time(cal_data.time());
+       public void provide_data(AltosDataListener listener) {
+               listener.set_serial(serial);
+               listener.set_tick(tick);
                listener.set_state(this.state);
-               cal_data.set_state(this.state);
-               cal_data.set_flight(flight);
-               cal_data.set_serial(serial);
+               listener.set_flight(flight);
                listener.set_rssi(rssi, status);
 
                listener.set_pressure(AltosConvert.barometer_to_pressure(pres));
+
+               AltosCalData cal_data = listener.cal_data();
+
                cal_data.set_accel_plus_minus(accel_plus_g, accel_minus_g);
                listener.set_acceleration(cal_data.acceleration(accel));
                if (kalman_height != AltosLib.MISSING)
                        listener.set_kalman(kalman_height, kalman_speed, kalman_acceleration);
                listener.set_temperature(AltosConvert.thermometer_to_temperature(temp));
                listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(batt));
-               listener.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(apogee));
-               listener.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(main));
+               listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(apogee));
+               listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(main));
                if (gps != null)
                        listener.set_gps(gps);
        }