X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosPreferences.java;h=de926b38ca2abca9dfbd5a6fc78b3651c39682a4;hb=578c4b17b8f62f2727654ebda78ee139f9fe13fa;hp=e92b9532466fa2e11e00dc03291c9425139264da;hpb=f03ca0ab8799bfa5100eaa2577cfd7b9c37d05bf;p=fw%2Faltos

diff --git a/altosui/AltosPreferences.java b/altosui/AltosPreferences.java
index e92b9532..de926b38 100644
--- a/altosui/AltosPreferences.java
+++ b/altosui/AltosPreferences.java
@@ -34,6 +34,9 @@ class AltosPreferences {
 	/* channel preference name */
 	final static String channelPreferenceFormat = "CHANNEL-%d";
 
+	/* frequency preference name */
+	final static String frequencyPreferenceFormat = "FREQUENCY-%d";
+
 	/* telemetry format preference name */
 	final static String telemetryPreferenceFormat = "TELEMETRY-%d";
 
@@ -49,6 +52,9 @@ class AltosPreferences {
 	/* serial debug preference name */
 	final static String serialDebugPreference = "SERIAL-DEBUG";
 
+	/* scanning telemetry preferences name */
+	final static String scanningTelemetryPreference = "SCANNING-TELEMETRY";
+
 	/* Default logdir is ~/TeleMetrum */
 	final static String logdirName = "TeleMetrum";
 
@@ -61,9 +67,6 @@ class AltosPreferences {
 	/* Map directory -- hangs of logdir */
 	static File mapdir;
 
-	/* Channel (map serial to channel) */
-	static Hashtable<Integer, Integer> channels;
-
 	/* Frequency (map serial to frequency) */
 	static Hashtable<Integer, Double> frequencies;
 
@@ -82,6 +85,9 @@ class AltosPreferences {
 	/* Serial debug */
 	static boolean serial_debug;
 
+	/* Scanning telemetry */
+	static int scanning_telemetry;
+
 	/* List of frequencies */
 	final static String common_frequencies_node_name = "COMMON-FREQUENCIES";
 	static AltosFrequency[] common_frequencies;
@@ -148,7 +154,7 @@ class AltosPreferences {
 		if (!mapdir.exists())
 			mapdir.mkdirs();
 
-		channels = new Hashtable<Integer,Integer>();
+		frequencies = new Hashtable<Integer, Double>();
 
 		telemetries = new Hashtable<Integer,Integer>();
 
@@ -156,6 +162,8 @@ class AltosPreferences {
 
 		callsign = preferences.get(callsignPreference,"N0CALL");
 
+		scanning_telemetry = preferences.getInt(scanningTelemetryPreference,(1 << Altos.ao_telemetry_standard));
+
 		String firmwaredir_string = preferences.get(firmwaredirPreference, null);
 		if (firmwaredir_string != null)
 			firmwaredir = new File(firmwaredir_string);
@@ -242,20 +250,24 @@ class AltosPreferences {
 		return mapdir;
 	}
 
-	public static void set_channel(int serial, int new_channel) {
-		channels.put(serial, new_channel);
+	public static void set_frequency(int serial, double new_frequency) {
+		frequencies.put(serial, new_frequency);
 		synchronized (preferences) {
-			preferences.putInt(String.format(channelPreferenceFormat, serial), new_channel);
+			preferences.putDouble(String.format(frequencyPreferenceFormat, serial), new_frequency);
 			flush_preferences();
 		}
 	}
 
-	public static int channel(int serial) {
-		if (channels.containsKey(serial))
-			return channels.get(serial);
-		int channel = preferences.getInt(String.format(channelPreferenceFormat, serial), 0);
-		channels.put(serial, channel);
-		return channel;
+	public static double frequency(int serial) {
+		if (frequencies.containsKey(serial))
+			return frequencies.get(serial);
+		double frequency = preferences.getDouble(String.format(frequencyPreferenceFormat, serial), 0);
+		if (frequency == 0.0) {
+			int channel = preferences.getInt(String.format(channelPreferenceFormat, serial), 0);
+			frequency = AltosConvert.radio_channel_to_frequency(channel);
+		}
+		frequencies.put(serial, frequency);
+		return frequency;
 	}
 
 	public static void set_telemetry(int serial, int new_telemetry) {
@@ -275,6 +287,18 @@ class AltosPreferences {
 		return telemetry;
 	}
 
+	public static void set_scanning_telemetry(int new_scanning_telemetry) {
+		scanning_telemetry = new_scanning_telemetry;
+		synchronized (preferences) {
+			preferences.putInt(scanningTelemetryPreference, scanning_telemetry);
+			flush_preferences();
+		}
+	}
+
+	public static int scanning_telemetry() {
+		return scanning_telemetry;
+	}
+
 	public static void set_voice(boolean new_voice) {
 		voice = new_voice;
 		synchronized (preferences) {
@@ -339,4 +363,21 @@ class AltosPreferences {
 			flush_preferences();
 		}
 	}
+
+	public static void add_common_frequency(AltosFrequency frequency) {
+		AltosFrequency[]	new_frequencies = new AltosFrequency[common_frequencies.length + 1];
+		int			i;
+
+		for (i = 0; i < common_frequencies.length; i++) {
+			if (frequency.frequency == common_frequencies[i].frequency)
+				return;
+			if (frequency.frequency < common_frequencies[i].frequency)
+				break;
+			new_frequencies[i] = common_frequencies[i];
+		}
+		new_frequencies[i] = frequency;
+		for (; i < common_frequencies.length; i++)
+			new_frequencies[i+1] = common_frequencies[i];
+		set_common_frequencies(new_frequencies);
+	}
 }