diff options
author | cnlohr <lohr85@gmail.com> | 2018-03-10 23:57:58 -0500 |
---|---|---|
committer | cnlohr <lohr85@gmail.com> | 2018-03-10 23:57:58 -0500 |
commit | a2ba45f43ae02b1e39b1816fe9c1c70c54a7f046 (patch) | |
tree | b0a916dad0fb979e997d069a0f6c3184279e479a /include | |
parent | 5ae3acb6d63301ac14beaebe692f5af680e65c26 (diff) | |
download | libsurvive-a2ba45f43ae02b1e39b1816fe9c1c70c54a7f046.tar.gz libsurvive-a2ba45f43ae02b1e39b1816fe9c1c70c54a7f046.tar.bz2 |
Switch from pos,quat to pose. Also change initialization order.
Diffstat (limited to 'include')
-rw-r--r-- | include/libsurvive/survive.h | 2 | ||||
-rw-r--r-- | include/libsurvive/survive_types.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/libsurvive/survive.h b/include/libsurvive/survive.h index d9b5f08..f441c89 100644 --- a/include/libsurvive/survive.h +++ b/include/libsurvive/survive.h @@ -201,7 +201,7 @@ void survive_default_light_process( SurviveObject * so, int sensor_id, int acode 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, uint32_t lh ); void survive_default_button_process(SurviveObject * so, uint8_t eventType, uint8_t buttonId, uint8_t axis1Id, uint16_t axis1Val, uint8_t axis2Id, uint16_t axis2Val); -void survive_default_raw_pose_process(SurviveObject * so, uint8_t lighthouse, FLT *position, FLT *quaternion); +void survive_default_raw_pose_process(SurviveObject * so, uint8_t lighthouse, FLT *pose); ////////////////////// Survive Drivers //////////////////////////// diff --git a/include/libsurvive/survive_types.h b/include/libsurvive/survive_types.h index be1115b..ba0c8f1 100644 --- a/include/libsurvive/survive_types.h +++ b/include/libsurvive/survive_types.h @@ -49,7 +49,7 @@ typedef void (*light_process_func)( SurviveObject * so, int sensor_id, int acode typedef void (*imu_process_func)( SurviveObject * so, int mask, FLT * accelgyro, uint32_t timecode, int id ); typedef void (*angle_process_func)( SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle, uint32_t lh); typedef void(*button_process_func)(SurviveObject * so, uint8_t eventType, uint8_t buttonId, uint8_t axis1Id, uint16_t axis1Val, uint8_t axis2Id, uint16_t axis2Val); -typedef void(*raw_pose_func)(SurviveObject * so, uint8_t lighthouse, FLT *position, FLT *quaternion); +typedef void(*raw_pose_func)(SurviveObject * so, uint8_t lighthouse, FLT *pose); typedef int(*haptic_func)(SurviveObject * so, uint8_t reserved, uint16_t pulseHigh , uint16_t pulseLow, uint16_t repeatCount); |