Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosIdleFetch.java

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 2b92d729c0809b9db23e3f7a4cfd73adbbb48dc7..2f230923587e95c474a5b0b510c18ae4e992222b 100644 (file)
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -41,6 +41,7 @@ class AltosIdler {
        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_adxl375_easymotor_v2 = 11;
        static final int        idle_imu = 12;
        static final int        idle_imu_et_v2 = 13;

+       static final int        idle_imu_em_v3 = 14;

 
        static final int        idle_sensor_tm = 100;
        static final int        idle_sensor_metrum = 101;
 
        static final int        idle_sensor_tm = 100;
        static final int        idle_sensor_metrum = 101;


@@ -56,6 +57,8 @@ class AltosIdler {
        static final int        idle_sensor_easymotor2 = 111;
        static final int        idle_sensor_emini3 = 112;
        static final int        idle_sensor_etimer2 = 113;
        static final int        idle_sensor_easymotor2 = 111;
        static final int        idle_sensor_emini3 = 112;
        static final int        idle_sensor_etimer2 = 113;

+       static final int        idle_sensor_emega3 = 114;
+       static final int        idle_sensor_tgps4 = 115;

 
        public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
                for (int idler : idlers) {
 
        public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
                for (int idler : idlers) {


@@ -132,6 +135,9 @@ class AltosIdler {
                        case idle_sensor_tgps3:
                                AltosSensorTGPS3.provide_data(listener, link);
                                break;
                        case idle_sensor_tgps3:
                                AltosSensorTGPS3.provide_data(listener, link);
                                break;

+                       case idle_sensor_tgps4:
+                               AltosSensorTGPS4.provide_data(listener, link);
+                               break;

                        case idle_sensor_tmini3:
                                AltosSensorTMini3.provide_data(listener, link);
                                break;
                        case idle_sensor_tmini3:
                                AltosSensorTMini3.provide_data(listener, link);
                                break;


@@ -257,6 +263,12 @@ public class AltosIdleFetch implements AltosDataProvider {
                               AltosIdler.idle_ms5607,
                               AltosIdler.idle_imu_em_v2,
                               AltosIdler.idle_sensor_mega),
                               AltosIdler.idle_ms5607,
                               AltosIdler.idle_imu_em_v2,
                               AltosIdler.idle_sensor_mega),

+               new AltosIdler("EasyMega-v3",
+                              AltosIdler.idle_adxl375,
+                              AltosIdler.idle_ms5607,
+                              AltosIdler.idle_imu,
+                              AltosIdler.idle_mag,
+                              AltosIdler.idle_sensor_mega),

                new AltosIdler("TeleGPS-v1",
                               AltosIdler.idle_gps,
                               AltosIdler.idle_sensor_tgps1),
                new AltosIdler("TeleGPS-v1",
                               AltosIdler.idle_gps,
                               AltosIdler.idle_sensor_tgps1),


@@ -266,6 +278,9 @@ public class AltosIdleFetch implements AltosDataProvider {
                new AltosIdler("TeleGPS-v3",
                               AltosIdler.idle_gps,
                               AltosIdler.idle_sensor_tgps3),
                new AltosIdler("TeleGPS-v3",
                               AltosIdler.idle_gps,
                               AltosIdler.idle_sensor_tgps3),

+               new AltosIdler("TeleGPS-v4",
+                              AltosIdler.idle_gps,
+                              AltosIdler.idle_sensor_tgps4),

                new AltosIdler("EasyTimer-v1",
                               AltosIdler.idle_imu_et_v1,
                               AltosIdler.idle_sensor_easytimer1),
                new AltosIdler("EasyTimer-v1",
                               AltosIdler.idle_imu_et_v1,
                               AltosIdler.idle_sensor_easytimer1),