X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Fao-send-telem%2Fao-send-telem.c;h=26c3263e72a193886a248067adb83746c869ba0f;hb=d1f9121593fe30b924223e89ef4d596b5bec2b25;hp=c6cc51a160227f7e3c9d7620f432fb388043a6db;hpb=583458772746317b98fced907ec780edff465888;p=fw%2Faltos diff --git a/ao-tools/ao-send-telem/ao-send-telem.c b/ao-tools/ao-send-telem/ao-send-telem.c index c6cc51a1..26c3263e 100644 --- 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_METRUM_SENSOR: + cur_state = telem->metrum_sensor.state; + break; + case AO_TELEMETRY_MINI: + cur_state = telem->mini.state; + break; } return cur_state; } @@ -199,7 +205,7 @@ main (int argc, char **argv) exit (1); cc_usb_printf(cc, "m 0\n"); - cc_usb_printf(cc, "F %d\n", freq); + cc_usb_printf(cc, "c F %d\n", freq); for (i = optind; i < argc; i++) { file = fopen(argv[i], "r"); if (!file) { @@ -224,8 +230,10 @@ main (int argc, char **argv) last_tick = telem.generic.tick; send_telem(cc, &telem); } else { + enum ao_flight_state state = packet_state(&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); }