projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Make AltosFlightStatsTable neater
[fw/altos]
/
altoslib
/
AltosTelemetryMini3.java
diff --git
a/altoslib/AltosTelemetryMini3.java
b/altoslib/AltosTelemetryMini3.java
index b8a507cc3d0f6d2b15a6a22fc714d0a420a9fe6f..1d627668184cf489e7c8f00bf2e53a1be12b4abd 100644
(file)
--- a/
altoslib/AltosTelemetryMini3.java
+++ b/
altoslib/AltosTelemetryMini3.java
@@
-40,22
+40,22
@@
public class AltosTelemetryMini3 extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void
update_state(AltosState state
) {
- super.
update_state(state
);
+ public void
provide_data(AltosDataListener listener, AltosCalData cal_data
) {
+ super.
provide_data(listener, cal_data
);
-
state.set_state(state
());
+
cal_data.set_ground_pressure(ground_pres
());
- state.set_battery_voltage(AltosConvert.tele_mini_3_battery_voltage(v_batt()));
+ listener.set_state(state());
+ cal_data.set_state(state());
- state.set_apogee_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_a()));
- state.set_main_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_m()));
+ listener.set_battery_voltage(AltosConvert.tele_mini_3_battery_voltage(v_batt()));
-
state.set_pressure(pres(
));
-
state.set_temperature(temp()/100.0
);
+
listener.set_apogee_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_a()
));
+
listener.set_main_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_m())
);
- state.set_kalman(extend_height(state, height_16()),
-
speed()/16.0, acceleration()/16
.0);
+ listener.set_pressure(pres());
+
listener.set_temperature(temp()/100
.0);
-
state.set_ground_pressure(ground_pres()
);
+
listener.set_kalman(height_16(), speed()/16.0, acceleration()/16.0
);
}
}
}
}