aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Turvey <mturvey6@gmail.com>2017-03-24 16:00:20 -0700
committerMichael Turvey <mturvey6@gmail.com>2017-03-24 16:00:20 -0700
commitefe1b3e98866d45dd3bb5f8060712db152762edd (patch)
tree6d6479c5db0a716c9db021a5269068d48583c03d
parenta279a202768e1cae10f4fb651aad2b3b21db43ab (diff)
downloadlibsurvive-efe1b3e98866d45dd3bb5f8060712db152762edd.tar.gz
libsurvive-efe1b3e98866d45dd3bb5f8060712db152762edd.tar.bz2
Fixing linux
-rw-r--r--calibrate_client.c4
-rwxr-xr-xsrc/survive_cal.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/calibrate_client.c b/calibrate_client.c
index 1e18321..abfbabc 100644
--- a/calibrate_client.c
+++ b/calibrate_client.c
@@ -90,9 +90,9 @@ void my_imu_process( struct SurviveObject * so, int mask, FLT * accelgyro, uint3
}
-void my_angle_process( struct SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle )
+void my_angle_process( struct SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle, uint32_t lh )
{
- survive_default_angle_process( so, sensor_id, acode, timecode, length, angle );
+ survive_default_angle_process( so, sensor_id, acode, timecode, length, angle, lh );
}
diff --git a/src/survive_cal.c b/src/survive_cal.c
index 5414048..ae92bad 100755
--- a/src/survive_cal.c
+++ b/src/survive_cal.c
@@ -141,7 +141,7 @@ void survive_cal_install( struct SurviveContext * ctx )
if (AllowAllTrackersForCal || isRequiredTracker)
{
- if (MAX_DEVICES_TO_CAL < cd->numPoseObjects)
+ if (MAX_DEVICES_TO_CAL > cd->numPoseObjects)
{
cd->poseobjects[j] = ctx->objs[j];
cd->numPoseObjects++;
@@ -150,7 +150,7 @@ void survive_cal_install( struct SurviveContext * ctx )
}
else
{
- SV_ERROR("Calibration is NOT using %s; device count exceeds MAX_DEVICES_TO_CAL", cd->poseobjects[j]->codename);
+ SV_INFO("Calibration is NOT using %s; device count exceeds MAX_DEVICES_TO_CAL", ctx->objs[j]->codename);
}
}