projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Show a more useful message when the flash target device is unknown
[fw/altos]
/
altoslib
/
AltosTelemetryReader.java
diff --git
a/altoslib/AltosTelemetryReader.java
b/altoslib/AltosTelemetryReader.java
index 1020efb0f1f4ffc0d1cbeaccd45a904e58297483..de957f65b34005fccc1f87b0f33eab6b56ff0057 100644
(file)
--- a/
altoslib/AltosTelemetryReader.java
+++ b/
altoslib/AltosTelemetryReader.java
@@
-16,7
+16,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_1
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.text.*;
import java.io.*;
import java.text.*;
import java.io.*;
@@
-41,19
+41,15
@@
public class AltosTelemetryReader extends AltosFlightReader {
throw new IOException("IO error");
} while (!link.get_monitor());
AltosTelemetry telem = AltosTelemetry.parse(l.line);
throw new IOException("IO error");
} while (!link.get_monitor());
AltosTelemetry telem = AltosTelemetry.parse(l.line);
- if (state == null) {
- System.out.printf("Make state\n");
+ if (state == null)
state = new AltosState(cal_data());
state = new AltosState(cal_data());
- }
- telem.provide_data(state, state.cal_data);
+ telem.provide_data(state);
return state;
}
public AltosCalData cal_data() {
return state;
}
public AltosCalData cal_data() {
- if (cal_data == null) {
- System.out.printf("Make cal data\n");
+ if (cal_data == null)
cal_data = new AltosCalData();
cal_data = new AltosCalData();
- }
return cal_data;
}
return cal_data;
}