diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-09-18 16:01:43 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-09-18 16:01:43 -0600 |
| commit | 6e4c104c28952f2010c7b1cbc9ce59e148ab2d8f (patch) | |
| tree | b62b70697d5873aa2f3d37d09e8ccfb1ae779d6a /src | |
| parent | 63eeaada85cb9ddccb0fa9b2d751cc8f46399d9c (diff) | |
| parent | 4f2cbe0c537c9f417aae310cc3b89f84e0915103 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ao_flight_test.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c index 8e69730e..298848d6 100644 --- a/src/test/ao_flight_test.c +++ b/src/test/ao_flight_test.c @@ -344,8 +344,10 @@ struct ao_cmds { #include <ao_ms5607.h> struct ao_ms5607_prom ao_ms5607_prom; #include "ao_ms5607_convert.c" +#if TELEMEGA #define AO_PYRO_NUM 4 #include <ao_pyro.h> +#endif #else #include "ao_convert.c" #endif @@ -427,6 +429,9 @@ static double ao_test_landed_time; static int landed_set; static double landed_time; static double landed_height; +#if AO_PYRO_NUM +static uint16_t pyros_fired; +#endif #if HAS_MPU6000 static struct ao_mpu6000_sample ao_ground_mpu6000; @@ -825,6 +830,10 @@ ao_sleep(void *wchan) ao_insert(); return; case AO_LOG_TEMP_VOLT: + if (pyros_fired != log_mega->u.volt.pyro) { + printf("pyro changed %x -> %x\n", pyros_fired, log_mega->u.volt.pyro); + pyros_fired = log_mega->u.volt.pyro; + } break; case AO_LOG_GPS_TIME: ao_gps_prev = ao_gps_static; |