summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-02-07 01:30:21 -0800
committerKeith Packard <keithp@keithp.com>2015-02-07 01:30:21 -0800
commit211cb482e4da04dc032432abc236ef8b5a5e732f (patch)
tree20dc5cf15e516d3207e176a0b1eebbdbf17cd5b7
parentf9f235bce84df3a6c0261e9d256aac544f87f70f (diff)
altos: Separate out ao_tracker force from dbg
Allow enabling telemetry when USB is connected without also enabling the motion debugging output. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/kernel/ao_tracker.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/kernel/ao_tracker.c b/src/kernel/ao_tracker.c
index 9b007af8..962f145d 100644
--- a/src/kernel/ao_tracker.c
+++ b/src/kernel/ao_tracker.c
@@ -132,7 +132,7 @@ ao_tracker(void)
if (height < 0)
height = -height;
- if (ao_tracker_force_telem)
+ if (ao_tracker_force_telem > 1)
printf("head %d ring %d ground_distance %d height %d\n", gps_head, ring, ground_distance, height);
if (ground_distance > ao_config.tracker_motion ||
height > (ao_config.tracker_motion << 1))
@@ -141,7 +141,7 @@ ao_tracker(void)
break;
}
}
- if (ao_tracker_force_telem) {
+ if (ao_tracker_force_telem > 1) {
printf ("moving %d started %d\n", moving, log_started);
flush();
}
@@ -191,11 +191,9 @@ static struct ao_task ao_tracker_task;
static void
ao_tracker_set_telem(void)
{
- uint8_t telem;
ao_cmd_hex();
- telem = ao_cmd_lex_i;
if (ao_cmd_status == ao_cmd_success)
- ao_tracker_force_telem = telem;
+ ao_tracker_force_telem = ao_cmd_lex_i;
ao_cmd_status = ao_cmd_success;
printf ("flight: %d\n", ao_flight_number);
printf ("force_telem: %d\n", ao_tracker_force_telem);
@@ -211,7 +209,7 @@ ao_tracker_set_telem(void)
}
static const struct ao_cmds ao_tracker_cmds[] = {
- { ao_tracker_set_telem, "t <d>\0Set telem on USB" },
+ { ao_tracker_set_telem, "t <d>\0Set telem on USB (0 off, 1 on, 2 dbg)" },
{ 0, NULL },
};