X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=4b9a52542241c1cd3a6f1908bb842c80fd97fbe6;hp=6c0d130ba6571a876eec58cf95413f5572528ddb;hb=0072e9741719367a1f6748d242cd6195a1a7c6a5;hpb=87c8bb3956897830da1f7aaca2990a9571767b73 diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java index 6c0d130b..4b9a5254 100644 --- a/altoslib/AltosIdleFetch.java +++ b/altoslib/AltosIdleFetch.java @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_8; +package org.altusmetrum.altoslib_13; import java.io.*; import java.util.*; @@ -28,58 +29,74 @@ class AltosIdler { static final int idle_gps = 0; static final int idle_imu = 1; - static final int idle_mag = 2; - static final int idle_ms5607 = 3; + 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_tmini = 14; - static final int idle_sensor_tgps = 15; - - public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException { + 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) { - AltosIdle idle = null; switch (idler) { case idle_gps: - AltosGPS.update_state(state, link, config_data); + AltosGPS.provide_data(listener, link); break; case idle_imu: - AltosIMU.update_state(state, link, config_data); + AltosIMU.provide_data(listener, link, AltosIMU.orient_telemega); break; - case idle_mag: - AltosMag.update_state(state, link, config_data); + case idle_imu_em_v2: + AltosIMU.provide_data(listener, link, AltosIMU.orient_easymega_v2); break; - case idle_ms5607: - AltosMs5607.update_state(state, link, config_data); + case idle_mag: + AltosMag.provide_data(listener, link); break; case idle_mma655x: - AltosMma655x.update_state(state, link, config_data); + AltosMma655x.provide_data(listener, link); + break; + case idle_adxl375: + AltosAdxl375.provide_data(listener, link); + break; + case idle_ms5607: + AltosMs5607.provide_data(listener, link); break; case idle_sensor_tm: - AltosSensorTM.update_state(state, link, config_data); + AltosSensorTM.provide_data(listener, link); break; case idle_sensor_metrum: - AltosSensorMetrum.update_state(state, link, config_data); + AltosSensorMetrum.provide_data(listener, link); break; case idle_sensor_mega: - AltosSensorMega.update_state(state, link, config_data); + AltosSensorMega.provide_data(listener, link); + break; + case idle_sensor_emini1: + AltosSensorEMini.provide_data(listener, link, 1); + break; + case idle_sensor_emini2: + AltosSensorEMini.provide_data(listener, link, 2); break; - case idle_sensor_emini: - AltosSensorEMini.update_state(state, link, config_data); + case idle_sensor_tmini2: + AltosSensorTMini2.provide_data(listener, link); break; - case idle_sensor_tmini: - AltosSensorTMini.update_state(state, link, config_data); + case idle_sensor_tgps1: + AltosSensorTGPS1.provide_data(listener, link); break; - case idle_sensor_tgps: - AltosSensorTGPS.update_state(state, link, config_data); + case idle_sensor_tgps2: + AltosSensorTGPS2.provide_data(listener, link); + break; + case idle_sensor_tmini3: + AltosSensorTMini3.provide_data(listener, link); break; } - if (idle != null) - idle.update_state(state); } } @@ -94,20 +111,28 @@ class AltosIdler { } -public class AltosIdleFetch implements AltosStateUpdate { +public class AltosIdleFetch implements AltosDataProvider { static final AltosIdler[] idlers = { - new AltosIdler("EasyMini", + new AltosIdler("EasyMini-v1", + AltosIdler.idle_ms5607, + AltosIdler.idle_sensor_emini1), + + new AltosIdler("EasyMini-v2", AltosIdler.idle_ms5607, - AltosIdler.idle_sensor_emini), + AltosIdler.idle_sensor_emini2), new AltosIdler("TeleMini-v1", AltosIdler.idle_sensor_tm), new AltosIdler("TeleMini-v2", AltosIdler.idle_ms5607, - AltosIdler.idle_sensor_tmini), + AltosIdler.idle_sensor_tmini2), + + new AltosIdler("TeleMini-v3", + AltosIdler.idle_ms5607, + AltosIdler.idle_sensor_tmini3), new AltosIdler("TeleMetrum-v1", AltosIdler.idle_gps, @@ -115,45 +140,76 @@ public class AltosIdleFetch implements AltosStateUpdate { new AltosIdler("TeleMetrum-v2", AltosIdler.idle_gps, - AltosIdler.idle_ms5607, AltosIdler.idle_mma655x, + AltosIdler.idle_mma655x, + AltosIdler.idle_ms5607, AltosIdler.idle_sensor_metrum), - new AltosIdler("TeleMega", + new AltosIdler("TeleMetrum-v3", AltosIdler.idle_gps, - AltosIdler.idle_ms5607, AltosIdler.idle_mma655x, + AltosIdler.idle_adxl375, + AltosIdler.idle_ms5607, + AltosIdler.idle_sensor_metrum), + + 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("EasyMega", - AltosIdler.idle_ms5607, AltosIdler.idle_mma655x, + 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("TeleGPS", + 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_tgps), + AltosIdler.idle_sensor_tgps1), + new AltosIdler("TeleGPS-v2", + AltosIdler.idle_gps, + AltosIdler.idle_sensor_tgps2), }; AltosLink link; - double frequency; - String callsign; - - public void update_state(AltosState state) throws InterruptedException { + public void provide_data(AltosDataListener listener) throws InterruptedException, AltosUnknownProduct { try { + boolean matched = false; /* Fetch config data from remote */ AltosConfigData config_data = new AltosConfigData(link); - state.set_state(AltosLib.ao_flight_stateless); - state.set_serial(config_data.serial); - state.set_callsign(config_data.callsign); - state.set_ground_accel(config_data.accel_cal_plus); - state.set_accel_g(config_data.accel_cal_plus, config_data.accel_cal_minus); - state.set_product(config_data.product); + listener.set_state(AltosLib.ao_flight_stateless); for (AltosIdler idler : idlers) { if (idler.matches(config_data)) { - idler.update_state(state, link, config_data); + idler.provide_data(listener, link); + matched = true; break; } } - state.set_received_time(System.currentTimeMillis()); + if (!matched) + throw new AltosUnknownProduct(config_data.product); + listener.set_received_time(System.currentTimeMillis()); } catch (TimeoutException te) { }