altos/stm32f4-disco: Start hooking up stm32f413 USB for the disco board

[fw/altos] / altoslib / AltosFrequency.java

diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java
index f9aa6de6ccb3eeea88baee2eb751a6ae3b9cd44d..58f503c565d16db931668c33e8df2b2e4c7c838a 100644 (file)
--- a/altoslib/AltosFrequency.java
+++ b/altoslib/AltosFrequency.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_11;
+package org.altusmetrum.altoslib_13;
 
 import java.io.*;
 import java.util.*;
@@ -57,28 +58,11 @@ public class AltosFrequency {
 
                return diff < 0.010;
        }
-
-       public AltosHashSet hashSet() {
-               AltosHashSet    h = new AltosHashSet();
-
-               h.putDouble("frequency", frequency);
-               h.putString("description", description);
-               return h;
-       }
-
        public AltosFrequency(double f, String d) {
                frequency = f;
                description = d;
        }
-
-       private AltosFrequency(AltosHashSet h) {
-               frequency = h.getDouble("frequency", 0.0);
-               description = h.getString("description", "");
-       }
-
-       public static AltosFrequency fromHashSet(AltosHashSet h, AltosFrequency def) {
-               if (h == null)
-                       return def;
-               return new AltosFrequency(h);
+       public AltosFrequency() {
+               this(0, null);
        }
 }