altos/telefireone-v2.0: Remove build of ao_product.h from Makefile

[fw/altos] / altoslib / AltosTelemetryMegaData.java

diff --git a/altoslib/AltosTelemetryMegaData.java b/altoslib/AltosTelemetryMegaData.java
index 916f1e9447a6ca0214fc4a58f2d16ea1aefc8ea4..1a0bff315f3474109d508bf85995be71574f1dff 100644 (file)
--- a/altoslib/AltosTelemetryMegaData.java
+++ b/altoslib/AltosTelemetryMegaData.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
@@ -24,7 +24,9 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
 
        int     v_batt() { return int16(6); }
        int     v_pyro() { return int16(8); }
-       int     sense(int i) { int v = uint8(10+i); return v << 4 | v >> 8; }
+
+       /* pyro sense values are sent in 8 bits, expand to 12 bits */
+       int     sense(int i) { int v = uint8(10+i); return (v << 4) | (v >> 4); }
 
        int     ground_pres() { return int32(16); }
        int     ground_accel() { return int16(20); }
@@ -39,34 +41,35 @@ public class AltosTelemetryMegaData extends AltosTelemetryStandard {
                super(bytes);
        }
 
-       public void update_state(AltosState state) {
-               super.update_state(state);
+       public void provide_data(AltosDataListener listener) {
+               super.provide_data(listener);
 
-               state.set_state(state());
+               listener.set_state(state());
 
-               state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
-               state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
+               listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
+               listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
 
-               state.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense(4)));
-               state.set_main_voltage(AltosConvert.mega_pyro_voltage(sense(5)));
+               listener.set_apogee_voltage(AltosConvert.mega_pyro_voltage(sense(4)));
+               listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sense(5)));
 
                double voltages[] = new double[4];
                for (int i = 0; i < 4; i++)
                        voltages[i] = AltosConvert.mega_pyro_voltage(sense(i));
 
-               state.set_ignitor_voltage(voltages);
+               listener.set_igniter_voltage(voltages);
+
+               AltosCalData cal_data = listener.cal_data();
 
-               state.set_ground_accel(ground_accel());
-               state.set_ground_pressure(ground_pres());
-               state.set_accel_g(accel_plus_g(), accel_minus_g());
+               cal_data.set_ground_accel(ground_accel());
+               cal_data.set_ground_pressure(ground_pres());
+               cal_data.set_accel_plus_minus(accel_plus_g(), accel_minus_g());
 
                /* Fill in the high bits of height from recent GPS
                 * data if available, otherwise guess using the
                 * previous kalman height
                 */
 
-               state.set_kalman(extend_height(state, height_16()),
-                                speed()/16.0, acceleration() / 16.0);
+               listener.set_kalman(height_16(), speed()/16.0, acceleration() / 16.0);
        }
 }