Merge pull request #27 from cnlohr/cal_with_ootx

Cal with ootx

1 files changed, 24 insertions, 2 deletions

diff --git a/src/survive_internal.h b/src/survive_internal.h
index 446f3c0..11c9d89 100644
--- a/src/survive_internal.h
+++ b/src/survive_internal.h
@@ -62,6 +62,22 @@ struct SurviveUSBInterface
 
 //This is defined in survive.h
 struct SurviveObject;
+struct SurviveCalData;
+
+struct BaseStationData
+{
+	uint8_t PositionSet:1;
+	float Position[3];
+	float Quaternion[4];
+
+	uint8_t OOTXSet:1;
+	uint32_t BaseStationID;
+	float fcalphase[2];
+	float fcaltilt[2];
+	float fcalcurve[2];
+	float fcalgibpha[2];
+	float fcalgibmag[2];
+};
 
 struct SurviveContext
 {
@@ -75,9 +91,15 @@ struct SurviveContext
 	light_process_func lightproc;
 	imu_process_func imuproc;
 
-	//Data Subsystem
+	//Calibration data:
+	struct BaseStationData bsd[NUM_LIGHTHOUSES];
+
+	struct SurviveCalData * calptr; //If and only if the calibration subsystem is attached.
+
+	//Data Subsystem.  These should be last, as there may be additional surviveobjects.
 	struct SurviveObject headset;
-	struct SurviveObject watchman[2];
+	struct SurviveObject watchman[2]; //Currently only two supported watchmen.
+
 };