projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Create new abstraction underneath AltosState for recording values
[fw/altos]
/
altoslib
/
AltosConfigData.java
diff --git
a/altoslib/AltosConfigData.java
b/altoslib/AltosConfigData.java
index 812296f33dff04483f08d8ed9ebfb78102096920..05fc2031c3bc2cd067d7d8ce2eab7eab626373d5 100644
(file)
--- a/
altoslib/AltosConfigData.java
+++ b/
altoslib/AltosConfigData.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
*
* 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
*
* 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.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
0
;
+package org.altusmetrum.altoslib_1
1
;
import java.util.*;
import java.text.*;
import java.util.*;
import java.text.*;
@@
-34,7
+35,7
@@
public class AltosConfigData implements Iterable<String> {
public int altitude_32;
/* Strings returned */
public int altitude_32;
/* Strings returned */
- public LinkedList<String> lines;
+ public LinkedList<String>
__
lines;
/* Config information */
/* HAS_FLIGHT*/
/* Config information */
/* HAS_FLIGHT*/
@@
-142,7
+143,7
@@
public class AltosConfigData implements Iterable<String> {
}
public Iterator<String> iterator() {
}
public Iterator<String> iterator() {
- return lines.iterator();
+ return
__
lines.iterator();
}
public int log_space() {
}
public int log_space() {
@@
-204,7
+205,7
@@
public class AltosConfigData implements Iterable<String> {
for (int i = 0; i < parts.length; i++) {
try {
for (int i = 0; i < parts.length; i++) {
try {
- r[i] = AltosLib.fromdec(parts[i]);
+ r[i] =
(int)
AltosLib.fromdec(parts[i]);
} catch (NumberFormatException n) {
r[i] = 0;
}
} catch (NumberFormatException n) {
r[i] = 0;
}
@@
-213,6
+214,10
@@
public class AltosConfigData implements Iterable<String> {
return r;
}
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 int compare_version(String other) {
int[] me = parse_version(version);
int[] them = parse_version(other);
@@
-232,63
+237,63
@@
public class AltosConfigData implements Iterable<String> {
}
public void reset() {
}
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_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
- log_space =
-1
;
+ log_space =
AltosLib.MISSING
;
version = "unknown";
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;
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 = 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) {
}
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) {}
/* Version replies */
try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
try { product = get_string(line, "product"); } catch (Exception e) {}
@@
-437,11
+442,11
@@
public class AltosConfigData implements Iterable<String> {
if (frequency > 0) {
radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
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);
} 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);
}
} else {
radio_channel = AltosConvert.radio_frequency_to_channel(freq);
}
@@
-452,7
+457,7
@@
public class AltosConfigData implements Iterable<String> {
int setting = radio_setting;
if (radio_frequency < 0 && channel < 0 && setting < 0)
int setting = radio_setting;
if (radio_frequency < 0 && channel < 0 && setting < 0)
- return
-1
;
+ return
AltosLib.MISSING
;
if (channel < 0)
channel = 0;
if (channel < 0)
channel = 0;
@@
-718,5
+723,4
@@
public class AltosConfigData implements Iterable<String> {
break;
}
}
break;
}
}
-
}
}