altos/stm32f4: Add start of stm32f413 USB support

[fw/altos] / altosuilib / AltosScanUI.java

diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index 031158243e69de010d475e14be13f801244c1847..fad1b2cde8ce72f9b7c4f2dec9cd5b734707804f 100644 (file)
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.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.altosuilib_7;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -25,7 +26,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_13.*;
 
 class AltosScanResult {
        String          callsign;
@@ -62,9 +63,18 @@ class AltosScanResult {
                rate = in_rate;
        }
 
-       public boolean equals(AltosScanResult other) {
+       public int hashCode() {
+               return serial ^ frequency.hashCode() ^ telemetry ^ rate;
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
+                       return false;
+               if (!(o instanceof AltosScanResult))
+                       return false;
+               AltosScanResult other = (AltosScanResult) o;
                return (serial == other.serial &&
-                       frequency.frequency == other.frequency.frequency &&
+                       frequency.equals(other.frequency) &&
                        telemetry == other.telemetry &&
                        rate == other.rate);
        }
@@ -203,10 +213,11 @@ public class AltosScanUI
                                                if (state == null)
                                                        continue;
                                                packet_count++;
-                                               if (state.flight != AltosLib.MISSING) {
-                                                       final AltosScanResult   result = new AltosScanResult(state.callsign,
-                                                                                                            state.serial,
-                                                                                                            state.flight,
+                                               AltosCalData    cal_data = state.cal_data();
+                                               if (cal_data.flight != AltosLib.MISSING) {
+                                                       final AltosScanResult   result = new AltosScanResult(cal_data.callsign,
+                                                                                                            cal_data.serial,
+                                                                                                            cal_data.flight,
                                                                                                             frequencies[frequency_index],
                                                                                                             telemetry,
                                                                                                             rate);