X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=2b92d729c0809b9db23e3f7a4cfd73adbbb48dc7;hb=bcf9db74705dcd77eccd8f36f73c2eb99a5f1c70;hp=25a36096f6d98b275dcf2810a990b384fd02a19a;hpb=7b40813fdafce4ebd635aceb4c32355339a4d98d;p=fw%2Faltos

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 25a36096..2b92d729 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -40,6 +40,7 @@ class AltosIdler {
 	static final int	idle_adxl375 = 10;
 	static final int	idle_adxl375_easymotor_v2 = 11;
 	static final int	idle_imu = 12;
+	static final int	idle_imu_et_v2 = 13;
 
 	static final int	idle_sensor_tm = 100;
 	static final int	idle_sensor_metrum = 101;
@@ -49,9 +50,12 @@ class AltosIdler {
 	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;
-	static final int	idle_sensor_easymotor2 = 110;
+	static final int	idle_sensor_tgps3 = 108;
+	static final int	idle_sensor_tmini3 = 109;
+	static final int	idle_sensor_easytimer1 = 110;
+	static final int	idle_sensor_easymotor2 = 111;
+	static final int	idle_sensor_emini3 = 112;
+	static final int	idle_sensor_etimer2 = 113;
 
 	public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -77,6 +81,9 @@ class AltosIdler {
 			case idle_imu_et_v1:
 				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v1);
 				break;
+			case idle_imu_et_v2:
+				AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v2);
+				break;
 			case idle_imu:
 				AltosIMU.provide_data(listener, link, AltosLib.MISSING);
 				break;
@@ -110,6 +117,9 @@ class AltosIdler {
 			case idle_sensor_emini2:
 				AltosSensorEMini.provide_data(listener, link, 2);
 				break;
+			case idle_sensor_emini3:
+				AltosSensorEMini.provide_data(listener, link, 3);
+				break;
 			case idle_sensor_tmini2:
 				AltosSensorTMini2.provide_data(listener, link);
 				break;
@@ -119,6 +129,9 @@ class AltosIdler {
 			case idle_sensor_tgps2:
 				AltosSensorTGPS2.provide_data(listener, link);
 				break;
+			case idle_sensor_tgps3:
+				AltosSensorTGPS3.provide_data(listener, link);
+				break;
 			case idle_sensor_tmini3:
 				AltosSensorTMini3.provide_data(listener, link);
 				break;
@@ -155,6 +168,10 @@ public class AltosIdleFetch implements AltosDataProvider {
 			       AltosIdler.idle_ms5607,
 			       AltosIdler.idle_sensor_emini2),
 
+		new AltosIdler("EasyMini-v3",
+			       AltosIdler.idle_ms5607,
+			       AltosIdler.idle_sensor_emini3),
+
 		new AltosIdler("TeleMini-v1",
 			       AltosIdler.idle_sensor_tm),
 
@@ -246,12 +263,18 @@ public class AltosIdleFetch implements AltosDataProvider {
 		new AltosIdler("TeleGPS-v2",
 			       AltosIdler.idle_gps,
 			       AltosIdler.idle_sensor_tgps2),
+		new AltosIdler("TeleGPS-v3",
+			       AltosIdler.idle_gps,
+			       AltosIdler.idle_sensor_tgps3),
 		new AltosIdler("EasyTimer-v1",
 			       AltosIdler.idle_imu_et_v1,
 			       AltosIdler.idle_sensor_easytimer1),
 		new AltosIdler("EasyMotor-v2",
 			       AltosIdler.idle_adxl375_easymotor_v2,
 			       AltosIdler.idle_sensor_easymotor2),
+		new AltosIdler("EasyTimer-v2",
+			       AltosIdler.idle_imu_et_v2,
+			       AltosIdler.idle_sensor_easymotor2),
 	};
 
 	AltosLink		link;