diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-16 10:52:13 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-16 10:52:13 -0700 |
| commit | ccaa625c6161e14f5c2281cc43134d1928094620 (patch) | |
| tree | c339acbb982d1f2d67977be98a4ae7cac85f8057 /include | |
| parent | d9c9ebe6de1e6f255d645dd6e641f2c288238bc2 (diff) | |
| parent | 6daf2506fcfbfcd26d63a8bddba319d67ecc33e5 (diff) | |
| download | libsurvive-ccaa625c6161e14f5c2281cc43134d1928094620.tar.gz libsurvive-ccaa625c6161e14f5c2281cc43134d1928094620.tar.bz2 | |
Merge branch 'master' into WinSupport2
# Conflicts:
# src/survive_vive.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/libsurvive/survive.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/libsurvive/survive.h b/include/libsurvive/survive.h index eb30252..e3e167a 100644 --- a/include/libsurvive/survive.h +++ b/include/libsurvive/survive.h @@ -50,8 +50,8 @@ struct SurviveObject 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 last_sync_time[NUM_LIGHTHOUSES]; + uint32_t last_sync_length[NUM_LIGHTHOUSES]; uint32_t recent_sync_time; uint32_t last_lighttime; //May be a 24- or 32- bit number depending on what device. @@ -161,7 +161,6 @@ void survive_add_driver( SurviveContext * ctx, void * payload, DeviceDriverCb po typedef struct { uint8_t sensor_id; - uint8_t type; //Mostly unused. Set to 255 to ignore it. uint16_t length; uint32_t timestamp; } |