projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools/ao-send-telem: Support sending TM v2 and Tm v2 telemetry
[fw/altos]
/
ao-tools
/
ao-send-telem
/
ao-send-telem.c
diff --git
a/ao-tools/ao-send-telem/ao-send-telem.c
b/ao-tools/ao-send-telem/ao-send-telem.c
index db061377807bf2c9624874ef07de249f0c5c3ad9..26c3263e72a193886a248067adb83746c869ba0f 100644
(file)
--- a/
ao-tools/ao-send-telem/ao-send-telem.c
+++ b/
ao-tools/ao-send-telem/ao-send-telem.c
@@
-85,6
+85,12
@@
packet_state(union ao_telemetry_all *telem)
case AO_TELEMETRY_MEGA_DATA:
cur_state = telem->mega_data.state;
break;
case AO_TELEMETRY_MEGA_DATA:
cur_state = telem->mega_data.state;
break;
+ case AO_TELEMETRY_METRUM_SENSOR:
+ cur_state = telem->metrum_sensor.state;
+ break;
+ case AO_TELEMETRY_MINI:
+ cur_state = telem->mini.state;
+ break;
}
return cur_state;
}
}
return cur_state;
}
@@
-224,8
+230,10
@@
main (int argc, char **argv)
last_tick = telem.generic.tick;
send_telem(cc, &telem);
} else {
last_tick = telem.generic.tick;
send_telem(cc, &telem);
} else {
+ enum ao_flight_state state = packet_state(&telem);
add_telem(&telem);
add_telem(&telem);
- if (packet_state(&telem) > ao_flight_pad) {
+ if (ao_flight_pad < state && state < ao_flight_landed) {
+ printf ("started\n");
started = 1;
last_tick = send_queued(cc, realtime);
}
started = 1;
last_tick = send_queued(cc, realtime);
}