projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop log dumping at flight end. Print 'end' at end of log.
[fw/altos]
/
ao_monitor.c
diff --git
a/ao_monitor.c
b/ao_monitor.c
index 5930afaa85b8c01af4dbcb1b6480253c23535370..5997d427a4388536687bf1a0c3a4c93238d655bb 100644
(file)
--- a/
ao_monitor.c
+++ b/
ao_monitor.c
@@
-17,11
+17,6
@@
#include "ao.h"
#include "ao.h"
-const char const * const ao_state_names[] = {
- "startup", "idle", "pad", "boost", "coast",
- "apogee", "drogue", "main", "landed", "invalid"
-};
-
__xdata uint8_t ao_monitoring;
__pdata uint8_t ao_monitor_led;
__xdata uint8_t ao_monitoring;
__pdata uint8_t ao_monitor_led;
@@
-41,19
+36,24
@@
ao_monitor(void)
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
if (state > ao_flight_invalid)
state = ao_flight_invalid;
if (recv.status & PKT_APPEND_STATUS_1_CRC_OK) {
- printf ("CALL %s SERIAL %3d RSSI %
3
d STATUS %02x STATE %7s ",
+ printf ("CALL %s SERIAL %3d RSSI %
4
d STATUS %02x STATE %7s ",
callsign,
recv.telemetry.addr,
(int) recv.rssi - 74, recv.status,
ao_state_names[state]);
callsign,
recv.telemetry.addr,
(int) recv.rssi - 74, recv.status,
ao_state_names[state]);
- printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d ",
+ printf("%5u a: %5d p: %5d t: %5d v: %5d d: %5d m: %5d
fa: %5d ga: %d fv: %7ld fp: %5d gp: %5d
",
recv.telemetry.adc.tick,
recv.telemetry.adc.accel,
recv.telemetry.adc.pres,
recv.telemetry.adc.temp,
recv.telemetry.adc.v_batt,
recv.telemetry.adc.sense_d,
recv.telemetry.adc.tick,
recv.telemetry.adc.accel,
recv.telemetry.adc.pres,
recv.telemetry.adc.temp,
recv.telemetry.adc.v_batt,
recv.telemetry.adc.sense_d,
- recv.telemetry.adc.sense_m);
+ recv.telemetry.adc.sense_m,
+ recv.telemetry.flight_accel,
+ recv.telemetry.ground_accel,
+ recv.telemetry.flight_vel,
+ recv.telemetry.flight_pres,
+ recv.telemetry.ground_pres);
ao_gps_print(&recv.telemetry.gps);
ao_rssi_set((int) recv.rssi - 74);
} else {
ao_gps_print(&recv.telemetry.gps);
ao_rssi_set((int) recv.rssi - 74);
} else {
@@
-66,24
+66,30
@@
ao_monitor(void)
__xdata struct ao_task ao_monitor_task;
__xdata struct ao_task ao_monitor_task;
+void
+ao_set_monitor(uint8_t monitoring)
+{
+ ao_monitoring = monitoring;
+ ao_wakeup(&ao_monitoring);
+}
+
static void
static void
-
ao_
set_monitor(void)
+set_monitor(void)
{
ao_cmd_hex();
{
ao_cmd_hex();
- ao_monitoring = ao_cmd_lex_i != 0;
- ao_wakeup(&ao_monitoring);
+ ao_set_monitor(ao_cmd_lex_i != 0);
}
__code struct ao_cmds ao_monitor_cmds[] = {
}
__code struct ao_cmds ao_monitor_cmds[] = {
- { 'm',
ao_set_monitor,
"m <0 off, 1 on> Enable/disable radio monitoring" },
- { 0,
ao_set_monitor,
NULL },
+ { 'm',
set_monitor,
"m <0 off, 1 on> Enable/disable radio monitoring" },
+ { 0,
set_monitor,
NULL },
};
void
};
void
-ao_monitor_init(uint8_t monitor_led
)
+ao_monitor_init(uint8_t monitor_led
, uint8_t monitoring) __reentrant
{
ao_monitor_led = monitor_led;
{
ao_monitor_led = monitor_led;
- ao_monitoring =
0
;
+ ao_monitoring =
monitoring
;
ao_cmd_register(&ao_monitor_cmds[0]);
ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
}
ao_cmd_register(&ao_monitor_cmds[0]);
ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
}