altos: Add EasyMega v2.0 to default build

[fw/altos] / altoslib / AltosIdleFetch.java

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index cfd6866a1c1f77e2c15fa99e10798b137a1bb451..88a65e63bb7001fcdf5f4e3fb087d641284e6945 100644 (file)
--- 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_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
@@ -43,47 +43,47 @@ class AltosIdler {
        static final int        idle_sensor_tgps = 16;
        static final int        idle_sensor_tmini3 = 17;
 
-       public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
+       public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
                for (int idler : idlers) {
                        switch (idler) {
                        case idle_gps:
-                               AltosGPS.provide_data(listener, link, cal_data);
+                               AltosGPS.provide_data(listener, link);
                                break;
                        case idle_imu:
-                               AltosIMU.provide_data(listener, link, cal_data);
+                               AltosIMU.provide_data(listener, link);
                                break;
                        case idle_mag:
-                               AltosMag.provide_data(listener, link, cal_data);
+                               AltosMag.provide_data(listener, link);
                                break;
                        case idle_mma655x:
-                               AltosMma655x.provide_data(listener, link, cal_data);
+                               AltosMma655x.provide_data(listener, link);
                                break;
                        case idle_ms5607:
-                               AltosMs5607.provide_data(listener, link, cal_data);
+                               AltosMs5607.provide_data(listener, link);
                                break;
                        case idle_sensor_tm:
-                               AltosSensorTM.provide_data(listener, link, cal_data);
+                               AltosSensorTM.provide_data(listener, link);
                                break;
                        case idle_sensor_metrum:
-                               AltosSensorMetrum.provide_data(listener, link, cal_data);
+                               AltosSensorMetrum.provide_data(listener, link);
                                break;
                        case idle_sensor_mega:
-                               AltosSensorMega.provide_data(listener, link, cal_data);
+                               AltosSensorMega.provide_data(listener, link);
                                break;
                        case idle_sensor_emini1:
-                               AltosSensorEMini.provide_data(listener, link, cal_data, 1);
+                               AltosSensorEMini.provide_data(listener, link, 1);
                                break;
                        case idle_sensor_emini2:
-                               AltosSensorEMini.provide_data(listener, link, cal_data, 2);
+                               AltosSensorEMini.provide_data(listener, link, 2);
                                break;
                        case idle_sensor_tmini2:
-                               AltosSensorTMini2.provide_data(listener, link, cal_data);
+                               AltosSensorTMini2.provide_data(listener, link);
                                break;
                        case idle_sensor_tgps:
-                               AltosSensorTGPS.provide_data(listener, link, cal_data);
+                               AltosSensorTGPS.provide_data(listener, link);
                                break;
                        case idle_sensor_tmini3:
-                               AltosSensorTMini3.provide_data(listener, link, cal_data);
+                               AltosSensorTMini3.provide_data(listener, link);
                                break;
                        }
                }
@@ -133,12 +133,30 @@ public class AltosIdleFetch implements AltosDataProvider {
                               AltosIdler.idle_ms5607,
                               AltosIdler.idle_sensor_metrum),
 
-               new AltosIdler("TeleMega",
+               new AltosIdler("TeleMega-v0",
                               AltosIdler.idle_gps,
                               AltosIdler.idle_mma655x,
                               AltosIdler.idle_ms5607,
                               AltosIdler.idle_imu, 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_sensor_mega),
+               new AltosIdler("TeleMega-v2",
+                              AltosIdler.idle_gps,
+                              AltosIdler.idle_mma655x,
+                              AltosIdler.idle_ms5607,
+                              AltosIdler.idle_imu, 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_sensor_mega),
                new AltosIdler("EasyMega",
                               AltosIdler.idle_mma655x,
                               AltosIdler.idle_ms5607,
@@ -151,7 +169,7 @@ public class AltosIdleFetch implements AltosDataProvider {
 
        AltosLink               link;
 
-       public void provide_data(AltosDataListener listener, AltosCalData cal_data) throws InterruptedException, AltosUnknownProduct {
+       public void provide_data(AltosDataListener listener) throws InterruptedException, AltosUnknownProduct {
                try {
                        boolean matched = false;
                        /* Fetch config data from remote */
@@ -159,7 +177,7 @@ public class AltosIdleFetch implements AltosDataProvider {
                        listener.set_state(AltosLib.ao_flight_stateless);
                        for (AltosIdler idler : idlers) {
                                if (idler.matches(config_data)) {
-                                       idler.provide_data(listener, link, cal_data);
+                                       idler.provide_data(listener, link);
                                        matched = true;
                                        break;
                                }