diff options
| author | Justin Berger <j.david.berger@gmail.com> | 2018-03-21 01:20:49 -0600 |
|---|---|---|
| committer | Justin Berger <j.david.berger@gmail.com> | 2018-03-21 01:20:49 -0600 |
| commit | 3209993da5cd0bed791babf5a45cdb42cd1e6f46 (patch) | |
| tree | ed79526b99a0ab619e65062c45a2f64d40b33f2d /src/survive_data.c | |
| parent | 31d9fc358a85fe47dab28f78c396ee1f8d4d6dbb (diff) | |
| parent | be3fa4562f9578472de1ded5588df8dc502898c6 (diff) | |
| download | libsurvive-3209993da5cd0bed791babf5a45cdb42cd1e6f46.tar.gz libsurvive-3209993da5cd0bed791babf5a45cdb42cd1e6f46.tar.bz2 | |
Merge branch 'master' into standard_lh_calib
Diffstat (limited to 'src/survive_data.c')
| -rw-r--r-- | src/survive_data.c | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/src/survive_data.c b/src/survive_data.c index befcbe7..c586658 100644 --- a/src/survive_data.c +++ b/src/survive_data.c @@ -41,6 +41,7 @@ typedef struct typedef struct { double acode_offset; + int sent_out_ootx_bits; } lightcap2_global_data; typedef struct @@ -218,7 +219,22 @@ void handle_lightcap2_process_sweep_data(SurviveObject *so) //printf("%4d\n", lcd->sweep.sweep_len[i]); int offset_from = lcd->sweep.sweep_time[i] - lcd->per_sweep.activeSweepStartTime + lcd->sweep.sweep_len[i] / 2; -// if (offset_from < 380000 && offset_from > 70000) + // first, send out the sync pulse data for the last round (for OOTX decoding + if (!lcd->global.sent_out_ootx_bits) { + if (lcd->per_sweep.lh_max_pulse_length[0] != 0) { + so->ctx->lightproc( + so, -1, handle_lightcap2_getAcodeFromSyncPulse(so, lcd->per_sweep.lh_max_pulse_length[0]), + lcd->per_sweep.lh_max_pulse_length[0], lcd->per_sweep.lh_start_time[0], 0, 0); + } + if (lcd->per_sweep.lh_max_pulse_length[1] != 0) { + so->ctx->lightproc( + so, -2, handle_lightcap2_getAcodeFromSyncPulse(so, lcd->per_sweep.lh_max_pulse_length[1]), + lcd->per_sweep.lh_max_pulse_length[1], lcd->per_sweep.lh_start_time[1], 0, 1); + } + lcd->global.sent_out_ootx_bits = 1; + } + + // if (offset_from < 380000 && offset_from > 70000) { //if (longest_pulse *10 / 8 < lcd->sweep.sweep_len[i]) { @@ -329,32 +345,7 @@ void handle_lightcap2_sync(SurviveObject * so, LightcapElement * le ) //this should probably be fixed. Maybe some kind of timing based guess at which lighthouse. // looks like this is the first sync pulse. Cool! - - // first, send out the sync pulse data for the last round (for OOTX decoding - { - if (lcd->per_sweep.lh_max_pulse_length[0] != 0) - { - so->ctx->lightproc( - so, - -1, - handle_lightcap2_getAcodeFromSyncPulse(so, lcd->per_sweep.lh_max_pulse_length[0]), - lcd->per_sweep.lh_max_pulse_length[0], - lcd->per_sweep.lh_start_time[0], - 0, - 0); - } - if (lcd->per_sweep.lh_max_pulse_length[1] != 0) - { - so->ctx->lightproc( - so, - -2, - handle_lightcap2_getAcodeFromSyncPulse(so, lcd->per_sweep.lh_max_pulse_length[1]), - lcd->per_sweep.lh_max_pulse_length[1], - lcd->per_sweep.lh_start_time[1], - 0, - 1); - } - } + lcd->global.sent_out_ootx_bits = 0; //fprintf(stderr, "************************************ Reinitializing Disambiguator!!!\n"); // initialize here. @@ -384,7 +375,6 @@ void handle_lightcap2_sync(SurviveObject * so, LightcapElement * le ) } */ } - // printf("%d %d\n", acode, lcd->per_sweep.activeLighthouse ); } |