projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Don't include baro-specific config values for easytimer
[fw/altos]
/
src
/
kernel
/
ao_config.c
diff --git
a/src/kernel/ao_config.c
b/src/kernel/ao_config.c
index 9fbc64bdbd482e7da78d2dd60d3f71d92ae1141c..687923499aef2c73efbf67ebea14b088586645d5 100644
(file)
--- a/
src/kernel/ao_config.c
+++ b/
src/kernel/ao_config.c
@@
-367,6
+367,8
@@
ao_config_send_frequency_set(void)
#if HAS_FLIGHT
#if HAS_FLIGHT
+#if HAS_BARO
+
static void
ao_config_main_deploy_show(void)
{
static void
ao_config_main_deploy_show(void)
{
@@
-385,6
+387,8
@@
ao_config_main_deploy_set(void)
_ao_config_edit_finish();
}
_ao_config_edit_finish();
}
+#endif
+
#if HAS_ACCEL
static void
ao_config_accel_calibrate_show(void)
#if HAS_ACCEL
static void
ao_config_accel_calibrate_show(void)
@@
-502,6
+506,7
@@
ao_config_accel_calibrate_set(void)
}
#endif /* HAS_ACCEL */
}
#endif /* HAS_ACCEL */
+#if HAS_BARO
static void
ao_config_apogee_delay_show(void)
{
static void
ao_config_apogee_delay_show(void)
{
@@
-537,6
+542,7
@@
ao_config_apogee_lockout_set(void)
ao_config.apogee_lockout = r;
_ao_config_edit_finish();
}
ao_config.apogee_lockout = r;
_ao_config_edit_finish();
}
+#endif
#endif /* HAS_FLIGHT */
#endif /* HAS_FLIGHT */
@@
-988,7
+994,7
@@
ao_config_save(void);
#endif
const struct ao_config_var ao_config_vars[] = {
#endif
const struct ao_config_var ao_config_vars[] = {
-#if HAS_FLIGHT
+#if HAS_FLIGHT
&& HAS_BARO
{ "m <meters>\0Main deploy (m)",
ao_config_main_deploy_set, ao_config_main_deploy_show, },
{ "d <delay>\0Apogee delay (s)",
{ "m <meters>\0Main deploy (m)",
ao_config_main_deploy_set, ao_config_main_deploy_show, },
{ "d <delay>\0Apogee delay (s)",