diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-25 18:31:12 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-25 18:31:12 +0400 |
| commit | 1e4bb764a61335c0e209f83438e74264e972a164 (patch) | |
| tree | 1d4fd2c9616ee7953eea17ab0c3e37fe49c05b47 /src/modules/systemlib | |
| parent | f36ffe0859912e2976df5b2cabc87018d3f55f4e (diff) | |
| parent | 8d2950561d1889ab1d4c2fc5d832a2984048487d (diff) | |
| download | px4-firmware-1e4bb764a61335c0e209f83438e74264e972a164.tar.gz px4-firmware-1e4bb764a61335c0e209f83438e74264e972a164.tar.bz2 px4-firmware-1e4bb764a61335c0e209f83438e74264e972a164.zip | |
Merge branch 'mathlib_new' into vector_control2
Diffstat (limited to 'src/modules/systemlib')
| -rw-r--r-- | src/modules/systemlib/perf_counter.c | 3 | ||||
| -rw-r--r-- | src/modules/systemlib/ppm_decode.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/modules/systemlib/perf_counter.c b/src/modules/systemlib/perf_counter.c index bf84b7945..b4ca0ed3e 100644 --- a/src/modules/systemlib/perf_counter.c +++ b/src/modules/systemlib/perf_counter.c @@ -295,10 +295,11 @@ perf_print_counter(perf_counter_t handle) case PC_ELAPSED: { struct perf_ctr_elapsed *pce = (struct perf_ctr_elapsed *)handle; - printf("%s: %llu events, %lluus elapsed, min %lluus max %lluus\n", + printf("%s: %llu events, %lluus elapsed, %llu avg, min %lluus max %lluus\n", handle->name, pce->event_count, pce->time_total, + pce->time_total / pce->event_count, pce->time_least, pce->time_most); break; diff --git a/src/modules/systemlib/ppm_decode.h b/src/modules/systemlib/ppm_decode.h index 6c5e15345..5a1ad84da 100644 --- a/src/modules/systemlib/ppm_decode.h +++ b/src/modules/systemlib/ppm_decode.h @@ -57,6 +57,7 @@ __BEGIN_DECLS * PPM decoder state */ __EXPORT extern uint16_t ppm_buffer[PPM_MAX_CHANNELS]; /**< decoded PPM channel values */ +__EXPORT extern uint16_t ppm_frame_length; /**< length of the decoded PPM frame (includes gap) */ __EXPORT extern unsigned ppm_decoded_channels; /**< count of decoded channels */ __EXPORT extern hrt_abstime ppm_last_valid_decode; /**< timestamp of the last valid decode */ |