projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
altoslib
/
AltosDebug.java
diff --git
a/altoslib/AltosDebug.java
b/altoslib/AltosDebug.java
index 6784f60abb3793c4de9df2aa07b2b89e3df12058..e93c2d2de74720a8d81783f1249545714fc4164c 100644
(file)
--- a/
altoslib/AltosDebug.java
+++ b/
altoslib/AltosDebug.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_
5
;
+package org.altusmetrum.altoslib_
10
;
import java.io.*;
import java.io.*;
@@
-52,7
+52,7
@@
public class AltosDebug {
public static final byte GET_CHIP_ID = 0x68;
public static final byte GET_CHIP_ID = 0x68;
- AltosLink link;
+
private
AltosLink link;
boolean debug_mode;
boolean debug_mode;
@@
-112,7
+112,11
@@
public class AltosDebug {
int i = 0;
int start = 0;
while (i < length) {
int i = 0;
int start = 0;
while (i < length) {
- String line = link.get_reply().trim();
+ String line = link.get_reply();
+ if (line == null)
+ throw new IOException("No reply");
+
+ line = line.trim();
if (!AltosLib.ishex(line) || line.length() % 2 != 0)
throw new IOException(
String.format
if (!AltosLib.ishex(line) || line.length() % 2 != 0)
throw new IOException(
String.format
@@
-277,4
+281,4
@@
public class AltosDebug {
public AltosDebug (AltosLink link) {
this.link = link;
}
public AltosDebug (AltosLink link) {
this.link = link;
}
-}
\ No newline at end of file
+}