X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosScanUI.java;h=fad1b2cde8ce72f9b7c4f2dec9cd5b734707804f;hp=7e51a55a757d174d8dce0a1ac6566cefbbaf5d8d;hb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;hpb=fb914d37018a585a879161483609d3c0be556d1e

diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index 7e51a55a..fad1b2cd 100644
--- 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_3;
+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_5.*;
+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);
 	}
@@ -159,6 +169,8 @@ public class AltosScanUI
 	Thread				thread;
 	AltosFrequency[]		frequencies;
 	int				frequency_index;
+	int				packet_count;
+	int				tick_count;
 
 	void scan_exception(Exception e) {
 		if (e instanceof FileNotFoundException) {
@@ -200,10 +212,12 @@ public class AltosScanUI
 						AltosState	state = reader.read();
 						if (state == null)
 							continue;
-						if (state.flight != AltosLib.MISSING) {
-							final AltosScanResult	result = new AltosScanResult(state.callsign,
-													     state.serial,
-													     state.flight,
+						packet_count++;
+						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);
@@ -251,9 +265,6 @@ public class AltosScanUI
 	void next() throws InterruptedException, TimeoutException {
 		reader.set_monitor(false);
 
-		/* Let any pending input from the last configuration drain out */
-		Thread.sleep(100);
-
 		if (select_rate) {
 			boolean	wrapped = false;
 			do {
@@ -284,6 +295,8 @@ public class AltosScanUI
 				return;
 			}
 		}
+		packet_count = 0;
+		tick_count = 0;
 		++frequency_index;
 		if (frequency_index >= frequencies.length)
 			frequency_index = 0;
@@ -308,7 +321,9 @@ public class AltosScanUI
 	}
 
 	void tick_timer() throws InterruptedException, TimeoutException {
-		next();
+		++tick_count;
+		if (packet_count == 0 || tick_count > 5)
+			next();
 	}
 
 	public void actionPerformed(ActionEvent e) {
@@ -356,7 +371,6 @@ public class AltosScanUI
 				if (r != null) {
 					if (device != null) {
 						if (reader != null) {
-							System.out.printf("frequency %g rate %d\n", r.frequency.frequency, r.rate);
 							reader.set_telemetry(r.telemetry);
 							reader.set_telemetry_rate(r.rate);
 							reader.set_frequency(r.frequency.frequency);
@@ -441,6 +455,7 @@ public class AltosScanUI
 	}
 
 	public AltosScanUI(AltosUIFrame in_owner, boolean in_select_telemetry) {
+		super(in_owner, "Scan Telemetry", false);
 
 		owner = in_owner;
 		select_telemetry = in_select_telemetry;