Merge remote-tracking branch 'origin/master'

[fw/altos] / src / core / ao_log.c

diff --git a/src/core/ao_log.c b/src/core/ao_log.c
index 6d3ad535971fff508867195c8e748ff9f161e2fd..8bcb770763c0efe70ad1917c4d8caabc14ab257c 100644 (file)
--- a/src/core/ao_log.c
+++ b/src/core/ao_log.c
@@ -16,16 +16,15 @@
  */
 
 #include "ao.h"
+#include <ao_log.h>
 
 __pdata uint32_t ao_log_current_pos;
 __pdata uint32_t ao_log_end_pos;
 __pdata uint32_t ao_log_start_pos;
 __xdata uint8_t        ao_log_running;
-__pdata enum flight_state ao_log_state;
+__pdata enum ao_flight_state ao_log_state;
 __xdata uint16_t ao_flight_number;
 
-__code uint8_t ao_log_format = AO_LOG_FORMAT_FULL;
-
 void
 ao_log_flush(void)
 {
@@ -264,7 +263,7 @@ ao_log_delete(void) __reentrant
 }
 
 __code struct ao_cmds ao_log_cmds[] = {
-       { ao_log_list,  "l\0List flight logs" },
+       { ao_log_list,  "l\0List logs" },
        { ao_log_delete,        "d <flight-number>\0Delete flight" },
        { 0,    NULL },
 };
@@ -279,6 +278,11 @@ ao_log_init(void)
 
        ao_cmd_register(&ao_log_cmds[0]);
 
+#ifndef HAS_ADC
+#error Define HAS_ADC for ao_log.c
+#endif
+#if HAS_ADC
        /* Create a task to log events to eeprom */
        ao_add_task(&ao_log_task, ao_log, "log");
+#endif
 }