projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
telegps: Working towards building fat versions of telegps application
[fw/altos]
/
altoslib
/
AltosTelemetryMegaData.java
diff --git
a/altoslib/AltosTelemetryMegaData.java
b/altoslib/AltosTelemetryMegaData.java
index a4df70bee80ed084f1c17723802c594590b0c4b3..fac5695f27fbf6048a5f5d7b994f1e0ffe3ea529 100644
(file)
--- a/
altoslib/AltosTelemetryMegaData.java
+++ b/
altoslib/AltosTelemetryMegaData.java
@@
-15,11
+15,11
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
3
;
+package org.altusmetrum.altoslib_
4
;
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int state;
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
int state;
-
+
int v_batt;
int v_pyro;
int sense[];
int v_batt;
int v_pyro;
int sense[];
@@
-41,7
+41,7
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
v_batt = int16(6);
v_pyro = int16(8);
v_batt = int16(6);
v_pyro = int16(8);
- sense = new int[6];
+ sense = new int[6];
for (int i = 0; i < 6; i++) {
sense[i] = int8(10 + i) << 4;
for (int i = 0; i < 6; i++) {
sense[i] = int8(10 + i) << 4;
@@
-62,7
+62,7
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
super.update_state(state);
state.set_state(this.state);
super.update_state(state);
state.set_state(this.state);
-
+
state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro));
state.set_battery_voltage(AltosConvert.mega_battery_voltage(v_batt));
state.set_pyro_voltage(AltosConvert.mega_pyro_voltage(v_pyro));