From 4b33798e33e5d2841a91041dad8b99ddfbe29b6b Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sat, 10 Mar 2018 20:52:34 -0500 Subject: Use HIDAPI and update formatting for the data recorder. --- Makefile | 6 +++--- data_recorder.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e57dae5..25d510f 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,9 @@ LIBSURVIVE_CORE:=src/survive.o src/survive_usb.o src/survive_data.o src/survive_ #If you want to use HIDAPI on Linux. -#CFLAGS:=$(CFLAGS) -DHIDAPI -#REDISTS:=$(REDISTS) redist/hid-linux.o -#LDFLAGS:=$(LDFLAGS) -ludev +CFLAGS:=$(CFLAGS) -DHIDAPI +REDISTS:=$(REDISTS) redist/hid-linux.o +LDFLAGS:=$(LDFLAGS) -ludev #Useful Preprocessor Directives: # -DUSE_DOUBLE = use double instead of float for most operations. diff --git a/data_recorder.c b/data_recorder.c index 6123d57..80e95be 100644 --- a/data_recorder.c +++ b/data_recorder.c @@ -53,7 +53,7 @@ double timestamp_in_us() { int write_to_output(const char *format, ...) { va_list args; va_start(args, format); - fprintf(output_file, "%.17g ", timestamp_in_us()); + fprintf(output_file, "%0.6f ", timestamp_in_us()); vfprintf(output_file, format, args); va_end(args); @@ -116,7 +116,7 @@ void my_light_process(struct SurviveObject *so, int sensor_id, int acode, void my_imu_process(struct SurviveObject *so, int mask, FLT *accelgyro, uint32_t timecode, int id) { survive_default_imu_process(so, mask, accelgyro, timecode, id); - write_to_output("I %s %d %u %.17g %.17g %.17g %.17g %.17g %.17g %d\n", + write_to_output("I %s %d %u %0.6f %0.6f %0.6f %0.6f %0.6f %0.6f %d\n", so->codename, mask, timecode, accelgyro[0], accelgyro[1], accelgyro[2], accelgyro[3], accelgyro[4], accelgyro[5], id); } -- cgit v1.2.3