import java.text.*;
import java.util.concurrent.*;
-public class AltosConfigData implements Iterable<String> {
+public class AltosConfigData {
/* Version information */
public String manufacturer;
public int log_space;
public String version;
public int altitude_32;
-
- /* Strings returned */
- public LinkedList<String> __lines;
+ public int config_major, config_minor;
/* Config information */
/* HAS_FLIGHT*/
public int accel_zero_along, accel_zero_across, accel_zero_through;
/* ms5607 data */
- public int ms5607_reserved;
- public int ms5607_sens;
- public int ms5607_off;
- public int ms5607_tcs;
- public int ms5607_tco;
- public int ms5607_tref;
- public int ms5607_tempsens;
- public int ms5607_crc;
+ AltosMs5607 ms5607;
+
+ public AltosMs5607 ms5607() {
+ if (ms5607 == null)
+ ms5607 = new AltosMs5607();
+ return ms5607;
+ }
public static String get_string(String line, String label) throws ParseException {
if (line.startsWith(label)) {
throw new ParseException("mismatch", 0);
}
- public Iterator<String> iterator() {
- return __lines.iterator();
- }
-
public int log_space() {
if (log_space > 0)
return log_space;
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);
}
public void reset() {
- __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";
+ config_major = AltosLib.MISSING;
+ config_minor = AltosLib.MISSING;
- 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);
+
/* Version replies */
try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
try { product = get_string(line, "product"); } catch (Exception e) {}
/* Version also contains MS5607 info, which we ignore here */
- try { ms5607_reserved = get_int(line, "ms5607 reserved:"); } catch (Exception e) {}
- try { ms5607_sens = get_int(line, "ms5607 sens:"); } catch (Exception e) {}
- try { ms5607_off = get_int(line, "ms5607 off:"); } catch (Exception e) {}
- try { ms5607_tcs = get_int(line, "ms5607 tcs:"); } catch (Exception e) {}
- try { ms5607_tco = get_int(line, "ms5607 tco:"); } catch (Exception e) {}
- try { ms5607_tref = get_int(line, "ms5607 tref:"); } catch (Exception e) {}
- try { ms5607_tempsens = get_int(line, "ms5607 tempsens:"); } catch (Exception e) {}
- try { ms5607_crc = get_int(line, "ms5607 crc:"); } catch (Exception e) {}
+ try { ms5607().reserved = get_int(line, "ms5607 reserved:"); } catch (Exception e) {}
+ try { ms5607().sens = get_int(line, "ms5607 sens:"); } catch (Exception e) {}
+ try { ms5607().off = get_int(line, "ms5607 off:"); } catch (Exception e) {}
+ try { ms5607().tcs = get_int(line, "ms5607 tcs:"); } catch (Exception e) {}
+ try { ms5607().tco = get_int(line, "ms5607 tco:"); } catch (Exception e) {}
+ try { ms5607().tref = get_int(line, "ms5607 tref:"); } catch (Exception e) {}
+ try { ms5607().tempsens = get_int(line, "ms5607 tempsens:"); } catch (Exception e) {}
+ try { ms5607().crc = get_int(line, "ms5607 crc:"); } catch (Exception e) {}
/* Config show replies */
+ try {
+ if (line.startsWith("Config version")) {
+ String[] bits = line.split("\\s+");
+ if (bits.length >= 3) {
+ String[] cfg = bits[2].split("\\.");
+
+ if (cfg.length >= 2) {
+ System.out.printf("major %s minor %s\n", cfg[0], cfg[1]);
+ config_major = Integer.parseInt(cfg[0]);
+ config_minor = Integer.parseInt(cfg[1]);
+ }
+ }
+ }
+ } catch (Exception e) {}
+
/* HAS_FLIGHT */
try { main_deploy = get_int(line, "Main deploy:"); } catch (Exception e) {}
try { apogee_delay = get_int(line, "Apogee delay:"); } catch (Exception e) {}
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);
}
int setting = radio_setting;
if (radio_frequency < 0 && channel < 0 && setting < 0)
- return -1;
+ return AltosLib.MISSING;
if (channel < 0)
channel = 0;
projects / fw / altos / blobdiff