public double raw_pressure() {
if (pres != MISSING)
- return pres / 100.0;
+ return pres;
return MISSING;
}
public double ground_pressure() {
if (ground_pres != MISSING)
- return ground_pres / 100.0;
+ return ground_pres;
return MISSING;
}
public double battery_voltage() {
if (v_batt != MISSING)
- return 3.3 * adc(v_batt) * 27.0 / (15.0 + 27.0);
+ return 3.3 * adc(v_batt) * (15.0 + 27.0) / 27.0;
return MISSING;
}
static double pyro(int raw) {
if (raw != MISSING)
- return 3.3 * adc(raw) * 27.0 / (100.0 + 27.0);
+ return 3.3 * adc(raw) * (100.0 + 27.0) / 27.0;
return MISSING;
}
}
public double acceleration() {
- System.out.printf("MM record acceleration %g ground_accel %d accel %d accel_minus_g %d accel_plus_g %d\n",
- acceleration, ground_accel, accel, accel_minus_g, accel_plus_g);
if (acceleration != MISSING)
return acceleration;
}
public double accel_speed() {
- return speed;
+ if (speed != MISSING)
+ return speed;
+ if (flight_vel == MISSING)
+ return MISSING;
+ return flight_vel / (accel_counts_per_mss() * 100.0);
}
public void copy (AltosRecordMM old) {