projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add TeleLCOTwo firmware
[fw/altos]
/
altoslib
/
AltosIdleFetch.java
diff --git
a/altoslib/AltosIdleFetch.java
b/altoslib/AltosIdleFetch.java
index 1cb43d6dd55b9df2437474f8b71f2788de3a30a0..48db6ab444983a752b5d93eab32ee1c247739f27 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_
5
;
+package org.altusmetrum.altoslib_
9
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-38,6
+38,7
@@
class AltosIdler {
static final int idle_sensor_mega = 12;
static final int idle_sensor_emini = 13;
static final int idle_sensor_tmini = 14;
static final int idle_sensor_mega = 12;
static final int idle_sensor_emini = 13;
static final int idle_sensor_tmini = 14;
+ static final int idle_sensor_tgps = 15;
public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
for (int idler : idlers) {
public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
for (int idler : idlers) {
@@
-72,6
+73,10
@@
class AltosIdler {
break;
case idle_sensor_tmini:
AltosSensorTMini.update_state(state, link, config_data);
break;
case idle_sensor_tmini:
AltosSensorTMini.update_state(state, link, config_data);
+ break;
+ case idle_sensor_tgps:
+ AltosSensorTGPS.update_state(state, link, config_data);
+ break;
}
if (idle != null)
idle.update_state(state);
}
if (idle != null)
idle.update_state(state);
@@
-118,6
+123,13
@@
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),
+ new AltosIdler("TeleGPS",
+ AltosIdler.idle_gps,
+ AltosIdler.idle_sensor_tgps),
};
AltosLink link;
};
AltosLink link;
@@
-127,12
+139,14
@@
public class AltosIdleFetch implements AltosStateUpdate {
public void update_state(AltosState state) throws InterruptedException {
try {
public void update_state(AltosState state) throws InterruptedException {
try {
+ /* Fetch config data from remote */
AltosConfigData config_data = new AltosConfigData(link);
AltosConfigData config_data = new AltosConfigData(link);
- state.set_state(AltosLib.ao_flight_sta
rtup
);
+ state.set_state(AltosLib.ao_flight_sta
teless
);
state.set_serial(config_data.serial);
state.set_callsign(config_data.callsign);
state.set_ground_accel(config_data.accel_cal_plus);
state.set_accel_g(config_data.accel_cal_plus, config_data.accel_cal_minus);
state.set_serial(config_data.serial);
state.set_callsign(config_data.callsign);
state.set_ground_accel(config_data.accel_cal_plus);
state.set_accel_g(config_data.accel_cal_plus, config_data.accel_cal_minus);
+ state.set_product(config_data.product);
for (AltosIdler idler : idlers) {
if (idler.matches(config_data)) {
idler.update_state(state, link, config_data);
for (AltosIdler idler : idlers) {
if (idler.matches(config_data)) {
idler.update_state(state, link, config_data);