projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add U-Blox GPS driver
[fw/altos]
/
altoslib
/
AltosTelemetryRecordRaw.java
diff --git
a/altoslib/AltosTelemetryRecordRaw.java
b/altoslib/AltosTelemetryRecordRaw.java
index 43d0f17a4562456d54eeba072e01a20c6437cb1e..f94789bb57adb08d936bf26ba9806eeeb199ca12 100644
(file)
--- a/
altoslib/AltosTelemetryRecordRaw.java
+++ b/
altoslib/AltosTelemetryRecordRaw.java
@@
-15,17
+15,14
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.AltosLib;
-
-import java.lang.*;
-import java.text.*;
-import java.util.HashMap;
+package org.altusmetrum.altoslib_1;
public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
int[] bytes;
int serial;
int tick;
int type;
public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
int[] bytes;
int serial;
int tick;
int type;
+ int rssi;
long received_time;
long received_time;
@@
-49,25
+46,32
@@
public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
return AltosLib.uint32(bytes, off + 1);
}
return AltosLib.uint32(bytes, off + 1);
}
+ public int int32(int off) {
+ return AltosLib.int32(bytes, off + 1);
+ }
+
public String string(int off, int l) {
return AltosLib.string(bytes, off + 1, l);
}
public String string(int off, int l) {
return AltosLib.string(bytes, off + 1, l);
}
- public AltosTelemetryRecordRaw(int[] in_bytes) {
+ public AltosTelemetryRecordRaw(int[] in_bytes
, int in_rssi
) {
bytes = in_bytes;
serial = uint16(0);
tick = uint16(2);
type = uint8(4);
bytes = in_bytes;
serial = uint16(0);
tick = uint16(2);
type = uint8(4);
+ rssi = in_rssi;
}
public AltosRecord update_state(AltosRecord previous) {
AltosRecord next;
}
public AltosRecord update_state(AltosRecord previous) {
AltosRecord next;
- if (previous != null)
- next = new AltosRecord(previous);
+
+ if (previous != null && previous.serial == serial)
+ next = previous.clone();
else
else
- next = new AltosRecord();
+ next = new AltosRecord
None
();
next.serial = serial;
next.tick = tick;
next.serial = serial;
next.tick = tick;
+ next.rssi = rssi;
return next;
}
return next;
}