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 /include | |
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 'include')
-rw-r--r-- | include/libsurvive/survive.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/libsurvive/survive.h b/include/libsurvive/survive.h index 7fd6046..03249e9 100644 --- a/include/libsurvive/survive.h +++ b/include/libsurvive/survive.h @@ -77,6 +77,8 @@ struct BaseStationData FLT fcalgibmag[2]; }; +struct config_group; + struct SurviveContext { text_feedback_func faultfunction; @@ -85,6 +87,9 @@ struct SurviveContext imu_process_func imuproc; angle_process_func angleproc; + struct config_group* global_config_values; + struct config_group* lh_config; //lighthouse configs + //Calibration data: BaseStationData bsd[NUM_LIGHTHOUSES]; |