Merge pull request #11 from mcharleb/PRIu64-fix

Fixed printf of uint64_t
This commit is contained in:
Lorenz Meier
2016-01-28 01:01:10 +01:00
2 changed files with 9 additions and 5 deletions
+6 -4
View File
@@ -40,6 +40,8 @@
*
*/
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include <math.h>
#include "estimator_base.h"
#include <mathlib/mathlib.h>
@@ -337,7 +339,7 @@ void EstimatorBase::printStoredIMU()
void EstimatorBase::printIMU(struct imuSample *data)
{
printf("time %llu\n", data->time_us);
printf("time %" PRIu64 "\n", data->time_us);
printf("delta_ang_dt %.5f\n", (double)data->delta_ang_dt);
printf("delta_vel_dt %.5f\n", (double)data->delta_vel_dt);
printf("dA: %.5f %.5f %.5f \n", (double)data->delta_ang(0), (double)data->delta_ang(1), (double)data->delta_ang(2));
@@ -365,14 +367,14 @@ void EstimatorBase::printStoredMag()
void EstimatorBase::printMag(struct magSample *data)
{
printf("time %llu\n", data->time_us);
printf("time %" PRIu64 "\n", data->time_us);
printf("mag: %.5f %.5f %.5f \n\n", (double)data->mag(0), (double)data->mag(1), (double)data->mag(2));
}
void EstimatorBase::printBaro(struct baroSample *data)
{
printf("time %llu\n", data->time_us);
printf("time %" PRIu64 "\n", data->time_us);
printf("baro: %.5f\n\n", (double)data->hgt);
}
@@ -387,7 +389,7 @@ void EstimatorBase::printStoredBaro()
void EstimatorBase::printGps(struct gpsSample *data)
{
printf("time %llu\n", data->time_us);
printf("time %" PRIu64 "\n", data->time_us);
printf("gps pos: %.5f %.5f %.5f\n", (double)data->pos(0), (double)data->pos(1), (double)data->hgt);
printf("gps vel %.5f %.5f %.5f\n\n", (double)data->vel(0), (double)data->vel(1), (double)data->vel(2));
}