projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao_telemetry: Switch time variables to AO_TICK_TYPE
[fw/altos]
/
src
/
kernel
/
ao_tracker.c
diff --git
a/src/kernel/ao_tracker.c
b/src/kernel/ao_tracker.c
index 1454c17c31815aadd08c9d060f10a81cacf78711..8cf797e966b42a8c98f62cbb71c0c919dbe579f7 100644
(file)
--- a/
src/kernel/ao_tracker.c
+++ b/
src/kernel/ao_tracker.c
@@
-63,7
+63,7
@@
ao_tracker(void)
uint8_t new;
int32_t ground_distance;
int16_t height;
uint8_t new;
int32_t ground_distance;
int16_t height;
-
uint16_t
gps_tick;
+
AO_TICK_TYPE
gps_tick;
uint8_t new_tracker_running;
#if HAS_ADC
uint8_t new_tracker_running;
#if HAS_ADC
@@
-134,7
+134,7
@@
ao_tracker(void)
height = -height;
if (ao_tracker_force_telem > 1)
height = -height;
if (ao_tracker_force_telem > 1)
- printf("head %d ring %d ground_distance %
d height %d\n", gps_head, ring,
ground_distance, height);
+ printf("head %d ring %d ground_distance %
ld height %d\n", gps_head, ring, (long)
ground_distance, height);
if (ground_distance > ao_config.tracker_motion ||
height > (ao_config.tracker_motion << 1))
{
if (ground_distance > ao_config.tracker_motion ||
height > (ao_config.tracker_motion << 1))
{
@@
-186,9
+186,9
@@
ao_gps_lock(void)
static uint8_t erasing_current;
void
static uint8_t erasing_current;
void
-ao_tracker_erase_start(
uint16
_t flight)
+ao_tracker_erase_start(
int32
_t flight)
{
{
- erasing_current = flight == ao_flight_number;
+ erasing_current = flight ==
(int32_t)
ao_flight_number;
if (erasing_current) {
ao_mutex_get(&tracker_mutex);
ao_log_stop();
if (erasing_current) {
ao_mutex_get(&tracker_mutex);
ao_log_stop();