* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
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); }
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
- cal_data.set_state(state());
listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
listener.set_igniter_voltage(voltages);
+ AltosCalData cal_data = listener.cal_data();
+
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());