projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: tile site maps
[fw/altos]
/
ao-tools
/
altosui
/
AltosTelemetry.java
diff --git
a/ao-tools/altosui/AltosTelemetry.java
b/ao-tools/altosui/AltosTelemetry.java
index bc62690b262874b4006ff723f208ae2a8daebfd2..bdb6466a46d7d66ec03914cad9653bac9b71c8a9 100644
(file)
--- a/
ao-tools/altosui/AltosTelemetry.java
+++ b/
ao-tools/altosui/AltosTelemetry.java
@@
-20,9
+20,6
@@
package altosui;
import java.lang.*;
import java.text.*;
import java.util.HashMap;
import java.lang.*;
import java.text.*;
import java.util.HashMap;
-import altosui.AltosConvert;
-import altosui.AltosRecord;
-import altosui.AltosGPS;
/*
* Telemetry data contents
/*
* Telemetry data contents
@@
-53,10
+50,16
@@
import altosui.AltosGPS;
*/
public class AltosTelemetry extends AltosRecord {
*/
public class AltosTelemetry extends AltosRecord {
- public AltosTelemetry(String line) throws ParseException {
+ public AltosTelemetry(String line) throws ParseException
, AltosCRCException
{
String[] words = line.split("\\s+");
int i = 0;
String[] words = line.split("\\s+");
int i = 0;
+ if (words[i].equals("CRC") && words[i+1].equals("INVALID")) {
+ i += 2;
+ AltosParse.word(words[i++], "RSSI");
+ rssi = AltosParse.parse_int(words[i++]);
+ throw new AltosCRCException(rssi);
+ }
if (words[i].equals("CALL")) {
version = 0;
} else {
if (words[i].equals("CALL")) {
version = 0;
} else {