X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=05fc2031c3bc2cd067d7d8ce2eab7eab626373d5;hb=bbe0c2e0a3216f40f49af34b756330ba28d7c7e1;hp=6b55cc6fdc9c8dc7c7177b0e5e7bf4030ec2e49b;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 6b55cc6f..05fc2031 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -35,7 +35,7 @@ public class AltosConfigData implements Iterable<String> {
 	public int	altitude_32;
 
 	/* Strings returned */
-	public LinkedList<String>	lines;
+	public LinkedList<String>	__lines;
 
 	/* Config information */
 	/* HAS_FLIGHT*/
@@ -143,7 +143,7 @@ public class AltosConfigData implements Iterable<String> {
 	}
 
 	public Iterator<String> iterator() {
-		return lines.iterator();
+		return __lines.iterator();
 	}
 
 	public int log_space() {
@@ -214,6 +214,10 @@ public class AltosConfigData implements Iterable<String> {
 		return r;
 	}
 
+	public boolean altitude_32() {
+		return altitude_32 == 1;
+	}
+
 	public int compare_version(String other) {
 		int[]	me = parse_version(version);
 		int[]	them = parse_version(other);
@@ -233,63 +237,63 @@ public class AltosConfigData implements Iterable<String> {
 	}
 
 	public void reset() {
-		lines = new LinkedList<String>();
+		__lines = new LinkedList<String>();
 
-		manufacturer = "unknown";
-		product = "unknown";
-		serial = 0;
-		flight = 0;
+		manufacturer = null;
+		product = null;
+		serial = AltosLib.MISSING;
+		flight = AltosLib.MISSING;
 		log_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
-		log_space = -1;
+		log_space = AltosLib.MISSING;
 		version = "unknown";
 
-		main_deploy = -1;
-		apogee_delay = -1;
-		apogee_lockout = -1;
+		main_deploy = AltosLib.MISSING;
+		apogee_delay = AltosLib.MISSING;
+		apogee_lockout = AltosLib.MISSING;
 
-		radio_frequency = -1;
+		radio_frequency = AltosLib.MISSING;
 		callsign = null;
-		radio_enable = -1;
-		radio_calibration = -1;
-		radio_channel = -1;
-		radio_setting = -1;
-		telemetry_rate = -1;
+		radio_enable = AltosLib.MISSING;
+		radio_calibration = AltosLib.MISSING;
+		radio_channel = AltosLib.MISSING;
+		radio_setting = AltosLib.MISSING;
+		telemetry_rate = AltosLib.MISSING;
 
-		accel_cal_plus = -1;
-		accel_cal_minus = -1;
-		pad_orientation = -1;
+		accel_cal_plus = AltosLib.MISSING;
+		accel_cal_minus = AltosLib.MISSING;
+		pad_orientation = AltosLib.MISSING;
 
-		flight_log_max = -1;
-		log_fixed = -1;
-		ignite_mode = -1;
+		flight_log_max = AltosLib.MISSING;
+		log_fixed = AltosLib.MISSING;
+		ignite_mode = AltosLib.MISSING;
 
-		aes_key = "";
+		aes_key = null;
 
 		pyro = 0;
 		npyro = 0;
 		pyros = null;
-		pyro_firing_time = -1;
+		pyro_firing_time = AltosLib.MISSING;
 
-		aprs_interval = -1;
-		aprs_ssid = -1;
-		aprs_format = -1;
+		aprs_interval = AltosLib.MISSING;
+		aprs_ssid = AltosLib.MISSING;
+		aprs_format = AltosLib.MISSING;
 
-		beep = -1;
+		beep = AltosLib.MISSING;
 
-		tracker_motion = -1;
-		tracker_interval = -1;
+		tracker_motion = AltosLib.MISSING;
+		tracker_interval = AltosLib.MISSING;
 
-		storage_size = -1;
-		storage_erase_unit = -1;
-		stored_flight = 0;
+		storage_size = AltosLib.MISSING;
+		storage_erase_unit = AltosLib.MISSING;
+		stored_flight = AltosLib.MISSING;
 
-		accel_zero_along = -1;
-		accel_zero_across = -1;
-		accel_zero_through = -1;
+		accel_zero_along = AltosLib.MISSING;
+		accel_zero_across = AltosLib.MISSING;
+		accel_zero_through = AltosLib.MISSING;
 	}
 
 	public void parse_line(String line) {
-		lines.add(line);
+		__lines.add(line);
 		/* Version replies */
 		try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
 		try { product = get_string(line, "product"); } catch (Exception e) {}
@@ -438,11 +442,11 @@ public class AltosConfigData implements Iterable<String> {
 
 		if (frequency > 0) {
 			radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
-			radio_channel = -1;
+			radio_channel = AltosLib.MISSING;
 		} else if (setting > 0) {
 			radio_setting =AltosConvert.radio_frequency_to_setting(freq,
 										    radio_calibration);
-			radio_channel = -1;
+			radio_channel = AltosLib.MISSING;
 		} else {
 			radio_channel = AltosConvert.radio_frequency_to_channel(freq);
 		}
@@ -453,7 +457,7 @@ public class AltosConfigData implements Iterable<String> {
 		int	setting = radio_setting;
 
 		if (radio_frequency < 0 && channel < 0 && setting < 0)
-			return -1;
+			return AltosLib.MISSING;
 
 		if (channel < 0)
 			channel = 0;
@@ -719,5 +723,4 @@ public class AltosConfigData implements Iterable<String> {
 			break;
 		}
 	}
-
 }