projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add config and pyro tabs to graph widget
[fw/altos]
/
src
/
kernel
/
ao_log_tiny.c
diff --git
a/src/kernel/ao_log_tiny.c
b/src/kernel/ao_log_tiny.c
index 046b7b204a200a9a5a9fb0722d6511d7edd47d91..ccdb3aac38fe8ca63ee70e463de617863a0340a8 100644
(file)
--- a/
src/kernel/ao_log_tiny.c
+++ b/
src/kernel/ao_log_tiny.c
@@
-18,7
+18,7
@@
#include "ao.h"
#include "ao.h"
-static
__data uint16_t
ao_log_tiny_interval;
+static
AO_TICK_TYPE
ao_log_tiny_interval;
#define AO_LOG_TINY_INTERVAL_DEFAULT AO_MS_TO_TICKS(1000)
#if USE_FAST_ASCENT_LOG
#define AO_LOG_TINY_INTERVAL_DEFAULT AO_MS_TO_TICKS(1000)
#if USE_FAST_ASCENT_LOG
@@
-30,7
+30,7
@@
static __data uint16_t ao_log_tiny_interval;
#endif
void
#endif
void
-ao_log_tiny_set_interval(
uint16_t
ticks)
+ao_log_tiny_set_interval(
AO_TICK_TYPE
ticks)
{
ao_log_tiny_interval = ticks;
}
{
ao_log_tiny_interval = ticks;
}
@@
-46,8
+46,8
@@
static void ao_log_tiny_data(uint16_t d)
}
}
}
}
-static
__xdata
uint16_t ao_log_pad_ring[AO_PAD_RING];
-static
__pdata
uint8_t ao_log_pad_ring_pos;
+static uint16_t ao_log_pad_ring[AO_PAD_RING];
+static uint8_t ao_log_pad_ring_pos;
#define ao_pad_ring_next(n) (((n) + 1) & (AO_PAD_RING - 1))
#define ao_pad_ring_next(n) (((n) + 1) & (AO_PAD_RING - 1))
@@
-134,7
+134,7
@@
ao_log(void)
* Write out the sample when finished
*/
now = ao_time();
* Write out the sample when finished
*/
now = ao_time();
- if ((
int16_t
) (now - (last_time + ao_log_tiny_interval)) >= 0 && count) {
+ if ((
AO_TICK_SIGNED
) (now - (last_time + ao_log_tiny_interval)) >= 0 && count) {
count = sum / count;
if (ao_log_started)
ao_log_tiny_data(count);
count = sum / count;
if (ao_log_started)
ao_log_tiny_data(count);
@@
-150,7
+150,7
@@
ao_log(void)
int16_t
ao_log_flight(uint8_t slot)
{
int16_t
ao_log_flight(uint8_t slot)
{
- static
__xdata
uint16_t flight;
+ static uint16_t flight;
(void) slot;
ao_storage_read(0, &flight, 2);
(void) slot;
ao_storage_read(0, &flight, 2);