X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=1ac075e394c13b01b03658c1a26857dbf053aac4;hp=7a700bdf74823f47150a51b242207ccd4bc5cc3b;hb=783a541d661f24f2df1dee86bad2e47950bee9da;hpb=06cf43cea9149f8c04c80785a613408454eab4f2

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 7a700bdf..1ac075e3 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.*;
@@ -33,20 +33,22 @@ class AltosIdler {
 	static final int	idle_imu_tm_v4 = 3;
 	static final int	idle_imu_em_v1 = 4;
 	static final int	idle_imu_em_v2 = 5;
-	static final int	idle_mag = 6;
-	static final int	idle_mma655x = 7;
-	static final int	idle_ms5607 = 8;
-	static final int	idle_adxl375 = 9;
-
-	static final int	idle_sensor_tm = 10;
-	static final int	idle_sensor_metrum = 11;
-	static final int	idle_sensor_mega = 12;
-	static final int	idle_sensor_emini1 = 13;
-	static final int	idle_sensor_emini2 = 14;
-	static final int	idle_sensor_tmini2 = 15;
-	static final int	idle_sensor_tgps1 = 16;
-	static final int	idle_sensor_tgps2 = 17;
-	static final int	idle_sensor_tmini3 = 18;
+	static final int	idle_imu_et_v1 = 6;
+	static final int	idle_mag = 7;
+	static final int	idle_mma655x = 8;
+	static final int	idle_ms5607 = 9;
+	static final int	idle_adxl375 = 10;
+
+	static final int	idle_sensor_tm = 100;
+	static final int	idle_sensor_metrum = 101;
+	static final int	idle_sensor_mega = 102;
+	static final int	idle_sensor_emini1 = 103;
+	static final int	idle_sensor_emini2 = 104;
+	static final int	idle_sensor_tmini2 = 105;
+	static final int	idle_sensor_tgps1 = 106;
+	static final int	idle_sensor_tgps2 = 107;
+	static final int	idle_sensor_tmini3 = 108;
+	static final int	idle_sensor_easytimer1 = 109;
 
 	public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -69,6 +71,9 @@ class AltosIdler {
 			case idle_imu_em_v2:
 				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easymega_v2);
 				break;
+			case idle_imu_et_v1:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v1);
+				break;
 			case idle_mag:
 				AltosMag.provide_data(listener, link);
 				break;
@@ -108,6 +113,9 @@ class AltosIdler {
 			case idle_sensor_tmini3:
 				AltosSensorTMini3.provide_data(listener, link);
 				break;
+			case idle_sensor_easytimer1:
+				AltosSensorEasyTimer1.provide_data(listener, link);
+				break;
 			}
 		}
 	}
@@ -208,6 +216,9 @@ public class AltosIdleFetch implements AltosDataProvider {
 		new AltosIdler("TeleGPS-v2",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_sensor_tgps2),
+		new AltosIdler("EasyTimer-v1",
+			       AltosIdler.idle_imu_et_v1,
+			       AltosIdler.idle_sensor_easytimer1),
 	};
 
 	AltosLink		link;
@@ -216,7 +227,7 @@ public class AltosIdleFetch implements AltosDataProvider {
 		try {
 			boolean	matched = false;
 			/* Fetch config data from remote */
-			AltosConfigData config_data = new AltosConfigData(link);
+			AltosConfigData config_data = link.config_data();
 			listener.set_state(AltosLib.ao_flight_stateless);
 			for (AltosIdler idler : idlers) {
 				if (idler.matches(config_data)) {