projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: Add ao-test-gps program
[fw/altos]
/
altoslib
/
AltosIdleFetch.java
diff --git
a/altoslib/AltosIdleFetch.java
b/altoslib/AltosIdleFetch.java
index 64c421f4f3e5db5858a9f921eaa98446ff67d08d..50745d9755d9be1436932d62c848615bdb51f255 100644
(file)
--- a/
altoslib/AltosIdleFetch.java
+++ b/
altoslib/AltosIdleFetch.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_
5
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-118,6
+118,10
@@
public class AltosIdleFetch implements AltosStateUpdate {
AltosIdler.idle_ms5607, AltosIdler.idle_mma655x,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
AltosIdler.idle_ms5607, AltosIdler.idle_mma655x,
AltosIdler.idle_imu, AltosIdler.idle_mag,
AltosIdler.idle_sensor_mega),
+ new AltosIdler("EasyMega",
+ AltosIdler.idle_ms5607, AltosIdler.idle_mma655x,
+ AltosIdler.idle_imu, AltosIdler.idle_mag,
+ AltosIdler.idle_sensor_mega),
};
AltosLink link;
};
AltosLink link;
@@
-125,7
+129,7
@@
public class AltosIdleFetch implements AltosStateUpdate {
double frequency;
String callsign;
double frequency;
String callsign;
- public void update_state(AltosState state) {
+ public void update_state(AltosState state)
throws InterruptedException
{
try {
AltosConfigData config_data = new AltosConfigData(link);
state.set_state(AltosLib.ao_flight_startup);
try {
AltosConfigData config_data = new AltosConfigData(link);
state.set_state(AltosLib.ao_flight_startup);
@@
-140,10
+144,9
@@
public class AltosIdleFetch implements AltosStateUpdate {
}
}
state.set_received_time(System.currentTimeMillis());
}
}
state.set_received_time(System.currentTimeMillis());
- } catch (InterruptedException ie) {
} catch (TimeoutException te) {
}
} catch (TimeoutException te) {
}
-
+
}
public AltosIdleFetch(AltosLink link) {
}
public AltosIdleFetch(AltosLink link) {