diff options
| -rw-r--r-- | calibrate.c | 2 | ||||
| -rw-r--r-- | src/poser_octavioradii.c | 6 | ||||
| -rwxr-xr-x | src/survive.c | 2 | ||||
| -rwxr-xr-x | src/survive_vive.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/calibrate.c b/calibrate.c index cfd3e17..ff3b774 100644 --- a/calibrate.c +++ b/calibrate.c @@ -14,7 +14,7 @@ struct SurviveContext * ctx; int quit = 0; -static LighthouseCount = 0; +static int LighthouseCount = 0; void HandleKey( int keycode, int bDown ) { diff --git a/src/poser_octavioradii.c b/src/poser_octavioradii.c index 0d8674c..be1e9f7 100644 --- a/src/poser_octavioradii.c +++ b/src/poser_octavioradii.c @@ -252,7 +252,7 @@ static void normalizeAndMultiplyVector(FLT *vectorToNormalize, size_t count, FLT } -static RefineEstimateUsingGradientDescentRadii(FLT *estimateOut, SensorAngles *angles, FLT *initialEstimate, size_t numRadii, PointPair *pairs, size_t numPairs, FILE *logFile) +static void RefineEstimateUsingGradientDescentRadii(FLT *estimateOut, SensorAngles *angles, FLT *initialEstimate, size_t numRadii, PointPair *pairs, size_t numPairs, FILE *logFile) { int i = 0; FLT lastMatchFitness = calculateFitness(angles, initialEstimate, pairs, numPairs); @@ -521,9 +521,9 @@ static void QuickPose(SurviveObject *so) if (sensorCount > 4) { - FLT pos[3]; + Point pos; FLT orient[4]; - SolveForLighthouseRadii(pos, orient, to); + SolveForLighthouseRadii(&pos, orient, to); } diff --git a/src/survive.c b/src/survive.c index 1c406e8..a5ca68f 100755 --- a/src/survive.c +++ b/src/survive.c @@ -182,7 +182,7 @@ SurviveContext * survive_init( int headless ) ctx->buttonQueue.buttonservicesem = OGCreateSema(); // start the thread to process button data - ctx->buttonservicethread = OGCreateThread(button_servicer, ctx); + ctx->buttonservicethread = OGCreateThread(&button_servicer, ctx); survive_install_button_fn(ctx, NULL); survive_install_raw_pose_fn(ctx, NULL); diff --git a/src/survive_vive.c b/src/survive_vive.c index 65636cf..934b5d3 100755 --- a/src/survive_vive.c +++ b/src/survive_vive.c @@ -309,8 +309,8 @@ static inline int getupdate_feature_report(libusb_device_handle* dev, uint16_t i int ret = libusb_control_transfer(dev, LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_IN, 0x01, 0x300 | data[0], interface, data, datalen, 1000 ); if( ret == -9 ) return -9; - if (ret < 0) - return -1; + if (ret < 0) + return -1; return ret; } |