From 76623e6a945cb8be50f8081f610b397e480dcf58 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Fri, 3 Mar 2017 01:32:49 -0500 Subject: First thoughts on a resolver? --- include/survive.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'include/survive.h') diff --git a/include/survive.h b/include/survive.h index 51910a6..0d43465 100644 --- a/include/survive.h +++ b/include/survive.h @@ -20,6 +20,11 @@ struct SurviveContext; //It will also require a recompile. TODO: revisit this and correct the comment once fixed. #define NUM_LIGHTHOUSES 2 +struct SurviveObject; + +//XXX TODO -> Probably should be one function to take multiple types of input? +typedef int (*ResolverCB)( struct SurviveObject * so ); + struct SurviveObject { struct SurviveContext * ctx; @@ -36,9 +41,16 @@ struct SurviveObject int8_t ison:1; int8_t additional_flags:6; + //Pose Information, also "resolver" field. + FLT PoseConfidence; //0..1 + FLT Position[3]; + FLT Rotation[4]; + void * Resolver; + ResolverCB * PreferredResolverFn; //XXX TODO + + int8_t nr_locations; FLT * sensor_locations; FLT * sensor_normals; - int8_t nr_locations; //Timing sensitive data (mostly for disambiguation) int32_t timebase_hz; //48,000,000 for normal vive hardware. (checked) @@ -51,7 +63,7 @@ struct SurviveObject int32_t pulse_synctime_slack; //5,000 for normal vive hardware. (guessed) //Flood info, for calculating which laser is currently sweeping. - int8_t oldcode; + 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. uint32_t last_time[NUM_LIGHTHOUSES]; @@ -60,10 +72,14 @@ struct SurviveObject uint32_t last_lighttime; //May be a 24- or 32- bit number depending on what device. + //Debug int tsl; }; + + + typedef void (*text_feedback_func)( struct SurviveContext * ctx, const char * fault ); typedef void (*light_process_func)( struct SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length ); typedef void (*imu_process_func)( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id ); -- cgit v1.2.3 From 58b19da6848e64c9ca7aa47d8b3e0cd30db89d44 Mon Sep 17 00:00:00 2001 From: cnlohr Date: Fri, 3 Mar 2017 02:15:04 -0500 Subject: Split out into some more things in the include folder. Getting closer to trying to have posers. --- include/survive.h | 118 ------------------------------------------------------ 1 file changed, 118 deletions(-) delete mode 100644 include/survive.h (limited to 'include/survive.h') diff --git a/include/survive.h b/include/survive.h deleted file mode 100644 index 0d43465..0000000 --- a/include/survive.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef _SURVIVE_H -#define _SURVIVE_H - -#include - -#ifndef FLT -#ifdef USE_DOUBLE -#define FLT double -#else -#define FLT float -#endif -#endif - -struct SurviveContext; - -//DANGER: This structure may be redefined. Note that it is logically split into 64-bit chunks -//for optimization on 32- and 64-bit systems. - -//Careful with this, you can't just add another one right now, would take minor changes in survive_data.c and the cal tools. -//It will also require a recompile. TODO: revisit this and correct the comment once fixed. -#define NUM_LIGHTHOUSES 2 - -struct SurviveObject; - -//XXX TODO -> Probably should be one function to take multiple types of input? -typedef int (*ResolverCB)( struct SurviveObject * so ); - -struct SurviveObject -{ - struct SurviveContext * ctx; - - char codename[4]; //3 letters, null-terminated. Currently HMD, WM0, WM1. - char drivername[4]; //3 letters for driver. Currently "HTC" - int16_t buttonmask; - int16_t axis1; - - int16_t axis2; - int16_t axis3; - int8_t charge; - int8_t charging:1; - int8_t ison:1; - int8_t additional_flags:6; - - //Pose Information, also "resolver" field. - FLT PoseConfidence; //0..1 - FLT Position[3]; - FLT Rotation[4]; - void * Resolver; - ResolverCB * PreferredResolverFn; //XXX TODO - - int8_t nr_locations; - FLT * sensor_locations; - FLT * sensor_normals; - - //Timing sensitive data (mostly for disambiguation) - int32_t timebase_hz; //48,000,000 for normal vive hardware. (checked) - int32_t timecenter_ticks; //200,000 for normal vive hardware. (checked) - int32_t pulsedist_max_ticks; //500,000 for normal vive hardware. (guessed) - int32_t pulselength_min_sync; //2,200 for normal vive hardware. (guessed) - int32_t pulse_in_clear_time; //35,000 for normal vive hardware. (guessed) - int32_t pulse_max_for_sweep; //1,800 for normal vive hardware. (guessed) - int32_t pulse_synctime_offset; //20,000 for normal vive hardware. (guessed) - int32_t pulse_synctime_slack; //5,000 for normal vive hardware. (guessed) - - //Flood info, for calculating which laser is currently sweeping. - 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. - uint32_t last_time[NUM_LIGHTHOUSES]; - uint32_t last_length[NUM_LIGHTHOUSES]; - uint32_t recent_sync_time; - - uint32_t last_lighttime; //May be a 24- or 32- bit number depending on what device. - - - //Debug - int tsl; -}; - - - - -typedef void (*text_feedback_func)( struct SurviveContext * ctx, const char * fault ); -typedef void (*light_process_func)( struct SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length ); -typedef void (*imu_process_func)( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id ); -typedef void (*angle_process_func)( struct SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle ); - -struct SurviveContext * survive_init( int headless ); - -//For any of these, you may pass in 0 for the function pointer to use default behavior. -void survive_install_info_fn( struct SurviveContext * ctx, text_feedback_func fbp ); -void survive_install_error_fn( struct SurviveContext * ctx, text_feedback_func fbp ); -void survive_install_light_fn( struct SurviveContext * ctx, light_process_func fbp ); -void survive_install_imu_fn( struct SurviveContext * ctx, imu_process_func fbp ); -void survive_install_angle_fn( struct SurviveContext * ctx, angle_process_func fbp ); - -void survive_close( struct SurviveContext * ctx ); -int survive_poll(); - -struct SurviveObject * survive_get_so_by_name( struct SurviveContext * ctx, const char * name ); - -//Utilitiy functions. -int survive_simple_inflate( struct SurviveContext * ctx, const char * input, int inlen, char * output, int outlen ); - -int survive_send_magic( struct SurviveContext * ctx, int magic_code, void * data, int datalen ); - -//Install the calibrator. -void survive_cal_install( struct SurviveContext * ctx ); - -//Call these from your callback if overridden. -//Accept higher-level data. -void survive_default_light_process( struct SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length ); -void survive_default_imu_process( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id ); -void survive_default_angle_process( struct SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle ); - - -#endif - -- cgit v1.2.3