Make ao_flight_test able to read raw logging data

[fw/altos] / ao_flight_test.c

diff --git a/ao_flight_test.c b/ao_flight_test.c
index e9c6a5304d8be85e22402e4a128cfd64698887cf..a94fc7402c6ad4ab143486961e88c16aed0b0048 100644 (file)
--- a/ao_flight_test.c
+++ b/ao_flight_test.c
@@ -165,6 +165,7 @@ ao_insert(void)
 static int     ao_records_read = 0;
 static int     ao_eof_read = 0;
 static int     ao_flight_ground_accel;
 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)
 
 void
 ao_sleep(void *wchan)


@@ -175,6 +176,7 @@ ao_sleep(void *wchan)
                uint16_t        tick;
                uint16_t        a, b;
                int             ret;
                uint16_t        tick;
                uint16_t        a, b;
                int             ret;

+               char            line[1024];

 
                for (;;) {
                        if (ao_records_read > 20 && ao_flight_state == ao_flight_startup)
 
                for (;;) {
                        if (ao_records_read > 20 && ao_flight_state == ao_flight_startup)


@@ -184,8 +186,7 @@ ao_sleep(void *wchan)
                                return;
                        }
 
                                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);
                                if (++ao_eof_read >= 1000) {
                                        printf ("no more data, exiting simulation\n");
                                        exit(0);


@@ -194,11 +195,16 @@ ao_sleep(void *wchan)
                                ao_insert();
                                return;
                        }
                                ao_insert();
                                return;
                        }

+                       ret = sscanf(line, "%c %hx %hx %hx", &type, &tick, &a, &b);

                        if (ret != 4)
                                continue;
                        if (ret != 4)
                                continue;

+                       if (type != 'F' && !ao_flight_started)
+                               continue;
+

                        switch (type) {
                        case 'F':
                                ao_flight_ground_accel = a;
                        switch (type) {
                        case 'F':
                                ao_flight_ground_accel = a;

+                               ao_flight_started = 1;

                                break;
                        case 'S':
                                break;
                                break;
                        case 'S':
                                break;