projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
core
/
ao_log.c
diff --git
a/src/core/ao_log.c
b/src/core/ao_log.c
index d696625efbf79ab5d6b9173bcb35ea63844b2cbe..701c81aba7444ba95c8a4ae7203c5fa7683c61dc 100644
(file)
--- a/
src/core/ao_log.c
+++ b/
src/core/ao_log.c
@@
-17,6
+17,7
@@
#include "ao.h"
#include <ao_log.h>
#include "ao.h"
#include <ao_log.h>
+#include <ao_config.h>
__pdata uint32_t ao_log_current_pos;
__pdata uint32_t ao_log_end_pos;
__pdata uint32_t ao_log_current_pos;
__pdata uint32_t ao_log_end_pos;
@@
-25,8
+26,6
@@
__xdata uint8_t ao_log_running;
__pdata enum ao_flight_state ao_log_state;
__xdata uint16_t ao_flight_number;
__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)
{
void
ao_log_flush(void)
{
@@
-50,7
+49,7
@@
static __xdata struct ao_log_erase erase;
static uint32_t
ao_log_erase_pos(uint8_t i)
{
static uint32_t
ao_log_erase_pos(uint8_t i)
{
- return i * sizeof (struct ao_log_erase) + AO_
STORAGE_ERASE_LOG
;
+ return i * sizeof (struct ao_log_erase) + AO_
CONFIG_MAX_SIZE
;
}
void
}
void
@@
-58,14
+57,14
@@
ao_log_write_erase(uint8_t pos)
{
erase.unused = 0x00;
erase.flight = ao_flight_number;
{
erase.unused = 0x00;
erase.flight = ao_flight_number;
- ao_
storage
_write(ao_log_erase_pos(pos), &erase, sizeof (erase));
- ao_
storage
_flush();
+ ao_
config
_write(ao_log_erase_pos(pos), &erase, sizeof (erase));
+ ao_
config
_flush();
}
static void
ao_log_read_erase(uint8_t pos)
{
}
static void
ao_log_read_erase(uint8_t pos)
{
- ao_
storage
_read(ao_log_erase_pos(pos), &erase, sizeof (erase));
+ ao_
config
_read(ao_log_erase_pos(pos), &erase, sizeof (erase));
}
}
@@
-89,7
+88,7
@@
ao_log_erase_mark(void)
static uint8_t
ao_log_slots()
{
static uint8_t
ao_log_slots()
{
- return (uint8_t) (ao_storage_
config
/ ao_config.flight_log_max);
+ return (uint8_t) (ao_storage_
log_max
/ ao_config.flight_log_max);
}
uint32_t
}
uint32_t
@@
-280,6
+279,11
@@
ao_log_init(void)
ao_cmd_register(&ao_log_cmds[0]);
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");
/* Create a task to log events to eeprom */
ao_add_task(&ao_log_task, ao_log, "log");
+#endif
}
}