diff options
| author | Michael Turvey <mwturvey@users.noreply.github.com> | 2017-12-19 23:36:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 23:36:46 -0700 |
| commit | 7c883ad2f01a452b3a0664deed12c0121429092a (patch) | |
| tree | 5a47b9c9403ac2d37dee3b449cd5d353d47014fd /src | |
| parent | e5a9bff729fb0c596daed5cdf45683e11c666766 (diff) | |
| parent | a015a5bc3631f813281c5af85a29b9d84a3eb924 (diff) | |
| download | libsurvive-7c883ad2f01a452b3a0664deed12c0121429092a.tar.gz libsurvive-7c883ad2f01a452b3a0664deed12c0121429092a.tar.bz2 | |
Merge pull request #82 from mwturvey/SupportOneLighthouse
Add support for using only 1 lighthouse
Diffstat (limited to 'src')
| -rwxr-xr-x | src/survive.c | 2 | ||||
| -rwxr-xr-x | src/survive_cal.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/survive.c b/src/survive.c index f637bd8..0c88137 100755 --- a/src/survive.c +++ b/src/survive.c @@ -75,6 +75,8 @@ SurviveContext * survive_init( int headless ) config_read(ctx, "config.json"); + ctx->activeLighthouses = config_read_uint32(ctx->global_config_values, "LighthouseCount", 2); + ctx->faultfunction = survivefault; ctx->notefunction = survivenote; diff --git a/src/survive_cal.c b/src/survive_cal.c index ae92bad..0dbadd3 100755 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -218,7 +218,7 @@ void survive_cal_light( struct SurviveObject * so, int sensor_id, int acode, int int i; for( i = 0; i < NUM_LIGHTHOUSES; i++ ) if( ctx->bsd[i].OOTXSet == 0 ) break; - if( i == NUM_LIGHTHOUSES ) cd->stage = 2; //TODO: Make this configuratble to allow single lighthouse. + if( i == ctx->activeLighthouses ) cd->stage = 2; //TODO: Make this configuratble to allow single lighthouse. } break; case 3: //Look for light sync lengths. @@ -309,7 +309,7 @@ void survive_cal_angle( struct SurviveObject * so, int sensor_id, int acode, uin cd->found_common = 1; for( i = 0; i < cd->numPoseObjects; i++ ) //for( i = 0; i < MAX_SENSORS_TO_CAL/SENSORS_PER_OBJECT; i++ ) - for( j = 0; j < NUM_LIGHTHOUSES; j++ ) + for( j = 0; j < ctx->activeLighthouses; j++ ) { int sensors_visible = 0; for( k = 0; k < SENSORS_PER_OBJECT; k++ ) |