X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=2a36983f93b4cec07c3783f49cc34182da6b653e;hp=88a5dab4eafd4885ff36abe7d8914a1e1a80df72;hb=52149fd81df45f37f5097850795f290f463c43ef;hpb=312f303be7f2a641020903ed2daccb8a4d67ec42

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 88a5dab4..2a36983f 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_12;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.*;
@@ -28,11 +28,15 @@ class AltosIdler {
 	int[]	idlers;
 
 	static final int	idle_gps = 0;
-	static final int	idle_imu = 1;
-	static final int	idle_mag = 2;
-	static final int	idle_mma655x = 4;
-	static final int	idle_ms5607 = 5;
-
+	static final int	idle_imu_tm_v1_v2 = 1;
+	static final int	idle_imu_tm_v3 = 2;
+	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;
@@ -40,8 +44,9 @@ class AltosIdler {
 	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_tgps = 16;
-	static final int	idle_sensor_tmini3 = 17;
+	static final int	idle_sensor_tgps1 = 16;
+	static final int	idle_sensor_tgps2 = 17;
+	static final int	idle_sensor_tmini3 = 18;
 
 	public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -49,8 +54,20 @@ class AltosIdler {
 			case idle_gps:
 				AltosGPS.provide_data(listener, link);
 				break;
-			case idle_imu:
-				AltosIMU.provide_data(listener, link);
+			case idle_imu_tm_v1_v2:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_telemega_v1_v2);
+				break;
+			case idle_imu_tm_v3:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_telemega_v3);
+				break;
+			case idle_imu_tm_v4:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_telemega_v4);
+				break;
+			case idle_imu_em_v1:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easymega_v1);
+				break;
+			case idle_imu_em_v2:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easymega_v2);
 				break;
 			case idle_mag:
 				AltosMag.provide_data(listener, link);
@@ -58,6 +75,9 @@ class AltosIdler {
 			case idle_mma655x:
 				AltosMma655x.provide_data(listener, link);
 				break;
+			case idle_adxl375:
+				AltosAdxl375.provide_data(listener, link);
+				break;
 			case idle_ms5607:
 				AltosMs5607.provide_data(listener, link);
 				break;
@@ -79,8 +99,11 @@ class AltosIdler {
 			case idle_sensor_tmini2:
 				AltosSensorTMini2.provide_data(listener, link);
 				break;
-			case idle_sensor_tgps:
-				AltosSensorTGPS.provide_data(listener, link);
+			case idle_sensor_tgps1:
+				AltosSensorTGPS1.provide_data(listener, link);
+				break;
+			case idle_sensor_tgps2:
+				AltosSensorTGPS2.provide_data(listener, link);
 				break;
 			case idle_sensor_tmini3:
 				AltosSensorTMini3.provide_data(listener, link);
@@ -133,38 +156,58 @@ public class AltosIdleFetch implements AltosDataProvider {
 			       AltosIdler.idle_ms5607,
 			       AltosIdler.idle_sensor_metrum),
 
+		new AltosIdler("TeleMetrum-v3",
+			       AltosIdler.idle_gps,
+			       AltosIdler.idle_adxl375,
+			       AltosIdler.idle_ms5607,
+			       AltosIdler.idle_sensor_metrum),
+
 		new AltosIdler("TeleMega-v0",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_mma655x,
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_imu, AltosIdler.idle_mag,
+			       AltosIdler.idle_imu_tm_v1_v2, AltosIdler.idle_mag,
 			       AltosIdler.idle_sensor_mega),
 		new AltosIdler("TeleMega-v1",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_mma655x,
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_imu, AltosIdler.idle_mag,
+			       AltosIdler.idle_imu_tm_v1_v2, AltosIdler.idle_mag,
 			       AltosIdler.idle_sensor_mega),
 		new AltosIdler("TeleMega-v2",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_mma655x,
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_imu, AltosIdler.idle_mag,
+			       AltosIdler.idle_imu_tm_v1_v2, AltosIdler.idle_mag,
 			       AltosIdler.idle_sensor_mega),
 		new AltosIdler("TeleMega-v3",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_mma655x,
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_imu,
+			       AltosIdler.idle_imu_tm_v3,
+			       AltosIdler.idle_sensor_mega),
+		new AltosIdler("TeleMega-v4",
+			       AltosIdler.idle_gps,
+			       AltosIdler.idle_adxl375,
+			       AltosIdler.idle_ms5607,
+			       AltosIdler.idle_imu_tm_v4,
 			       AltosIdler.idle_sensor_mega),
-		new AltosIdler("EasyMega",
+		new AltosIdler("EasyMega-v1",
 			       AltosIdler.idle_mma655x,
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_imu, AltosIdler.idle_mag,
+			       AltosIdler.idle_imu_em_v1, AltosIdler.idle_mag,
+			       AltosIdler.idle_sensor_mega),
+		new AltosIdler("EasyMega-v2",
+			       AltosIdler.idle_adxl375,
+			       AltosIdler.idle_ms5607,
+			       AltosIdler.idle_imu_em_v2,
 			       AltosIdler.idle_sensor_mega),
-		new AltosIdler("TeleGPS",
+		new AltosIdler("TeleGPS-v1",
+			       AltosIdler.idle_gps,
+			       AltosIdler.idle_sensor_tgps1),
+		new AltosIdler("TeleGPS-v2",
 			       AltosIdler.idle_gps,
-			       AltosIdler.idle_sensor_tgps),
+			       AltosIdler.idle_sensor_tgps2),
 	};
 
 	AltosLink		link;