X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosEepromRecordFireTwo.java;h=bfdd6cf898adc4f4f5aa4c22e68f96bdd9c90795;hb=7600116a191b3ac252a0f716d200d0e0b3500987;hp=809247c798e5ed2699e1c8b27e58c875809abd4a;hpb=f753ad3b9d0f3dc9794e5dd097063aab6cf9bdc4;p=fw%2Faltos diff --git a/altoslib/AltosEepromRecordFireTwo.java b/altoslib/AltosEepromRecordFireTwo.java index 809247c7..bfdd6cf8 100644 --- a/altoslib/AltosEepromRecordFireTwo.java +++ b/altoslib/AltosEepromRecordFireTwo.java @@ -57,7 +57,7 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord { if (v < 0.5) v = 0.5; if (v > 4.5) v = 4.5; - double psi = (v - 0.5) / 4.0 * 1600.0; + double psi = (v - 0.5) / 4.0 * 2500.0; return AltosConvert.psi_to_pa(psi); } @@ -68,7 +68,7 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord { return AltosConvert.lb_to_n(v * 298 * 9.807); } - public void update_state(AltosState state) { + public void update_state(AltosFlightListener state) { super.update_state(state); switch (cmd()) { @@ -82,7 +82,7 @@ public class AltosEepromRecordFireTwo extends AltosEepromRecord { break; case AltosLib.AO_LOG_SENSOR: state.set_pressure(adc_to_pa(pres())); - state.set_accel(adc_to_n(thrust())); + state.set_thrust(adc_to_n(thrust())); break; } }