* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
public class AltosTelemetrySensor extends AltosTelemetryStandard {
int speed() { return int16(20); }
int height_16() { return int16(22); }
- int ground_accel() { return int16(24); }
- int ground_pres() { return int16(26); }
+ int ground_pres() { return int16(24); }
+ int ground_accel() { return int16(26); }
int accel_plus_g() { return int16(28); }
int accel_minus_g() { return int16(30); }
super(bytes);
}
- public void update_state(AltosState state) {
- super.update_state(state);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
+
+ listener.set_state(state());
+
+ AltosCalData cal_data = listener.cal_data();
- state.set_state(state());
if (type() == packet_type_TM_sensor) {
- state.set_ground_accel(ground_accel());
- state.set_accel_g(accel_plus_g(), accel_minus_g());
- state.set_accel(accel());
+ cal_data.set_ground_accel(ground_accel());
+ cal_data.set_accel_plus_minus(accel_plus_g(), accel_minus_g());
+ listener.set_acceleration(cal_data.acceleration(accel()));
}
- state.set_ground_pressure(AltosConvert.barometer_to_pressure(ground_pres()));
- state.set_pressure(AltosConvert.barometer_to_pressure(pres()));
- state.set_temperature(AltosConvert.thermometer_to_temperature(temp()));
- state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(v_batt()));
+ cal_data.set_ground_pressure(AltosConvert.barometer_to_pressure(ground_pres()));
+ listener.set_pressure(AltosConvert.barometer_to_pressure(pres()));
+ listener.set_temperature(AltosConvert.thermometer_to_temperature(temp()));
+ listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(v_batt()));
if (type() == packet_type_TM_sensor || type() == packet_type_Tm_sensor) {
- state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sense_d()));
- state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sense_m()));
+ listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(sense_d()));
+ listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(sense_m()));
}
- state.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);
+ listener.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);
}
}