X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=e1658683036df4e6dc26446b61b3ff014e7d7868;hp=42943c07c478e7cfb4f1ae426ef8f254d7e0c5a2;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 42943c07..e1658683 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 import java.util.*;
@@ -37,6 +37,8 @@ class AltosIdler {
 	static final int	idle_sensor_metrum = 11;
 	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) {
@@ -69,6 +71,12 @@ class AltosIdler {
 			case idle_sensor_emini:
 				AltosSensorEMini.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);
@@ -99,7 +107,7 @@ public class AltosIdleFetch implements AltosStateUpdate {
 
 		new AltosIdler("TeleMini-v2",
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_sensor_tm),
+			       AltosIdler.idle_sensor_tmini),
 
 		new AltosIdler("TeleMetrum-v1",
 			       AltosIdler.idle_gps,
@@ -115,6 +123,13 @@ public class AltosIdleFetch implements AltosStateUpdate {
 			       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;
@@ -122,10 +137,11 @@ public class AltosIdleFetch implements AltosStateUpdate {
 	double			frequency;
 	String			callsign;
 
-	public void update_state(AltosState state) {
+	public void update_state(AltosState state) throws InterruptedException {
 		try {
+			/* Fetch config data from remote */
 			AltosConfigData config_data = new AltosConfigData(link);
-			state.set_state(AltosLib.ao_flight_startup);
+			state.set_state(AltosLib.ao_flight_stateless);
 			state.set_serial(config_data.serial);
 			state.set_callsign(config_data.callsign);
 			state.set_ground_accel(config_data.accel_cal_plus);
@@ -137,10 +153,9 @@ public class AltosIdleFetch implements AltosStateUpdate {
 				}
 			}
 			state.set_received_time(System.currentTimeMillis());
-		} catch (InterruptedException ie) {
 		} catch (TimeoutException te) {
 		}
-		
+
 	}
 
 	public AltosIdleFetch(AltosLink link) {