Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosSensorMega.java

diff --git a/altoslib/AltosSensorMega.java b/altoslib/AltosSensorMega.java
index 3afb8a642612509928876bfff311aeb581e54ccf..63c7a0ce960ddf0ef25e7487af3acb8b4d569f46 100644 (file)
--- a/altoslib/AltosSensorMega.java
+++ b/altoslib/AltosSensorMega.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
  *
  * 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
  *
  * 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.
  */
 
  * 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;
 
 
 import java.util.concurrent.TimeoutException;
 


@@ -88,7 +89,7 @@ class AltosSensorMega {
                }
        }
 
                }
        }
 

-       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 {
                        AltosSensorMega sensor_mega = new AltosSensorMega(link);
 
                try {
                        AltosSensorMega sensor_mega = new AltosSensorMega(link);
 


@@ -102,7 +103,6 @@ class AltosSensorMega {
                        state.set_ignitor_voltage(ignitor_voltage);
 
                } catch (TimeoutException te) {
                        state.set_ignitor_voltage(ignitor_voltage);
 
                } catch (TimeoutException te) {

-               } catch (InterruptedException ie) {

                }
        }
 }
                }
        }
 }