From 35e08aaa24bd01e6ace453f89ddb73a6bb0508b0 Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Tue, 14 Feb 2017 01:00:33 -0500
Subject: Still not working, but getting closer to dynamic OOTX decoding.

---
 src/survive_process.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/survive_process.c')

diff --git a/src/survive_process.c b/src/survive_process.c
index d3a8c4a..184532b 100644
--- a/src/survive_process.c
+++ b/src/survive_process.c
@@ -1,15 +1,19 @@
 //<>< (C) 2016 C. N. Lohr, FULLY Under MIT/x11 License.
 //All MIT/x11 Licensed Code in this file may be relicensed freely under the GPL or LGPL licenses.
 
-#include "survive_internal.h"
+#include "survive_cal.h"
 
-
-int bufferpts[32*2];
-char buffermts[32*128];
-int buffertimeto[32];
+//XXX TODO: Once data is avialble in the context, use the stuff here to handle converting from time codes to
+//proper angles, then from there perform the rest of the solution. 
 
 void survive_default_light_process( struct SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length  )
 {
+
+	if( so->ctx->calptr )
+	{
+		survive_cal_light( so, sensor_id, acode, timeinsweep, timecode, length );
+	}
+
 	//TODO: Writeme!
 }
 
@@ -18,4 +22,3 @@ void survive_default_imu_process( struct SurviveObject * so, int16_t * accelgyro
 	//TODO: Writeme!
 }
 
-
-- 
cgit v1.2.3


From 2e5d0355da2376f27dcbe0cc6d04b737145ac853 Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Thu, 16 Feb 2017 15:47:46 -0500
Subject: update with more integration stuff.

---
 src/survive_process.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/survive_process.c')

diff --git a/src/survive_process.c b/src/survive_process.c
index 184532b..cb53588 100644
--- a/src/survive_process.c
+++ b/src/survive_process.c
@@ -8,13 +8,29 @@
 
 void survive_default_light_process( struct SurviveObject * so, int sensor_id, int acode, int timeinsweep, uint32_t timecode, uint32_t length  )
 {
+	struct SurviveContext * ctx = so->ctx;
+	int base_station = acode >> 2;
+	int axis = acode & 1;
 
-	if( so->ctx->calptr )
+	if( ctx->calptr )
 	{
 		survive_cal_light( so, sensor_id, acode, timeinsweep, timecode, length );
 	}
 
-	//TODO: Writeme!
+	if( base_station > NUM_LIGHTHOUSES ) return;
+
+	//No loner need sync information past this point.
+	if( sensor_id < 0 ) return;
+
+	float angle = (timeinsweep - 200000) * (1./200000. * 3.14159265359/2.0);
+
+	//Need to now do angle correction.
+#if 1
+	struct BaseStationData * bsd = &ctx->bsd[base_station];
+
+	//TODO!!!
+#endif
+	
 }
 
 void survive_default_imu_process( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id )
-- 
cgit v1.2.3


From 32fbccbd7d90f1e456d1e477eab2128aaf88df93 Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Thu, 16 Feb 2017 17:16:31 -0500
Subject: Move to having an angle callback.

---
 src/survive_process.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'src/survive_process.c')

diff --git a/src/survive_process.c b/src/survive_process.c
index cb53588..75453da 100644
--- a/src/survive_process.c
+++ b/src/survive_process.c
@@ -21,18 +21,36 @@ void survive_default_light_process( struct SurviveObject * so, int sensor_id, in
 
 	//No loner need sync information past this point.
 	if( sensor_id < 0 ) return;
-
-	float angle = (timeinsweep - 200000) * (1./200000. * 3.14159265359/2.0);
+	FLT angle = (timeinsweep - so->timecenter_ticks) * (1./so->timecenter_ticks * 3.14159265359/2.0);
 
 	//Need to now do angle correction.
 #if 1
 	struct BaseStationData * bsd = &ctx->bsd[base_station];
 
+	//XXX TODO: This seriously needs to be worked on.  See: https://github.com/cnlohr/libsurvive/issues/18
+	angle += bsd->fcalphase[axis];
+//	angle += bsd->fcaltilt[axis] * predicted_angle(axis1);
+	
 	//TODO!!!
 #endif
-	
+
+	FLT length_sec = length / (FLT)so->timebase_hz;
+	ctx->angleproc( so, sensor_id, acode, timecode, length_sec, angle );
 }
 
+
+void survive_default_angle_process( struct SurviveObject * so, int sensor_id, int acode, uint32_t timecode, FLT length, FLT angle )
+{
+	struct SurviveContext * ctx = so->ctx;
+	if( ctx->calptr )
+	{
+		survive_cal_angle( so, sensor_id, acode, timecode, length, angle );
+	}
+
+	//TODO: Writeme!
+}	
+
+
 void survive_default_imu_process( struct SurviveObject * so, int16_t * accelgyro, uint32_t timecode, int id )
 {
 	//TODO: Writeme!
-- 
cgit v1.2.3