altoslib: Do data analysis on raw values rather than AltosState

[fw/altos] / altoslib / AltosTelemetryMini2.java

diff --git a/altoslib/AltosTelemetryMini2.java b/altoslib/AltosTelemetryMini2.java
index bc151139e57e255999e6c2e2a58eba2d4877a9d8..02d1c757cea2f532f9df7f8f8224bb0530f89b81 100644 (file)
--- a/altoslib/AltosTelemetryMini2.java
+++ b/altoslib/AltosTelemetryMini2.java
@@ -40,20 +40,21 @@ public class AltosTelemetryMini2 extends AltosTelemetryStandard {
                super(bytes);
        }
 
-       public void update_state(AltosState state) {
-               super.update_state(state);
+       public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
+               super.provide_data(listener, cal_data);
 
-               state.set_state(state());
+               listener.set_state(state());
+               cal_data.set_state(state());
 
-               state.set_battery_voltage(AltosConvert.tele_mini_2_voltage(v_batt()));
-               state.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sense_a()));
-               state.set_main_voltage(AltosConvert.tele_mini_2_voltage(sense_m()));
+               listener.set_battery_voltage(AltosConvert.tele_mini_2_voltage(v_batt()));
+               listener.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sense_a()));
+               listener.set_main_voltage(AltosConvert.tele_mini_2_voltage(sense_m()));
 
-               state.set_ground_pressure(ground_pres());
+               cal_data.set_ground_pressure(ground_pres());
 
-               state.set_pressure(pres());
-               state.set_temperature(temp()/100.0);
+               listener.set_pressure(pres());
+               listener.set_temperature(temp()/100.0);
 
-               state.set_kalman(height(), speed()/16.0, acceleration()/16.0);
+               listener.set_kalman(height(), speed()/16.0, acceleration()/16.0);
        }
 }