projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions in preparation for 1.9.2
[fw/altos]
/
altoslib
/
AltosTelemetryMegaData.java
diff --git
a/altoslib/AltosTelemetryMegaData.java
b/altoslib/AltosTelemetryMegaData.java
index c0749e871a3c66f0f90bb8ae1ffe28d3f29fd5a5..3e1e3c95d1fff00cb8958088803a204e79b61bc6 100644
(file)
--- a/
altoslib/AltosTelemetryMegaData.java
+++ b/
altoslib/AltosTelemetryMegaData.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
4
;
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
@@
-24,7
+24,9
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int v_batt() { return int16(6); }
int v_pyro() { return int16(8); }
int v_batt() { return int16(6); }
int v_pyro() { return int16(8); }
- int sense(int i) { int v = uint8(10+i); return v << 4 | v >> 8; }
+
+ /* pyro sense values are sent in 8 bits, expand to 12 bits */
+ int sense(int i) { int v = uint8(10+i); return (v << 4) | (v >> 4); }
int ground_pres() { return int32(16); }
int ground_accel() { return int16(20); }
int ground_pres() { return int32(16); }
int ground_accel() { return int16(20); }
@@
-39,11
+41,10
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void provide_data(AltosDataListener listener
, AltosCalData cal_data
) {
- super.provide_data(listener
, cal_data
);
+ 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.mega_battery_voltage(v_batt()));
listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
listener.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt()));
listener.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro()));
@@
-55,7
+56,9
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
for (int i = 0; i < 4; i++)
voltages[i] = AltosConvert.mega_pyro_voltage(sense(i));
for (int i = 0; i < 4; i++)
voltages[i] = AltosConvert.mega_pyro_voltage(sense(i));
- listener.set_ignitor_voltage(voltages);
+ listener.set_igniter_voltage(voltages);
+
+ AltosCalData cal_data = listener.cal_data();
cal_data.set_ground_accel(ground_accel());
cal_data.set_ground_pressure(ground_pres());
cal_data.set_ground_accel(ground_accel());
cal_data.set_ground_pressure(ground_pres());