X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosSensorTM.java;h=5d1b1b7f6c50f24ca023dbbbe83c9516d46e12bb;hb=44c0cecabb3a815dbf7f52e6b2dad364cc72b60c;hp=2696a3080a252c68f10f43e1b0d49c75f82f5e20;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00;p=fw%2Faltos diff --git a/altoslib/AltosSensorTM.java b/altoslib/AltosSensorTM.java index 2696a308..5d1b1b7f 100644 --- a/altoslib/AltosSensorTM.java +++ b/altoslib/AltosSensorTM.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_2; +package org.altusmetrum.altoslib_11; import java.util.concurrent.TimeoutException; @@ -28,7 +29,7 @@ public class AltosSensorTM { public int drogue; public int main; - static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) { + static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException { try { AltosSensorTM sensor_tm = new AltosSensorTM(link); @@ -40,9 +41,8 @@ public class AltosSensorTM { state.set_battery_voltage(AltosConvert.cc_battery_to_voltage(sensor_tm.batt)); state.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.drogue)); state.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sensor_tm.main)); - + } catch (TimeoutException te) { - } catch (InterruptedException ie) { } }