projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Re-send previous GPS position in APRS if lock is lost
[fw/altos]
/
altoslib
/
AltosMs5607.java
diff --git
a/altoslib/AltosMs5607.java
b/altoslib/AltosMs5607.java
index b29fa9ae845d11ad4652448f4627587ae062027e..97d08c3ea7c894f6f74be8515b6d0aaf0b5ed7ae 100644
(file)
--- a/
altoslib/AltosMs5607.java
+++ b/
altoslib/AltosMs5607.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_
2
;
+package org.altusmetrum.altoslib_
3
;
import java.util.concurrent.*;
import java.util.concurrent.*;
@@
-85,12
+85,10
@@
public class AltosMs5607 {
}
public boolean parse_line(String line) {
}
public boolean parse_line(String line) {
- System.out.printf ("parse %s\n", line);
String[] items = line.split("\\s+");
if (line.startsWith("Pressure:")) {
if (items.length >= 2) {
raw_pres = Integer.parseInt(items[1]);
String[] items = line.split("\\s+");
if (line.startsWith("Pressure:")) {
if (items.length >= 2) {
raw_pres = Integer.parseInt(items[1]);
- System.out.printf ("raw_pres %d\n", raw_pres);
}
} else if (line.startsWith("Temperature:")) {
if (items.length >= 2)
}
} else if (line.startsWith("Temperature:")) {
if (items.length >= 2)
@@
-99,10
+97,8
@@
public class AltosMs5607 {
if (items.length >= 3)
reserved = Integer.parseInt(items[2]);
} else if (line.startsWith("ms5607 sens:")) {
if (items.length >= 3)
reserved = Integer.parseInt(items[2]);
} else if (line.startsWith("ms5607 sens:")) {
- System.out.printf ("found sens length %d\n", items.length);
if (items.length >= 3) {
sens = Integer.parseInt(items[2]);
if (items.length >= 3) {
sens = Integer.parseInt(items[2]);
- System.out.printf ("sens %d\n", sens);
}
} else if (line.startsWith("ms5607 off:")) {
if (items.length >= 3)
}
} else if (line.startsWith("ms5607 off:")) {
if (items.length >= 3)
@@
-128,7
+124,7
@@
public class AltosMs5607 {
return true;
}
return true;
}
- static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+ static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data)
throws InterruptedException
{
try {
AltosMs5607 ms5607 = new AltosMs5607(link);
try {
AltosMs5607 ms5607 = new AltosMs5607(link);
@@
-137,7
+133,6
@@
public class AltosMs5607 {
return;
}
} catch (TimeoutException te) {
return;
}
} catch (TimeoutException te) {
- } catch (InterruptedException ie) {
}
}
}
}
@@
-157,13
+152,9
@@
public class AltosMs5607 {
throw new TimeoutException();
}
if (!parse_line(line)) {
throw new TimeoutException();
}
if (!parse_line(line)) {
- System.out.printf ("stop parsing at %s\n", line);
break;
}
}
break;
}
}
- System.out.printf ("sens %d off %d tcs %d tco %d tref %d tempsens %d crc %d pres %d temp %d\n",
- sens, off, tcs, tco, tref, tempsens, crc, raw_pres, raw_temp);
convert();
convert();
- System.out.printf ("pa %d cc %d\n", pa, cc);
}
}
}
}