projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into altosdroid
[fw/altos]
/
altoslib
/
AltosTelemetryRecordRaw.java
diff --git
a/altoslib/AltosTelemetryRecordRaw.java
b/altoslib/AltosTelemetryRecordRaw.java
index c21da6fc1cbe26f87eb480f0ecf6fce9477cc6f0..a06348c19d2e379a3733b7cd0e2214b034d34834 100644
(file)
--- a/
altoslib/AltosTelemetryRecordRaw.java
+++ b/
altoslib/AltosTelemetryRecordRaw.java
@@
-15,7
+15,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
;
+package org.altusmetrum.
altoslib_1
;
public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
int[] bytes;
public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
int[] bytes;
@@
-62,7
+62,8
@@
public class AltosTelemetryRecordRaw extends AltosTelemetryRecord {
public AltosRecord update_state(AltosRecord previous) {
AltosRecord next;
public AltosRecord update_state(AltosRecord previous) {
AltosRecord next;
- if (previous != null)
+
+ if (previous != null && previous.serial == serial)
next = previous.clone();
else
next = new AltosRecordNone();
next = previous.clone();
else
next = new AltosRecordNone();