projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: Fix some scheme compat issues
[fw/altos]
/
altoslib
/
AltosConfigData.java
diff --git
a/altoslib/AltosConfigData.java
b/altoslib/AltosConfigData.java
index cb19ddf0f6cec054230296299366ded3f5ca6ccb..dc036867047cf278432aa99b7b35be0ccb244d6f 100644
(file)
--- a/
altoslib/AltosConfigData.java
+++ b/
altoslib/AltosConfigData.java
@@
-16,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
1
;
+package org.altusmetrum.altoslib_1
2
;
import java.util.*;
import java.text.*;
import java.util.*;
import java.text.*;
@@
-140,16
+140,16
@@
public class AltosConfigData {
}
public int log_space() {
}
public int log_space() {
- if (log_space
> 0
)
+ if (log_space
!= AltosLib.MISSING
)
return log_space;
return log_space;
- if (storage_size
> 0
) {
+ if (storage_size
!= AltosLib.MISSING
) {
int space = storage_size;
int space = storage_size;
- if (storage_erase_unit
> 0
&& use_flash_for_config())
+ if (storage_erase_unit
!= AltosLib.MISSING
&& use_flash_for_config())
space -= storage_erase_unit;
space -= storage_erase_unit;
- if (space
> 0
)
+ if (space
!= AltosLib.MISSING
)
return space;
}
return 0;
return space;
}
return 0;
@@
-262,8
+262,8
@@
public class AltosConfigData {
aes_key = null;
aes_key = null;
- pyro =
0
;
- npyro =
0
;
+ pyro =
AltosLib.MISSING
;
+ npyro =
AltosLib.MISSING
;
pyros = null;
pyro_firing_time = AltosLib.MISSING;
pyros = null;
pyro_firing_time = AltosLib.MISSING;
@@
-372,7
+372,7
@@
public class AltosConfigData {
pyros = new AltosPyro[npyro];
pyro = 0;
} catch (Exception e) {}
pyros = new AltosPyro[npyro];
pyro = 0;
} catch (Exception e) {}
- if (npyro
> 0
) {
+ if (npyro
!= AltosLib.MISSING
) {
try {
AltosPyro p = new AltosPyro(pyro, line);
if (pyro < npyro)
try {
AltosPyro p = new AltosPyro(pyro, line);
if (pyro < npyro)
@@
-405,7
+405,7
@@
public class AltosConfigData {
/* HAS_GYRO */
try {
/* HAS_GYRO */
try {
- if (line.startsWith("IMU cal
l
along")) {
+ if (line.startsWith("IMU cal along")) {
String[] bits = line.split("\\s+");
if (bits.length >= 8) {
accel_zero_along = Integer.parseInt(bits[3]);
String[] bits = line.split("\\s+");
if (bits.length >= 8) {
accel_zero_along = Integer.parseInt(bits[3]);
@@
-436,23
+436,22
@@
public class AltosConfigData {
}
public boolean has_frequency() {
}
public boolean has_frequency() {
- return radio_frequency
>= 0 || radio_setting >= 0 || radio_channel >= 0
;
+ return radio_frequency
!= AltosLib.MISSING || radio_setting != AltosLib.MISSING || radio_channel != AltosLib.MISSING
;
}
public boolean has_telemetry_rate() {
}
public boolean has_telemetry_rate() {
- return telemetry_rate
>= 0
;
+ return telemetry_rate
!= AltosLib.MISSING
;
}
public void set_frequency(double freq) {
int frequency = radio_frequency;
int setting = radio_setting;
}
public void set_frequency(double freq) {
int frequency = radio_frequency;
int setting = radio_setting;
- if (frequency
> 0
) {
+ if (frequency
!= AltosLib.MISSING
) {
radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
radio_channel = AltosLib.MISSING;
radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
radio_channel = AltosLib.MISSING;
- } else if (setting > 0) {
- radio_setting =AltosConvert.radio_frequency_to_setting(freq,
- radio_calibration);
+ } else if (setting != AltosLib.MISSING) {
+ radio_setting =AltosConvert.radio_frequency_to_setting(freq, radio_calibration);
radio_channel = AltosLib.MISSING;
} else {
radio_channel = AltosConvert.radio_frequency_to_channel(freq);
radio_channel = AltosLib.MISSING;
} else {
radio_channel = AltosConvert.radio_frequency_to_channel(freq);
@@
-463,12
+462,12
@@
public class AltosConfigData {
int channel = radio_channel;
int setting = radio_setting;
int channel = radio_channel;
int setting = radio_setting;
- if (radio_frequency
< 0 && channel < 0 && setting < 0
)
+ if (radio_frequency
== AltosLib.MISSING && channel == AltosLib.MISSING && setting == AltosLib.MISSING
)
return AltosLib.MISSING;
return AltosLib.MISSING;
- if (channel
< 0
)
+ if (channel
== AltosLib.MISSING
)
channel = 0;
channel = 0;
- if (setting
< 0
)
+ if (setting
== AltosLib.MISSING
)
setting = 0;
return AltosConvert.radio_to_frequency(radio_frequency,
setting = 0;
return AltosConvert.radio_to_frequency(radio_frequency,
@@
-489,70
+488,78
@@
public class AltosConfigData {
public boolean mma655x_inverted() throws AltosUnknownProduct {
public boolean mma655x_inverted() throws AltosUnknownProduct {
- if (product.startsWith("EasyMega-v1"))
- return false;
- if (product.startsWith("TeleMetrum-v2"))
- return true;
- if (product.startsWith("TeleMega-v2"))
- return false;
- if (product.startsWith("TeleMega-v1"))
- return false;
+ if (product != null) {
+ if (product.startsWith("EasyMega-v1"))
+ return false;
+ if (product.startsWith("TeleMetrum-v2"))
+ return true;
+ if (product.startsWith("TeleMega-v2"))
+ return false;
+ if (product.startsWith("TeleMega-v1"))
+ return false;
+ }
throw new AltosUnknownProduct(product);
}
public void get_values(AltosConfigValues source) throws AltosConfigDataException {
/* HAS_FLIGHT */
throw new AltosUnknownProduct(product);
}
public void get_values(AltosConfigValues source) throws AltosConfigDataException {
/* HAS_FLIGHT */
- if (main_deploy
>= 0
)
+ if (main_deploy
!= AltosLib.MISSING
)
main_deploy = source.main_deploy();
main_deploy = source.main_deploy();
- if (apogee_delay
>= 0
)
+ if (apogee_delay
!= AltosLib.MISSING
)
apogee_delay = source.apogee_delay();
apogee_delay = source.apogee_delay();
- if (apogee_lockout
>= 0
)
+ if (apogee_lockout
!= AltosLib.MISSING
)
apogee_lockout = source.apogee_lockout();
/* HAS_RADIO */
if (has_frequency())
set_frequency(source.radio_frequency());
apogee_lockout = source.apogee_lockout();
/* HAS_RADIO */
if (has_frequency())
set_frequency(source.radio_frequency());
- if (radio_enable
>= 0
)
+ if (radio_enable
!= AltosLib.MISSING
)
radio_enable = source.radio_enable();
if (callsign != null)
callsign = source.callsign();
radio_enable = source.radio_enable();
if (callsign != null)
callsign = source.callsign();
- if (telemetry_rate
>= 0
)
+ if (telemetry_rate
!= AltosLib.MISSING
)
telemetry_rate = source.telemetry_rate();
/* HAS_ACCEL */
telemetry_rate = source.telemetry_rate();
/* HAS_ACCEL */
- if (pad_orientation
>= 0
)
+ if (pad_orientation
!= AltosLib.MISSING
)
pad_orientation = source.pad_orientation();
pad_orientation = source.pad_orientation();
+ if (accel_cal_plus != AltosLib.MISSING)
+ accel_cal_plus = source.accel_cal_plus();
+
+ if (accel_cal_minus != AltosLib.MISSING)
+ accel_cal_minus = source.accel_cal_minus();
+
/* HAS_LOG */
/* HAS_LOG */
- if (flight_log_max
>= 0
)
+ if (flight_log_max
!= AltosLib.MISSING
)
flight_log_max = source.flight_log_max();
/* HAS_IGNITE */
flight_log_max = source.flight_log_max();
/* HAS_IGNITE */
- if (ignite_mode
>= 0
)
+ if (ignite_mode
!= AltosLib.MISSING
)
ignite_mode = source.ignite_mode();
/* AO_PYRO_NUM */
ignite_mode = source.ignite_mode();
/* AO_PYRO_NUM */
- if (npyro
> 0
)
+ if (npyro
!= AltosLib.MISSING
)
pyros = source.pyros();
pyros = source.pyros();
- if (pyro_firing_time
>= 0
)
+ if (pyro_firing_time
!= AltosLib.MISSING
)
pyro_firing_time = source.pyro_firing_time();
/* HAS_APRS */
pyro_firing_time = source.pyro_firing_time();
/* HAS_APRS */
- if (aprs_interval
>= 0
)
+ if (aprs_interval
!= AltosLib.MISSING
)
aprs_interval = source.aprs_interval();
aprs_interval = source.aprs_interval();
- if (aprs_ssid
>= 0
)
+ if (aprs_ssid
!= AltosLib.MISSING
)
aprs_ssid = source.aprs_ssid();
aprs_ssid = source.aprs_ssid();
- if (aprs_format
>= 0
)
+ if (aprs_format
!= AltosLib.MISSING
)
aprs_format = source.aprs_format();
/* HAS_BEEP */
aprs_format = source.aprs_format();
/* HAS_BEEP */
- if (beep
>= 0
)
+ if (beep
!= AltosLib.MISSING
)
beep = source.beep();
/* HAS_TRACKER */
beep = source.beep();
/* HAS_TRACKER */
- if (tracker_motion
>= 0
)
+ if (tracker_motion
!= AltosLib.MISSING
)
tracker_motion = source.tracker_motion();
tracker_motion = source.tracker_motion();
- if (tracker_interval
>= 0
)
+ if (tracker_interval
!= AltosLib.MISSING
)
tracker_interval = source.tracker_interval();
}
tracker_interval = source.tracker_interval();
}
@@
-572,7
+579,7
@@
public class AltosConfigData {
if (log_space() == 0)
max_enabled = false;
if (log_space() == 0)
max_enabled = false;
- if (log_fixed
> 0
)
+ if (log_fixed
!= AltosLib.MISSING
)
max_enabled = false;
switch (log_format) {
max_enabled = false;
switch (log_format) {
@@
-580,7
+587,7
@@
public class AltosConfigData {
max_enabled = false;
break;
default:
max_enabled = false;
break;
default:
- if (stored_flight
> 0
)
+ if (stored_flight
!= AltosLib.MISSING
)
max_enabled = false;
break;
}
max_enabled = false;
break;
}
@@
-591,8
+598,9
@@
public class AltosConfigData {
dest.set_flight_log_max(flight_log_max);
dest.set_ignite_mode(ignite_mode);
dest.set_pad_orientation(pad_orientation);
dest.set_flight_log_max(flight_log_max);
dest.set_ignite_mode(ignite_mode);
dest.set_pad_orientation(pad_orientation);
+ dest.set_accel_cal(accel_cal_plus, accel_cal_minus);
dest.set_callsign(callsign);
dest.set_callsign(callsign);
- if (npyro
> 0
)
+ if (npyro
!= AltosLib.MISSING
)
dest.set_pyros(pyros);
else
dest.set_pyros(null);
dest.set_pyros(pyros);
else
dest.set_pyros(null);
@@
-616,17
+624,17
@@
public class AltosConfigData {
public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
/* HAS_FLIGHT */
public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
/* HAS_FLIGHT */
- if (main_deploy
>= 0
)
+ if (main_deploy
!= AltosLib.MISSING
)
link.printf("c m %d\n", main_deploy);
link.printf("c m %d\n", main_deploy);
- if (apogee_delay
>= 0
)
+ if (apogee_delay
!= AltosLib.MISSING
)
link.printf("c d %d\n", apogee_delay);
link.printf("c d %d\n", apogee_delay);
- if (apogee_lockout
>= 0
)
+ if (apogee_lockout
!= AltosLib.MISSING
)
link.printf("c L %d\n", apogee_lockout);
/* HAS_RADIO */
if (has_frequency()) {
link.printf("c L %d\n", apogee_lockout);
/* HAS_RADIO */
if (has_frequency()) {
- boolean has_frequency = radio_frequency
>= 0
;
- boolean has_setting = radio_setting
> 0
;
+ boolean has_frequency = radio_frequency
!= AltosLib.MISSING
;
+ boolean has_setting = radio_setting
!= AltosLib.MISSING
;
double frequency = frequency();
link.set_radio_frequency(frequency,
has_frequency,
double frequency = frequency();
link.set_radio_frequency(frequency,
has_frequency,
@@
-642,7
+650,7
@@
public class AltosConfigData {
}
}
}
}
- if (telemetry_rate
>= 0
) {
+ if (telemetry_rate
!= AltosLib.MISSING
) {
link.printf("c T %d\n", telemetry_rate);
if (remote) {
link.flush_output();
link.printf("c T %d\n", telemetry_rate);
if (remote) {
link.flush_output();
@@
-664,49
+672,50
@@
public class AltosConfigData {
}
}
}
}
- if (radio_enable
>= 0
)
+ if (radio_enable
!= AltosLib.MISSING
)
link.printf("c e %d\n", radio_enable);
/* HAS_ACCEL */
link.printf("c e %d\n", radio_enable);
/* HAS_ACCEL */
- /* UI doesn't support accel cal */
- if (pad_orientation >= 0)
+ if (pad_orientation != AltosLib.MISSING)
link.printf("c o %d\n", pad_orientation);
link.printf("c o %d\n", pad_orientation);
+ if (accel_cal_plus != AltosLib.MISSING && accel_cal_minus != AltosLib.MISSING)
+ link.printf("c a %d %d\n", accel_cal_plus, accel_cal_minus);
/* HAS_LOG */
if (flight_log_max != 0)
link.printf("c l %d\n", flight_log_max);
/* HAS_IGNITE */
/* HAS_LOG */
if (flight_log_max != 0)
link.printf("c l %d\n", flight_log_max);
/* HAS_IGNITE */
- if (ignite_mode
>= 0
)
+ if (ignite_mode
!= AltosLib.MISSING
)
link.printf("c i %d\n", ignite_mode);
/* HAS_AES */
/* UI doesn't support AES key config */
/* AO_PYRO_NUM */
link.printf("c i %d\n", ignite_mode);
/* HAS_AES */
/* UI doesn't support AES key config */
/* AO_PYRO_NUM */
- if (npyro
> 0
) {
+ if (npyro
!= AltosLib.MISSING
) {
for (int p = 0; p < pyros.length; p++) {
link.printf("c P %s\n",
pyros[p].toString());
}
}
for (int p = 0; p < pyros.length; p++) {
link.printf("c P %s\n",
pyros[p].toString());
}
}
- if (pyro_firing_time
>= 0
)
+ if (pyro_firing_time
!= AltosLib.MISSING
)
link.printf("c I %d\n", (int) (pyro_firing_time * 100.0 + 0.5));
/* HAS_APRS */
link.printf("c I %d\n", (int) (pyro_firing_time * 100.0 + 0.5));
/* HAS_APRS */
- if (aprs_interval
>= 0
)
+ if (aprs_interval
!= AltosLib.MISSING
)
link.printf("c A %d\n", aprs_interval);
link.printf("c A %d\n", aprs_interval);
- if (aprs_ssid
>= 0
)
+ if (aprs_ssid
!= AltosLib.MISSING
)
link.printf("c S %d\n", aprs_ssid);
link.printf("c S %d\n", aprs_ssid);
- if (aprs_format
>= 0
)
+ if (aprs_format
!= AltosLib.MISSING
)
link.printf("c C %d\n", aprs_format);
/* HAS_BEEP */
link.printf("c C %d\n", aprs_format);
/* HAS_BEEP */
- if (beep
>= 0
)
+ if (beep
!= AltosLib.MISSING
)
link.printf("c b %d\n", beep);
/* HAS_TRACKER */
link.printf("c b %d\n", beep);
/* HAS_TRACKER */
- if (tracker_motion
>= 0 && tracker_interval >= 0
)
+ if (tracker_motion
!= AltosLib.MISSING && tracker_interval != AltosLib.MISSING
)
link.printf("c t %d %d\n", tracker_motion, tracker_interval);
/* HAS_GYRO */
link.printf("c t %d %d\n", tracker_motion, tracker_interval);
/* HAS_GYRO */