Merge branch 'master' into branch-1.9
[fw/altos] / altoslib / AltosIdleFetch.java
index 25a36096f6d98b275dcf2810a990b384fd02a19a..7ab8395ac8df5f8d8250f715267b25051c35680a 100644 (file)
@@ -49,9 +49,10 @@ 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;
 
        public void provide_data(AltosDataListener listener, AltosLink link) throws InterruptedException, TimeoutException, AltosUnknownProduct {
                for (int idler : idlers) {
@@ -119,6 +120,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;
@@ -246,6 +250,9 @@ 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),