projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Adapt KML output to make TRA record people happier
[fw/altos]
/
altoslib
/
AltosTelemetryMini2.java
diff --git
a/altoslib/AltosTelemetryMini2.java
b/altoslib/AltosTelemetryMini2.java
index bc151139e57e255999e6c2e2a58eba2d4877a9d8..3ea287ac23de4206022c2a67c3aee38ce043d5b0 100644
(file)
--- a/
altoslib/AltosTelemetryMini2.java
+++ b/
altoslib/AltosTelemetryMini2.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
1
;
+package org.altusmetrum.altoslib_1
2
;
public class AltosTelemetryMini2 extends AltosTelemetryStandard {
public class AltosTelemetryMini2 extends AltosTelemetryStandard {
@@
-40,20
+40,22
@@
public class AltosTelemetryMini2 extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void
update_state(AltosState state
) {
- super.
update_state(state
);
+ public void
provide_data(AltosDataListener listener
) {
+ super.
provide_data(listener
);
-
state
.set_state(state());
+
listener
.set_state(state());
-
state
.set_battery_voltage(AltosConvert.tele_mini_2_voltage(v_batt()));
-
state
.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sense_a()));
-
state
.set_main_voltage(AltosConvert.tele_mini_2_voltage(sense_m()));
+
listener
.set_battery_voltage(AltosConvert.tele_mini_2_voltage(v_batt()));
+
listener
.set_apogee_voltage(AltosConvert.tele_mini_2_voltage(sense_a()));
+
listener
.set_main_voltage(AltosConvert.tele_mini_2_voltage(sense_m()));
-
state.set_ground_pressure(ground_pres()
);
+
AltosCalData cal_data = listener.cal_data(
);
- state.set_pressure(pres());
- state.set_temperature(temp()/100.0);
+ cal_data.set_ground_pressure(ground_pres());
- state.set_kalman(height(), speed()/16.0, acceleration()/16.0);
+ listener.set_pressure(pres());
+ listener.set_temperature(temp()/100.0);
+
+ listener.set_kalman(height(), speed()/16.0, acceleration()/16.0);
}
}
}
}