* 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.*;
static final int idle_gps = 0;
static final int idle_imu = 1;
- static final int idle_mag = 2;
+ static final int idle_imu_em_v2 = 2;
+ static final int idle_mag = 3;
static final int idle_mma655x = 4;
-
+ static final int idle_ms5607 = 5;
+ static final int idle_adxl375 = 6;
static final int idle_sensor_tm = 10;
static final int idle_sensor_metrum = 11;
static final int idle_sensor_mega = 12;
- static final int idle_sensor_emini = 13;
- static final int idle_sensor_tmini2 = 14;
- static final int idle_sensor_tgps = 15;
- static final int idle_sensor_tmini3 = 16;
-
- public void provide_data(AltosDataListener listener, AltosLink link, AltosCalData cal_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
+ static final int idle_sensor_emini1 = 13;
+ static final int idle_sensor_emini2 = 14;
+ static final int idle_sensor_tmini2 = 15;
+ static final int idle_sensor_tgps1 = 16;
+ static final int idle_sensor_tgps2 = 17;
+ static final int idle_sensor_tmini3 = 18;
+
+ 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, AltosIMU.orient_telemega);
+ break;
+ case idle_imu_em_v2:
+ AltosIMU.provide_data(listener, link, AltosIMU.orient_easymega_v2);
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_sensor_tm:
- AltosSensorTM.provide_data(listener, link, cal_data);
+ case idle_adxl375:
+ AltosAdxl375.provide_data(listener, link);
+ break;
+ case idle_ms5607:
+ AltosMs5607.provide_data(listener, link);
+ break;
+ case idle_sensor_tm:
+ 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, 1);
break;
- case idle_sensor_emini:
- AltosSensorEMini.provide_data(listener, link, cal_data);
+ case idle_sensor_emini2:
+ 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);
+ case idle_sensor_tgps1:
+ AltosSensorTGPS1.provide_data(listener, link);
+ break;
+ case idle_sensor_tgps2:
+ AltosSensorTGPS2.provide_data(listener, link);
break;
case idle_sensor_tmini3:
- AltosSensorTMini3.provide_data(listener, link, cal_data);
+ AltosSensorTMini3.provide_data(listener, link);
break;
-*/
}
}
}
static final AltosIdler[] idlers = {
- new AltosIdler("EasyMini",
- AltosIdler.idle_sensor_emini),
+ new AltosIdler("EasyMini-v1",
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_sensor_emini1),
+
+ new AltosIdler("EasyMini-v2",
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_sensor_emini2),
new AltosIdler("TeleMini-v1",
AltosIdler.idle_sensor_tm),
new AltosIdler("TeleMini-v2",
+ AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_tmini2),
new AltosIdler("TeleMini-v3",
+ AltosIdler.idle_ms5607,
AltosIdler.idle_sensor_tmini3),
new AltosIdler("TeleMetrum-v1",
new AltosIdler("TeleMetrum-v2",
AltosIdler.idle_gps,
AltosIdler.idle_mma655x,
+ 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("EasyMega",
+ 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("TeleGPS",
+ 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-v1",
+ AltosIdler.idle_mma655x,
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_imu, AltosIdler.idle_mag,
+ AltosIdler.idle_sensor_mega),
+ new AltosIdler("EasyMega-v2",
+ AltosIdler.idle_adxl375,
+ AltosIdler.idle_ms5607,
+ AltosIdler.idle_imu_em_v2,
+ AltosIdler.idle_sensor_mega),
+ new AltosIdler("TeleGPS-v1",
+ AltosIdler.idle_gps,
+ AltosIdler.idle_sensor_tgps1),
+ new AltosIdler("TeleGPS-v2",
AltosIdler.idle_gps,
- AltosIdler.idle_sensor_tgps),
+ AltosIdler.idle_sensor_tgps2),
};
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 */
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;
}