diff options
author | mwturvey <michael.w.turvey@intel.com> | 2017-03-08 10:47:27 -0700 |
---|---|---|
committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-08 10:47:27 -0700 |
commit | a5430b24d41d1bb795db14036b35c39c7a9accd4 (patch) | |
tree | 90120d0a3d529aca81d77fe825229f8a6d641bc6 /calibrate.c | |
parent | 321749a4b8e3e8b3f4b03863200fbf86e36a0bbe (diff) | |
parent | c65498054c77192b2a12fdb5ef44439a14110292 (diff) | |
download | libsurvive-a5430b24d41d1bb795db14036b35c39c7a9accd4.tar.gz libsurvive-a5430b24d41d1bb795db14036b35c39c7a9accd4.tar.bz2 |
Merge branch 'master' of https://github.com/cnlohr/libsurvive
Diffstat (limited to 'calibrate.c')
-rw-r--r-- | calibrate.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/calibrate.c b/calibrate.c index a1e150b..c557251 100644 --- a/calibrate.c +++ b/calibrate.c @@ -10,6 +10,8 @@ #include "src/survive_cal.h" #include <DrawFunctions.h> +#include "src/survive_config.h" + struct SurviveContext * ctx; void HandleKey( int keycode, int bDown ) @@ -74,15 +76,14 @@ void my_light_process( struct SurviveObject * so, int sensor_id, int acode, int } } -void my_imu_process( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id ) +void my_imu_process( struct SurviveObject * so, int mask, FLT * accelgyro, uint32_t timecode, int id ) { - survive_default_imu_process( so, accelgyro, timecode, id ); + survive_default_imu_process( so, mask, accelgyro, timecode, id ); -return; //if( so->codename[0] == 'H' ) - if( 1 ) + if( 0 ) { - printf( "I %s %d %d %d %d %d %d %d %d\n", so->codename, timecode, accelgyro[0], accelgyro[1], accelgyro[2], accelgyro[3], accelgyro[4], accelgyro[5], id ); + printf( "I %s %d %f %f %f %f %f %f %d\n", so->codename, timecode, accelgyro[0], accelgyro[1], accelgyro[2], accelgyro[3], accelgyro[4], accelgyro[5], id ); } } @@ -146,6 +147,7 @@ void * GuiThread( void * v ) int main() { ctx = survive_init( 0 ); + config_init(); survive_install_light_fn( ctx, my_light_process ); survive_install_imu_fn( ctx, my_imu_process ); |