diff options
| author | Michael Turvey <mwturvey@users.noreply.github.com> | 2017-03-25 21:57:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-25 21:57:41 -0700 |
| commit | b795afd28b7f7e2c1b9ca3f01e9f5ffeb1c75be8 (patch) | |
| tree | d7156b4742fa6a77c71c9deb46237c9b8ef1a670 /src/survive_process.c | |
| parent | 5404526ae8da8c5fdff81b8ee8120ffe73647747 (diff) | |
| parent | efe1b3e98866d45dd3bb5f8060712db152762edd (diff) | |
| download | libsurvive-b795afd28b7f7e2c1b9ca3f01e9f5ffeb1c75be8.tar.gz libsurvive-b795afd28b7f7e2c1b9ca3f01e9f5ffeb1c75be8.tar.bz2 | |
Merge pull request #43 from mwturvey/alternate_disambiguator
Alternate disambiguator
Diffstat (limited to 'src/survive_process.c')
| -rw-r--r-- | src/survive_process.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/survive_process.c b/src/survive_process.c index 9295638..b58b344 100644 --- a/src/survive_process.c +++ b/src/survive_process.c @@ -6,14 +6,14 @@ //XXX TODO: Once data is avialble in the context, use the stuff here to handle converting from time codes to //proper angles, then from there perform the rest of the solution. -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) { SurviveContext * ctx = so->ctx; - int base_station = acode >> 2; + int base_station = lh; int axis = acode & 1; if( ctx->calptr ) { - survive_cal_light( so, sensor_id, acode, timeinsweep, timecode, length ); + survive_cal_light( so, sensor_id, acode, timeinsweep, timecode, length, lh); } //We don't use sync times, yet. @@ -37,16 +37,16 @@ void survive_default_light_process( SurviveObject * so, int sensor_id, int acode #endif FLT length_sec = length / (FLT)so->timebase_hz; - ctx->angleproc( so, sensor_id, acode, timecode, length_sec, angle ); + ctx->angleproc( so, sensor_id, acode, timecode, length_sec, angle, lh); } -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) { SurviveContext * ctx = so->ctx; if( ctx->calptr ) { - survive_cal_angle( so, sensor_id, acode, timecode, length, angle ); + survive_cal_angle( so, sensor_id, acode, timecode, length, angle, lh ); } if( so->PoserFn ) { |