diff options
author | cnlohr <lohr85@gmail.com> | 2017-04-04 23:19:03 -0400 |
---|---|---|
committer | cnlohr <lohr85@gmail.com> | 2017-04-04 23:19:03 -0400 |
commit | 5882e34cf7c6c9705ba0fd94cfb6e6072ceb8f63 (patch) | |
tree | b975cc4276fa938b5295e4cc97f49142bf968a3f /include/libsurvive/survive.h | |
parent | ed6f9dc1a9247581f13ecc6943823e04f0dcd4ca (diff) | |
parent | c68aebf34e1342560a3f8f52cb65e72eb2fa7b54 (diff) | |
download | libsurvive-5882e34cf7c6c9705ba0fd94cfb6e6072ceb8f63.tar.gz libsurvive-5882e34cf7c6c9705ba0fd94cfb6e6072ceb8f63.tar.bz2 |
Merge branch 'master' of https://github.com/cnlohr/libsurvive
Diffstat (limited to 'include/libsurvive/survive.h')
-rw-r--r-- | include/libsurvive/survive.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/libsurvive/survive.h b/include/libsurvive/survive.h index e04586c..278bbca 100644 --- a/include/libsurvive/survive.h +++ b/include/libsurvive/survive.h @@ -32,9 +32,9 @@ struct SurviveObject PoserCB PoserFn; //Device-specific information about the location of the sensors. This data will be used by the poser. - int8_t nr_locations; - FLT * sensor_locations; - FLT * sensor_normals; + int8_t nr_locations; // sensor count + FLT * sensor_locations; // size is nr_locations*3. Contains x,y,z values for each sensor + FLT * sensor_normals;// size is nrlocations*3. cointains normal vector for each sensor //Timing sensitive data (mostly for disambiguation) int32_t timebase_hz; //48,000,000 for normal vive hardware. (checked) @@ -47,6 +47,7 @@ struct SurviveObject int32_t pulse_synctime_slack; //5,000 for normal vive hardware. (guessed) //Flood info, for calculating which laser is currently sweeping. + void * disambiguator_data; int8_t oldcode; int8_t sync_set_number; //0 = master, 1 = slave, -1 = fault. int8_t did_handle_ootx; //If unset, will send lightcap data for sync pulses next time a sensor is hit. @@ -129,9 +130,9 @@ void survive_cal_install( SurviveContext * ctx ); //XXX This will be removed if //Call these from your callback if overridden. //Accept higher-level data. -void survive_default_light_process( SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length ); +void survive_default_light_process( SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length , uint32_t lh); void survive_default_imu_process( SurviveObject * so, int mode, FLT * accelgyro, uint32_t timecode, int id ); -void survive_default_angle_process( SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle ); +void survive_default_angle_process( SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle, uint32_t lh ); ////////////////////// Survive Drivers //////////////////////////// |