projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add motor pressure calibration data to easy motor log
[fw/altos]
/
src
/
kernel
/
ao_config.c
diff --git
a/src/kernel/ao_config.c
b/src/kernel/ao_config.c
index 9fbc64bdbd482e7da78d2dd60d3f71d92ae1141c..24eb79d9aaeba53b2fe2db62d93929569e5633d3 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 */
@@
-623,7
+629,7
@@
static void
ao_config_log_set(void)
{
#if FLIGHT_LOG_APPEND
ao_config_log_set(void)
{
#if FLIGHT_LOG_APPEND
- printf("Flight log fixed size %
d kB\n", ao_storage_log_max >> 10
);
+ printf("Flight log fixed size %
u kB\n", (unsigned) (ao_storage_log_max >> 10)
);
#else
uint32_t r;
#else
uint32_t r;
@@
-637,7
+643,7
@@
ao_config_log_set(void)
return;
}
if (r > ao_storage_log_max) {
return;
}
if (r > ao_storage_log_max) {
- printf("Flight log max %
d kB\n", ao_storage_log_max >> 10
);
+ printf("Flight log max %
u kB\n", (unsigned) (ao_storage_log_max >> 10)
);
return;
}
_ao_config_edit_start();
return;
}
_ao_config_edit_start();
@@
-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)",
@@
-1033,7
+1039,7
@@
const struct ao_config_var ao_config_vars[] = {
ao_config_log_set, ao_config_log_show },
#endif
#if HAS_IGNITE
ao_config_log_set, ao_config_log_show },
#endif
#if HAS_IGNITE
- { "i <0 dual, 1 apogee, 2 main>\0Igniter mode",
+ { "i <0 dual, 1 apogee, 2 main
, 3 booster
>\0Igniter mode",
ao_config_ignite_mode_set, ao_config_ignite_mode_show },
#endif
#if HAS_AES
ao_config_ignite_mode_set, ao_config_ignite_mode_show },
#endif
#if HAS_AES