X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=c4a32788d4617dd319ae190a5fe5667ef510ad7d;hb=3ed101d634968666cd3ee2d8c49737970caf406b;hp=ca3e33eb244ffc91d47a4a035a8ffad5a9e5e668;hpb=869bc258b727d2046835ac52a361d2ef529895ee;p=fw%2Faltos

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index ca3e33eb..c4a32788 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -38,6 +38,7 @@ class AltosIdler {
 	static final int	idle_mma655x = 8;
 	static final int	idle_ms5607 = 9;
 	static final int	idle_adxl375 = 10;
+	static final int	idle_adxl375_easymotor_v2 = 11;
 
 	static final int	idle_sensor_tm = 100;
 	static final int	idle_sensor_metrum = 101;
@@ -49,6 +50,7 @@ class AltosIdler {
 	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;
 
 	public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -81,7 +83,10 @@ class AltosIdler {
 				AltosMma655x.provide_data(listener, link);
 				break;
 			case idle_adxl375:
-				AltosAdxl375.provide_data(listener, link);
+				AltosAdxl375.provide_data(listener, link, false, AltosLib.MISSING);
+				break;
+			case idle_adxl375_easymotor_v2:
+				AltosAdxl375.provide_data(listener, link, true, AltosIMU.imu_type_easymotor_v2);
 				break;
 			case idle_ms5607:
 				AltosMs5607.provide_data(listener, link);
@@ -116,6 +121,9 @@ class AltosIdler {
 			case idle_sensor_easytimer1:
 				AltosSensorEasyTimer1.provide_data(listener, link);
 				break;
+			case idle_sensor_easymotor2:
+				AltosSensorEasyMotor2.provide_data(listener, link);
+				break;
 			}
 		}
 	}
@@ -219,6 +227,9 @@ public class AltosIdleFetch implements AltosDataProvider {
 		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),
 	};
 
 	AltosLink		link;
@@ -227,7 +238,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)) {