projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mark master branch as past the 1.5 point
[fw/altos]
/
altoslib
/
AltosTelemetryMegaData.java
diff --git
a/altoslib/AltosTelemetryMegaData.java
b/altoslib/AltosTelemetryMegaData.java
index 8b1869bb65f3141fdc83a74496b97fdaa3fb0995..d949c02f3bc233fcc937e17150841f5184daf495 100644
(file)
--- a/
altoslib/AltosTelemetryMegaData.java
+++ b/
altoslib/AltosTelemetryMegaData.java
@@
-36,7
+36,7
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
public AltosTelemetryMegaData(int[] bytes) {
super(bytes);
public AltosTelemetryMegaData(int[] bytes) {
super(bytes);
- state = int8(5);
+ state =
u
int8(5);
v_batt = int16(6);
v_pyro = int16(8);
v_batt = int16(6);
v_pyro = int16(8);
@@
-44,7
+44,7
@@
public class AltosTelemetryMegaData extends AltosTelemetryStandard {
sense = new int[6];
for (int i = 0; i < 6; i++) {
sense = new int[6];
for (int i = 0; i < 6; i++) {
- sense[i] = int8(10 + i) << 4;
+ sense[i] =
u
int8(10 + i) << 4;
sense[i] |= sense[i] >> 8;
}
sense[i] |= sense[i] >> 8;
}