projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Add support for TeleMega v4
[fw/altos]
/
altoslib
/
AltosTelemetryMini3.java
diff --git
a/altoslib/AltosTelemetryMini3.java
b/altoslib/AltosTelemetryMini3.java
index 13c2ea4d2d4ad5ba08d434cb7fe7b5296d166086..b18314420203f1053f9ae42f66f96a3dac8bdae1 100644
(file)
--- a/
altoslib/AltosTelemetryMini3.java
+++ b/
altoslib/AltosTelemetryMini3.java
@@
-16,7
+16,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
2
;
+package org.altusmetrum.altoslib_1
3
;
public class AltosTelemetryMini3 extends AltosTelemetryStandard {
public class AltosTelemetryMini3 extends AltosTelemetryStandard {
@@
-40,19
+40,18
@@
public class AltosTelemetryMini3 extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
- super.provide_data(listener, cal_data);
-
- cal_data.set_ground_pressure(ground_pres());
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
listener.set_state(state());
listener.set_state(state());
- cal_data.set_state(state());
listener.set_battery_voltage(AltosConvert.tele_mini_3_battery_voltage(v_batt()));
listener.set_apogee_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_a()));
listener.set_main_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_m()));
listener.set_battery_voltage(AltosConvert.tele_mini_3_battery_voltage(v_batt()));
listener.set_apogee_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_a()));
listener.set_main_voltage(AltosConvert.tele_mini_3_pyro_voltage(sense_m()));
+ listener.cal_data().set_ground_pressure(ground_pres());
+
listener.set_pressure(pres());
listener.set_temperature(temp()/100.0);
listener.set_pressure(pres());
listener.set_temperature(temp()/100.0);