X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=1ac075e394c13b01b03658c1a26857dbf053aac4;hp=43eb980a64340c6f0395f6394575ad9785292f6e;hb=HEAD;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859 diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java index 43eb980a..b64ba0a4 100644 --- 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_14; import java.io.*; import java.util.*; @@ -28,56 +28,121 @@ class AltosIdler { int[] idlers; static final int idle_gps = 0; - static final int idle_imu = 1; - static final int idle_mag = 2; - static final int idle_mma655x = 4; + static final int idle_imu_tm_v1_v2 = 1; + static final int idle_imu_tm_v3 = 2; + static final int idle_imu_tm_v4 = 3; + static final int idle_imu_em_v1 = 4; + static final int idle_imu_em_v2 = 5; + static final int idle_imu_et_v1 = 6; + static final int idle_mag = 7; + 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_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_mega = 102; + static final int idle_sensor_emini1 = 103; + static final int idle_sensor_emini2 = 104; + 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_tgps3 = 108; + static final int idle_sensor_tmini3 = 109; + static final int idle_sensor_easytimer1 = 110; + 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_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 { + 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_tm_v1_v2: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_telemega_v1_v2); + break; + case idle_imu_tm_v3: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_telemega_v3); + break; + case idle_imu_tm_v4: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_telemega_v4); + break; + case idle_imu_em_v1: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easymega_v1); + break; + case idle_imu_em_v2: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easymega_v2); + break; + case idle_imu_et_v1: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v1); + break; + case idle_imu_et_v2: + AltosIMU.provide_data(listener, link, AltosIMU.imu_type_easytimer_v2); break; case idle_imu: - AltosIMU.provide_data(listener, link, cal_data); + AltosIMU.provide_data(listener, link, AltosLib.MISSING); 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_adxl375: + AltosAdxl375.provide_data(listener, link, false, AltosLib.MISSING); break; -/* case idle_sensor_tm: - AltosSensorTM.provide_data(listener, link, cal_data); + 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); + 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_emini3: + AltosSensorEMini.provide_data(listener, link, 3); break; case idle_sensor_tmini2: - AltosSensorTMini2.provide_data(listener, link, cal_data); + AltosSensorTMini2.provide_data(listener, link); + break; + case idle_sensor_tgps1: + AltosSensorTGPS1.provide_data(listener, link); + break; + case idle_sensor_tgps2: + AltosSensorTGPS2.provide_data(listener, link); break; - case idle_sensor_tgps: - AltosSensorTGPS.provide_data(listener, link, cal_data); + case idle_sensor_tgps3: + AltosSensorTGPS3.provide_data(listener, link); break; case idle_sensor_tmini3: - AltosSensorTMini3.provide_data(listener, link, cal_data); + AltosSensorTMini3.provide_data(listener, link); + break; + case idle_sensor_easytimer1: + AltosSensorEasyTimer1.provide_data(listener, link); + break; + case idle_sensor_easymotor2: + AltosSensorEasyMotor2.provide_data(listener, link); break; -*/ } } } @@ -97,16 +162,27 @@ public class AltosIdleFetch implements AltosDataProvider { 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("EasyMini-v3", + AltosIdler.idle_ms5607, + AltosIdler.idle_sensor_emini3), 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", @@ -116,33 +192,110 @@ public class AltosIdleFetch implements AltosDataProvider { new AltosIdler("TeleMetrum-v2", AltosIdler.idle_gps, AltosIdler.idle_mma655x, + AltosIdler.idle_ms5607, + AltosIdler.idle_sensor_metrum), + + new AltosIdler("TeleMetrum-v3", + AltosIdler.idle_gps, + AltosIdler.idle_adxl375, + AltosIdler.idle_ms5607, + AltosIdler.idle_sensor_metrum), + + new AltosIdler("TeleMetrum-v4", + AltosIdler.idle_gps, + AltosIdler.idle_adxl375, + AltosIdler.idle_ms5607, AltosIdler.idle_sensor_metrum), - new AltosIdler("TeleMega", + new AltosIdler("TeleMega-v0", AltosIdler.idle_gps, AltosIdler.idle_mma655x, - AltosIdler.idle_imu, AltosIdler.idle_mag, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu_tm_v1_v2, AltosIdler.idle_mag, + AltosIdler.idle_sensor_mega), + new AltosIdler("TeleMega-v1", + AltosIdler.idle_gps, + AltosIdler.idle_mma655x, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu_tm_v1_v2, AltosIdler.idle_mag, AltosIdler.idle_sensor_mega), - new AltosIdler("EasyMega", + new AltosIdler("TeleMega-v2", + AltosIdler.idle_gps, + AltosIdler.idle_mma655x, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu_tm_v1_v2, AltosIdler.idle_mag, + AltosIdler.idle_sensor_mega), + new AltosIdler("TeleMega-v3", + AltosIdler.idle_gps, AltosIdler.idle_mma655x, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu_tm_v3, + AltosIdler.idle_sensor_mega), + new AltosIdler("TeleMega-v4", + AltosIdler.idle_gps, + AltosIdler.idle_adxl375, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu_tm_v4, + AltosIdler.idle_sensor_mega), + new AltosIdler("TeleMega-v5", + AltosIdler.idle_gps, + AltosIdler.idle_adxl375, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu, AltosIdler.idle_mag, + AltosIdler.idle_sensor_mega), + new AltosIdler("TeleMega-v6", + AltosIdler.idle_gps, + AltosIdler.idle_adxl375, + AltosIdler.idle_ms5607, AltosIdler.idle_imu, AltosIdler.idle_mag, AltosIdler.idle_sensor_mega), - new AltosIdler("TeleGPS", + new AltosIdler("EasyMega-v1", + AltosIdler.idle_mma655x, + AltosIdler.idle_ms5607, + AltosIdler.idle_imu_em_v1, 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("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-v2", + AltosIdler.idle_gps, + AltosIdler.idle_sensor_tgps2), + new AltosIdler("TeleGPS-v3", AltosIdler.idle_gps, - AltosIdler.idle_sensor_tgps), + AltosIdler.idle_sensor_tgps3), + 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), + new AltosIdler("EasyTimer-v2", + AltosIdler.idle_imu_et_v2, + AltosIdler.idle_sensor_easymotor2), }; 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 */ - 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)) { - idler.provide_data(listener, link, cal_data); + idler.provide_data(listener, link); matched = true; break; }