diff options
author | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
---|---|---|
committer | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
commit | ba38ddcc4c3d74c00139ceff9b45481259d80fc7 (patch) | |
tree | ba1efc8aa8f7a76aa9f9f831aff16ea86fdc2b23 /src/survive_cal.c | |
parent | 1d9db12d7e115f2b8994f014e37f1086c17e90fd (diff) | |
parent | cdc60d110a9cd69c5bd8c0ac4e67db1ce7cecc93 (diff) | |
download | libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.gz libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.bz2 |
Merge remote-tracking branch 'remotes/upstream/master' into Octavios_Algorithm
Conflicts:
redist/linmath.c
Diffstat (limited to 'src/survive_cal.c')
-rw-r--r-- | src/survive_cal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/survive_cal.c b/src/survive_cal.c index 2acf51c..06914eb 100644 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -52,7 +52,7 @@ void ootx_packet_clbk_d(ootx_decoder_context *ct, ootx_packet* packet) b->fcalgibmag[1] = v6.fcal_1_gibmag; b->OOTXSet = 1; - config_set_lighthouse(b,id); + config_set_lighthouse(ctx->lh_config,b,id); // config_save("config.json"); } |