static int ao_records_read = 0;
static int ao_eof_read = 0;
static int ao_flight_ground_accel;
+static int ao_flight_started = 0;
void
ao_sleep(void *wchan)
uint16_t tick;
uint16_t a, b;
int ret;
+ char line[1024];
for (;;) {
if (ao_records_read > 20 && ao_flight_state == ao_flight_startup)
return;
}
- ret = fscanf(emulator_in, "%c %hx %hx %hx\n", &type, &tick, &a, &b);
- if (ret == EOF) {
+ if (!fgets(line, sizeof (line), emulator_in)) {
if (++ao_eof_read >= 1000) {
printf ("no more data, exiting simulation\n");
exit(0);
ao_insert();
return;
}
+ ret = sscanf(line, "%c %hx %hx %hx", &type, &tick, &a, &b);
if (ret != 4)
continue;
+ if (type != 'F' && !ao_flight_started)
+ continue;
+
switch (type) {
case 'F':
ao_flight_ground_accel = a;
+ ao_flight_started = 1;
break;
case 'S':
break;
return;
printf ("\t\t\t\t\t%s accel %g vel %g alt %d main %d\n",
ao_state_names[ao_flight_state],
- (ao_flight_accel - ao_ground_accel) / COUNTS_PER_G * GRAVITY,
+ (ao_ground_accel - ao_flight_accel) / COUNTS_PER_G * GRAVITY,
(double) ao_flight_vel / 100 / COUNTS_PER_G * GRAVITY,
- ao_pres_to_altitude(ao_flight_pres),
- ao_pres_to_altitude(ao_main_pres));
+ ao_pres_to_altitude(ao_flight_pres) - ao_pres_to_altitude(ao_ground_pres),
+ ao_pres_to_altitude(ao_main_pres) - ao_pres_to_altitude(ao_ground_pres));
if (ao_flight_state == ao_flight_landed)
exit(0);
}